diff --git a/CHANGELOG.md b/CHANGELOG.md index f6778cf..233a719 100644 --- 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 index c066a3b..d5d5a30 100644 --- 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/NeoForge/src/main/java/com/almostreliable/unified/compat/unification/EnderIORecipeUnifier.java b/NeoForge/src/main/java/com/almostreliable/unified/compat/unification/EnderIORecipeUnifier.java deleted file mode 100644 index 3a28121..0000000 --- a/NeoForge/src/main/java/com/almostreliable/unified/compat/unification/EnderIORecipeUnifier.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.almostreliable.unified.compat.unification; - -import com.almostreliable.unified.api.constant.RecipeConstants; -import com.almostreliable.unified.api.unification.recipe.RecipeJson; -import com.almostreliable.unified.api.unification.recipe.RecipeUnifier; -import com.almostreliable.unified.api.unification.recipe.UnificationHelper; - -public class EnderIORecipeUnifier implements RecipeUnifier { - - @Override - public void unify(UnificationHelper helper, RecipeJson recipe) { - helper.unifyOutputs(recipe, RecipeConstants.ITEM); - } -} diff --git a/NeoForge/src/main/java/com/almostreliable/unified/core/NeoForgePlugin.java b/NeoForge/src/main/java/com/almostreliable/unified/core/NeoForgePlugin.java index b4217d4..9771e45 100644 --- 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 index adce22f..270ede4 100644 --- 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 deleted file mode 100644 index 549d0dc..0000000 --- a/NeoForge/src/test/java/testmod/neoforge/tests/EnderIORecipeUnifierTests.java +++ /dev/null @@ -1,51 +0,0 @@ -package testmod.neoforge.tests; - -import com.almostreliable.unified.api.unification.recipe.RecipeUnifier; -import com.almostreliable.unified.compat.unification.EnderIORecipeUnifier; - -import testmod.gametest_core.SimpleGameTest; - -import static testmod.TestUtils.assertNoUnify; -import static testmod.TestUtils.assertUnify; - -public class EnderIORecipeUnifierTests { - - public static final RecipeUnifier UNIFIER = new EnderIORecipeUnifier(); - - @SimpleGameTest - public void test() { - assertUnify(UNIFIER, """ - { - "type": "enderio:grinding_ball", - "chance": 1.65, - "durability": 40000, - "grinding": 1.2, - "item": "minecraft:test_item", - "power": 0.8 - } - """, """ - { - "type": "enderio:grinding_ball", - "chance": 1.65, - "durability": 40000, - "grinding": 1.2, - "item": "testmod:test_item", - "power": 0.8 - } - """); - } - - @SimpleGameTest - public void testNot() { - assertNoUnify(UNIFIER, """ - { - "type": "enderio:grinding_ball", - "chance": 1.65, - "durability": 40000, - "grinding": 1.2, - "item": "enderio:copper_alloy_grinding_ball", - "power": 0.8 - } - """); - } -}