fix EnderIO unifier not targeting generic structures

AlmostReliable · Sep 27, 2024 · 70d9025 · 70d9025
1 parent f23cd8f
commit 70d9025
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 70 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,8 @@ and this project adheres to [Semantic Versioning].
 - added `end` stone variant to config defaults
 - added debug option to toggle logging invalid tag warnings, false by default
 - added logging for potentially broken recipes caused by unification
+- fixed unification for EnderIO outputs
+- removed EnderIO unifier since it's fully supported by the generic unifier
 
 ## [1.0.0] - 2024-08-22
 

diff --git a/Common/src/main/java/com/almostreliable/unified/api/constant/ModConstants.java b/Common/src/main/java/com/almostreliable/unified/api/constant/ModConstants.java
@@ -19,7 +19,6 @@ public interface ModConstants {
     String ARS_NOUVEAU = "ars_nouveau";
     String ARS_SCALAES = "ars_scalaes";
     String CYCLIC = "cyclic";
-    String ENDER_IO = "enderio";
     String GREGTECH_MODERN = "gtceu";
     String IMMERSIVE_ENGINEERING = "immersiveengineering";
     String INTEGRATED_DYNAMICS = "integrateddynamics";

diff --git a/...rge/src/main/java/com/almostreliable/unified/compat/unification/EnderIORecipeUnifier.java b/...rge/src/main/java/com/almostreliable/unified/compat/unification/EnderIORecipeUnifier.java
diff --git a/NeoForge/src/main/java/com/almostreliable/unified/core/NeoForgePlugin.java b/NeoForge/src/main/java/com/almostreliable/unified/core/NeoForgePlugin.java
@@ -9,7 +9,6 @@
 import com.almostreliable.unified.api.unification.recipe.RecipeUnifierRegistry;
 import com.almostreliable.unified.compat.unification.ArsNouveauRecipeUnifier;
 import com.almostreliable.unified.compat.unification.CyclicRecipeUnifier;
-import com.almostreliable.unified.compat.unification.EnderIORecipeUnifier;
 import com.almostreliable.unified.compat.unification.ImmersiveEngineeringRecipeUnifier;
 import com.almostreliable.unified.compat.unification.IntegratedDynamicsRecipeUnifier;
 import com.almostreliable.unified.compat.unification.MekanismRecipeUnifier;
@@ -38,7 +37,6 @@ public void registerRecipeUnifiers(RecipeUnifierRegistry registry) {
             ModConstants.ARS_SCALAES
         ).forEach(modId -> registry.registerForModId(modId, new ArsNouveauRecipeUnifier()));
         registry.registerForModId(ModConstants.CYCLIC, new CyclicRecipeUnifier());
-        registry.registerForModId(ModConstants.ENDER_IO, new EnderIORecipeUnifier());
         registry.registerForModId(ModConstants.IMMERSIVE_ENGINEERING, new ImmersiveEngineeringRecipeUnifier());
         registry.registerForModId(ModConstants.INTEGRATED_DYNAMICS, new IntegratedDynamicsRecipeUnifier());
         registry.registerForModId(ModConstants.MEKANISM, new MekanismRecipeUnifier());

diff --git a/NeoForge/src/test/java/testmod/neoforge/NeoForgeTest.java b/NeoForge/src/test/java/testmod/neoforge/NeoForgeTest.java
@@ -14,7 +14,6 @@
 import testmod.TestItems;
 import testmod.gametest_core.GameTestLoader;
 import testmod.neoforge.tests.ArsNouveauRecipeTests;
-import testmod.neoforge.tests.EnderIORecipeUnifierTests;
 import testmod.neoforge.tests.ImmersiveEngineeringRecipeUnifierTests;
 import testmod.neoforge.tests.IntegratedDynamicsRecipeUnifierTests;
 import testmod.neoforge.tests.MekanismRecipeUnifierTests;
@@ -29,7 +28,6 @@ public NeoForgeTest(IEventBus bus) {
             MekanismRecipeUnifierTests.class,
             ModernIndustrializationRecipeUnifierTests.class,
             ImmersiveEngineeringRecipeUnifierTests.class,
-            EnderIORecipeUnifierTests.class,
             IntegratedDynamicsRecipeUnifierTests.class);
 
         bus.addListener(this::onRegistry);

diff --git a/NeoForge/src/test/java/testmod/neoforge/tests/EnderIORecipeUnifierTests.java b/NeoForge/src/test/java/testmod/neoforge/tests/EnderIORecipeUnifierTests.java