diff --git a/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java b/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java index 9e4594b53..389ecedb1 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java +++ b/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java @@ -11,6 +11,7 @@ package vazkii.botania.client.integration.jei; import mezz.jei.api.IModPlugin; import mezz.jei.api.JeiPlugin; import mezz.jei.api.constants.VanillaRecipeCategoryUid; +import mezz.jei.api.gui.ingredient.IGuiIngredientGroup; import mezz.jei.api.recipe.IRecipeManager; import mezz.jei.api.registration.IRecipeCatalystRegistration; import mezz.jei.api.registration.IRecipeCategoryRegistration; @@ -22,12 +23,15 @@ import mezz.jei.api.runtime.IJeiRuntime; import mezz.jei.api.runtime.IRecipesGui; import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.screen.inventory.ContainerScreen; +import net.minecraft.client.resources.I18n; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.Ingredient; import net.minecraft.tags.BlockTags; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.text.TextFormatting; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.mana.IManaItem; @@ -219,6 +223,16 @@ public class JEIBotaniaPlugin implements IModPlugin { CorporeaInputHandler.supportedGuiFilter = gui -> gui instanceof ContainerScreen || gui instanceof IRecipesGui; } + public static void addDefaultRecipeIdTooltip(IGuiIngredientGroup group, int slot, ResourceLocation recipeId) { + group.addTooltipCallback((slotIndex, input, ingredient, tooltip) -> { + if (slotIndex == slot) { + if (Minecraft.getInstance().gameSettings.advancedItemTooltips || Screen.hasShiftDown()) { + tooltip.add(TextFormatting.DARK_GRAY + I18n.format("jei.tooltip.recipe.id", recipeId)); + } + } + }); + } + @Nonnull @Override public ResourceLocation getPluginUid() { diff --git a/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeCategory.java b/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeCategory.java index 6a657c4ef..6668440c6 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeCategory.java +++ b/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeCategory.java @@ -25,6 +25,7 @@ import net.minecraft.item.crafting.Ingredient; import net.minecraft.util.ResourceLocation; import vazkii.botania.api.recipe.RecipeBrew; +import vazkii.botania.client.integration.jei.JEIBotaniaPlugin; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibMisc; @@ -125,6 +126,8 @@ public class BreweryRecipeCategory implements IRecipeCategory { recipeLayout.getItemStacks().init(7, false, 87, 41); recipeLayout.getItemStacks().set(7, getItemMatchingFocus(focus, IFocus.Mode.INPUT, inputs.get(0), outputs.get(0))); + + JEIBotaniaPlugin.addDefaultRecipeIdTooltip(recipeLayout.getItemStacks(), 7, recipe.getId()); } /** diff --git a/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeCategory.java b/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeCategory.java index d146568ab..8d39c35c4 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeCategory.java +++ b/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeCategory.java @@ -19,6 +19,7 @@ import mezz.jei.api.ingredients.IIngredients; import mezz.jei.api.recipe.category.IRecipeCategory; import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.renderer.BufferBuilder; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.texture.AtlasTexture; @@ -28,6 +29,7 @@ import net.minecraft.client.resources.I18n; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.Ingredient; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.text.TextFormatting; import org.lwjgl.opengl.GL11; @@ -135,5 +137,15 @@ public class ElvenTradeRecipeCategory implements IRecipeCategory { + if (slotIndex >= endIndex) { + if (Minecraft.getInstance().gameSettings.advancedItemTooltips || Screen.hasShiftDown()) { + tooltip.add(TextFormatting.DARK_GRAY + I18n.format("jei.tooltip.recipe.id", recipeId)); + } + } + }); } } diff --git a/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeCategory.java b/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeCategory.java index 0097eb293..a3335035c 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeCategory.java +++ b/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeCategory.java @@ -26,6 +26,7 @@ import net.minecraft.util.ResourceLocation; import vazkii.botania.api.recipe.RecipeManaInfusion; import vazkii.botania.client.core.handler.HUDHandler; +import vazkii.botania.client.integration.jei.JEIBotaniaPlugin; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.mana.TilePool; import vazkii.botania.common.core.helper.ItemNBTHelper; @@ -133,5 +134,7 @@ public class ManaPoolRecipeCategory implements IRecipeCategory recipeLayout.getItemStacks().init(2, false, 99, 12); recipeLayout.getItemStacks().set(2, ingredients.getOutputs(VanillaTypes.ITEM).get(0)); } + + IGuiIngredientGroup group = outputFluid ? recipeLayout.getFluidStacks() : recipeLayout.getItemStacks(); + JEIBotaniaPlugin.addDefaultRecipeIdTooltip(group, 2, recipe.getId()); } } diff --git a/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeCategory.java b/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeCategory.java index a17a4b6d4..a0fd3a682 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeCategory.java +++ b/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeCategory.java @@ -24,6 +24,7 @@ import net.minecraft.util.ResourceLocation; import vazkii.botania.api.recipe.RecipeRuneAltar; import vazkii.botania.client.core.handler.HUDHandler; +import vazkii.botania.client.integration.jei.JEIBotaniaPlugin; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.mana.TilePool; import vazkii.botania.common.lib.LibMisc; @@ -120,6 +121,7 @@ public class RunicAltarRecipeCategory implements IRecipeCategory