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

fix: patch only once, bump dependancy

Browse source
This commit is contained in:
ftbsc 2023-02-08 00:08:13 +01:00
parent 22fa139b74
commit 4f7baa6f87
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build.gradle
View file

@ -16,7 +16,7 @@ dependencies {
implementation 'org.apache.logging.log4j:log4j-core:2.15.0' implementation 'org.apache.logging.log4j:log4j-core:2.15.0'
implementation 'org.ow2.asm:asm-commons:9.4' implementation 'org.ow2.asm:asm-commons:9.4'
implementation 'cpw.mods:modlauncher:8.1.3' implementation 'cpw.mods:modlauncher:8.1.3'
implementation 'ftbsc:lll:0.0.5' implementation 'ftbsc:lll:0.1.1'
} }
// jar { // jar {

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

@ -19,9 +19,11 @@ import java.net.URLClassLoader;
import java.nio.file.Path; import java.nio.file.Path;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.EnumSet; import java.util.EnumSet;
import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.ServiceLoader; import java.util.ServiceLoader;
import java.util.Set;
import java.util.stream.Collectors; import java.util.stream.Collectors;
public class LilleroLoader implements ILaunchPluginService { public class LilleroLoader implements ILaunchPluginService {
@ -34,6 +36,7 @@ public class LilleroLoader implements ILaunchPluginService {
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<>();
private Set<IInjector> applied = new HashSet<>();
public LilleroLoader() { public LilleroLoader() {
LOGGER.info(INIT, "Patch Loader initialized"); LOGGER.info(INIT, "Patch Loader initialized");
@ -85,9 +88,10 @@ public class LilleroLoader implements ILaunchPluginService {
public EnumSet<Phase> handlesClass(Type classType, final boolean isEmpty, final String reason) { public EnumSet<Phase> handlesClass(Type classType, final boolean isEmpty, final String reason) {
if (isEmpty) return NAY; if (isEmpty) return NAY;
// 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
LOGGER.debug(HANDLER, "Inspecting class {}", classType.getClassName());
for (IInjector inj : this.injectors) { for (IInjector inj : this.injectors) {
if (inj.targetClass().equals(classType.getClassName())) { if (!this.applied.contains(inj) && inj.targetClass().equals(classType.getClassName())) {
LOGGER.debug(HANDLER, "Marked class {} as handled by {}", classType.getClassName(), LilleroLoader.NAME); LOGGER.info(HANDLER, "Marked class {} as handled by {}", classType.getClassName(), LilleroLoader.NAME);
return YAY; return YAY;
} }
} }
@ -101,6 +105,7 @@ public class LilleroLoader implements ILaunchPluginService {
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 -> !this.applied.contains(i))
.filter(i -> i.targetClass().equals(classType.getClassName())) .filter(i -> i.targetClass().equals(classType.getClassName()))
.collect(Collectors.toList()); .collect(Collectors.toList());
boolean modified = false; boolean modified = false;
@ -113,6 +118,7 @@ public class LilleroLoader implements ILaunchPluginService {
LOGGER.info(PATCHER, "Patching {}.{} with {} ({})", 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);
this.applied.add(inj);
modified = true; modified = true;
} catch (InjectionException e) { } catch (InjectionException e) {
LOGGER.error(PATCHER, "Error applying patch '{}' : {}", inj.name(), e.toString()); LOGGER.error(PATCHER, "Error applying patch '{}' : {}", inj.name(), e.toString());