zaaarf/lillero-loader
1
1
Fork 0
mirror of https://github.com/zaaarf/lillero-loader.git synced 2024-11-24 13:54:47 +01:00
Code Issues Projects Releases Packages Wiki Activity

fix: actually read log4j docs (a little) this time

Browse source
This commit is contained in:
ftbsc 2023-02-07 14:09:53 +01:00
parent 1e3b49d0ac
commit 3f2e82c027
2 changed files with 22 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
README.md
View file

@ -40,12 +40,12 @@ Edit your target instance and go into "Versions". Select "Forge", click "Customi
{ {
"downloads": { "downloads": {
"artifact": { "artifact": {
"sha1": "91770ff7cd9c8adc03e24ab03056ecafbb9f6e71", "sha1": "fe23393f61060cacdc2a767ad82057006a923007",
"size": 4468, "size": 4568,
"url": "https://maven.fantabos.co/ftbsc/lll/loader/0.0.6/loader-0.0.6.jar" "url": "https://maven.fantabos.co/ftbsc/lll/loader/0.0.7/loader-0.0.7.jar"
} }
}, },
"name": "ftbsc.lll:loader:0.0.6" "name": "ftbsc.lll:loader:0.0.7"
}, },
``` ```

29
src/main/java/ftbsc/lll/loader/LilleroLoader.java
View file

@ -7,6 +7,8 @@ import ftbsc.lll.exception.InjectionException;
import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.Marker;
import org.apache.logging.log4j.MarkerManager;
import org.objectweb.asm.Type; import org.objectweb.asm.Type;
import org.objectweb.asm.tree.ClassNode; import org.objectweb.asm.tree.ClassNode;
import org.objectweb.asm.tree.MethodNode; import org.objectweb.asm.tree.MethodNode;
@ -23,13 +25,18 @@ import java.util.ServiceLoader;
import java.util.stream.Collectors; import java.util.stream.Collectors;
public class LilleroLoader implements ILaunchPluginService { public class LilleroLoader implements ILaunchPluginService {
public static final Logger LOGGER = LogManager.getLogger(LilleroLoader.class.getCanonicalName()); private static final Logger LOGGER = LogManager.getLogger(LilleroLoader.class.getCanonicalName());
private static final Marker INIT = MarkerManager.getMarker("INIT");
private static final Marker RESOURCE = MarkerManager.getMarker("RESOURCE");
private static final Marker HANDLER = MarkerManager.getMarker("HANDLER");
private static final Marker PATCHER = MarkerManager.getMarker("PATCHER");
public static final String NAME = "lll-loader"; public static final String NAME = "lll-loader";
private List<IInjector> injectors = new ArrayList<>(); private List<IInjector> injectors = new ArrayList<>();
public LilleroLoader() { public LilleroLoader() {
LOGGER.info("INIT", "Patch Loader initialized"); LOGGER.info(INIT, "Patch Loader initialized");
} }
@Override @Override
@ -42,23 +49,23 @@ public class LilleroLoader implements ILaunchPluginService {
@Override @Override
public void offerResource(Path resource, String name) { public void offerResource(Path resource, String name) {
LOGGER.error("RESOURCE", String.format("Resource offered to us (%s@%s) but no action was taken", name, resource.toString())); LOGGER.warn(RESOURCE, "Resource offered to us ({}@{}) but no action was taken", name, resource.toString());
} }
@Override @Override
public void addResources(List<Map.Entry<String, Path>> resources) { public void addResources(List<Map.Entry<String, Path>> resources) {
LOGGER.debug("RESOURCE", "Resources being added:"); LOGGER.debug(RESOURCE, "Resources being added:");
for (Map.Entry<String, Path> row : resources) { for (Map.Entry<String, Path> row : resources) {
LOGGER.debug("RESOURCE", String.format("> %s (%s)", row.getKey(), row.getValue().toString())); LOGGER.debug(RESOURCE, "> {} ({})", row.getKey(), row.getValue().toString());
try { try {
URL jarUrl = new URL("file:" + row.getValue().toString()); URL jarUrl = new URL("file:" + row.getValue().toString());
URLClassLoader loader = new URLClassLoader(new URL[] { jarUrl }); URLClassLoader loader = new URLClassLoader(new URL[] { jarUrl });
for (IInjector inj : ServiceLoader.load(IInjector.class, loader)) { for (IInjector inj : ServiceLoader.load(IInjector.class, loader)) {
LOGGER.info("RESOURCE", String.format("Registering injector %s", inj.name())); LOGGER.info(RESOURCE, "Registering injector {}", inj.name());
this.injectors.add(inj); this.injectors.add(inj);
} }
} catch (MalformedURLException e) { } catch (MalformedURLException e) {
LOGGER.error("RESOURCE", String.format("Malformed URL for resource %s - 'file:%s'", row.getKey(), row.getValue().toString())); LOGGER.error(RESOURCE, "Malformed URL for resource {} - 'file:{}'", row.getKey(), row.getValue().toString());
} }
} }
} }
@ -80,7 +87,7 @@ public class LilleroLoader implements ILaunchPluginService {
// TODO can I make a set of target classes to make this faster // TODO can I make a set of target classes to make this faster
for (IInjector inj : this.injectors) { for (IInjector inj : this.injectors) {
if (inj.targetClass().equals(classType.getClassName())) { if (inj.targetClass().equals(classType.getClassName())) {
LOGGER.debug("HANDLER", String.format("Marked class %s as handled by us", classType.getClassName())); LOGGER.debug(HANDLER, "Marked class {} as handled by {}", classType.getClassName(), LilleroLoader.NAME);
return YAY; return YAY;
} }
} }
@ -92,7 +99,7 @@ public class LilleroLoader implements ILaunchPluginService {
@Override @Override
public int processClassWithFlags(Phase phase, ClassNode classNode, Type classType, String reason) { public int processClassWithFlags(Phase phase, ClassNode classNode, Type classType, String reason) {
LOGGER.debug("PATCHER", "Processing class {} in phase {} of {}", classType.getClassName(), phase.name(), reason); LOGGER.debug(PATCHER, "Processing class {} in phase {} of {}", classType.getClassName(), phase.name(), reason);
List<IInjector> relevantInjectors = this.injectors.stream() List<IInjector> relevantInjectors = this.injectors.stream()
.filter(i -> i.targetClass().equals(classType.getClassName())) .filter(i -> i.targetClass().equals(classType.getClassName()))
.collect(Collectors.toList()); .collect(Collectors.toList());
@ -103,12 +110,12 @@ public class LilleroLoader implements ILaunchPluginService {
inj.methodName().equals(method.name) && inj.methodName().equals(method.name) &&
inj.methodDesc().equals(method.desc) inj.methodDesc().equals(method.desc)
) { ) {
LOGGER.info("PATCHER", String.format("Patching %s.%s with %s (%s)", classType.getClassName(), method.name, inj.name(), inj.reason())); LOGGER.info(PATCHER, "Patching {}.{} with {} ({})", classType.getClassName(), method.name, inj.name(), inj.reason());
try { try {
inj.inject(classNode, method); inj.inject(classNode, method);
modified = true; modified = true;
} catch (InjectionException e) { } catch (InjectionException e) {
LOGGER.error("PATCHER", String.format("Error applying patch '%s' : %s", inj.name(), e.toString())); LOGGER.error(PATCHER, "Error applying patch '{}' : {}", inj.name(), e.toString());
} }
} }
} }