bump version

CHANGELOG.md

@@ -6,10 +6,16 @@ The format is based on [Keep a Changelog],
 and this project adheres to [Semantic Versioning].
 
 ## Unreleased
+- /
+
+## [1.1.0] - 2024-09-27
 
 - 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
+- added support for Extended Industrialization ([#92](https://github.com/AlmostReliable/almostunified/pull/92))
+- fixed unification for EnderIO outputs
+- removed EnderIO unifier since it's fully supported by the generic unifier
 
 ## [1.0.0] - 2024-08-22
 
@@ -20,4 +26,5 @@ Initial 1.21.1 port.
 [semantic versioning]: https://semver.org/spec/v2.0.0.html
 
 <!-- Versions -->
+[1.1.0]: https://github.com/AlmostReliable/almostunified/releases/tag/v1.21.1-1.1.0
 [1.0.0]: https://github.com/AlmostReliable/almostunified/releases/tag/v1.21.1-1.0.0

Common/build.gradle.kts

@@ -35,7 +35,7 @@ dependencies {
     modCompileOnly("mezz.jei:jei-$minecraftVersion-common-api:$jeiVersion") // required for jei plugin
     modCompileOnly("me.shedaniel:RoughlyEnoughItems-api:$reiVersion") // required for rei plugin
     compileOnly("me.shedaniel:REIPluginCompatibilities-forge-annotations:9.+") // required to disable rei compat layer
-    modCompileOnly("dev.emi:emi-xplat-intermediary:$emiVersion+1.21:api") // required for emi plugin TODO: replace on EMI release
+    modCompileOnly("dev.emi:emi-xplat-intermediary:$emiVersion+$minecraftVersion:api") // required for emi plugin
 }
 
 buildConfig {

Common/src/main/java/com/almostreliable/unified/api/constant/ModConstants.java

@@ -19,12 +19,12 @@ 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";
     String MEKANISM = "mekanism";
     String MODERN_INDUSTRIALIZATION = "modern_industrialization";
+    String EXTENDED_INDUSTRIALIZATION = "extended_industrialization";
     String OCCULTISM = "occultism";
     String PRODUCTIVE_TREES = "productivetrees";
     String THEURGY = "theurgy";

Fabric/build.gradle.kts

@@ -39,7 +39,7 @@ dependencies {
     // compile time
     modCompileOnly("mezz.jei:jei-$minecraftVersion-fabric-api:$jeiVersion") // required for common jei plugin
     modCompileOnly("me.shedaniel:RoughlyEnoughItems-api-fabric:$reiVersion") // required for common rei plugin
-    modCompileOnly("dev.emi:emi-fabric:$emiVersion+1.21:api") // required for common emi plugin TODO: replace on EMI release
+    modCompileOnly("dev.emi:emi-fabric:$emiVersion+$minecraftVersion:api") // required for common emi plugin
 
     // runtime
     if (enableRuntimeRecipeViewer == "true") {
@@ -47,7 +47,7 @@ dependencies {
             when (fabricRecipeViewer) {
                 "jei" -> "mezz.jei:jei-$minecraftVersion-fabric:$jeiVersion"
                 "rei" -> "me.shedaniel:RoughlyEnoughItems-fabric:$reiVersion"
-                "emi" -> "dev.emi:emi-fabric:$emiVersion+1.21" // TODO: replace on EMI release
+                "emi" -> "dev.emi:emi-fabric:$emiVersion+$minecraftVersion"
                 else -> throw GradleException("Invalid fabricRecipeViewer value: $fabricRecipeViewer")
             }
         )

NeoForge/build.gradle.kts

@@ -64,8 +64,7 @@ dependencies {
     }
     // TODO go back to API when solved: https://github.com/architectury/architectury-loom/issues/204
     modCompileOnly("me.shedaniel:RoughlyEnoughItems-neoforge:$reiVersion") // required for common rei plugin
-    modLocalRuntime("dev.architectury:architectury-neoforge:13.0.6") // TODO: Remove on new REI version
-    modCompileOnly("dev.emi:emi-neoforge:$emiVersion+1.21:api") // required for common emi plugin TODO: replace on EMI release
+    modCompileOnly("dev.emi:emi-neoforge:$emiVersion+$minecraftVersion:api") // required for common emi plugin
 
     // runtime
     forgeRuntimeLibrary("org.junit.jupiter:junit-jupiter-api:$junitVersion")
@@ -73,7 +72,7 @@ dependencies {
         when (neoforgeRecipeViewer) {
             "jei" -> modLocalRuntime("mezz.jei:jei-$minecraftVersion-neoforge:$jeiVersion") { isTransitive = false }
             "rei" -> modLocalRuntime("me.shedaniel:RoughlyEnoughItems-neoforge:$reiVersion")
-            "emi" -> modLocalRuntime("dev.emi:emi-neoforge:$emiVersion+1.21") //TODO: replace on EMI release
+            "emi" -> modLocalRuntime("dev.emi:emi-neoforge:$emiVersion+$minecraftVersion")
             else -> throw GradleException("Invalid forgeRecipeViewer value: $neoforgeRecipeViewer")
         }
     }

NeoForge/src/main/java/com/almostreliable/unified/compat/unification/EnderIORecipeUnifier.java

@@ -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);
-    }
-}

NeoForge/src/main/java/com/almostreliable/unified/core/NeoForgePlugin.java

@@ -9,7 +9,6 @@ import com.almostreliable.unified.api.unification.bundled.ShapedRecipeUnifier;
 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,11 +37,11 @@ public class NeoForgePlugin implements AlmostUnifiedPlugin {
             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());
         registry.registerForModId(ModConstants.MODERN_INDUSTRIALIZATION, new ModernIndustrializationRecipeUnifier());
+        registry.registerForModId(ModConstants.EXTENDED_INDUSTRIALIZATION, new ModernIndustrializationRecipeUnifier());
         registry.registerForModId(ModConstants.OCCULTISM, new OccultismRecipeUnifier());
         registry.registerForModId(ModConstants.PRODUCTIVE_TREES, new ProductiveTreesRecipeUnifier());
         registry.registerForModId(ModConstants.THEURGY, new TheurgyRecipeUnifier());

NeoForge/src/test/java/testmod/neoforge/NeoForgeTest.java

@@ -14,7 +14,6 @@ import testmod.CommonTest;
 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 class NeoForgeTest {
             MekanismRecipeUnifierTests.class,
             ModernIndustrializationRecipeUnifierTests.class,
             ImmersiveEngineeringRecipeUnifierTests.class,
-            EnderIORecipeUnifierTests.class,
             IntegratedDynamicsRecipeUnifierTests.class);
 
         bus.addListener(this::onRegistry);

NeoForge/src/test/java/testmod/neoforge/tests/EnderIORecipeUnifierTests.java

@@ -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
-            }
-            """);
-    }
-}

build.gradle.kts

@@ -93,7 +93,7 @@ subprojects {
         "minecraft"("com.mojang:minecraft:$minecraftVersion")
         "mappings"(loom.layered {
             officialMojangMappings()
-            parchment("org.parchmentmc.data:parchment-1.21:$parchmentVersion@zip") // TODO: replace on aprchment update
+            parchment("org.parchmentmc.data:parchment-1.21:$parchmentVersion@zip") // TODO: replace on parchment update
         })
 
         /**

gradle.properties

@@ -8,7 +8,7 @@ enableAccessWidener = false
 minecraftVersion = 1.21.1
 
 # Mod
-modVersion = 1.0.0
+modVersion = 1.1.0
 modPackage = com.almostreliable.unified
 modId = almostunified
 modName = AlmostUnified
@@ -23,8 +23,8 @@ parchmentVersion = 2024.07.28
 # Recipe Viewers
 enableRuntimeRecipeViewer = true
 jeiVersion = 19.8.4.113
-reiVersion = 16.0.754
-emiVersion = 1.1.10
+reiVersion = 16.0.762
+emiVersion = 1.1.13
 fabricRecipeViewer = rei
 neoforgeRecipeViewer = emi