Remove CCC and NEI Compat Code

FabricCompatibilityLayers · Aug 17, 2023 · 153158b · 153158b
1 parent 0e4d853
commit 153158b
Show file tree

Hide file tree

Showing 16 changed files with 8 additions and 492 deletions.
diff --git a/lib/CodeChickenCore-0.6.12.jar b/lib/CodeChickenCore-0.6.12.jar
diff --git a/lib/NotEnoughItems-1.4.2.1.jar b/lib/NotEnoughItems-1.4.2.1.jar
diff --git a/mod-compat/build.gradle b/mod-compat/build.gradle
@@ -5,8 +5,6 @@ dependencies {
     // add the intermediary jar of the mod in rootfolder/lib with a dummy fabric.mod.json file in it
     // if the file is named like "filename-fileversion.jar" then import it this way:
     // modCompileOnly(group: "local", name: "filename", version: "fileversion")
-    modCompileOnly(group: "local", name: "CodeChickenCore", version: "0.6.12")
-    modCompileOnly(group: "local", name: "NotEnoughItems", version: "1.4.2.1")
 }
 
 base {

diff --git a/mod-compat/src/main/java/fr/catcore/fabricatedforge/compat/ExtraRemapper.java b/mod-compat/src/main/java/fr/catcore/fabricatedforge/compat/ExtraRemapper.java
@@ -35,6 +35,5 @@ public void registerVisitors(VisitorInfos visitorInfos) {
     @Override
     public void afterRemap() {
         Mixins.addConfiguration("fabricated-forge.mods.mixins.json");
-        Utils.TRANSFORMER_EXCLUSIONS.add("fr.catcore.fabricatedforge.compat.nei.NEIFixer");
     }
 }
diff --git a/mod-compat/src/main/java/fr/catcore/fabricatedforge/compat/ModsMixinPlugin.java b/mod-compat/src/main/java/fr/catcore/fabricatedforge/compat/ModsMixinPlugin.java
@@ -19,14 +19,14 @@ public String getRefMapperConfig() {
 
     @Override
     public boolean shouldApplyMixin(String targetClassName, String mixinClassName) {
-        if (mixinClassName.contains(".nei.")) {
-            try {
-                this.getClass().getClassLoader().loadClass("codechicken.nei.forge.IContainerClientSide");
-                return true;
-            } catch (ClassNotFoundException e) {
-                return false;
-            }
-        }
+//        if (mixinClassName.contains(".nei.")) {
+//            try {
+//                this.getClass().getClassLoader().loadClass("codechicken.nei.forge.IContainerClientSide");
+//                return true;
+//            } catch (ClassNotFoundException e) {
+//                return false;
+//            }
+//        }
         return true;
     }
 

diff --git a/...va/fr/catcore/fabricatedforge/compat/mixin/codechickencore/ClassHeirachyManagerMixin.java b/...va/fr/catcore/fabricatedforge/compat/mixin/codechickencore/ClassHeirachyManagerMixin.java
diff --git a/.../main/java/fr/catcore/fabricatedforge/compat/mixin/codechickencore/ClassMappingMixin.java b/.../main/java/fr/catcore/fabricatedforge/compat/mixin/codechickencore/ClassMappingMixin.java
diff --git a/...ain/java/fr/catcore/fabricatedforge/compat/mixin/codechickencore/ClassOverriderMixin.java b/...ain/java/fr/catcore/fabricatedforge/compat/mixin/codechickencore/ClassOverriderMixin.java
diff --git a/.../main/java/fr/catcore/fabricatedforge/compat/mixin/codechickencore/FieldMappingMixin.java b/.../main/java/fr/catcore/fabricatedforge/compat/mixin/codechickencore/FieldMappingMixin.java
diff --git a/...main/java/fr/catcore/fabricatedforge/compat/mixin/codechickencore/MethodMappingMixin.java b/...main/java/fr/catcore/fabricatedforge/compat/mixin/codechickencore/MethodMappingMixin.java
diff --git a/.../src/main/java/fr/catcore/fabricatedforge/compat/mixin/nei/FurnaceRecipeHandlerMixin.java b/.../src/main/java/fr/catcore/fabricatedforge/compat/mixin/nei/FurnaceRecipeHandlerMixin.java