From 62f2d0170f69003e647d150e5476613cb7738dcd Mon Sep 17 00:00:00 2001 From: +merlan #flirora Date: Fri, 17 Oct 2025 18:26:20 -0400 Subject: [PATCH 1/2] =?UTF-8?q?Set=20gradlew=E2=80=99s=20executable=20bit?= =?UTF-8?q?=20for=20Linux=20and=20macOS=20developers?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gradlew | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 gradlew diff --git a/gradlew b/gradlew old mode 100644 new mode 100755 From 875e8c96be6445df900112fe1a46577243cfce9a Mon Sep 17 00:00:00 2001 From: +merlan #flirora Date: Fri, 17 Oct 2025 19:09:01 -0400 Subject: [PATCH 2/2] =?UTF-8?q?Show=20profession=20recipes=E2=80=99=20mini?= =?UTF-8?q?mum=20level=20and=20EXP=20reward=20in=20JEI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The minimum level was already shown when hovering over the arrow, but this commit also displays it in the top-right corner of the recipe box. Also, the EXP reward is now shown with the hover text. --- .../mine_and_slash/a_libraries/jei/CraftingCategory.java | 6 ++++++ .../mine_and_slash/a_libraries/jei/CraftingExtension.java | 4 ++++ .../database/data/profession/ProfessionRecipe.java | 1 + src/main/resources/assets/mmorpg/lang/en_us.json | 7 ++++++- 4 files changed, 17 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/robertx22/mine_and_slash/a_libraries/jei/CraftingCategory.java b/src/main/java/com/robertx22/mine_and_slash/a_libraries/jei/CraftingCategory.java index 22a96deb9..1cd08e65e 100644 --- a/src/main/java/com/robertx22/mine_and_slash/a_libraries/jei/CraftingCategory.java +++ b/src/main/java/com/robertx22/mine_and_slash/a_libraries/jei/CraftingCategory.java @@ -13,6 +13,8 @@ import mezz.jei.api.recipe.RecipeType; import mezz.jei.api.recipe.category.extensions.IExtendableRecipeCategory; import mezz.jei.api.recipe.category.extensions.vanilla.crafting.ICraftingCategoryExtension; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.Font; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; @@ -87,6 +89,10 @@ public void draw(ProfessionRecipe recipe, IRecipeSlotsView recipeSlotsView, GuiG int recipeWidth = this.getWidth(); int recipeHeight = this.getHeight(); recipeExtension.drawInfo(recipeWidth, recipeHeight, guiGraphics, mouseX, mouseY); + + Font font = Minecraft.getInstance().font; + Component levelText = Component.translatable("mmorpg.jei.level_requirement", recipe.getLevelRequirement()); + guiGraphics.drawString(font, levelText, CraftingCategory.width - font.width(levelText), 0, 0xFF808080, false); } @Override diff --git a/src/main/java/com/robertx22/mine_and_slash/a_libraries/jei/CraftingExtension.java b/src/main/java/com/robertx22/mine_and_slash/a_libraries/jei/CraftingExtension.java index be7dc6f4f..40dc4ecd0 100644 --- a/src/main/java/com/robertx22/mine_and_slash/a_libraries/jei/CraftingExtension.java +++ b/src/main/java/com/robertx22/mine_and_slash/a_libraries/jei/CraftingExtension.java @@ -6,6 +6,10 @@ import mezz.jei.api.gui.ingredient.ICraftingGridHelper; import mezz.jei.api.recipe.IFocusGroup; import mezz.jei.api.recipe.category.extensions.vanilla.crafting.ICraftingCategoryExtension; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.Font; +import net.minecraft.client.gui.GuiGraphics; +import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.ItemStack; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/robertx22/mine_and_slash/database/data/profession/ProfessionRecipe.java b/src/main/java/com/robertx22/mine_and_slash/database/data/profession/ProfessionRecipe.java index ff6141550..ac687b7e1 100644 --- a/src/main/java/com/robertx22/mine_and_slash/database/data/profession/ProfessionRecipe.java +++ b/src/main/java/com/robertx22/mine_and_slash/database/data/profession/ProfessionRecipe.java @@ -57,6 +57,7 @@ public List getTooltipJEI() { var prof = ExileDB.Professions().get(profession); list.add(prof.locName().append(" ").append(TooltipUtils.level(getLevelRequirement()))); + list.add(Component.translatable("mmorpg.jei.exp_reward", this.exp).withStyle(ChatFormatting.GREEN)); return list; diff --git a/src/main/resources/assets/mmorpg/lang/en_us.json b/src/main/resources/assets/mmorpg/lang/en_us.json index 74c882817..b8a4bd5a9 100644 --- a/src/main/resources/assets/mmorpg/lang/en_us.json +++ b/src/main/resources/assets/mmorpg/lang/en_us.json @@ -3661,6 +3661,11 @@ "library_of_exile.relic_stat.bonus_rune": "Rune Drop rate %1$s", "library_of_exile.relic_stat.bonus_skill_gem": "Skill Gem Drop rate %1$s", "library_of_exile.relic_stat.bonus_watcher_eye": "Watcher Eye Drop rate %1$s", - "library_of_exile.relic_type.mmorpg": "Mine and Slash Relic" + "library_of_exile.relic_type.mmorpg": "Mine and Slash Relic", + + "_comment": " [CATEGORY]: JEI integration", + + "mmorpg.jei.level_requirement": "LVL %s+", + "mmorpg.jei.exp_reward": "+%s EXP/LVL" } \ No newline at end of file