diff --git a/CHANGELOG.md b/CHANGELOG.md index fdfa517f9c..089686789b 100644 --- a/CHANGELOG.md +++ b/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 diff --git a/Common/build.gradle b/Common/build.gradle index aca1334466..09816d59c4 100644 --- a/Common/build.gradle +++ b/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" diff --git a/Common/src/main/java/at/petrak/hexcasting/common/recipe/ingredient/StateIngredient.java b/Common/src/main/java/at/petrak/hexcasting/common/recipe/ingredient/StateIngredient.java index cd2cca2268..ce5f0689f6 100644 --- a/Common/src/main/java/at/petrak/hexcasting/common/recipe/ingredient/StateIngredient.java +++ b/Common/src/main/java/at/petrak/hexcasting/common/recipe/ingredient/StateIngredient.java @@ -27,7 +27,7 @@ public interface StateIngredient extends Predicate { List getDisplayedStacks(); /** - * A description tooltip to display in areas like JEI recipes. + * A description tooltip to display in recipe viewers. */ default List descriptionTooltip() { return Collections.emptyList(); diff --git a/Fabric/src/main/java/at/petrak/hexcasting/fabric/interop/emi/BrainsweepeeEmiStack.java b/Common/src/main/java/at/petrak/hexcasting/interop/emi/BrainsweepeeEmiStack.java similarity index 98% rename from Fabric/src/main/java/at/petrak/hexcasting/fabric/interop/emi/BrainsweepeeEmiStack.java rename to Common/src/main/java/at/petrak/hexcasting/interop/emi/BrainsweepeeEmiStack.java index 43f23f9442..96d2a0a26a 100644 --- a/Fabric/src/main/java/at/petrak/hexcasting/fabric/interop/emi/BrainsweepeeEmiStack.java +++ b/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; diff --git a/Fabric/src/main/java/at/petrak/hexcasting/fabric/interop/emi/EmiBrainsweepRecipe.java b/Common/src/main/java/at/petrak/hexcasting/interop/emi/EmiBrainsweepRecipe.java similarity index 95% rename from Fabric/src/main/java/at/petrak/hexcasting/fabric/interop/emi/EmiBrainsweepRecipe.java rename to Common/src/main/java/at/petrak/hexcasting/interop/emi/EmiBrainsweepRecipe.java index 441a7e12ff..94c878c7d5 100644 --- a/Fabric/src/main/java/at/petrak/hexcasting/fabric/interop/emi/EmiBrainsweepRecipe.java +++ b/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() { diff --git a/Fabric/src/main/java/at/petrak/hexcasting/fabric/interop/emi/EmiEdifyRecipe.java b/Common/src/main/java/at/petrak/hexcasting/interop/emi/EmiEdifyRecipe.java similarity index 97% rename from Fabric/src/main/java/at/petrak/hexcasting/fabric/interop/emi/EmiEdifyRecipe.java rename to Common/src/main/java/at/petrak/hexcasting/interop/emi/EmiEdifyRecipe.java index 4c3f8d4c4d..d4df2ba904 100644 --- a/Fabric/src/main/java/at/petrak/hexcasting/fabric/interop/emi/EmiEdifyRecipe.java +++ b/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; diff --git a/Fabric/src/main/java/at/petrak/hexcasting/fabric/interop/emi/EmiPhialRecipe.java b/Common/src/main/java/at/petrak/hexcasting/interop/emi/EmiPhialRecipe.java similarity index 97% rename from Fabric/src/main/java/at/petrak/hexcasting/fabric/interop/emi/EmiPhialRecipe.java rename to Common/src/main/java/at/petrak/hexcasting/interop/emi/EmiPhialRecipe.java index 2e74629169..f1aa38ab3a 100644 --- a/Fabric/src/main/java/at/petrak/hexcasting/fabric/interop/emi/EmiPhialRecipe.java +++ b/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; diff --git a/Fabric/src/main/java/at/petrak/hexcasting/fabric/interop/emi/HexEMIPlugin.java b/Common/src/main/java/at/petrak/hexcasting/interop/emi/HexEMIPlugin.java similarity index 91% rename from Fabric/src/main/java/at/petrak/hexcasting/fabric/interop/emi/HexEMIPlugin.java rename to Common/src/main/java/at/petrak/hexcasting/interop/emi/HexEMIPlugin.java index 3c10fb9d4f..82ddff5b9d 100644 --- a/Fabric/src/main/java/at/petrak/hexcasting/fabric/interop/emi/HexEMIPlugin.java +++ b/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), diff --git a/Fabric/src/main/java/at/petrak/hexcasting/fabric/interop/emi/PatternRendererEMI.java b/Common/src/main/java/at/petrak/hexcasting/interop/emi/PatternRendererEMI.java similarity index 98% rename from Fabric/src/main/java/at/petrak/hexcasting/fabric/interop/emi/PatternRendererEMI.java rename to Common/src/main/java/at/petrak/hexcasting/interop/emi/PatternRendererEMI.java index da699de7a9..211d30dff8 100644 --- a/Fabric/src/main/java/at/petrak/hexcasting/fabric/interop/emi/PatternRendererEMI.java +++ b/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; diff --git a/Fabric/src/main/java/at/petrak/hexcasting/fabric/interop/emi/TheCoolerSlotWidget.java b/Common/src/main/java/at/petrak/hexcasting/interop/emi/TheCoolerSlotWidget.java similarity index 97% rename from Fabric/src/main/java/at/petrak/hexcasting/fabric/interop/emi/TheCoolerSlotWidget.java rename to Common/src/main/java/at/petrak/hexcasting/interop/emi/TheCoolerSlotWidget.java index 2f936f78bf..4af19d9751 100644 --- a/Fabric/src/main/java/at/petrak/hexcasting/fabric/interop/emi/TheCoolerSlotWidget.java +++ b/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; diff --git a/Forge/src/main/java/at/petrak/hexcasting/forge/interop/jei/BrainsweepRecipeCategory.java b/Common/src/main/java/at/petrak/hexcasting/interop/jei/BrainsweepRecipeCategory.java similarity index 95% rename from Forge/src/main/java/at/petrak/hexcasting/forge/interop/jei/BrainsweepRecipeCategory.java rename to Common/src/main/java/at/petrak/hexcasting/interop/jei/BrainsweepRecipeCategory.java index 5dab50b0c0..bf01f459e5 100644 --- a/Forge/src/main/java/at/petrak/hexcasting/forge/interop/jei/BrainsweepRecipeCategory.java +++ b/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,7 +35,7 @@ public class BrainsweepRecipeCategory implements IRecipeCategory { 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); @@ -37,7 +35,6 @@ public EdifyRecipeCategory(IGuiHelper guiHelper) { } @Override - @OnlyIn(Dist.CLIENT) public @NotNull Component getTitle() { return localizedName; } diff --git a/Forge/src/main/java/at/petrak/hexcasting/forge/interop/jei/HexJEIPlugin.java b/Common/src/main/java/at/petrak/hexcasting/interop/jei/HexJEIPlugin.java similarity index 98% rename from Forge/src/main/java/at/petrak/hexcasting/forge/interop/jei/HexJEIPlugin.java rename to Common/src/main/java/at/petrak/hexcasting/interop/jei/HexJEIPlugin.java index 32572ba10c..671ef9b302 100644 --- a/Forge/src/main/java/at/petrak/hexcasting/forge/interop/jei/HexJEIPlugin.java +++ b/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; diff --git a/Forge/src/main/java/at/petrak/hexcasting/forge/interop/jei/PatternDrawable.java b/Common/src/main/java/at/petrak/hexcasting/interop/jei/PatternDrawable.java similarity index 98% rename from Forge/src/main/java/at/petrak/hexcasting/forge/interop/jei/PatternDrawable.java rename to Common/src/main/java/at/petrak/hexcasting/interop/jei/PatternDrawable.java index bf96781a00..8ebc401ac3 100644 --- a/Forge/src/main/java/at/petrak/hexcasting/forge/interop/jei/PatternDrawable.java +++ b/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; diff --git a/Forge/src/main/java/at/petrak/hexcasting/forge/interop/jei/PhialRecipeCategory.java b/Common/src/main/java/at/petrak/hexcasting/interop/jei/PhialRecipeCategory.java similarity index 91% rename from Forge/src/main/java/at/petrak/hexcasting/forge/interop/jei/PhialRecipeCategory.java rename to Common/src/main/java/at/petrak/hexcasting/interop/jei/PhialRecipeCategory.java index 23a4272a4e..96fc2a4549 100644 --- a/Forge/src/main/java/at/petrak/hexcasting/forge/interop/jei/PhialRecipeCategory.java +++ b/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,7 +26,7 @@ public class PhialRecipeCategory implements IRecipeCategory { 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); @@ -36,7 +34,6 @@ public PhialRecipeCategory(IGuiHelper guiHelper) { } @Override - @OnlyIn(Dist.CLIENT) public @NotNull Component getTitle() { return localizedName; } diff --git a/Common/src/main/resources/assets/hexcasting/patchouli_books/thehexbook/en_us/templates/brainsweep.json b/Common/src/main/resources/assets/hexcasting/patchouli_books/thehexbook/en_us/templates/brainsweep.json index c7081d0b5b..1b0dc3b004 100644 --- a/Common/src/main/resources/assets/hexcasting/patchouli_books/thehexbook/en_us/templates/brainsweep.json +++ b/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, diff --git a/Common/src/main/resources/assets/hexcasting/textures/gui/brainsweep_jei.png b/Common/src/main/resources/assets/hexcasting/textures/gui/brainsweep_recipe.png similarity index 100% rename from Common/src/main/resources/assets/hexcasting/textures/gui/brainsweep_jei.png rename to Common/src/main/resources/assets/hexcasting/textures/gui/brainsweep_recipe.png diff --git a/Common/src/main/resources/assets/hexcasting/textures/gui/brainsweep_emi.png b/Common/src/main/resources/assets/hexcasting/textures/gui/brainsweep_recipe_icon.png similarity index 100% rename from Common/src/main/resources/assets/hexcasting/textures/gui/brainsweep_emi.png rename to Common/src/main/resources/assets/hexcasting/textures/gui/brainsweep_recipe_icon.png diff --git a/Common/src/main/resources/assets/hexcasting/textures/gui/brainsweep.png b/Common/src/main/resources/assets/hexcasting/textures/gui/brainsweep_recipe_nobg.png similarity index 100% rename from Common/src/main/resources/assets/hexcasting/textures/gui/brainsweep.png rename to Common/src/main/resources/assets/hexcasting/textures/gui/brainsweep_recipe_nobg.png diff --git a/Common/src/main/resources/assets/hexcasting/textures/gui/edify_jei.png b/Common/src/main/resources/assets/hexcasting/textures/gui/edify_recipe.png similarity index 100% rename from Common/src/main/resources/assets/hexcasting/textures/gui/edify_jei.png rename to Common/src/main/resources/assets/hexcasting/textures/gui/edify_recipe.png diff --git a/Common/src/main/resources/assets/hexcasting/textures/gui/edify_emi.png b/Common/src/main/resources/assets/hexcasting/textures/gui/edify_recipe_icon.png similarity index 100% rename from Common/src/main/resources/assets/hexcasting/textures/gui/edify_emi.png rename to Common/src/main/resources/assets/hexcasting/textures/gui/edify_recipe_icon.png diff --git a/Common/src/main/resources/assets/hexcasting/textures/gui/edify.png b/Common/src/main/resources/assets/hexcasting/textures/gui/edify_recipe_nobg.png similarity index 100% rename from Common/src/main/resources/assets/hexcasting/textures/gui/edify.png rename to Common/src/main/resources/assets/hexcasting/textures/gui/edify_recipe_nobg.png diff --git a/Common/src/main/resources/assets/hexcasting/textures/gui/phial_jei.png b/Common/src/main/resources/assets/hexcasting/textures/gui/phial_recipe.png similarity index 100% rename from Common/src/main/resources/assets/hexcasting/textures/gui/phial_jei.png rename to Common/src/main/resources/assets/hexcasting/textures/gui/phial_recipe.png diff --git a/Common/src/main/resources/assets/hexcasting/textures/gui/phial_emi.png b/Common/src/main/resources/assets/hexcasting/textures/gui/phial_recipe_icon.png similarity index 100% rename from Common/src/main/resources/assets/hexcasting/textures/gui/phial_emi.png rename to Common/src/main/resources/assets/hexcasting/textures/gui/phial_recipe_icon.png diff --git a/Common/src/main/resources/assets/hexcasting/textures/gui/phial.png b/Common/src/main/resources/assets/hexcasting/textures/gui/phial_recipe_nobg.png similarity index 100% rename from Common/src/main/resources/assets/hexcasting/textures/gui/phial.png rename to Common/src/main/resources/assets/hexcasting/textures/gui/phial_recipe_nobg.png diff --git a/Fabric/build.gradle b/Fabric/build.gradle index 9cc6b1b0e1..0d6911a6d4 100644 --- a/Fabric/build.gradle +++ b/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" diff --git a/Fabric/src/main/resources/fabric.mod.json b/Fabric/src/main/resources/fabric.mod.json index 38174656fe..1b5be950da 100644 --- a/Fabric/src/main/resources/fabric.mod.json +++ b/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" diff --git a/Forge/build.gradle b/Forge/build.gradle index 43831992c4..4efacc0bba 100644 --- a/Forge/build.gradle +++ b/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") diff --git a/gradle.properties b/gradle.properties index 4bc43541a6..10a627ebe8 100644 --- a/gradle.properties +++ b/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