diff --git a/build.gradle.kts b/build.gradle.kts index 383a5782b..7de56bc9d 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -4,6 +4,8 @@ plugins { minecraft { extraRunJvmArguments.add("-Dangelica.enableTestBlocks=true") + extraRunJvmArguments.add("-Dangelica.dumpClass=true") + //extraRunJvmArguments.add("-Dangelica.redirectorLogspam=true") } tasks.test { diff --git a/dependencies.gradle b/dependencies.gradle index 53b8822f7..121987e05 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -49,7 +49,7 @@ configurations { } dependencies { - compileOnly("com.github.GTNewHorizons:Hodgepodge:2.6.91") + compileOnly("com.github.GTNewHorizons:Hodgepodge:2.6.97") compileOnly("com.gtnewhorizons.retrofuturabootstrap:RetroFuturaBootstrap:1.0.7") { transitive = false } @@ -61,7 +61,7 @@ dependencies { // Iris Shaders compileOnly('org.jetbrains:annotations:26.0.2') - api("com.github.GTNewHorizons:GTNHLib:0.6.37:dev") + api("com.github.GTNewHorizons:GTNHLib:0.6.39:dev") shadowImplementation("org.anarres:jcpp:1.4.14") // Apache 2.0 shadowImplementation("org.taumc:glsl-transformation-lib:0.2.0-4.g6b42bca") { exclude module: "antlr4" // we only want to shadow the runtime module @@ -70,18 +70,18 @@ dependencies { compileOnly "org.apache.ant:ant:1.8.2" // Because who doesn't want NEI - devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.7.64-GTNH:dev') - devOnlyNonPublishable('com.github.GTNewHorizons:CodeChickenCore:1.4.3:dev') + devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.7.72-GTNH:dev') + devOnlyNonPublishable('com.github.GTNewHorizons:CodeChickenCore:1.4.7:dev') // Notfine Deps compileOnly("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev") devOnlyNonPublishable("com.github.GTNewHorizons:Baubles-Expanded:2.1.9-GTNH:dev") - compileOnly("com.github.GTNewHorizons:twilightforest:2.7.8:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:twilightforest:2.7.9:dev") { transitive = false } compileOnly(rfg.deobf('curse.maven:witchery-69673:2234410')) - compileOnly("com.github.GTNewHorizons:TinkersConstruct:1.13.40-GTNH:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:TinkersConstruct:1.13.48-GTNH:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:Natura:2.8.8:dev") - compileOnly("com.github.GTNewHorizons:ThaumicHorizons:1.7.5:dev") + compileOnly("com.github.GTNewHorizons:ThaumicHorizons:1.7.6:dev") compileOnly("com.github.GTNewHorizons:Battlegear2:1.4.3:dev") { transitive = false } diff --git a/src/main/java/com/gtnewhorizons/angelica/loading/AngelicaTweaker.java b/src/main/java/com/gtnewhorizons/angelica/loading/AngelicaTweaker.java index 573608251..a35b1843a 100644 --- a/src/main/java/com/gtnewhorizons/angelica/loading/AngelicaTweaker.java +++ b/src/main/java/com/gtnewhorizons/angelica/loading/AngelicaTweaker.java @@ -1,6 +1,5 @@ package com.gtnewhorizons.angelica.loading; -import com.gtnewhorizon.gtnhlib.asm.ASMUtil; import com.gtnewhorizon.gtnhlib.config.ConfigException; import com.gtnewhorizon.gtnhlib.config.ConfigurationManager; import com.gtnewhorizon.gtnhmixins.IEarlyMixinLoader; @@ -9,14 +8,14 @@ import com.gtnewhorizon.gtnhmixins.builders.ITransformers; import com.gtnewhorizons.angelica.config.AngelicaConfig; import com.gtnewhorizons.angelica.config.CompatConfig; import com.gtnewhorizons.angelica.mixins.Mixins; -import com.gtnewhorizons.angelica.transform.compat.GenericCompatTransformer; -import com.gtnewhorizons.angelica.transform.compat.handlers.CompatHandler; -import com.gtnewhorizons.angelica.transform.compat.handlers.CompatHandlers; +import com.gtnewhorizons.angelica.loading.fml.compat.CompatHandlers; +import cpw.mods.fml.relauncher.FMLLaunchHandler; import cpw.mods.fml.relauncher.IFMLLoadingPlugin; import jss.notfine.asm.AsmTransformers; import jss.notfine.asm.mappings.Namer; import jss.notfine.config.MCPatcherForgeConfig; import jss.notfine.config.NotFineConfig; +import net.minecraft.launchwrapper.Launch; import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -43,17 +42,17 @@ import java.util.Set; //@IFMLLoadingPlugin.SortingIndex(Integer.MAX_VALUE - 5) @IFMLLoadingPlugin.MCVersion("1.7.10") @IFMLLoadingPlugin.TransformerExclusions({ - "com.gtnewhorizons.angelica.transform.RedirectorTransformer", - "com.gtnewhorizons.angelica.glsm.GLStateManager"}) + "jss.notfine.asm", + "com.gtnewhorizons.angelica.loading", + "com.gtnewhorizons.angelica.glsm.GLStateManager"}) public class AngelicaTweaker implements IFMLLoadingPlugin, IEarlyMixinLoader { - private static final boolean DUMP_CLASSES = Boolean.parseBoolean(System.getProperty("angelica.dumpClass", "false")); - private static boolean OBF_ENV; + private static Boolean OBF_ENV; public static final Logger LOGGER = LogManager.getLogger("Angelica"); private String[] transformerClasses; - static { + public AngelicaTweaker() { try { // Angelica Config ConfigurationManager.registerConfig(AngelicaConfig.class); @@ -68,39 +67,29 @@ public class AngelicaTweaker implements IFMLLoadingPlugin, IEarlyMixinLoader { ctx.updateLoggers(); // Debug features - AngelicaConfig.enableTestBlocks = Boolean.parseBoolean(System.getProperty("angelica.enableTestBlocks", "false")); + AngelicaConfig.enableTestBlocks = Boolean.getBoolean("angelica.enableTestBlocks"); } catch (ConfigException e) { throw new RuntimeException(e); } + verifyDependencies(); + } + + private static void verifyDependencies() { + if (AngelicaTweaker.class.getResource("/it/unimi/dsi/fastutil/ints/Int2ObjectMap.class") == null) { + throw new RuntimeException("Missing dependency: Angelica requires GTNHLib 0.2.1 or newer! Download: https://modrinth.com/mod/gtnhlib"); + } } @Override public String[] getASMTransformerClass() { - // Directly add this to the MixinServiceLaunchWrapper tweaker's list of Tweak Classes - final List mixinTweakClasses = GlobalProperties.get(MixinServiceLaunchWrapper.BLACKBOARD_KEY_TWEAKCLASSES); - if (mixinTweakClasses != null) { - mixinTweakClasses.add(MixinCompatHackTweaker.class.getName()); - } if (transformerClasses == null) { final List transformers = new ArrayList<>(); - - // Regsiter compat handlers, and add extra specific transformers, then build and register the generic transformer - for (CompatHandler handler : CompatHandlers.getHandlers()) { - GenericCompatTransformer.register(handler); - if (handler.extraTransformers() != null) { - transformers.addAll(handler.extraTransformers()); - } - } - - GenericCompatTransformer.build(); - transformers.add(GenericCompatTransformer.class.getName()); - + transformers.addAll(CompatHandlers.getTransformers()); // Add NotFine transformers final List notFineTransformers = Arrays.asList(ITransformers.getTransformers(AsmTransformers.class)); if (!notFineTransformers.isEmpty()) Namer.initNames(); transformers.addAll(notFineTransformers); - transformerClasses = transformers.toArray(new String[0]); } return transformerClasses; @@ -118,7 +107,28 @@ public class AngelicaTweaker implements IFMLLoadingPlugin, IEarlyMixinLoader { @Override public void injectData(Map data) { - OBF_ENV = (boolean) data.get("runtimeDeobfuscationEnabled"); + OBF_ENV = (Boolean) data.get("runtimeDeobfuscationEnabled"); + // Directly add this to the MixinServiceLaunchWrapper tweaker's list of Tweak Classes + final List tweaks = GlobalProperties.get(MixinServiceLaunchWrapper.BLACKBOARD_KEY_TWEAKCLASSES); + if (tweaks != null) { + tweaks.add("com.gtnewhorizons.angelica.loading.fml.tweakers.IncompatibleModsDisablerTweaker"); + if (AngelicaConfig.enableHudCaching) { + tweaks.add("com.gtnewhorizons.angelica.loading.fml.tweakers.XaerosTransformerDisablerTweaker"); + } + if (FMLLaunchHandler.side().isClient()) { + // We register ITweakers that will run last in order to register + // specific IClassTransformers that will run last in the transformer chain. + // If we were to register them normally in getASMTransformerClass(), + // they would be sorted at index 0 which we do not want. + boolean rfbLoaded = Launch.blackboard.getOrDefault("angelica.rfbPluginLoaded", Boolean.FALSE) == Boolean.TRUE; + if (!rfbLoaded) { + tweaks.add("com.gtnewhorizons.angelica.loading.fml.tweakers.AngelicaLateTweaker"); + } + if (AngelicaConfig.enableSodium) { + tweaks.add("com.gtnewhorizons.angelica.loading.fml.tweakers.SodiumLateTweaker"); + } + } + } } @Override @@ -141,21 +151,26 @@ public class AngelicaTweaker implements IFMLLoadingPlugin, IEarlyMixinLoader { return IMixins.getEarlyMixins(Mixins.class, loadedCoreMods); } - public static boolean DUMP_CLASSES() { - return DUMP_CLASSES || !OBF_ENV; - } - /** * Returns true if we are in an obfuscated environment, returns false in dev environment. */ public static boolean isObfEnv() { + if (OBF_ENV == null) { + throw new IllegalStateException("Obfuscation state has been accessed too early!"); + } return OBF_ENV; } - public static void dumpClass(String className, byte[] originalBytes, byte[] transformedBytes, Object transformer) { - if (AngelicaTweaker.DUMP_CLASSES()) { - ASMUtil.saveAsRawClassFile(originalBytes, className + "_PRE", transformer); - ASMUtil.saveAsRawClassFile(transformedBytes, className + "_POST", transformer); + /** + * Returns the appropriate name according to current environment's obfuscation + */ + public static String obf(String deobf, String obf) { + if (OBF_ENV == null) { + throw new IllegalStateException("Obfuscation state has been accessed too early!"); } + if (OBF_ENV) { + return obf; + } + return deobf; } } diff --git a/src/main/java/com/gtnewhorizons/angelica/loading/fml/compat/CompatHandlers.java b/src/main/java/com/gtnewhorizons/angelica/loading/fml/compat/CompatHandlers.java new file mode 100644 index 000000000..c3a779571 --- /dev/null +++ b/src/main/java/com/gtnewhorizons/angelica/loading/fml/compat/CompatHandlers.java @@ -0,0 +1,64 @@ +package com.gtnewhorizons.angelica.loading.fml.compat; + +import com.gtnewhorizons.angelica.config.CompatConfig; +import com.gtnewhorizons.angelica.loading.fml.compat.handlers.ExtraUtilsCompatHandler; +import com.gtnewhorizons.angelica.loading.fml.compat.handlers.ImmersiveEngineeringCompatHandler; +import com.gtnewhorizons.angelica.loading.fml.compat.handlers.StacksOnStacksCompatHandler; +import com.gtnewhorizons.angelica.loading.fml.compat.handlers.ThaumcraftCompatHandler; +import com.gtnewhorizons.angelica.loading.fml.compat.handlers.ThaumicHorizonsCompatHandler; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.function.Supplier; + +public enum CompatHandlers { + + STACKS_ON_STACKS(() -> CompatConfig.fixStacksOnStacks, new StacksOnStacksCompatHandler()), + EXTRA_UTILS(() -> CompatConfig.fixExtraUtils, new ExtraUtilsCompatHandler()), + IMMERSIVE_ENGINEERING(() -> CompatConfig.fixImmersiveEngineering, new ImmersiveEngineeringCompatHandler()), + THAUMCRAFT(() -> CompatConfig.fixThaumcraft, new ThaumcraftCompatHandler()), + THAUMIC_HORIZONS(() -> CompatConfig.fixThaumicHorizons, new ThaumicHorizonsCompatHandler()); + + private final Supplier applyIf; + private final ICompatHandler handler; + + CompatHandlers(Supplier applyIf, ICompatHandler handler) { + this.applyIf = applyIf; + this.handler = handler; + } + + private static List compatHandlers = null; + + public static List getHandlers() { + if (compatHandlers != null) { + return compatHandlers; + } + compatHandlers = new ArrayList<>(); + for (CompatHandlers value : values()) { + if (value.applyIf.get()) { + compatHandlers.add(value.handler); + } + } + return compatHandlers; + } + + /** + * Returns extra transformers as well as the main transformer. + * Returns an empty list if no handlers registered. + */ + public static List getTransformers() { + final List handlers = getHandlers(); + if (handlers.isEmpty()) { + return Collections.emptyList(); + } + List transformers = new ArrayList<>(); + for (ICompatHandler handler : handlers) { + if (handler.extraTransformers() != null) { + transformers.addAll(handler.extraTransformers()); + } + } + transformers.add("com.gtnewhorizons.angelica.loading.fml.transformers.GenericCompatTransformer"); + return transformers; + } +} diff --git a/src/main/java/com/gtnewhorizons/angelica/transform/compat/handlers/CompatHandler.java b/src/main/java/com/gtnewhorizons/angelica/loading/fml/compat/ICompatHandler.java similarity index 84% rename from src/main/java/com/gtnewhorizons/angelica/transform/compat/handlers/CompatHandler.java rename to src/main/java/com/gtnewhorizons/angelica/loading/fml/compat/ICompatHandler.java index 83578435b..23906a7b2 100644 --- a/src/main/java/com/gtnewhorizons/angelica/transform/compat/handlers/CompatHandler.java +++ b/src/main/java/com/gtnewhorizons/angelica/loading/fml/compat/ICompatHandler.java @@ -1,9 +1,9 @@ -package com.gtnewhorizons.angelica.transform.compat.handlers; +package com.gtnewhorizons.angelica.loading.fml.compat; import java.util.List; import java.util.Map; -public interface CompatHandler { +public interface ICompatHandler { default Map> getFieldLevelTessellator() { return null; diff --git a/src/main/java/com/gtnewhorizons/angelica/transform/compat/handlers/ExtraUtilsCompatHandler.java b/src/main/java/com/gtnewhorizons/angelica/loading/fml/compat/handlers/ExtraUtilsCompatHandler.java similarity index 76% rename from src/main/java/com/gtnewhorizons/angelica/transform/compat/handlers/ExtraUtilsCompatHandler.java rename to src/main/java/com/gtnewhorizons/angelica/loading/fml/compat/handlers/ExtraUtilsCompatHandler.java index 039921d1d..5f70acc69 100644 --- a/src/main/java/com/gtnewhorizons/angelica/transform/compat/handlers/ExtraUtilsCompatHandler.java +++ b/src/main/java/com/gtnewhorizons/angelica/loading/fml/compat/handlers/ExtraUtilsCompatHandler.java @@ -1,10 +1,11 @@ -package com.gtnewhorizons.angelica.transform.compat.handlers; +package com.gtnewhorizons.angelica.loading.fml.compat.handlers; import com.google.common.collect.ImmutableMap; +import com.gtnewhorizons.angelica.loading.fml.compat.ICompatHandler; import java.util.Map; -public class ExtraUtilsCompatHandler implements CompatHandler { +public class ExtraUtilsCompatHandler implements ICompatHandler { @Override public Map getThreadSafeISBRHAnnotations() { diff --git a/src/main/java/com/gtnewhorizons/angelica/transform/compat/handlers/ImmersiveEngineeringCompatHandler.java b/src/main/java/com/gtnewhorizons/angelica/loading/fml/compat/handlers/ImmersiveEngineeringCompatHandler.java similarity index 86% rename from src/main/java/com/gtnewhorizons/angelica/transform/compat/handlers/ImmersiveEngineeringCompatHandler.java rename to src/main/java/com/gtnewhorizons/angelica/loading/fml/compat/handlers/ImmersiveEngineeringCompatHandler.java index b4db3c103..e22d313d7 100644 --- a/src/main/java/com/gtnewhorizons/angelica/transform/compat/handlers/ImmersiveEngineeringCompatHandler.java +++ b/src/main/java/com/gtnewhorizons/angelica/loading/fml/compat/handlers/ImmersiveEngineeringCompatHandler.java @@ -1,13 +1,13 @@ -package com.gtnewhorizons.angelica.transform.compat.handlers; +package com.gtnewhorizons.angelica.loading.fml.compat.handlers; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import com.gtnewhorizons.angelica.transform.compat.transformers.specific.ImmersiveEngineeringTransformer; +import com.gtnewhorizons.angelica.loading.fml.compat.ICompatHandler; import java.util.List; import java.util.Map; -public class ImmersiveEngineeringCompatHandler implements CompatHandler { +public class ImmersiveEngineeringCompatHandler implements ICompatHandler { @Override public Map> getTileEntityNullGuard() { @@ -38,7 +38,7 @@ public class ImmersiveEngineeringCompatHandler implements CompatHandler { @Override public List extraTransformers() { - return ImmutableList.of(ImmersiveEngineeringTransformer.class.getName()); + return ImmutableList.of("com.gtnewhorizons.angelica.loading.fml.compat.transformers.specific.ImmersiveEngineeringTransformer"); } } diff --git a/src/main/java/com/gtnewhorizons/angelica/transform/compat/handlers/StacksOnStacksCompatHandler.java b/src/main/java/com/gtnewhorizons/angelica/loading/fml/compat/handlers/StacksOnStacksCompatHandler.java similarity index 72% rename from src/main/java/com/gtnewhorizons/angelica/transform/compat/handlers/StacksOnStacksCompatHandler.java rename to src/main/java/com/gtnewhorizons/angelica/loading/fml/compat/handlers/StacksOnStacksCompatHandler.java index fe96055a2..32c5ec218 100644 --- a/src/main/java/com/gtnewhorizons/angelica/transform/compat/handlers/StacksOnStacksCompatHandler.java +++ b/src/main/java/com/gtnewhorizons/angelica/loading/fml/compat/handlers/StacksOnStacksCompatHandler.java @@ -1,13 +1,13 @@ -package com.gtnewhorizons.angelica.transform.compat.handlers; +package com.gtnewhorizons.angelica.loading.fml.compat.handlers; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import com.gtnewhorizons.angelica.transform.compat.transformers.specific.StacksOnStacksTransformer; +import com.gtnewhorizons.angelica.loading.fml.compat.ICompatHandler; import java.util.List; import java.util.Map; -public class StacksOnStacksCompatHandler implements CompatHandler { +public class StacksOnStacksCompatHandler implements ICompatHandler { @Override public Map> getFieldLevelTessellator() { @@ -28,6 +28,6 @@ public class StacksOnStacksCompatHandler implements CompatHandler { @Override public List extraTransformers() { - return ImmutableList.of(StacksOnStacksTransformer.class.getName()); + return ImmutableList.of("com.gtnewhorizons.angelica.loading.fml.compat.transformers.specific.StacksOnStacksTransformer"); } } diff --git a/src/main/java/com/gtnewhorizons/angelica/transform/compat/handlers/ThaumcraftCompatHandler.java b/src/main/java/com/gtnewhorizons/angelica/loading/fml/compat/handlers/ThaumcraftCompatHandler.java similarity index 63% rename from src/main/java/com/gtnewhorizons/angelica/transform/compat/handlers/ThaumcraftCompatHandler.java rename to src/main/java/com/gtnewhorizons/angelica/loading/fml/compat/handlers/ThaumcraftCompatHandler.java index f06cdce75..8d0f47ae1 100644 --- a/src/main/java/com/gtnewhorizons/angelica/transform/compat/handlers/ThaumcraftCompatHandler.java +++ b/src/main/java/com/gtnewhorizons/angelica/loading/fml/compat/handlers/ThaumcraftCompatHandler.java @@ -1,12 +1,13 @@ -package com.gtnewhorizons.angelica.transform.compat.handlers; +package com.gtnewhorizons.angelica.loading.fml.compat.handlers; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; +import com.gtnewhorizons.angelica.loading.fml.compat.ICompatHandler; import java.util.List; import java.util.Map; -public class ThaumcraftCompatHandler implements CompatHandler { +public class ThaumcraftCompatHandler implements ICompatHandler { @Override public Map> getHUDCachingEarlyReturn() { diff --git a/src/main/java/com/gtnewhorizons/angelica/transform/compat/handlers/ThaumicHorizonsCompatHandler.java b/src/main/java/com/gtnewhorizons/angelica/loading/fml/compat/handlers/ThaumicHorizonsCompatHandler.java similarity index 64% rename from src/main/java/com/gtnewhorizons/angelica/transform/compat/handlers/ThaumicHorizonsCompatHandler.java rename to src/main/java/com/gtnewhorizons/angelica/loading/fml/compat/handlers/ThaumicHorizonsCompatHandler.java index 6267e58ab..60e0ce998 100644 --- a/src/main/java/com/gtnewhorizons/angelica/transform/compat/handlers/ThaumicHorizonsCompatHandler.java +++ b/src/main/java/com/gtnewhorizons/angelica/loading/fml/compat/handlers/ThaumicHorizonsCompatHandler.java @@ -1,12 +1,13 @@ -package com.gtnewhorizons.angelica.transform.compat.handlers; +package com.gtnewhorizons.angelica.loading.fml.compat.handlers; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; +import com.gtnewhorizons.angelica.loading.fml.compat.ICompatHandler; import java.util.List; import java.util.Map; -public class ThaumicHorizonsCompatHandler implements CompatHandler { +public class ThaumicHorizonsCompatHandler implements ICompatHandler { @Override public Map> getHUDCachingEarlyReturn() { diff --git a/src/main/java/com/gtnewhorizons/angelica/transform/compat/transformers/generic/FieldLevelTessellatorTransformer.java b/src/main/java/com/gtnewhorizons/angelica/loading/fml/compat/transformers/generic/FieldLevelTessellatorTransformer.java similarity index 94% rename from src/main/java/com/gtnewhorizons/angelica/transform/compat/transformers/generic/FieldLevelTessellatorTransformer.java rename to src/main/java/com/gtnewhorizons/angelica/loading/fml/compat/transformers/generic/FieldLevelTessellatorTransformer.java index d62199a2b..a5f976e11 100644 --- a/src/main/java/com/gtnewhorizons/angelica/transform/compat/transformers/generic/FieldLevelTessellatorTransformer.java +++ b/src/main/java/com/gtnewhorizons/angelica/loading/fml/compat/transformers/generic/FieldLevelTessellatorTransformer.java @@ -1,6 +1,6 @@ -package com.gtnewhorizons.angelica.transform.compat.transformers.generic; +package com.gtnewhorizons.angelica.loading.fml.compat.transformers.generic; -import com.gtnewhorizons.angelica.transform.AsmUtil; +import com.gtnewhorizons.angelica.loading.AngelicaTweaker; import org.spongepowered.asm.lib.Opcodes; import org.spongepowered.asm.lib.tree.AbstractInsnNode; import org.spongepowered.asm.lib.tree.ClassNode; @@ -62,7 +62,7 @@ public class FieldLevelTessellatorTransformer { new FieldInsnNode( Opcodes.GETSTATIC, "net/minecraft/client/renderer/Tessellator", - AsmUtil.obf("instance", "field_78398_a"), + AngelicaTweaker.obf("instance", "field_78398_a"), "Lnet/minecraft/client/renderer/Tessellator;")); list.add(new VarInsnNode(Opcodes.ASTORE, localIndex)); mn.instructions.insert(list); diff --git a/src/main/java/com/gtnewhorizons/angelica/transform/compat/transformers/generic/HUDCachingEarlyReturnTransformer.java b/src/main/java/com/gtnewhorizons/angelica/loading/fml/compat/transformers/generic/HUDCachingEarlyReturnTransformer.java similarity index 95% rename from src/main/java/com/gtnewhorizons/angelica/transform/compat/transformers/generic/HUDCachingEarlyReturnTransformer.java rename to src/main/java/com/gtnewhorizons/angelica/loading/fml/compat/transformers/generic/HUDCachingEarlyReturnTransformer.java index 2bd57feca..5ec9930f1 100644 --- a/src/main/java/com/gtnewhorizons/angelica/transform/compat/transformers/generic/HUDCachingEarlyReturnTransformer.java +++ b/src/main/java/com/gtnewhorizons/angelica/loading/fml/compat/transformers/generic/HUDCachingEarlyReturnTransformer.java @@ -1,4 +1,4 @@ -package com.gtnewhorizons.angelica.transform.compat.transformers.generic; +package com.gtnewhorizons.angelica.loading.fml.compat.transformers.generic; import com.gtnewhorizons.angelica.loading.AngelicaTweaker; import org.spongepowered.asm.lib.Opcodes; diff --git a/src/main/java/com/gtnewhorizons/angelica/transform/compat/transformers/generic/ThreadSafeISBRHAnnotationTransformer.java b/src/main/java/com/gtnewhorizons/angelica/loading/fml/compat/transformers/generic/ThreadSafeISBRHAnnotationTransformer.java similarity index 89% rename from src/main/java/com/gtnewhorizons/angelica/transform/compat/transformers/generic/ThreadSafeISBRHAnnotationTransformer.java rename to src/main/java/com/gtnewhorizons/angelica/loading/fml/compat/transformers/generic/ThreadSafeISBRHAnnotationTransformer.java index 7d2cd4de0..07ff5056f 100644 --- a/src/main/java/com/gtnewhorizons/angelica/transform/compat/transformers/generic/ThreadSafeISBRHAnnotationTransformer.java +++ b/src/main/java/com/gtnewhorizons/angelica/loading/fml/compat/transformers/generic/ThreadSafeISBRHAnnotationTransformer.java @@ -1,4 +1,4 @@ -package com.gtnewhorizons.angelica.transform.compat.transformers.generic; +package com.gtnewhorizons.angelica.loading.fml.compat.transformers.generic; import org.spongepowered.asm.lib.tree.AnnotationNode; import org.spongepowered.asm.lib.tree.ClassNode; diff --git a/src/main/java/com/gtnewhorizons/angelica/transform/compat/transformers/generic/TileEntityNullGuardTransformer.java b/src/main/java/com/gtnewhorizons/angelica/loading/fml/compat/transformers/generic/TileEntityNullGuardTransformer.java similarity index 94% rename from src/main/java/com/gtnewhorizons/angelica/transform/compat/transformers/generic/TileEntityNullGuardTransformer.java rename to src/main/java/com/gtnewhorizons/angelica/loading/fml/compat/transformers/generic/TileEntityNullGuardTransformer.java index 5bd0402f4..25ae7f95d 100644 --- a/src/main/java/com/gtnewhorizons/angelica/transform/compat/transformers/generic/TileEntityNullGuardTransformer.java +++ b/src/main/java/com/gtnewhorizons/angelica/loading/fml/compat/transformers/generic/TileEntityNullGuardTransformer.java @@ -1,7 +1,6 @@ -package com.gtnewhorizons.angelica.transform.compat.transformers.generic; +package com.gtnewhorizons.angelica.loading.fml.compat.transformers.generic; import com.gtnewhorizons.angelica.loading.AngelicaTweaker; -import com.gtnewhorizons.angelica.transform.AsmUtil; import org.spongepowered.asm.lib.Opcodes; import org.spongepowered.asm.lib.tree.AbstractInsnNode; import org.spongepowered.asm.lib.tree.ClassNode; @@ -60,7 +59,7 @@ public class TileEntityNullGuardTransformer { AbstractInsnNode in = mn.instructions.get(i); if (in instanceof MethodInsnNode min) { if (min.getOpcode() == Opcodes.INVOKEINTERFACE - && min.name.equals(AsmUtil.obf("getTileEntity", "func_147438_o")) + && min.name.equals(AngelicaTweaker.obf("getTileEntity", "func_147438_o")) && min.owner.equals("net/minecraft/world/IBlockAccess")) { AbstractInsnNode castNodeAbstract = min.getNext(); if (castNodeAbstract instanceof TypeInsnNode castNodeType) { diff --git a/src/main/java/com/gtnewhorizons/angelica/transform/compat/transformers/specific/ImmersiveEngineeringTransformer.java b/src/main/java/com/gtnewhorizons/angelica/loading/fml/compat/transformers/specific/ImmersiveEngineeringTransformer.java similarity index 96% rename from src/main/java/com/gtnewhorizons/angelica/transform/compat/transformers/specific/ImmersiveEngineeringTransformer.java rename to src/main/java/com/gtnewhorizons/angelica/loading/fml/compat/transformers/specific/ImmersiveEngineeringTransformer.java index d90ab872a..2cb99ec2b 100644 --- a/src/main/java/com/gtnewhorizons/angelica/transform/compat/transformers/specific/ImmersiveEngineeringTransformer.java +++ b/src/main/java/com/gtnewhorizons/angelica/loading/fml/compat/transformers/specific/ImmersiveEngineeringTransformer.java @@ -1,6 +1,7 @@ -package com.gtnewhorizons.angelica.transform.compat.transformers.specific; +package com.gtnewhorizons.angelica.loading.fml.compat.transformers.specific; import com.gtnewhorizons.angelica.loading.AngelicaTweaker; +import com.gtnewhorizons.angelica.loading.shared.AngelicaClassDump; import net.minecraft.launchwrapper.IClassTransformer; import org.spongepowered.asm.lib.ClassReader; import org.spongepowered.asm.lib.Opcodes; @@ -60,7 +61,7 @@ public class ImmersiveEngineeringTransformer implements IClassTransformer { cn.accept(cw); final byte[] bytes = cw.toByteArray(); AngelicaTweaker.LOGGER.info("[AngelicaCompat]Extra Transformers: Applied ImmersiveEngineeringTransformer"); - AngelicaTweaker.dumpClass(transformedName, basicClass, bytes, this); + AngelicaClassDump.dumpClass(transformedName, basicClass, bytes, this); return bytes; } diff --git a/src/main/java/com/gtnewhorizons/angelica/transform/compat/transformers/specific/StacksOnStacksTransformer.java b/src/main/java/com/gtnewhorizons/angelica/loading/fml/compat/transformers/specific/StacksOnStacksTransformer.java similarity index 97% rename from src/main/java/com/gtnewhorizons/angelica/transform/compat/transformers/specific/StacksOnStacksTransformer.java rename to src/main/java/com/gtnewhorizons/angelica/loading/fml/compat/transformers/specific/StacksOnStacksTransformer.java index b3779dc59..8a2d62121 100644 --- a/src/main/java/com/gtnewhorizons/angelica/transform/compat/transformers/specific/StacksOnStacksTransformer.java +++ b/src/main/java/com/gtnewhorizons/angelica/loading/fml/compat/transformers/specific/StacksOnStacksTransformer.java @@ -1,7 +1,8 @@ -package com.gtnewhorizons.angelica.transform.compat.transformers.specific; +package com.gtnewhorizons.angelica.loading.fml.compat.transformers.specific; import com.google.common.collect.ImmutableList; import com.gtnewhorizons.angelica.loading.AngelicaTweaker; +import com.gtnewhorizons.angelica.loading.shared.AngelicaClassDump; import net.minecraft.launchwrapper.IClassTransformer; import org.spongepowered.asm.lib.ClassReader; import org.spongepowered.asm.lib.ClassWriter; @@ -47,7 +48,7 @@ public class StacksOnStacksTransformer implements IClassTransformer { cn.accept(cw); final byte[] bytes = cw.toByteArray(); AngelicaTweaker.LOGGER.info("[AngelicaCompat]Extra Transformers: Applied StacksOnStacksTransformer"); - AngelicaTweaker.dumpClass(transformedName, basicClass, bytes, this); + AngelicaClassDump.dumpClass(transformedName, basicClass, bytes, this); return bytes; } diff --git a/src/main/java/com/gtnewhorizons/angelica/loading/fml/transformers/AngelicaRedirectorTransformer.java b/src/main/java/com/gtnewhorizons/angelica/loading/fml/transformers/AngelicaRedirectorTransformer.java new file mode 100644 index 000000000..32f4f2be0 --- /dev/null +++ b/src/main/java/com/gtnewhorizons/angelica/loading/fml/transformers/AngelicaRedirectorTransformer.java @@ -0,0 +1,49 @@ +package com.gtnewhorizons.angelica.loading.fml.transformers; + +import com.gtnewhorizons.angelica.loading.AngelicaTweaker; +import com.gtnewhorizons.angelica.loading.shared.AngelicaClassDump; +import com.gtnewhorizons.angelica.loading.shared.transformers.AngelicaRedirector; +import net.minecraft.launchwrapper.IClassTransformer; +import org.objectweb.asm.ClassReader; +import org.objectweb.asm.ClassWriter; +import org.objectweb.asm.tree.ClassNode; + +/** IClassTransformer wrapper for {@link AngelicaRedirector} */ +public class AngelicaRedirectorTransformer implements IClassTransformer { + + private final AngelicaRedirector inner; + private final String[] exclusions; + + public AngelicaRedirectorTransformer() { + inner = new AngelicaRedirector(AngelicaTweaker.isObfEnv()); + exclusions = inner.getTransformerExclusions(); + } + + @Override + public byte[] transform(final String className, String transformedName, byte[] basicClass) { + if (basicClass == null) return null; + + // Ignore classes that are excluded from transformation - Doesn't fully work without the + // TransformerExclusions due to some nested classes + for (String exclusion : exclusions) { + if (transformedName.startsWith(exclusion)) return basicClass; + } + + if (!inner.shouldTransform(basicClass)) { + return basicClass; + } + + final ClassReader cr = new ClassReader(basicClass); + final ClassNode cn = new ClassNode(); + cr.accept(cn, 0); + final boolean changed = inner.transformClassNode(transformedName, cn); + if (changed) { + final ClassWriter cw = new ClassWriter(ClassWriter.COMPUTE_MAXS); + cn.accept(cw); + final byte[] bytes = cw.toByteArray(); + AngelicaClassDump.dumpClass(transformedName, basicClass, bytes, this); + return bytes; + } + return basicClass; + } +} diff --git a/src/main/java/com/gtnewhorizons/angelica/loading/fml/transformers/GenericCompatTransformer.java b/src/main/java/com/gtnewhorizons/angelica/loading/fml/transformers/GenericCompatTransformer.java new file mode 100644 index 000000000..4d0ebf425 --- /dev/null +++ b/src/main/java/com/gtnewhorizons/angelica/loading/fml/transformers/GenericCompatTransformer.java @@ -0,0 +1,91 @@ +package com.gtnewhorizons.angelica.loading.fml.transformers; + +import com.gtnewhorizons.angelica.loading.shared.AngelicaClassDump; +import com.gtnewhorizons.angelica.loading.fml.compat.ICompatHandler; +import com.gtnewhorizons.angelica.loading.fml.compat.CompatHandlers; +import com.gtnewhorizons.angelica.loading.fml.compat.transformers.generic.FieldLevelTessellatorTransformer; +import com.gtnewhorizons.angelica.loading.fml.compat.transformers.generic.HUDCachingEarlyReturnTransformer; +import com.gtnewhorizons.angelica.loading.fml.compat.transformers.generic.ThreadSafeISBRHAnnotationTransformer; +import com.gtnewhorizons.angelica.loading.fml.compat.transformers.generic.TileEntityNullGuardTransformer; +import it.unimi.dsi.fastutil.objects.Object2BooleanOpenHashMap; +import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap; +import it.unimi.dsi.fastutil.objects.ObjectOpenHashSet; +import net.minecraft.launchwrapper.IClassTransformer; +import org.spongepowered.asm.lib.ClassReader; +import org.spongepowered.asm.lib.tree.ClassNode; +import org.spongepowered.asm.transformers.MixinClassWriter; + +import java.util.List; +import java.util.Map; +import java.util.Set; + +public class GenericCompatTransformer implements IClassTransformer { + + private final Map> fieldLevelTessellator = new Object2ObjectOpenHashMap<>(); + private final Map> tileEntityNullGuard = new Object2ObjectOpenHashMap<>(); + private final Map threadSafeIBSRH = new Object2BooleanOpenHashMap<>(); + private final Map> hudCachingEarlyReturn = new Object2ObjectOpenHashMap<>(); + private final Set targetedClasses = new ObjectOpenHashSet<>(); + + public GenericCompatTransformer() { + for (ICompatHandler handler : CompatHandlers.getHandlers()) { + registerHandler(handler); + } + buildTargetClassSet(); + } + + private void registerHandler(ICompatHandler handler) { + if (handler.getFieldLevelTessellator() != null) { + fieldLevelTessellator.putAll(handler.getFieldLevelTessellator()); + } + if (handler.getTileEntityNullGuard() != null) { + tileEntityNullGuard.putAll(handler.getTileEntityNullGuard()); + } + if (handler.getThreadSafeISBRHAnnotations() != null) { + threadSafeIBSRH.putAll(handler.getThreadSafeISBRHAnnotations()); + } + if (handler.getHUDCachingEarlyReturn() != null) { + hudCachingEarlyReturn.putAll(handler.getHUDCachingEarlyReturn()); + } + } + + private void buildTargetClassSet() { + targetedClasses.addAll(fieldLevelTessellator.keySet()); + targetedClasses.addAll(tileEntityNullGuard.keySet()); + targetedClasses.addAll(threadSafeIBSRH.keySet()); + targetedClasses.addAll(hudCachingEarlyReturn.keySet()); + } + + @Override + public byte[] transform(String name, String transformedName, byte[] basicClass) { + if (basicClass == null) return null; + + if (!targetedClasses.contains(transformedName)) return basicClass; + + ClassReader cr = new ClassReader(basicClass); + ClassNode cn = new ClassNode(); + cr.accept(cn, 0); + + if (fieldLevelTessellator.containsKey(transformedName)) { + FieldLevelTessellatorTransformer.transform(cn, fieldLevelTessellator.get(transformedName)); + } + + if (tileEntityNullGuard.containsKey(transformedName)) { + TileEntityNullGuardTransformer.transform(cn, tileEntityNullGuard.get(transformedName)); + } + + if (threadSafeIBSRH.containsKey(transformedName)) { + ThreadSafeISBRHAnnotationTransformer.transform(cn, threadSafeIBSRH.get(transformedName)); + } + + if (hudCachingEarlyReturn.containsKey(transformedName)) { + HUDCachingEarlyReturnTransformer.transform(cn, hudCachingEarlyReturn.get(transformedName)); + } + + MixinClassWriter cw = new MixinClassWriter(MixinClassWriter.COMPUTE_MAXS | MixinClassWriter.COMPUTE_FRAMES); + cn.accept(cw); + final byte[] bytes = cw.toByteArray(); + AngelicaClassDump.dumpClass(transformedName, basicClass, bytes, this); + return bytes; + } +} diff --git a/src/main/java/com/gtnewhorizons/angelica/transform/BlockTransformer.java b/src/main/java/com/gtnewhorizons/angelica/loading/fml/transformers/SodiumBlockTransformer.java similarity index 68% rename from src/main/java/com/gtnewhorizons/angelica/transform/BlockTransformer.java rename to src/main/java/com/gtnewhorizons/angelica/loading/fml/transformers/SodiumBlockTransformer.java index 37e2df746..498ec159d 100644 --- a/src/main/java/com/gtnewhorizons/angelica/transform/BlockTransformer.java +++ b/src/main/java/com/gtnewhorizons/angelica/loading/fml/transformers/SodiumBlockTransformer.java @@ -1,7 +1,8 @@ -package com.gtnewhorizons.angelica.transform; +package com.gtnewhorizons.angelica.loading.fml.transformers; import com.google.common.collect.ImmutableList; -import com.gtnewhorizons.angelica.loading.AngelicaTweaker; +import com.gtnewhorizons.angelica.loading.shared.AngelicaClassDump; +import com.gtnewhorizons.angelica.loading.shared.transformers.AngelicaRedirector; import net.minecraft.launchwrapper.IClassTransformer; import org.apache.commons.lang3.tuple.Pair; import org.objectweb.asm.ClassReader; @@ -10,10 +11,9 @@ import org.objectweb.asm.tree.ClassNode; import java.util.List; -public class BlockTransformer implements IClassTransformer { +public class SodiumBlockTransformer implements IClassTransformer { - private static final String BlockClassFriendly = "net.minecraft.block.Block"; - public static final List> BlockBoundsFields = ImmutableList.of( + private static final List> BlockBoundsFields = ImmutableList.of( Pair.of("minX", "field_149759_B"), Pair.of("minY", "field_149760_C"), Pair.of("minZ", "field_149754_D"), @@ -23,12 +23,13 @@ public class BlockTransformer implements IClassTransformer { ); /** - * Delete the global vanilla bounding box fields off the Block object. {@link RedirectorTransformer} + * Delete the global vanilla bounding box fields off the Block object. {@link AngelicaRedirector} * replaces these with a thread-safe alternative. */ @Override public byte[] transform(String name, String transformedName, byte[] basicClass) { - if (basicClass != null && BlockClassFriendly.equals(transformedName)) { + if (basicClass == null) return null; + if ("net.minecraft.block.Block".equals(transformedName)) { final ClassReader cr = new ClassReader(basicClass); final ClassNode cn = new ClassNode(); cr.accept(cn, 0); @@ -36,7 +37,7 @@ public class BlockTransformer implements IClassTransformer { ClassWriter cw = new ClassWriter(ClassWriter.COMPUTE_MAXS); cn.accept(cw); final byte[] bytes = cw.toByteArray(); - AngelicaTweaker.dumpClass(transformedName, basicClass, bytes, this); + AngelicaClassDump.dumpClass(transformedName, basicClass, bytes, this); return bytes; } return basicClass; diff --git a/src/main/java/com/gtnewhorizons/angelica/loading/fml/tweakers/AngelicaLateTweaker.java b/src/main/java/com/gtnewhorizons/angelica/loading/fml/tweakers/AngelicaLateTweaker.java new file mode 100644 index 000000000..542fb6567 --- /dev/null +++ b/src/main/java/com/gtnewhorizons/angelica/loading/fml/tweakers/AngelicaLateTweaker.java @@ -0,0 +1,36 @@ +package com.gtnewhorizons.angelica.loading.fml.tweakers; + +import cpw.mods.fml.relauncher.FMLRelaunchLog; +import net.minecraft.launchwrapper.ITweaker; +import net.minecraft.launchwrapper.Launch; +import net.minecraft.launchwrapper.LaunchClassLoader; + +import java.io.File; +import java.util.List; + +public class AngelicaLateTweaker implements ITweaker { + + @Override + public void acceptOptions(List args, File gameDir, File assetsDir, String profile) { + // no-op + } + + @Override + public void injectIntoClassLoader(LaunchClassLoader classLoader) { + // no-op + } + + @Override + public String getLaunchTarget() { + return null; + } + + @Override + public String[] getLaunchArguments() { + // Run after Mixins, but before LWJGl3ify + String transformer = "com.gtnewhorizons.angelica.loading.fml.transformers.AngelicaRedirectorTransformer"; + FMLRelaunchLog.finer("Registering transformer %s", transformer); + Launch.classLoader.registerTransformer(transformer); + return new String[0]; + } +} diff --git a/src/main/java/com/gtnewhorizons/angelica/loading/MixinCompatHackTweaker.java b/src/main/java/com/gtnewhorizons/angelica/loading/fml/tweakers/IncompatibleModsDisablerTweaker.java similarity index 59% rename from src/main/java/com/gtnewhorizons/angelica/loading/MixinCompatHackTweaker.java rename to src/main/java/com/gtnewhorizons/angelica/loading/fml/tweakers/IncompatibleModsDisablerTweaker.java index 5e113f6a1..20e33a01e 100644 --- a/src/main/java/com/gtnewhorizons/angelica/loading/MixinCompatHackTweaker.java +++ b/src/main/java/com/gtnewhorizons/angelica/loading/fml/tweakers/IncompatibleModsDisablerTweaker.java @@ -1,11 +1,7 @@ -package com.gtnewhorizons.angelica.loading; +package com.gtnewhorizons.angelica.loading.fml.tweakers; -import com.gtnewhorizons.angelica.config.AngelicaConfig; -import com.gtnewhorizons.angelica.transform.BlockTransformer; -import com.gtnewhorizons.angelica.transform.RedirectorTransformer; -import cpw.mods.fml.common.Loader; import cpw.mods.fml.relauncher.CoreModManager; -import cpw.mods.fml.relauncher.FMLLaunchHandler; +import cpw.mods.fml.relauncher.FMLRelaunchLog; import net.minecraft.launchwrapper.IClassTransformer; import net.minecraft.launchwrapper.ITweaker; import net.minecraft.launchwrapper.Launch; @@ -23,61 +19,44 @@ import java.util.List; import java.util.Map; import java.util.Set; -import static com.gtnewhorizons.angelica.loading.AngelicaTweaker.LOGGER; +public class IncompatibleModsDisablerTweaker implements ITweaker { + + private static final boolean DISABLE_OPTIFINE_FASTCRAFT_BETTERFPS = true; -public class MixinCompatHackTweaker implements ITweaker { - public static final boolean DISABLE_OPTIFINE_FASTCRAFT_BETTERFPS = true; @Override public void acceptOptions(List args, File gameDir, File assetsDir, String profile) { - verifyDependencies(); + // no-op + } - if(DISABLE_OPTIFINE_FASTCRAFT_BETTERFPS) { - LOGGER.info("Disabling Optifine, Fastcraft, BetterFPS, and other incompatible mods (if present)"); - disableIncompatibleMods(); - } - - if (AngelicaConfig.enableHudCaching){ - disableXaerosMinimapWaypointTransformer(); + @Override + public void injectIntoClassLoader(LaunchClassLoader classLoader) { + if (DISABLE_OPTIFINE_FASTCRAFT_BETTERFPS) { + FMLRelaunchLog.info("[Angelica/IncompatibleModsDisablerTweaker] Disabling Optifine, Fastcraft, BetterFPS, and other incompatible mods (if present)"); + disableIncompatibleMods(classLoader); } } - private void verifyDependencies() { - if(MixinCompatHackTweaker.class.getResource("/it/unimi/dsi/fastutil/ints/Int2ObjectMap.class") == null) { - throw new RuntimeException("Missing dependency: Angelica requires GTNHLib 0.2.1 or newer! Download: https://modrinth.com/mod/gtnhlib"); - } + @Override + public String getLaunchTarget() { + return null; } - private void disableXaerosMinimapWaypointTransformer(){ - try { - final LaunchClassLoader lcl = Launch.classLoader; - final Field xformersField = lcl.getClass().getDeclaredField("transformers"); - xformersField.setAccessible(true); - @SuppressWarnings("unchecked") - List xformers = (List) xformersField.get(lcl); - for (int idx = xformers.size() - 1; idx >= 0; idx--) { - final String name = xformers.get(idx).getClass().getName(); - if (name.startsWith("xaero.common.core.transformer.GuiIngameForgeTransformer")) { - LOGGER.info("Removing transformer " + name); - xformers.remove(idx); - } - } - } catch (Exception e) { - throw new RuntimeException(e); - } + @Override + public String[] getLaunchArguments() { + return new String[0]; } @SuppressWarnings("unchecked") - private void disableIncompatibleMods() { + private void disableIncompatibleMods(LaunchClassLoader lcl) { // Remove transformers, Mod Containers, and mixins for Optifine, Fastcraft, BetterFPS and other incompatible mods try { - final LaunchClassLoader lcl = Launch.classLoader; final Field xformersField = lcl.getClass().getDeclaredField("transformers"); xformersField.setAccessible(true); final List xformers = (List) xformersField.get(lcl); for (int idx = xformers.size() - 1; idx >= 0; idx--) { final String name = xformers.get(idx).getClass().getName(); if (name.startsWith("optifine") || name.startsWith("fastcraft") || name.startsWith("me.guichaguri.betterfps")) { - LOGGER.info("Removing transformer " + name); + FMLRelaunchLog.info("[Angelica/IncompatibleModsDisablerTweaker] Removing transformer " + name); xformers.remove(idx); } } @@ -85,13 +64,14 @@ public class MixinCompatHackTweaker implements ITweaker { throw new RuntimeException(e); } try { - final Field injectedContainersField = Loader.class.getDeclaredField("injectedContainers"); + final Class loaderClass = Class.forName("cpw.mods.fml.common.Loader", true, lcl); + final Field injectedContainersField = loaderClass.getDeclaredField("injectedContainers"); injectedContainersField.setAccessible(true); - final List containers = (List ) injectedContainersField.get(Loader.class); + final List containers = (List) injectedContainersField.get(loaderClass); for (int idx = containers.size() - 1; idx >= 0; idx--) { - final String name = containers.get(idx); + final String name = containers.get(idx); if (name.startsWith("optifine") || name.startsWith("fastcraft")) { - LOGGER.info("Removing mod container " + name); + FMLRelaunchLog.info("[Angelica/IncompatibleModsDisablerTweaker] Removing mod container " + name); containers.remove(idx); } } @@ -105,7 +85,7 @@ public class MixinCompatHackTweaker implements ITweaker { for (int idx = reparsedCoremods.size() - 1; idx >= 0; idx--) { final String coreMod = reparsedCoremods.get(idx); if (coreMod.startsWith("optimizationsandtweaks")) { - LOGGER.info("Removing reparsed coremod " + coreMod); + FMLRelaunchLog.info("[Angelica/IncompatibleModsDisablerTweaker] Removing reparsed coremod " + coreMod); // Fool the CoreModManager into not checking for a mod container again later loadedCoremods.add(reparsedCoremods.remove(idx)); @@ -120,7 +100,7 @@ public class MixinCompatHackTweaker implements ITweaker { for (int idx = mixinConfigsDefault.size() - 1; idx >= 0; idx--) { final String name = mixinConfigsDefault.get(idx); if (name != null && name.contains("optimizationsandtweaks")) { - LOGGER.info("Removing mixin config " + name); + FMLRelaunchLog.info("[Angelica/IncompatibleModsDisablerTweaker] Removing mixin config " + name); mixinConfigsDefault.remove(idx); } } @@ -131,7 +111,7 @@ public class MixinCompatHackTweaker implements ITweaker { for (Config config : mixinConfigs) { final String name = config.getName(); if (name != null && name.contains("optimizationsandtweaks")) { - LOGGER.info("Removing queued mixin config " + config.getName()); + FMLRelaunchLog.info("[Angelica/IncompatibleModsDisablerTweaker] Removing queued mixin config " + config.getName()); toRemove.add(config); } } @@ -144,8 +124,8 @@ public class MixinCompatHackTweaker implements ITweaker { final Map containers = (Map) containersField.get(platformManager); for (Map.Entry entry : containers.entrySet()) { final String attribute = entry.getKey().getAttribute("MixinConfigs"); - if(attribute != null && attribute.contains("optimizationsandtweaks")) { - LOGGER.info("Removing mixin container " + entry.getKey().toString()); + if (attribute != null && attribute.contains("optimizationsandtweaks")) { + FMLRelaunchLog.info("[Angelica/IncompatibleModsDisablerTweaker] Removing mixin container " + entry.getKey().toString()); containers.remove(entry.getKey()); } } @@ -155,31 +135,4 @@ public class MixinCompatHackTweaker implements ITweaker { throw new RuntimeException(e); } } - - @Override - public void injectIntoClassLoader(LaunchClassLoader classLoader) { - // no-op - } - - @Override - public String getLaunchTarget() { - return null; - } - - @Override - public String[] getLaunchArguments() { - if (FMLLaunchHandler.side().isClient()) { - final boolean rfbLoaded = Launch.blackboard.getOrDefault("angelica.rfbPluginLoaded", Boolean.FALSE) == Boolean.TRUE; - - if (!rfbLoaded) { - // Run after Mixins, but before LWJGl3ify - Launch.classLoader.registerTransformer(RedirectorTransformer.class.getName()); - } - if(AngelicaConfig.enableSodium) { - Launch.classLoader.registerTransformer(BlockTransformer.class.getName()); - } - } - - return new String[0]; - } } diff --git a/src/main/java/com/gtnewhorizons/angelica/loading/fml/tweakers/SodiumLateTweaker.java b/src/main/java/com/gtnewhorizons/angelica/loading/fml/tweakers/SodiumLateTweaker.java new file mode 100644 index 000000000..655cacaa9 --- /dev/null +++ b/src/main/java/com/gtnewhorizons/angelica/loading/fml/tweakers/SodiumLateTweaker.java @@ -0,0 +1,35 @@ +package com.gtnewhorizons.angelica.loading.fml.tweakers; + +import cpw.mods.fml.relauncher.FMLRelaunchLog; +import net.minecraft.launchwrapper.ITweaker; +import net.minecraft.launchwrapper.Launch; +import net.minecraft.launchwrapper.LaunchClassLoader; + +import java.io.File; +import java.util.List; + +public class SodiumLateTweaker implements ITweaker { + + @Override + public void acceptOptions(List args, File gameDir, File assetsDir, String profile) { + // no-op + } + + @Override + public void injectIntoClassLoader(LaunchClassLoader classLoader) { + // no-op + } + + @Override + public String getLaunchTarget() { + return null; + } + + @Override + public String[] getLaunchArguments() { + String transformer = "com.gtnewhorizons.angelica.loading.fml.transformers.SodiumBlockTransformer"; + FMLRelaunchLog.finer("Registering transformer %s", transformer); + Launch.classLoader.registerTransformer(transformer); + return new String[0]; + } +} diff --git a/src/main/java/com/gtnewhorizons/angelica/loading/fml/tweakers/XaerosTransformerDisablerTweaker.java b/src/main/java/com/gtnewhorizons/angelica/loading/fml/tweakers/XaerosTransformerDisablerTweaker.java new file mode 100644 index 000000000..cd304d7d7 --- /dev/null +++ b/src/main/java/com/gtnewhorizons/angelica/loading/fml/tweakers/XaerosTransformerDisablerTweaker.java @@ -0,0 +1,47 @@ +package com.gtnewhorizons.angelica.loading.fml.tweakers; + +import cpw.mods.fml.relauncher.FMLRelaunchLog; +import net.minecraft.launchwrapper.IClassTransformer; +import net.minecraft.launchwrapper.ITweaker; +import net.minecraft.launchwrapper.LaunchClassLoader; + +import java.io.File; +import java.lang.reflect.Field; +import java.util.List; + +public class XaerosTransformerDisablerTweaker implements ITweaker { + + @Override + public void acceptOptions(List args, File gameDir, File assetsDir, String profile) { + // no-op + } + + @Override + public void injectIntoClassLoader(LaunchClassLoader classLoader) { + try { + final Field xformersField = classLoader.getClass().getDeclaredField("transformers"); + xformersField.setAccessible(true); + @SuppressWarnings("unchecked") + List transformers = (List) xformersField.get(classLoader); + for (int idx = transformers.size() - 1; idx >= 0; idx--) { + final String name = transformers.get(idx).getClass().getName(); + if (name.startsWith("xaero.common.core.transformer.GuiIngameForgeTransformer")) { + transformers.remove(idx); + FMLRelaunchLog.info("[Angelica/XaerosTransformerDisablerTweaker] Removed transformer " + name); + } + } + } catch (Exception e) { + throw new RuntimeException(e); + } + } + + @Override + public String getLaunchTarget() { + return null; + } + + @Override + public String[] getLaunchArguments() { + return new String[0]; + } +} diff --git a/src/main/java/com/gtnewhorizons/angelica/loading/fml/tweakers/package-info.java b/src/main/java/com/gtnewhorizons/angelica/loading/fml/tweakers/package-info.java new file mode 100644 index 000000000..20dc4f8a2 --- /dev/null +++ b/src/main/java/com/gtnewhorizons/angelica/loading/fml/tweakers/package-info.java @@ -0,0 +1,11 @@ +/** + * ITweaker needs to be in a standalone package + * because FML adds the whole package to the class + * loader exclusions and that causes really hard to + * find bugs. ITweakers also get class loaded + * by the parent class loader and not LaunchClassLoader, + * as a result the ITweakers should not reference any + * class otherwise it will load them (maybe a second time) + * on the parent class loader. + */ +package com.gtnewhorizons.angelica.loading.fml.tweakers; diff --git a/src/main/java/com/gtnewhorizons/angelica/loading/rfb/AngelicaRfbPlugin.java b/src/main/java/com/gtnewhorizons/angelica/loading/rfb/AngelicaRfbPlugin.java index 5f1389410..9c3f96942 100644 --- a/src/main/java/com/gtnewhorizons/angelica/loading/rfb/AngelicaRfbPlugin.java +++ b/src/main/java/com/gtnewhorizons/angelica/loading/rfb/AngelicaRfbPlugin.java @@ -1,5 +1,6 @@ package com.gtnewhorizons.angelica.loading.rfb; +import com.gtnewhorizons.angelica.loading.rfb.transformers.RFBAngelicaRedirector; import com.gtnewhorizons.retrofuturabootstrap.api.PluginContext; import com.gtnewhorizons.retrofuturabootstrap.api.RetroFuturaBootstrap; import com.gtnewhorizons.retrofuturabootstrap.api.RfbClassTransformer; @@ -21,8 +22,10 @@ public class AngelicaRfbPlugin implements RfbPlugin { if (isServer) { return null; } + + final boolean isObf = RetroFuturaBootstrap.API.launchClassLoader().findClassMetadata("net.minecraft.world.World") == null; return new RfbClassTransformer[] { - new RedirectorTransformerWrapper() + new RFBAngelicaRedirector(isObf) }; } } diff --git a/src/main/java/com/gtnewhorizons/angelica/loading/rfb/RedirectorTransformerWrapper.java b/src/main/java/com/gtnewhorizons/angelica/loading/rfb/transformers/RFBAngelicaRedirector.java similarity index 71% rename from src/main/java/com/gtnewhorizons/angelica/loading/rfb/RedirectorTransformerWrapper.java rename to src/main/java/com/gtnewhorizons/angelica/loading/rfb/transformers/RFBAngelicaRedirector.java index c45d669a8..b90f1aaee 100644 --- a/src/main/java/com/gtnewhorizons/angelica/loading/rfb/RedirectorTransformerWrapper.java +++ b/src/main/java/com/gtnewhorizons/angelica/loading/rfb/transformers/RFBAngelicaRedirector.java @@ -1,6 +1,7 @@ -package com.gtnewhorizons.angelica.loading.rfb; +package com.gtnewhorizons.angelica.loading.rfb.transformers; -import com.gtnewhorizons.angelica.transform.RedirectorTransformer; +import com.gtnewhorizons.angelica.loading.shared.AngelicaClassDump; +import com.gtnewhorizons.angelica.loading.shared.transformers.AngelicaRedirector; import com.gtnewhorizons.retrofuturabootstrap.api.ClassNodeHandle; import com.gtnewhorizons.retrofuturabootstrap.api.ExtensibleClassLoader; import com.gtnewhorizons.retrofuturabootstrap.api.RfbClassTransformer; @@ -10,10 +11,14 @@ import org.jetbrains.annotations.Nullable; import java.util.jar.Manifest; -/** RFB wrapper for {@link com.gtnewhorizons.angelica.transform.RedirectorTransformer} */ -public class RedirectorTransformerWrapper implements RfbClassTransformer { +/** RfbClassTransformer wrapper for {@link AngelicaRedirector} */ +public class RFBAngelicaRedirector implements RfbClassTransformer { - public final RedirectorTransformer inner = new RedirectorTransformer(); + private final AngelicaRedirector inner; + + public RFBAngelicaRedirector(boolean isObf) { + inner = new AngelicaRedirector(isObf); + } @Pattern("[a-z0-9-]+") @Override @@ -33,7 +38,7 @@ public class RedirectorTransformerWrapper implements RfbClassTransformer { @Override public @NotNull String @Nullable [] additionalExclusions() { - return RedirectorTransformer.getTransformerExclusions().toArray(new String[0]); + return inner.getTransformerExclusions(); } @Override @@ -47,7 +52,7 @@ public class RedirectorTransformerWrapper implements RfbClassTransformer { // If a class is already a transformed ClassNode, conservatively continue processing. return true; } - return inner.shouldRfbTransform(classNode.getOriginalBytes()); + return inner.shouldTransform(classNode.getOriginalBytes()); } @Override @@ -56,6 +61,7 @@ public class RedirectorTransformerWrapper implements RfbClassTransformer { final boolean changed = inner.transformClassNode(className, classNode.getNode()); if (changed) { classNode.computeMaxs(); + AngelicaClassDump.dumpRFBClass(className, classNode, this); } } } diff --git a/src/main/java/com/gtnewhorizons/angelica/loading/shared/AngelicaClassDump.java b/src/main/java/com/gtnewhorizons/angelica/loading/shared/AngelicaClassDump.java new file mode 100644 index 000000000..a50010184 --- /dev/null +++ b/src/main/java/com/gtnewhorizons/angelica/loading/shared/AngelicaClassDump.java @@ -0,0 +1,25 @@ +package com.gtnewhorizons.angelica.loading.shared; + +import com.gtnewhorizon.gtnhlib.asm.ASMUtil; +import com.gtnewhorizons.retrofuturabootstrap.api.ClassNodeHandle; + +public class AngelicaClassDump { + + private static final boolean DUMP_CLASS = Boolean.getBoolean("angelica.dumpClass"); + + public static void dumpClass(String className, byte[] originalBytes, byte[] transformedBytes, Object transformer) { + if (DUMP_CLASS) { + ASMUtil.saveAsRawClassFile(originalBytes, className + "_PRE", transformer); + ASMUtil.saveAsRawClassFile(transformedBytes, className + "_POST", transformer); + } + } + + public static void dumpRFBClass(String className, ClassNodeHandle classNode, Object transformer) { + if (DUMP_CLASS) { + final byte[] originalBytes = classNode.getOriginalBytes(); + final byte[] transformedBytes = classNode.computeBytes(); + ASMUtil.saveAsRawClassFile(originalBytes, className + "_PRE", transformer); + ASMUtil.saveAsRawClassFile(transformedBytes, className + "_POST", transformer); + } + } +} diff --git a/src/main/java/com/gtnewhorizons/angelica/loading/shared/package-info.java b/src/main/java/com/gtnewhorizons/angelica/loading/shared/package-info.java new file mode 100644 index 000000000..357e08ead --- /dev/null +++ b/src/main/java/com/gtnewhorizons/angelica/loading/shared/package-info.java @@ -0,0 +1,6 @@ +/** + * Package that contains classes that may be loaded both by RFB and FML classloaders, the code contained in this package + * should not reference any code from outside of this package to avoid causing hard to debug classloading issues unless + * the code is known to be safe with different classloaders. + */ +package com.gtnewhorizons.angelica.loading.shared; diff --git a/src/main/java/com/gtnewhorizons/angelica/transform/RedirectorTransformer.java b/src/main/java/com/gtnewhorizons/angelica/loading/shared/transformers/AngelicaRedirector.java similarity index 76% rename from src/main/java/com/gtnewhorizons/angelica/transform/RedirectorTransformer.java rename to src/main/java/com/gtnewhorizons/angelica/loading/shared/transformers/AngelicaRedirector.java index e71d3c0a7..0445967fa 100644 --- a/src/main/java/com/gtnewhorizons/angelica/transform/RedirectorTransformer.java +++ b/src/main/java/com/gtnewhorizons/angelica/loading/shared/transformers/AngelicaRedirector.java @@ -1,14 +1,12 @@ -package com.gtnewhorizons.angelica.transform; +package com.gtnewhorizons.angelica.loading.shared.transformers; +import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import com.gtnewhorizon.gtnhlib.asm.ClassConstantPoolParser; -import com.gtnewhorizons.angelica.loading.AngelicaTweaker; -import net.coderbot.iris.IrisLogging; -import net.minecraft.launchwrapper.IClassTransformer; import net.minecraft.launchwrapper.Launch; import org.apache.commons.lang3.tuple.Pair; -import org.objectweb.asm.ClassReader; -import org.objectweb.asm.ClassWriter; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.objectweb.asm.Opcodes; import org.objectweb.asm.tree.AbstractInsnNode; import org.objectweb.asm.tree.ClassNode; @@ -22,7 +20,6 @@ import org.objectweb.asm.tree.MethodNode; import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandles; -import java.util.Arrays; import java.util.Collections; import java.util.HashMap; import java.util.List; @@ -33,10 +30,25 @@ import java.util.stream.Collectors; /** * This transformer redirects many GL calls to our custom GLStateManager + *

+ * THIS CLASS MIGHT BE LOADED ON A DIFFERENT CLASS LOADER, + * IT SHOULD NOT CALL ANY CODE FROM THE MAIN MOD */ -public class RedirectorTransformer implements IClassTransformer { +public final class AngelicaRedirector { + // TODO(Alexdoru) properly split this class in two because currently this class is doing + // two very different things : + // - redirect the GL calls to our GL manager class + // - replace the block fields with a thread safe replacement (only if Sodium is enabled) - private static final boolean ASSERT_MAIN_THREAD = Boolean.parseBoolean(System.getProperty("angelica.assertMainThread", "false")); + public AngelicaRedirector(boolean isObf) { + IS_OBF = isObf; + } + + private final boolean IS_OBF; + + private static final boolean ASSERT_MAIN_THREAD = Boolean.getBoolean("angelica.assertMainThread"); + private static final boolean LOG_SPAM = Boolean.getBoolean("angelica.redirectorLogspam"); + private static final Logger LOGGER = LogManager.getLogger("AngelicaRedirector"); private static final String Drawable = "org/lwjgl/opengl/Drawable"; private static final String GLStateManager = "com/gtnewhorizons/angelica/glsm/GLStateManager"; private static final String GL11 = "org/lwjgl/opengl/GL11"; @@ -58,24 +70,26 @@ public class RedirectorTransformer implements IClassTransformer { "startGame", "func_71384_a", "initializeTextures", "func_77474_a" ); + private static final List> BlockBoundsFields = ImmutableList.of( + Pair.of("minX", "field_149759_B"), + Pair.of("minY", "field_149760_C"), + Pair.of("minZ", "field_149754_D"), + Pair.of("maxX", "field_149755_E"), + Pair.of("maxY", "field_149756_F"), + Pair.of("maxZ", "field_149757_G") + ); /** All classes in net.minecraft.block.* are the block subclasses save for these. */ - private static final List VanillaBlockExclusions = Arrays.asList( + private static final String[] VanillaBlockExclusions = { "net/minecraft/block/IGrowable", "net/minecraft/block/ITileEntityProvider", "net/minecraft/block/BlockEventData", "net/minecraft/block/BlockSourceImpl", "net/minecraft/block/material/" - ); + }; private static final ClassConstantPoolParser cstPoolParser = new ClassConstantPoolParser(GL11, GL13, GL14, OpenGlHelper, EXTBlendFunc, ARBMultiTexture, BlockPackage, Project); private static final Map> methodRedirects = new HashMap<>(); private static final Map glCapRedirects = new HashMap<>(); - private static final List TransformerExclusions = Arrays.asList( - "org.lwjgl", - "com.gtnewhorizons.angelica.glsm.", - "com.gtnewhorizons.angelica.transform", - "me.eigenraven.lwjgl3ify" - ); private static final Set moddedBlockSubclasses = Collections.newSetFromMap(new ConcurrentHashMap<>()); // Block owners we *shouldn't* redirect because they shadow one of our fields @@ -209,8 +223,7 @@ public class RedirectorTransformer implements IClassTransformer { try { final Class angelicaConfig = Class.forName("com.gtnewhorizons.angelica.config.AngelicaConfig", true, Launch.classLoader); - final MethodHandle sodiumGetter = MethodHandles.lookup().findStaticGetter(angelicaConfig, "enableSodium", boolean.class); - angelicaConfigSodiumEnabledGetter = sodiumGetter; + angelicaConfigSodiumEnabledGetter = MethodHandles.lookup().findStaticGetter(angelicaConfig, "enableSodium", boolean.class); } catch (ReflectiveOperationException e) { throw new RuntimeException(e); } @@ -240,45 +253,23 @@ public class RedirectorTransformer implements IClassTransformer { return isVanillaBlockSubclass(className) || moddedBlockSubclasses.contains(className); } - public static List getTransformerExclusions() { - return Collections.unmodifiableList(TransformerExclusions); + private String getFieldName(Pair fieldPair) { + return IS_OBF ? fieldPair.getRight() : fieldPair.getLeft(); } - public boolean shouldRfbTransform(byte[] basicClass) { + public String[] getTransformerExclusions() { + return new String[]{ + "org.lwjgl", + "com.gtnewhorizons.angelica.glsm.", + "com.gtnewhorizons.angelica.transform", + "me.eigenraven.lwjgl3ify" + }; + } + + public boolean shouldTransform(byte[] basicClass) { return cstPoolParser.find(basicClass, true); } - @Override - public byte[] transform(final String className, String transformedName, byte[] basicClass) { - if (basicClass == null) return null; - - // Ignore classes that are excluded from transformation - Doesn't fully work without the - // TransformerExclusions due to some nested classes - for (String exclusion : TransformerExclusions) { - if (className.startsWith(exclusion)) { - return basicClass; - } - } - - if (!cstPoolParser.find(basicClass, true)) { - return basicClass; - } - - // Keep in sync with com.gtnewhorizons.angelica.loading.rfb.RedirectorTransformerWrapper - final ClassReader cr = new ClassReader(basicClass); - final ClassNode cn = new ClassNode(); - cr.accept(cn, 0); - final boolean changed = transformClassNode(transformedName, cn); - if (changed) { - final ClassWriter cw = new ClassWriter(ClassWriter.COMPUTE_MAXS); - cn.accept(cw); - final byte[] bytes = cw.toByteArray(); - AngelicaTweaker.dumpClass(transformedName, basicClass, bytes, this); - return bytes; - } - return basicClass; - } - /** @return Was the class changed? */ public boolean transformClassNode(String transformedName, ClassNode cn) { if (cn == null) { @@ -292,19 +283,19 @@ public class RedirectorTransformer implements IClassTransformer { } // Check if this class shadows any fields of the parent class - if(moddedBlockSubclasses.contains(cn.name)) { + if (moddedBlockSubclasses.contains(cn.name)) { // If a superclass shadows, then so do we, because JVM will resolve a reference on our class to that // superclass boolean doWeShadow; - if(blockOwnerExclusions.contains(cn.superName)) { + if (blockOwnerExclusions.contains(cn.superName)) { doWeShadow = true; } else { // Check if we declare any known field names - Set fieldsDeclaredByClass = cn.fields.stream().map(f -> f.name).collect(Collectors.toSet()); - doWeShadow = BlockTransformer.BlockBoundsFields.stream().anyMatch(pair -> fieldsDeclaredByClass.contains(pair.getLeft()) || fieldsDeclaredByClass.contains(pair.getRight())); + doWeShadow = BlockBoundsFields.stream().anyMatch(pair -> + cn.fields.stream().anyMatch(field -> field.name.equals(getFieldName(pair)))); } if (doWeShadow) { - AngelicaTweaker.LOGGER.info("Class '{}' shadows one or more block bounds fields, these accesses won't be redirected!", cn.name); + LOGGER.info("Class '{}' shadows one or more block bounds fields, these accesses won't be redirected!", cn.name); blockOwnerExclusions.add(cn.name); } } @@ -332,11 +323,11 @@ public class RedirectorTransformer implements IClassTransformer { name = "disable" + name; } } - if (IrisLogging.ENABLE_SPAM) { + if (LOG_SPAM) { if (name == null) { - AngelicaTweaker.LOGGER.info("Redirecting call in {} from GL11.{}(I)V to GLStateManager.{}(I)V", transformedName, mNode.name, mNode.name); + LOGGER.info("Redirecting call in {} from GL11.{}(I)V to GLStateManager.{}(I)V", transformedName, mNode.name, mNode.name); } else { - AngelicaTweaker.LOGGER.info("Redirecting call in {} from GL11.{}(I)V to GLStateManager.{}()V", transformedName, mNode.name, name); + LOGGER.info("Redirecting call in {} from GL11.{}(I)V to GLStateManager.{}()V", transformedName, mNode.name, name); } } mNode.owner = GLStateManager; @@ -353,15 +344,15 @@ public class RedirectorTransformer implements IClassTransformer { mNode.desc = "(L" + Drawable + ";)V"; mNode.itf = false; changed = true; - if (IrisLogging.ENABLE_SPAM) { - AngelicaTweaker.LOGGER.info("Redirecting call in {} to GLStateManager.makeCurrent()", transformedName); + if (LOG_SPAM) { + LOGGER.info("Redirecting call in {} to GLStateManager.makeCurrent()", transformedName); } } else { final Map redirects = methodRedirects.get(mNode.owner); if (redirects != null && redirects.containsKey(mNode.name)) { - if (IrisLogging.ENABLE_SPAM) { + if (LOG_SPAM) { final String shortOwner = mNode.owner.substring(mNode.owner.lastIndexOf("/") + 1); - AngelicaTweaker.LOGGER.info("Redirecting call in {} from {}.{}{} to GLStateManager.{}{}", transformedName, shortOwner, mNode.name, mNode.desc, redirects.get(mNode.name), mNode.desc); + LOGGER.info("Redirecting call in {} from {}.{}{} to GLStateManager.{}{}", transformedName, shortOwner, mNode.name, mNode.desc, redirects.get(mNode.name), mNode.desc); } mNode.owner = GLStateManager; mNode.name = redirects.get(mNode.name); @@ -369,19 +360,15 @@ public class RedirectorTransformer implements IClassTransformer { redirectInMethod = true; } } - } - else if ((node.getOpcode() == Opcodes.GETFIELD || node.getOpcode() == Opcodes.PUTFIELD) && node instanceof FieldInsnNode fNode) { - if(!blockOwnerExclusions.contains(fNode.owner) && isBlockSubclass(fNode.owner) && isSodiumEnabled()) { - Pair fieldToRedirect = null; - for(Pair blockPairs : BlockTransformer.BlockBoundsFields) { - if(fNode.name.equals(blockPairs.getLeft()) || fNode.name.equals(blockPairs.getRight())) { - fieldToRedirect = blockPairs; - break; - } - } + } else if ((node.getOpcode() == Opcodes.GETFIELD || node.getOpcode() == Opcodes.PUTFIELD) && node instanceof FieldInsnNode fNode) { + if (!blockOwnerExclusions.contains(fNode.owner) && isBlockSubclass(fNode.owner) && isSodiumEnabled()) { + Pair fieldToRedirect = BlockBoundsFields.stream() + .filter(pair -> fNode.name.equals(getFieldName(pair))) + .findFirst() + .orElse(null); if (fieldToRedirect != null) { - if (IrisLogging.ENABLE_SPAM) { - AngelicaTweaker.LOGGER.info("Redirecting Block.{} in {} to thread-safe wrapper", fNode.name, transformedName); + if (LOG_SPAM) { + LOGGER.info("Redirecting Block.{} in {} to thread-safe wrapper", fNode.name, transformedName); } // Perform the redirect fNode.name = fieldToRedirect.getLeft(); // use unobfuscated name @@ -421,8 +408,6 @@ public class RedirectorTransformer implements IClassTransformer { private static class RedirectMap extends HashMap { - private static final long serialVersionUID = 1712218575345511543L; - public static RedirectMap newMap() { return new RedirectMap<>(); } diff --git a/src/main/java/com/gtnewhorizons/angelica/transform/AsmUtil.java b/src/main/java/com/gtnewhorizons/angelica/transform/AsmUtil.java deleted file mode 100644 index b8f30ef68..000000000 --- a/src/main/java/com/gtnewhorizons/angelica/transform/AsmUtil.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.gtnewhorizons.angelica.transform; - -import com.gtnewhorizons.angelica.loading.AngelicaTweaker; - -public class AsmUtil { - - public static String obf(String deobf, String obf) { - if (AngelicaTweaker.isObfEnv()) { - return obf; - } - return deobf; - } -} diff --git a/src/main/java/com/gtnewhorizons/angelica/transform/compat/GenericCompatTransformer.java b/src/main/java/com/gtnewhorizons/angelica/transform/compat/GenericCompatTransformer.java deleted file mode 100644 index 0c520a251..000000000 --- a/src/main/java/com/gtnewhorizons/angelica/transform/compat/GenericCompatTransformer.java +++ /dev/null @@ -1,80 +0,0 @@ -package com.gtnewhorizons.angelica.transform.compat; - -import com.gtnewhorizons.angelica.loading.AngelicaTweaker; -import com.gtnewhorizons.angelica.transform.compat.handlers.CompatHandler; -import com.gtnewhorizons.angelica.transform.compat.transformers.generic.FieldLevelTessellatorTransformer; -import com.gtnewhorizons.angelica.transform.compat.transformers.generic.HUDCachingEarlyReturnTransformer; -import com.gtnewhorizons.angelica.transform.compat.transformers.generic.ThreadSafeISBRHAnnotationTransformer; -import com.gtnewhorizons.angelica.transform.compat.transformers.generic.TileEntityNullGuardTransformer; -import it.unimi.dsi.fastutil.objects.Object2BooleanOpenHashMap; -import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap; -import it.unimi.dsi.fastutil.objects.ObjectOpenHashSet; -import net.minecraft.launchwrapper.IClassTransformer; -import org.spongepowered.asm.lib.ClassReader; -import org.spongepowered.asm.lib.tree.ClassNode; -import org.spongepowered.asm.transformers.MixinClassWriter; - -import java.util.List; -import java.util.Map; -import java.util.Set; - -public class GenericCompatTransformer implements IClassTransformer { - - private static final Map> fieldLevelTessellator = new Object2ObjectOpenHashMap<>(); - private static final Map> tileEntityNullGuard = new Object2ObjectOpenHashMap<>(); - private static final Map threadSafeIBSRH = new Object2BooleanOpenHashMap<>(); - private static final Map> hudCachingEarlyReturn = new Object2ObjectOpenHashMap<>(); - - private static final Set transformedClasses = new ObjectOpenHashSet<>(); - - @Override - public byte[] transform(String name, String transformedName, byte[] basicClass) { - if (basicClass == null) return null; - - if (!transformedClasses.contains(transformedName)) return basicClass; - - ClassReader cr = new ClassReader(basicClass); - ClassNode cn = new ClassNode(); - cr.accept(cn, 0); - - if (fieldLevelTessellator.containsKey(transformedName)) { - FieldLevelTessellatorTransformer.transform(cn, fieldLevelTessellator.get(transformedName)); - } - - if (tileEntityNullGuard.containsKey(transformedName)) { - TileEntityNullGuardTransformer.transform(cn, tileEntityNullGuard.get(transformedName)); - } - - if (threadSafeIBSRH.containsKey(transformedName)) { - ThreadSafeISBRHAnnotationTransformer.transform(cn, threadSafeIBSRH.get(transformedName)); - } - - if (hudCachingEarlyReturn.containsKey(transformedName)) { - HUDCachingEarlyReturnTransformer.transform(cn, hudCachingEarlyReturn.get(transformedName)); - } - - MixinClassWriter cw = new MixinClassWriter(MixinClassWriter.COMPUTE_MAXS | MixinClassWriter.COMPUTE_FRAMES); - cn.accept(cw); - final byte[] bytes = cw.toByteArray(); - AngelicaTweaker.dumpClass(transformedName, basicClass, bytes, this); - return bytes; - } - - public static void register(CompatHandler handler) { - if (handler.getFieldLevelTessellator() != null) - fieldLevelTessellator.putAll(handler.getFieldLevelTessellator()); - if (handler.getTileEntityNullGuard() != null) - tileEntityNullGuard.putAll(handler.getTileEntityNullGuard()); - if (handler.getThreadSafeISBRHAnnotations() != null) - threadSafeIBSRH.putAll(handler.getThreadSafeISBRHAnnotations()); - if (handler.getHUDCachingEarlyReturn() != null) - hudCachingEarlyReturn.putAll(handler.getHUDCachingEarlyReturn()); - } - - public static void build() { - transformedClasses.addAll(fieldLevelTessellator.keySet()); - transformedClasses.addAll(tileEntityNullGuard.keySet()); - transformedClasses.addAll(threadSafeIBSRH.keySet()); - transformedClasses.addAll(hudCachingEarlyReturn.keySet()); - } -} diff --git a/src/main/java/com/gtnewhorizons/angelica/transform/compat/handlers/CompatHandlers.java b/src/main/java/com/gtnewhorizons/angelica/transform/compat/handlers/CompatHandlers.java deleted file mode 100644 index 94e5d764f..000000000 --- a/src/main/java/com/gtnewhorizons/angelica/transform/compat/handlers/CompatHandlers.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.gtnewhorizons.angelica.transform.compat.handlers; - -import com.gtnewhorizons.angelica.config.CompatConfig; - -import java.util.ArrayList; -import java.util.List; -import java.util.function.Supplier; - -public enum CompatHandlers { - - STACKS_ON_STACKS(() -> CompatConfig.fixStacksOnStacks, new StacksOnStacksCompatHandler()), - EXTRA_UTILS(() -> CompatConfig.fixExtraUtils, new ExtraUtilsCompatHandler()), - IMMERSIVE_ENGINEERING(() -> CompatConfig.fixImmersiveEngineering, new ImmersiveEngineeringCompatHandler()), - THAUMCRAFT(() -> CompatConfig.fixThaumcraft, new ThaumcraftCompatHandler()), - THAUMIC_HORIZONS(() -> CompatConfig.fixThaumicHorizons, new ThaumicHorizonsCompatHandler()); - - private final Supplier applyIf; - private final CompatHandler handler; - - CompatHandlers(Supplier applyIf, CompatHandler handler) { - this.applyIf = applyIf; - this.handler = handler; - } - - private static List compatHandlers = null; - - public static List getHandlers() { - if (compatHandlers != null) { - return compatHandlers; - } - compatHandlers = new ArrayList<>(); - for (CompatHandlers value : values()) { - if (value.applyIf.get()) { - compatHandlers.add(value.handler); - } - } - return compatHandlers; - } -} diff --git a/src/main/java/jss/notfine/asm/RenderBlocksTransformer.java b/src/main/java/jss/notfine/asm/RenderBlocksTransformer.java index 2c7c81b71..d1b69a402 100644 --- a/src/main/java/jss/notfine/asm/RenderBlocksTransformer.java +++ b/src/main/java/jss/notfine/asm/RenderBlocksTransformer.java @@ -2,7 +2,7 @@ package jss.notfine.asm; import static jss.notfine.asm.ASMUtils.matchesNodeSequence; -import com.gtnewhorizons.angelica.loading.AngelicaTweaker; +import com.gtnewhorizons.angelica.loading.shared.AngelicaClassDump; import net.minecraft.launchwrapper.IClassTransformer; import org.apache.commons.lang3.tuple.Pair; @@ -34,7 +34,7 @@ public class RenderBlocksTransformer implements IClassTransformer { public byte[] transform(String name, String transformedName, byte[] basicClass) { if ("net.minecraft.client.renderer.RenderBlocks".equals(transformedName)) { final byte[] bytes = patchRenderBlocks(basicClass); - AngelicaTweaker.dumpClass(transformedName, basicClass, bytes, this); + AngelicaClassDump.dumpClass(transformedName, basicClass, bytes, this); return bytes; } return basicClass; diff --git a/src/main/java/jss/notfine/asm/WorldRendererTransformer.java b/src/main/java/jss/notfine/asm/WorldRendererTransformer.java index c8e0474c0..99072657d 100644 --- a/src/main/java/jss/notfine/asm/WorldRendererTransformer.java +++ b/src/main/java/jss/notfine/asm/WorldRendererTransformer.java @@ -2,7 +2,7 @@ package jss.notfine.asm; import static jss.notfine.asm.ASMUtils.matchesNodeSequence; -import com.gtnewhorizons.angelica.loading.AngelicaTweaker; +import com.gtnewhorizons.angelica.loading.shared.AngelicaClassDump; import net.minecraft.launchwrapper.IClassTransformer; import org.apache.logging.log4j.LogManager; @@ -28,7 +28,7 @@ public class WorldRendererTransformer implements IClassTransformer { public byte[] transform(String name, String transformedName, byte[] basicClass) { if ("net.minecraft.client.renderer.WorldRenderer".equals(transformedName)) { final byte[] bytes = patchWorldRenderer(basicClass); - AngelicaTweaker.dumpClass(transformedName, basicClass, bytes, this); + AngelicaClassDump.dumpClass(transformedName, basicClass, bytes, this); return bytes; } return basicClass; diff --git a/src/main/resources/META-INF/rfb-plugin/angelica.properties b/src/main/resources/META-INF/rfb-plugin/angelica.properties index 8f058fccb..f5bc8ecee 100644 --- a/src/main/resources/META-INF/rfb-plugin/angelica.properties +++ b/src/main/resources/META-INF/rfb-plugin/angelica.properties @@ -2,7 +2,7 @@ name=Angelica version=${version} additionalVersions= className=com.gtnewhorizons.angelica.loading.rfb.AngelicaRfbPlugin -transformerExclusions=com.gtnewhorizons.angelica.transform.RedirectorTransformer +transformerExclusions=com.gtnewhorizons.angelica.loading.shared versionConstraints= loadBefore= loadAfter=mixin; lwjgl3ify