Add native EMI support for Forge

- moved EMI plugin classes to XPlat - bumped compile-only EMI dependencies to version 1.0.12 (that's when "experimental" annotations were removed from some stable APIs) - bumped local test run EMI versions to 1.1.4 (latest release; only enabled for Fabric by default, JEI stays default for Forge)
VazkiiMods · Apr 2, 2024 · b5426b2 · b5426b2
1 parent f64f16c
commit b5426b2
Show file tree

Hide file tree

Showing 19 changed files with 33 additions and 17 deletions.
diff --git a/Fabric/build.gradle b/Fabric/build.gradle
@@ -55,6 +55,7 @@ repositories {
         url = "https://maven.blamejared.com/" // for JEI and Patchouli
     }
     maven {
+        name = "TerraformersMC"
         url = "https://maven.terraformersmc.com/" // for trinkets and emi
     }
     maven {
@@ -111,7 +112,8 @@ dependencies {
 
     modCompileOnly "me.shedaniel:RoughlyEnoughItems-fabric:12.0.625"
 
-    modImplementation("dev.emi:emi-fabric:1.0.4+1.20.1") { transitive = false }
+    modCompileOnly "dev.emi:emi-fabric:1.0.12+${minecraft_version}:api"
+    modLocalRuntime "dev.emi:emi-fabric:1.1.4+${minecraft_version}"
 
     modImplementation "me.zeroeightsix:fiber:0.23.0-2"  
     include "me.zeroeightsix:fiber:0.23.0-2"

diff --git a/Fabric/src/main/resources/fabric.mod.json b/Fabric/src/main/resources/fabric.mod.json
@@ -62,7 +62,7 @@
       "vazkii.botania.fabric.internal_caps.CCAInternalEntityComponents"
     ],
     "emi": [
-      "vazkii.botania.fabric.integration.emi.BotaniaEmiPlugin"
+      "vazkii.botania.client.integration.emi.BotaniaEmiPlugin"
     ],
     "rei_client": [
       "vazkii.botania.fabric.integration.rei.BotaniaREIPlugin"

diff --git a/Forge/build.gradle b/Forge/build.gradle
@@ -38,6 +38,10 @@ repositories {
         name = "C4"
         url = "https://maven.theillusivec4.top/"
     }
+    maven {
+        name = "TerraformersMC"
+        url = "https://maven.terraformersmc.com/" // for emi
+    }
     maven {
         name = "Unascribed"
         url "https://repo.unascribed.com" // for ears
@@ -103,6 +107,9 @@ dependencies {
     compileOnly fg.deobf("mezz.jei:jei-1.20.1-common-api:15.2.0.27")
     runtimeOnly fg.deobf("mezz.jei:jei-1.20.1-forge:15.2.0.27")
 
+    compileOnly fg.deobf("dev.emi:emi-forge:1.0.12+${minecraft_version}:api")
+    //runtimeOnly fg.deobf("dev.emi:emi-forge:1.1.4+${minecraft_version}")
+
     compileOnly fg.deobf("top.theillusivec4.curios:curios-forge:5.4.2+1.20.1:api")
     runtimeOnly fg.deobf("top.theillusivec4.curios:curios-forge:5.4.2+1.20.1")
 

diff --git a/Xplat/build.gradle b/Xplat/build.gradle
@@ -19,6 +19,10 @@ repositories {
         name = "Jared" // Patchouli and JEI
         url = "https://maven.blamejared.com/"
     }
+    maven {
+        name = "TerraformersMC"
+        url = "https://maven.terraformersmc.com/" // for emi
+    }
     maven {
         name = "Unascribed"
         url "https://repo.unascribed.com" // for ears
@@ -40,6 +44,7 @@ dependencies {
     compileOnly "com.unascribed:ears-api:1.4.5"
 
     compileOnly "mezz.jei:jei-1.20.1-common-api:15.2.0.27"
+    compileOnly "dev.emi:emi-xplat-mojmap:1.0.12+${minecraft_version}:api"
 
     // annotationProcessor 'com.blamejared.crafttweaker:Crafttweaker_Annotation_Processors-1.18.2:2.0.0.123'
     // annotationProcessor 'com.blamejared.crafttweaker:CraftTweaker-common-1.18.2:9.1.123'

diff --git a/...integration/emi/AncientWillEmiRecipe.java → ...integration/emi/AncientWillEmiRecipe.java b/...integration/emi/AncientWillEmiRecipe.java → ...integration/emi/AncientWillEmiRecipe.java
@@ -1,4 +1,4 @@
-package vazkii.botania.fabric.integration.emi;
+package vazkii.botania.client.integration.emi;
 
 import dev.emi.emi.api.recipe.EmiPatternCraftingRecipe;
 import dev.emi.emi.api.stack.EmiIngredient;

diff --git a/...c/integration/emi/BlendTextureWidget.java → ...t/integration/emi/BlendTextureWidget.java b/...c/integration/emi/BlendTextureWidget.java → ...t/integration/emi/BlendTextureWidget.java
@@ -1,4 +1,4 @@
-package vazkii.botania.fabric.integration.emi;
+package vazkii.botania.client.integration.emi;
 
 import com.mojang.blaze3d.systems.RenderSystem;
 

diff --git a/...ric/integration/emi/BotaniaEmiPlugin.java → ...ent/integration/emi/BotaniaEmiPlugin.java b/...ric/integration/emi/BotaniaEmiPlugin.java → ...ent/integration/emi/BotaniaEmiPlugin.java
@@ -1,6 +1,7 @@
-package vazkii.botania.fabric.integration.emi;
+package vazkii.botania.client.integration.emi;
 
 import dev.emi.emi.api.EmiApi;
+import dev.emi.emi.api.EmiEntrypoint;
 import dev.emi.emi.api.EmiPlugin;
 import dev.emi.emi.api.EmiRegistry;
 import dev.emi.emi.api.recipe.EmiCraftingRecipe;
@@ -43,6 +44,7 @@
 
 import static vazkii.botania.common.lib.ResourceLocationHelper.prefix;
 
+@EmiEntrypoint
 public class BotaniaEmiPlugin implements EmiPlugin {
 	private static final Comparator<EmiRecipe> BY_ID = Comparator.comparing(EmiRecipe::getId);
 	private static final Comparator<EmiRecipe> BY_GROUP =

diff --git a/...ric/integration/emi/BotaniaEmiRecipe.java → ...ent/integration/emi/BotaniaEmiRecipe.java b/...ric/integration/emi/BotaniaEmiRecipe.java → ...ent/integration/emi/BotaniaEmiRecipe.java
@@ -1,4 +1,4 @@
-package vazkii.botania.fabric.integration.emi;
+package vazkii.botania.client.integration.emi;
 
 import dev.emi.emi.api.recipe.EmiRecipe;
 import dev.emi.emi.api.recipe.EmiRecipeCategory;

diff --git a/...ration/emi/BotanicalBreweryEmiRecipe.java → ...ration/emi/BotanicalBreweryEmiRecipe.java b/...ration/emi/BotanicalBreweryEmiRecipe.java → ...ration/emi/BotanicalBreweryEmiRecipe.java
@@ -1,4 +1,4 @@
-package vazkii.botania.fabric.integration.emi;
+package vazkii.botania.client.integration.emi;
 
 import dev.emi.emi.api.stack.EmiIngredient;
 import dev.emi.emi.api.stack.EmiStack;

diff --git a/...tegration/emi/CompositeLensEmiRecipe.java → ...tegration/emi/CompositeLensEmiRecipe.java b/...tegration/emi/CompositeLensEmiRecipe.java → ...tegration/emi/CompositeLensEmiRecipe.java
@@ -1,4 +1,4 @@
-package vazkii.botania.fabric.integration.emi;
+package vazkii.botania.client.integration.emi;
 
 import dev.emi.emi.api.recipe.EmiPatternCraftingRecipe;
 import dev.emi.emi.api.stack.EmiIngredient;

diff --git a/.../integration/emi/ElvenTradeEmiRecipe.java → .../integration/emi/ElvenTradeEmiRecipe.java b/.../integration/emi/ElvenTradeEmiRecipe.java → .../integration/emi/ElvenTradeEmiRecipe.java
@@ -1,4 +1,4 @@
-package vazkii.botania.fabric.integration.emi;
+package vazkii.botania.client.integration.emi;
 
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.blaze3d.vertex.VertexConsumer;

diff --git a/...ntegration/emi/ManaInfusionEmiRecipe.java → ...ntegration/emi/ManaInfusionEmiRecipe.java b/...ntegration/emi/ManaInfusionEmiRecipe.java → ...ntegration/emi/ManaInfusionEmiRecipe.java
@@ -1,4 +1,4 @@
-package vazkii.botania.fabric.integration.emi;
+package vazkii.botania.client.integration.emi;
 
 import dev.emi.emi.api.stack.EmiIngredient;
 import dev.emi.emi.api.stack.EmiStack;

diff --git a/...ia/fabric/integration/emi/ManaWidget.java → ...ia/client/integration/emi/ManaWidget.java b/...ia/fabric/integration/emi/ManaWidget.java → ...ia/client/integration/emi/ManaWidget.java
@@ -1,4 +1,4 @@
-package vazkii.botania.fabric.integration.emi;
+package vazkii.botania.client.integration.emi;
 
 import dev.emi.emi.api.widget.Bounds;
 import dev.emi.emi.api.widget.Widget;

diff --git a/...tegration/emi/MarimorphosisEmiRecipe.java → ...tegration/emi/MarimorphosisEmiRecipe.java b/...tegration/emi/MarimorphosisEmiRecipe.java → ...tegration/emi/MarimorphosisEmiRecipe.java
@@ -1,4 +1,4 @@
-package vazkii.botania.fabric.integration.emi;
+package vazkii.botania.client.integration.emi;
 
 import dev.emi.emi.api.stack.EmiIngredient;
 

diff --git a/...ric/integration/emi/OrechidEmiRecipe.java → ...ent/integration/emi/OrechidEmiRecipe.java b/...ric/integration/emi/OrechidEmiRecipe.java → ...ent/integration/emi/OrechidEmiRecipe.java
@@ -1,4 +1,4 @@
-package vazkii.botania.fabric.integration.emi;
+package vazkii.botania.client.integration.emi;
 
 import dev.emi.emi.api.recipe.EmiRecipeCategory;
 import dev.emi.emi.api.stack.EmiIngredient;

diff --git a/...gration/emi/PetalApothecaryEmiRecipe.java → ...gration/emi/PetalApothecaryEmiRecipe.java b/...gration/emi/PetalApothecaryEmiRecipe.java → ...gration/emi/PetalApothecaryEmiRecipe.java
@@ -1,4 +1,4 @@
-package vazkii.botania.fabric.integration.emi;
+package vazkii.botania.client.integration.emi;
 
 import dev.emi.emi.api.stack.EmiIngredient;
 import dev.emi.emi.api.stack.EmiStack;

diff --git a/...c/integration/emi/PureDaisyEmiRecipe.java → ...t/integration/emi/PureDaisyEmiRecipe.java b/...c/integration/emi/PureDaisyEmiRecipe.java → ...t/integration/emi/PureDaisyEmiRecipe.java
@@ -1,4 +1,4 @@
-package vazkii.botania.fabric.integration.emi;
+package vazkii.botania.client.integration.emi;
 
 import dev.emi.emi.api.recipe.EmiRecipe;
 import dev.emi.emi.api.stack.EmiIngredient;

diff --git a/.../integration/emi/RunicAltarEmiRecipe.java → .../integration/emi/RunicAltarEmiRecipe.java b/.../integration/emi/RunicAltarEmiRecipe.java → .../integration/emi/RunicAltarEmiRecipe.java
@@ -1,4 +1,4 @@
-package vazkii.botania.fabric.integration.emi;
+package vazkii.botania.client.integration.emi;
 
 import dev.emi.emi.api.recipe.EmiRecipe;
 import dev.emi.emi.api.stack.EmiIngredient;

diff --git a/...mi/TerrestrialAgglomerationEmiRecipe.java → ...mi/TerrestrialAgglomerationEmiRecipe.java b/...mi/TerrestrialAgglomerationEmiRecipe.java → ...mi/TerrestrialAgglomerationEmiRecipe.java
@@ -1,4 +1,4 @@
-package vazkii.botania.fabric.integration.emi;
+package vazkii.botania.client.integration.emi;
 
 import dev.emi.emi.api.stack.EmiIngredient;
 import dev.emi.emi.api.stack.EmiStack;