From f22c004bda98de429cc2c74924e9fa42f6cbf798 Mon Sep 17 00:00:00 2001 From: thedarkcolour <30441001+thedarkcolour@users.noreply.github.com> Date: Mon, 8 Apr 2024 17:49:45 -0700 Subject: [PATCH] Fix EMI skipping JEI compatibility --- .../compat/jei/ExDeorumJeiPlugin.java | 24 ++++++++++++------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/src/main/java/thedarkcolour/exdeorum/compat/jei/ExDeorumJeiPlugin.java b/src/main/java/thedarkcolour/exdeorum/compat/jei/ExDeorumJeiPlugin.java index 583c6385..0992a2b7 100644 --- a/src/main/java/thedarkcolour/exdeorum/compat/jei/ExDeorumJeiPlugin.java +++ b/src/main/java/thedarkcolour/exdeorum/compat/jei/ExDeorumJeiPlugin.java @@ -72,15 +72,21 @@ import java.util.function.Supplier; public class ExDeorumJeiPlugin implements IModPlugin { public static final ResourceLocation EX_DEORUM_JEI_TEXTURE = new ResourceLocation(ExDeorum.ID, "textures/gui/jei/enr_jei.png"); - static final RecipeType BARREL_COMPOST = RecipeType.create(ExDeorum.ID, "barrel_compost", BarrelCompostRecipe.class); - static final RecipeType BARREL_MIXING = RecipeType.create(ExDeorum.ID, "barrel_mixing", BarrelMixingRecipe.class); - static final RecipeType BARREL_FLUID_MIXING = RecipeType.create(ExDeorum.ID, "barrel_fluid_mixing", BarrelFluidMixingRecipe.class); - static final RecipeType LAVA_CRUCIBLE = RecipeType.create(ExDeorum.ID, "lava_crucible", CrucibleRecipe.class); - static final RecipeType WATER_CRUCIBLE = RecipeType.create(ExDeorum.ID, "water_crucible", CrucibleRecipe.class); - static final RecipeType CRUCIBLE_HEAT_SOURCES = RecipeType.create(ExDeorum.ID, "crucible_heat_sources", CrucibleHeatSourceRecipe.class); - static final RecipeType SIEVE = RecipeType.create(ExDeorum.ID, "sieve", GroupedSieveRecipe.class); - static final RecipeType HAMMER = RecipeType.create(ExDeorum.ID, "hammer", HammerRecipe.class); - static final RecipeType CROOK = RecipeType.create(ExDeorum.ID, "crook", CrookJeiRecipe.class); + static final RecipeType BARREL_COMPOST = recipeType("barrel_compost", BarrelCompostRecipe.class); + static final RecipeType BARREL_MIXING = recipeType("barrel_mixing", BarrelMixingRecipe.class); + static final RecipeType BARREL_FLUID_MIXING = recipeType("barrel_fluid_mixing", BarrelFluidMixingRecipe.class); + static final RecipeType LAVA_CRUCIBLE = recipeType("lava_crucible", CrucibleRecipe.class); + static final RecipeType WATER_CRUCIBLE = recipeType("water_crucible", CrucibleRecipe.class); + static final RecipeType CRUCIBLE_HEAT_SOURCES = recipeType("crucible_heat_sources", CrucibleHeatSourceRecipe.class); + static final RecipeType SIEVE = recipeType("sieve", GroupedSieveRecipe.class); + static final RecipeType HAMMER = recipeType("hammer", HammerRecipe.class); + static final RecipeType CROOK = recipeType("crook", CrookJeiRecipe.class); + + private static RecipeType recipeType(String path, Class type) { + // use alternative namespace so that EMI doesn't skip JEI compatibility + String namespace = ModList.get().isLoaded(ModIds.EMI) ? ExDeorum.ID + "_" + ModIds.EMI : ExDeorum.ID; + return RecipeType.create(namespace, path, type); + } @Override public ResourceLocation getPluginUid() {