Move JEI and EMI interop into Common

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 now work with both EMI and JEI on all platforms, rather than only EMI on Fabric and only 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

@@ -11,18 +11,20 @@ minecraft {
 repositories {
     mavenCentral()
 
+    // paucal, patchi, inline, JEI
     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
+        // fallback maven for JEI
         name = "ModMaven"
         url = "https://modmaven.dev"
     }
+    maven {
+        // 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 +35,8 @@ dependencies {
     implementation group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.1'
 
     compileOnly "at.petra-k.paucal:paucal-common-$minecraftVersion:$paucalVersion"
+    compileOnly "mezz.jei:jei-$minecraftVersion-common-api:$jeiVersion"
+    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;

Forge/src/main/java/at/petrak/hexcasting/forge/interop/jei/BrainsweepRecipeCategory.java → Common/src/main/java/at/petrak/hexcasting/interop/jei/BrainsweepRecipeCategory.java

@@ -1,4 +1,4 @@
-package at.petrak.hexcasting.forge.interop.jei;
+package at.petrak.hexcasting.interop.jei;
 
 import at.petrak.hexcasting.client.ClientTickCounter;
 import at.petrak.hexcasting.common.recipe.BrainsweepRecipe;
@@ -19,8 +19,6 @@
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.item.ItemStack;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.Collections;
@@ -37,15 +35,14 @@ public class BrainsweepRecipeCategory implements IRecipeCategory<BrainsweepRecip
     private final Component localizedName;
 
     public BrainsweepRecipeCategory(IGuiHelper guiHelper) {
-        ResourceLocation location = modLoc("textures/gui/brainsweep_jei.png");
+        ResourceLocation location = modLoc("textures/gui/brainsweep_recipe.png");
         background = guiHelper.drawableBuilder(location, 0, 0, 118, 86).setTextureSize(128, 128).build();
         var brainsweep = modLoc("brainsweep");
         localizedName = Component.translatable("hexcasting.action." + brainsweep);
         icon = new PatternDrawable(brainsweep, 16, 16);
     }
 
     @Override
-    @OnlyIn(Dist.CLIENT)
     public @NotNull
     Component getTitle() {
         return localizedName;

Forge/src/main/java/at/petrak/hexcasting/forge/interop/jei/EdifyRecipeCategory.java → Common/src/main/java/at/petrak/hexcasting/interop/jei/EdifyRecipeCategory.java

@@ -1,4 +1,4 @@
-package at.petrak.hexcasting.forge.interop.jei;
+package at.petrak.hexcasting.interop.jei;
 
 import at.petrak.hexcasting.common.casting.actions.spells.OpEdifySapling;
 import at.petrak.hexcasting.common.lib.HexBlocks;
@@ -15,8 +15,6 @@
 import net.minecraft.tags.ItemTags;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.crafting.Ingredient;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
 import org.jetbrains.annotations.NotNull;
 
 import static at.petrak.hexcasting.api.HexAPI.modLoc;
@@ -29,15 +27,14 @@ public class EdifyRecipeCategory implements IRecipeCategory<OpEdifySapling> {
     private final Component localizedName;
 
     public EdifyRecipeCategory(IGuiHelper guiHelper) {
-        ResourceLocation location = modLoc("textures/gui/edify_jei.png");
+        ResourceLocation location = modLoc("textures/gui/edify_recipe.png");
         background = guiHelper.drawableBuilder(location, 0, 0, 79, 61).setTextureSize(128, 128).build();
         var edify = modLoc("edify");
         localizedName = Component.translatable("hexcasting.action." + edify);
         icon = new PatternDrawable(edify, 16, 16).strokeOrder(false);
     }
 
     @Override
-    @OnlyIn(Dist.CLIENT)
     public @NotNull Component getTitle() {
         return localizedName;
     }

Forge/src/main/java/at/petrak/hexcasting/forge/interop/jei/HexJEIPlugin.java → Common/src/main/java/at/petrak/hexcasting/interop/jei/HexJEIPlugin.java

@@ -1,4 +1,4 @@
-package at.petrak.hexcasting.forge.interop.jei;
+package at.petrak.hexcasting.interop.jei;
 
 import at.petrak.hexcasting.api.HexAPI;
 import at.petrak.hexcasting.common.casting.actions.spells.OpEdifySapling;

Forge/src/main/java/at/petrak/hexcasting/forge/interop/jei/PatternDrawable.java → Common/src/main/java/at/petrak/hexcasting/interop/jei/PatternDrawable.java

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

Forge/src/main/java/at/petrak/hexcasting/forge/interop/jei/PhialRecipeCategory.java → Common/src/main/java/at/petrak/hexcasting/interop/jei/PhialRecipeCategory.java

@@ -1,4 +1,4 @@
-package at.petrak.hexcasting.forge.interop.jei;
+package at.petrak.hexcasting.interop.jei;
 
 import at.petrak.hexcasting.api.mod.HexTags;
 import at.petrak.hexcasting.common.casting.actions.spells.OpMakeBattery;
@@ -14,8 +14,6 @@
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.crafting.Ingredient;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
 import org.jetbrains.annotations.NotNull;
 
 import static at.petrak.hexcasting.api.HexAPI.modLoc;
@@ -28,15 +26,14 @@ public class PhialRecipeCategory implements IRecipeCategory<OpMakeBattery> {
     private final Component localizedName;
 
     public PhialRecipeCategory(IGuiHelper guiHelper) {
-        ResourceLocation location = modLoc("textures/gui/phial_jei.png");
+        ResourceLocation location = modLoc("textures/gui/phial_recipe.png");
         background = guiHelper.drawableBuilder(location, 0, 0, 113, 40).setTextureSize(128, 128).build();
         var craftPhial = modLoc("craft/battery");
         localizedName = Component.translatable("hexcasting.action." + craftPhial);
         icon = new PatternDrawable(craftPhial, 12, 12);
     }
 
     @Override
-    @OnlyIn(Dist.CLIENT)
     public @NotNull Component getTitle() {
         return localizedName;
     }

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,16 +58,18 @@ loom {
 repositories {
     mavenCentral()
 
-    // paucal and patchi
-    maven { url = 'https://maven.blamejared.com' }
+    // paucal, patchi, inline, JEI
+    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
-    maven { url = "https://maven.gnomecraft.net/releases" }
+    // JEI fallback mirror
+    maven { url "https://modmaven.dev" }
+    // EMI (temporarily changed from https://maven.terraformersmc.com/releases/ due to intermittent errors)
+    maven { url "https://maven.gnomecraft.net/releases" }
     exclusiveContent {
         forRepository {
             maven { url = "https://api.modrinth.com/maven" }
@@ -126,6 +128,9 @@ dependencies {
     modImplementation "dev.emi:trinkets:$trinketsVersion"
     modImplementation "dev.emi:emi-fabric:${emiVersion}"
 
+    modCompileOnlyApi("mezz.jei:jei-${minecraftVersion}-fabric-api:${jeiVersion}")
+    modRuntimeOnly("mezz.jei:jei-${minecraftVersion}-fabric:${jeiVersion}")
+
 //    modImplementation "maven.modrinth:gravity-api:$gravityApiVersion"
     modApi("com.github.Virtuoel:Pehkui:${pehkuiVersion}", {
         exclude group: "net.fabricmc.fabric-api"

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

@@ -33,8 +33,11 @@
     "cardinal-components": [
       "at.petrak.hexcasting.fabric.cc.HexCardinalComponents"
     ],
+    "jei_mod_plugin": [
+      "at.petrak.hexcasting.interop.jei.HexJEIPlugin"
+    ],
     "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,12 @@ 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, JEI
+    maven { url = 'https://maven.blamejared.com' }
+    // JEI fallback mirror
+    maven { url = "https://modmaven.dev" }
+    // 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
@@ -102,6 +98,7 @@ dependencies {
     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")

gradle.properties

@@ -17,6 +17,7 @@ paucalVersion=0.6.0-pre-118
 patchouliVersion=83
 
 jeiVersion=15.0.0.12
+emiVersion=1.0.4
 pehkuiVersion=3.8.2
 
 inlineVersion=1.2.2