Merge pull request #2 from MalTeeez/master

Add patcher to disable specific mixins in Hodgepodge

Author: BallOfEnergy1

dependencies.gradle

@@ -33,7 +33,7 @@
  */
 dependencies {
     // Hard deps begin
-    api("com.github.GTNewHorizons:GTNHLib:0.6.39:dev")
+    api("com.github.GTNewHorizons:GTNHLib:0.8.8:dev")
     // Hard deps end
 
     // Indev stuff; only uncomment outside main!
@@ -53,7 +53,9 @@ dependencies {
     //implementation("maven.modrinth:archaicfix:0.7.7:dev")
 
     // Compat begin
-    compileOnly("com.github.GTNewHorizons:Hodgepodge:2.6.78")
+    devOnlyNonPublishable("com.github.GTNewHorizons:Hodgepodge:2.7.17")
+    compileOnly("com.github.GTNewHorizons:Angelica:1.0.0-beta71-pre")
+
     compileOnly("com.falsepattern:chunkapi-mc1.7.10:0.7.0")
     compileOnly("com.falsepattern:endlessids-mc1.7.10:1.6.12")
 

src/main/java/com/gamma/spool/compat/hodgepodge/MixinReflectionPatcher.java

@@ -0,0 +1,61 @@
+package com.gamma.spool.compat.hodgepodge;
+
+import java.lang.reflect.Field;
+
+import com.gtnewhorizon.gtnhmixins.builders.ITargetMod;
+import com.gtnewhorizon.gtnhmixins.builders.MixinBuilder;
+import com.gtnewhorizon.gtnhmixins.builders.TargetModBuilder;
+
+public class MixinReflectionPatcher {
+
+    private static Class<?> mixinsClass;
+
+    public static void init() {
+        try {
+            Class.forName("com.mitchej123.hodgepodge.core.HodgepodgeCore");
+        } catch (ClassNotFoundException ignored) {
+            return;
+        }
+        try {
+            initialize();
+            applyPatches();
+        } catch (Exception e) {
+            System.out
+                .println("Failed to patch hodgepodge mixins, will probably fail if config settings arent disabled.");
+        }
+    }
+
+    private static void initialize() throws Exception {
+        ClassLoader loader = MixinReflectionPatcher.class.getClassLoader();
+        // Initialize the Mixins enum (creates all constants)
+        mixinsClass = Class.forName("com.mitchej123.hodgepodge.mixins.Mixins", true, loader);
+    }
+
+    private static void applyPatches() throws Exception {
+        // Create this mod as a ITargetMod via the TargetModBuilder from gtnhmixins
+        TargetModBuilder targetedMod = new TargetModBuilder().setCoreModClass("com.gamma.spool.core.SpoolCoreMod")
+            .setModId("spool");
+
+        addExcludedMod("TILE_ENTITY_RENDERER_PROFILER", targetedMod);
+        addExcludedMod("ADD_SIMULATION_DISTANCE_OPTION", targetedMod);
+        addExcludedMod("ADD_SIMULATION_DISTANCE_OPTION_THERMOS_FIX", targetedMod);
+        addExcludedMod("OPTIMIZE_TILEENTITY_REMOVAL", targetedMod);
+        addExcludedMod("SPEEDUP_NBT_COPY", targetedMod);
+    }
+
+    @SuppressWarnings("unchecked")
+    private static void addExcludedMod(String mixinName, Object targetedMod) throws Exception {
+        // Get the enum entry for this mixin target
+        Object mixin = Enum.valueOf((Class<Enum>) mixinsClass, mixinName);
+
+        // Allow accessing the builder field for the enum entries
+        Field builderField = mixinsClass.getDeclaredField("builder");
+        builderField.setAccessible(true);
+        Object builder = builderField.get(mixin);
+
+        // Just use the existing MixinBuilder for the entry from <clinit> and modify the excludedMods in AbstractBuilder
+        // via the usual method.
+        // In this case we do not care about the return value (the same reference for chaining)
+        ((MixinBuilder) builder).addExcludedMod((ITargetMod) targetedMod);
+    }
+}

src/main/java/com/gamma/spool/core/SpoolCoreMod.java

@@ -6,6 +6,7 @@
 
 import net.bytebuddy.agent.ByteBuddyAgent;
 
+import com.gamma.spool.compat.hodgepodge.MixinReflectionPatcher;
 import com.gamma.spool.config.APIConfig;
 import com.gamma.spool.config.ConcurrentConfig;
 import com.gamma.spool.config.DebugConfig;
@@ -53,6 +54,8 @@ public static long getRecursiveObjectSize(Object o) {
 
     static {
         try {
+            MixinReflectionPatcher.init();
+
             ConfigurationManager.registerConfig(DebugConfig.class);
 
             SpoolCompat.earlyInitialization();

src/main/java/com/gamma/spool/unusedTemp/SimulationDistanceHelper.java

@@ -17,8 +17,6 @@
 import net.minecraftforge.common.ForgeChunkManager;
 
 import com.gamma.spool.core.SpoolCompat;
-import com.mitchej123.hodgepodge.Compat;
-import com.mitchej123.hodgepodge.CoreTweaksCompat;
 import com.mitchej123.hodgepodge.config.FixesConfig;
 import com.mitchej123.hodgepodge.config.TweaksConfig;
 import com.mitchej123.hodgepodge.util.ChunkPosUtil;
@@ -41,15 +39,15 @@ public class SimulationDistanceHelper {
      * Mark a chunk as no to be simulated, or reset that state. Not thread safe!
      */
     public static void preventChunkSimulation(World world, long packedChunkPos, boolean prevent) {
-        if (!SpoolCompat.isModLoaded("hodgepodge") || !FixesConfig.addSimulationDistance) {
+        if (!SpoolCompat.isModLoaded("hodgepodge") || !FixesConfig.addSimulationDistance_WIP) {
             return;
         }
         ISimulationDistanceWorld mixin = (ISimulationDistanceWorld) world;
         mixin.hodgepodge$preventChunkSimulation(packedChunkPos, prevent);
     }
 
     public static int getSimulationDistance() {
-        if (SpoolCompat.isModLoaded("hodgepodge") && FixesConfig.addSimulationDistance)
+        if (SpoolCompat.isModLoaded("hodgepodge") && FixesConfig.addSimulationDistance_WIP)
             return TweaksConfig.simulationDistance;
         else return 0;
     }
@@ -307,9 +305,9 @@ public void chunkUnloaded(long chunk) {
         chunkTickMap.remove(chunk);
         for (NextTickListEntry entry : entries) {
             pendingTickListEntriesHashSet.remove(entry);
-            if (Compat.isCoreTweaksPresent()) {
-                CoreTweaksCompat.removeTickEntry(world, entry);
-            }
+            // if (Compat.isCoreTweaksPresent()) {
+            // CoreTweaksCompat.removeTickEntry(world, entry);
+            // }
             /*
              * Entries would get removed in tickUpdates eventually, but we risk reloading a chunk and having an
              * incompatible, similar entry in pendingTickListEntriesTreeSet/pendingTickListEntriesHashSet that can be
@@ -329,9 +327,9 @@ protected void removeTick(NextTickListEntry entry) {
         }
 
         pendingTickListEntriesHashSet.remove(entry);
-        if (Compat.isCoreTweaksPresent()) {
-            CoreTweaksCompat.removeTickEntry(world, entry);
-        }
+        // if (Compat.isCoreTweaksPresent()) {
+        // CoreTweaksCompat.removeTickEntry(world, entry);
+        // }
         long key = ChunkCoordIntPair.chunkXZ2Int(entry.xCoord >> 4, entry.zCoord >> 4);
         HashSet<NextTickListEntry> entries = chunkTickMap.get(key);
         if (entries != null) {