Use EMI on both Forge and Fabric

CHANGELOG.md

@@ -25,7 +25,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
 - Changed Wayfarer's Flight and Anchorite's Flight to both cost 2 dust per unit, and enforced a minimum cost for Anchorite's Flight ([#1040](https://github.com/FallingColors/HexMod/pull/1040)) @Robotgiggle
 - Changed the pattern limit to also include execution of non-pattern iotas like jumps ([#1035](https://github.com/FallingColors/HexMod/pull/1035)) @pythonmcpi
 - Changed the Hasty Retrospection mishap to Absent Introspection as it's now used for anything that only works while parenthesized ([#1047](https://github.com/FallingColors/HexMod/pull/1047)) @Robotgiggle
-- Updated the Flay Mind recipe display in EMI and JEI to cycle through all valid entities if the input is an entity tag ([#1023](https://github.com/FallingColors/HexMod/pull/1023)) @YukkuriC
+- All custom recipe displays are now handled via EMI on both sides rather than EMI on Fabric and JEI on Forge ([#1206](https://github.com/FallingColors/HexMod/pull/1206)) @Robotgiggle
+- Updated the Flay Mind recipe display to cycle through all valid entities if the input is an entity tag ([#1023](https://github.com/FallingColors/HexMod/pull/1023)) @YukkuriC
 - Re-implemented the ability to extract stored media from items in trinket/curio slots ([#996](https://github.com/FallingColors/HexMod/pull/996)) @YukkuriC
 - Patterns involving entity look direction now compensate for the vanilla bug that causes projectiles and phantoms to report the wrong direction ([#1025](https://github.com/FallingColors/HexMod/pull/1025)) @Robotgiggle
 - Edified Panels are now crafted with 9 planks rather than 8 to avoid conflicting with the vanilla chest recipe ([#1080](https://github.com/FallingColors/HexMod/pull/1080)) @Robotgiggle

Common/build.gradle

@@ -14,14 +14,10 @@ repositories {
     maven { url 'https://maven.blamejared.com' }
 
     maven {
-        // location of the maven that hosts JEI files
-        name = "Progwml6 maven"
-        url = "https://dvs1.progwml6.com/files/maven/"
-    }
-    maven {
-        // location of a maven mirror for JEI files, as a fallback
-        name = "ModMaven"
-        url = "https://modmaven.dev"
+        // maven for EMI
+        // temporarily changed from https://maven.terraformersmc.com/releases/ due to intermittent errors
+        name = "Gnomecraft maven"
+        url = "https://maven.gnomecraft.net/releases"
     }
 
     maven { url "https://maven.shedaniel.me/" }
@@ -33,6 +29,7 @@ dependencies {
     implementation group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.1'
 
     compileOnly "at.petra-k.paucal:paucal-common-$minecraftVersion:$paucalVersion"
+    compileOnly "dev.emi:emi-xplat-mojmap:$emiVersion+$minecraftVersion"
     compileOnly "vazkii.patchouli:Patchouli-xplat:$minecraftVersion-$patchouliVersion-SNAPSHOT"
 
     compileOnly "com.samsthenerd.inline:inline-forge:$minecraftVersion-$inlineVersion"

Common/src/main/java/at/petrak/hexcasting/common/recipe/ingredient/StateIngredient.java

@@ -27,7 +27,7 @@ public interface StateIngredient extends Predicate<BlockState> {
     List<ItemStack> getDisplayedStacks();
 
     /**
-     * A description tooltip to display in areas like JEI recipes.
+     * A description tooltip to display in recipe viewers.
      */
     default List<Component> descriptionTooltip() {
         return Collections.emptyList();

Fabric/src/main/java/at/petrak/hexcasting/fabric/interop/emi/BrainsweepeeEmiStack.java → Common/src/main/java/at/petrak/hexcasting/interop/emi/BrainsweepeeEmiStack.java

@@ -1,4 +1,4 @@
-package at.petrak.hexcasting.fabric.interop.emi;
+package at.petrak.hexcasting.interop.emi;
 
 import at.petrak.hexcasting.client.ClientTickCounter;
 import at.petrak.hexcasting.common.recipe.ingredient.brainsweep.BrainsweepeeIngredient;

Fabric/src/main/java/at/petrak/hexcasting/fabric/interop/emi/EmiBrainsweepRecipe.java → Common/src/main/java/at/petrak/hexcasting/interop/emi/EmiBrainsweepRecipe.java

@@ -1,4 +1,4 @@
-package at.petrak.hexcasting.fabric.interop.emi;
+package at.petrak.hexcasting.interop.emi;
 
 import dev.emi.emi.api.recipe.EmiRecipe;
 import dev.emi.emi.api.recipe.EmiRecipeCategory;
@@ -16,7 +16,7 @@ public record EmiBrainsweepRecipe(EmiIngredient blockInput,
                                   EmiIngredient villagerInput,
                                   EmiStack output,
                                   ResourceLocation id) implements EmiRecipe {
-    private static final ResourceLocation OVERLAY = modLoc("textures/gui/brainsweep_jei.png");
+    private static final ResourceLocation OVERLAY = modLoc("textures/gui/brainsweep_recipe.png");
 
     @Override
     public EmiRecipeCategory getCategory() {

Fabric/src/main/java/at/petrak/hexcasting/fabric/interop/emi/EmiEdifyRecipe.java → Common/src/main/java/at/petrak/hexcasting/interop/emi/EmiEdifyRecipe.java

@@ -1,4 +1,4 @@
-package at.petrak.hexcasting.fabric.interop.emi;
+package at.petrak.hexcasting.interop.emi;
 
 import at.petrak.hexcasting.common.lib.HexBlocks;
 import dev.emi.emi.api.recipe.EmiRecipe;
@@ -17,7 +17,7 @@
 import static at.petrak.hexcasting.api.HexAPI.modLoc;
 
 public class EmiEdifyRecipe implements EmiRecipe {
-    private static final ResourceLocation OVERLAY = modLoc("textures/gui/edify_jei.png");
+    private static final ResourceLocation OVERLAY = modLoc("textures/gui/edify_recipe.png");
 
     private final EmiIngredient saplings;
     private final EmiIngredient leaves;

Fabric/src/main/java/at/petrak/hexcasting/fabric/interop/emi/EmiPhialRecipe.java → Common/src/main/java/at/petrak/hexcasting/interop/emi/EmiPhialRecipe.java

@@ -1,4 +1,4 @@
-package at.petrak.hexcasting.fabric.interop.emi;
+package at.petrak.hexcasting.interop.emi;
 
 import at.petrak.hexcasting.api.mod.HexTags;
 import at.petrak.hexcasting.interop.utils.PhialRecipeStackBuilder;
@@ -17,7 +17,7 @@
 import static at.petrak.hexcasting.api.HexAPI.modLoc;
 
 public class EmiPhialRecipe implements EmiRecipe {
-    private static final ResourceLocation OVERLAY = modLoc("textures/gui/phial_jei.png");
+    private static final ResourceLocation OVERLAY = modLoc("textures/gui/phial_recipe.png");
 
     private final EmiIngredient inputs;
     private final EmiIngredient bottle;

Fabric/src/main/java/at/petrak/hexcasting/fabric/interop/emi/HexEMIPlugin.java → Common/src/main/java/at/petrak/hexcasting/interop/emi/HexEMIPlugin.java

@@ -1,9 +1,10 @@
-package at.petrak.hexcasting.fabric.interop.emi;
+package at.petrak.hexcasting.interop.emi;
 
 import at.petrak.hexcasting.api.mod.HexTags;
 import at.petrak.hexcasting.common.recipe.BrainsweepRecipe;
 import at.petrak.hexcasting.common.recipe.HexRecipeStuffRegistry;
 import at.petrak.hexcasting.interop.utils.PhialRecipeStackBuilder;
+import dev.emi.emi.api.EmiEntrypoint;
 import dev.emi.emi.api.EmiPlugin;
 import dev.emi.emi.api.EmiRegistry;
 import dev.emi.emi.api.recipe.EmiRecipeCategory;
@@ -14,14 +15,15 @@
 
 import static at.petrak.hexcasting.api.HexAPI.modLoc;
 
+@EmiEntrypoint
 public class HexEMIPlugin implements EmiPlugin {
 	private static final ResourceLocation BRAINSWEEP_ID = modLoc("brainsweep");
 	public static final ResourceLocation PHIAL_ID = modLoc("craft/battery");
 	public static final ResourceLocation EDIFY_ID = modLoc("edify");
 
-	private static final ResourceLocation SIMPLIFIED_ICON_BRAINSWEEP = modLoc("textures/gui/brainsweep_emi.png");
-	private static final ResourceLocation SIMPLIFIED_ICON_PHIAL = modLoc("textures/gui/phial_emi.png");
-	private static final ResourceLocation SIMPLIFIED_ICON_EDIFY = modLoc("textures/gui/edify_emi.png");
+	private static final ResourceLocation SIMPLIFIED_ICON_BRAINSWEEP = modLoc("textures/gui/brainsweep_recipe_icon.png");
+	private static final ResourceLocation SIMPLIFIED_ICON_PHIAL = modLoc("textures/gui/phial_recipe_icon.png");
+	private static final ResourceLocation SIMPLIFIED_ICON_EDIFY = modLoc("textures/gui/edify_recipe_icon.png");
 
 	public static final EmiRecipeCategory BRAINSWEEP = new EmiRecipeCategory(BRAINSWEEP_ID,
 		new PatternRendererEMI(BRAINSWEEP_ID, 16, 16),

Fabric/src/main/java/at/petrak/hexcasting/fabric/interop/emi/PatternRendererEMI.java → Common/src/main/java/at/petrak/hexcasting/interop/emi/PatternRendererEMI.java

@@ -1,4 +1,4 @@
-package at.petrak.hexcasting.fabric.interop.emi;
+package at.petrak.hexcasting.interop.emi;
 
 import at.petrak.hexcasting.api.casting.math.HexPattern;
 import at.petrak.hexcasting.api.mod.HexTags;

Fabric/src/main/java/at/petrak/hexcasting/fabric/interop/emi/TheCoolerSlotWidget.java → Common/src/main/java/at/petrak/hexcasting/interop/emi/TheCoolerSlotWidget.java

@@ -1,4 +1,4 @@
-package at.petrak.hexcasting.fabric.interop.emi;
+package at.petrak.hexcasting.interop.emi;
 
 import com.mojang.blaze3d.systems.RenderSystem;
 import dev.emi.emi.api.render.EmiRender;

Common/src/main/resources/assets/hexcasting/patchouli_books/thehexbook/en_us/templates/brainsweep.json

@@ -3,7 +3,7 @@
   "components": [
     {
       "type": "patchouli:image",
-      "image": "hexcasting:textures/gui/brainsweep.png",
+      "image": "hexcasting:textures/gui/brainsweep_recipe_nobg.png",
       "width": 128,
       "height": 128,
       "texture_width": 128,

Fabric/build.gradle

@@ -58,15 +58,15 @@ loom {
 repositories {
     mavenCentral()
 
-    // paucal and patchi
+    // paucal, patchi, inline
     maven { url = 'https://maven.blamejared.com' }
     // modmenu and clothconfig
     maven { url "https://maven.shedaniel.me/" }
     maven { url 'https://maven.ladysnake.org/releases' }
     // Entity reach
     maven { url "https://maven.jamieswhiteshirt.com/libs-release/" }
     maven { url "https://mvn.devos.one/snapshots/" }
-    // temporarily changed from https://maven.terraformersmc.com/releases/ due to intermittent errors
+    // EMI (temporarily changed from https://maven.terraformersmc.com/releases/ due to intermittent errors)
     maven { url = "https://maven.gnomecraft.net/releases" }
     exclusiveContent {
         forRepository {

Fabric/src/main/resources/fabric.mod.json

@@ -34,7 +34,7 @@
       "at.petrak.hexcasting.fabric.cc.HexCardinalComponents"
     ],
     "emi": [
-      "at.petrak.hexcasting.fabric.interop.emi.HexEMIPlugin"
+      "at.petrak.hexcasting.interop.emi.HexEMIPlugin"
     ],
     "modmenu": [
       "at.petrak.hexcasting.fabric.interop.ModMenuInterop"

Forge/build.gradle

@@ -49,16 +49,10 @@ repositories {
         dir 'libs'
     }
 
-    maven {
-        // location of the maven that hosts JEI files
-        name = "Progwml6 maven"
-        url = "https://dvs1.progwml6.com/files/maven/"
-    }
-    maven {
-        // location of a maven mirror for JEI files, as a fallback
-        name = "ModMaven"
-        url = "https://modmaven.dev"
-    }
+    // paucal, patchi, inline
+    maven { url = 'https://maven.blamejared.com' }
+    // EMI (temporarily changed from https://maven.terraformersmc.com/releases/ due to intermittent errors)
+    maven {url = "https://maven.gnomecraft.net/releases"}
     // caelus elytra
     maven { url = "https://maven.theillusivec4.top" }
     // pehkui
@@ -99,9 +93,7 @@ dependencies {
 
     // Optional interop
 
-    compileOnly fg.deobf("mezz.jei:jei-$minecraftVersion-common-api:$jeiVersion")
-    compileOnly fg.deobf("mezz.jei:jei-$minecraftVersion-forge-api:$jeiVersion")
-    runtimeOnly fg.deobf("mezz.jei:jei-$minecraftVersion-forge:$jeiVersion")
+    compileOnly fg.deobf("dev.emi:emi-forge:$emiVersion+$minecraftVersion")
 
     compileOnly fg.deobf("top.theillusivec4.curios:curios-forge:$curiosVersion+$minecraftVersion:api")
     runtimeOnly fg.deobf("top.theillusivec4.curios:curios-forge:$curiosVersion+$minecraftVersion")