move the cofh oredict asm fix to hodgepodge

GTNewHorizons · Sep 21, 2024 · 7982c76 · 7982c76
1 parent a777f1b
commit 7982c76
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 177 deletions.
diff --git a/src/main/java/gtPlusPlus/core/config/ASMConfiguration.java b/src/main/java/gtPlusPlus/core/config/ASMConfiguration.java
@@ -25,10 +25,6 @@ public static class Debug {
         @Config.DefaultBoolean(false)
         public boolean debugMode;
 
-        @Config.Comment("Enable/Disable COFH OreDictionaryArbiter Patch (Useful for Development)")
-        @Config.DefaultBoolean(true)
-        public boolean enableCofhPatch;
-
         @Config.Comment("Enable/Disable Forge OreDictionary Patch (Useful for Development)")
         @Config.DefaultBoolean(false)
         public boolean enableOreDictPatch;

diff --git a/...ava/gtPlusPlus/preloader/asm/transformers/ClassTransformer_COFH_OreDictionaryArbiter.java b/...ava/gtPlusPlus/preloader/asm/transformers/ClassTransformer_COFH_OreDictionaryArbiter.java
diff --git a/src/main/java/gtPlusPlus/preloader/asm/transformers/Preloader_Transformer_Handler.java b/src/main/java/gtPlusPlus/preloader/asm/transformers/Preloader_Transformer_Handler.java
@@ -17,7 +17,6 @@ public class Preloader_Transformer_Handler implements IClassTransformer {
 
     private static final Set<String> IC2_WRENCH_PATCH_CLASS_NAMES = new HashSet<>();
     private static final String FORGE_ORE_DICTIONARY = "net.minecraftforge.oredict.OreDictionary";
-    private static final String COFH_ORE_DICTIONARY_ARBITER = "cofh.core.util.oredict.OreDictionaryArbiter";
 
     static {
         IC2_WRENCH_PATCH_CLASS_NAMES.add("ic2.core.block.BlockTileEntity");
@@ -49,14 +48,6 @@ public byte[] transform(String name, String transformedName, byte[] basicClass)
             return classWriter.toByteArray();
         }
 
-        // Fix the OreDictionary COFH
-        if (transformedName.equals(COFH_ORE_DICTIONARY_ARBITER)
-            && (ASMConfiguration.debug.enableCofhPatch || GTCorePlugin.isDevEnv())) {
-            PreloaderLogger.INFO("COFH", "Transforming " + transformedName);
-            return new ClassTransformer_COFH_OreDictionaryArbiter(basicClass).getWriter()
-                .toByteArray();
-        }
-
         if (IC2_WRENCH_PATCH_CLASS_NAMES.contains(transformedName)) {
             PreloaderLogger.INFO("IC2 getHarvestTool Patch", "Transforming " + transformedName);
             return new ClassTransformer_IC2_GetHarvestTool(basicClass, !GTCorePlugin.isDevEnv(), transformedName)