From fd801a2ae6b521354646df67c56888d76756361d Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Sun, 11 Sep 2016 19:34:44 +0100 Subject: [PATCH] Fixed item stacks not showing up in a lot of places, including the lexicon recipe pages and the mana pool HUD. --- .../botania/client/core/handler/HUDHandler.java | 2 +- .../client/gui/lexicon/GuiLexiconIndex.java | 2 +- .../botania/common/block/tile/TileHourglass.java | 2 +- .../botania/common/item/ItemCraftingHalo.java | 2 +- .../common/item/block/ItemBlockSpecialFlower.java | 1 - .../botania/common/lexicon/page/PageRecipe.java | 2 +- .../botania/common/lexicon/page/PageShedding.java | 15 ++++++++------- .../vazkii/botania/common/lib/LibLexicon.java | 1 - 8 files changed, 13 insertions(+), 14 deletions(-) diff --git a/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java b/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java index c6c1c83c4..85361d5f9 100644 --- a/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java @@ -298,7 +298,7 @@ public final class HUDHandler { net.minecraft.client.renderer.RenderHelper.enableGUIStandardItemLighting(); mc.getRenderItem().renderItemAndEffectIntoGUI(stack, x - 20, y); mc.getRenderItem().renderItemAndEffectIntoGUI(recipe.getOutput(), x + 26, y); - mc.getRenderItem().renderItemOverlayIntoGUI(mc.fontRendererObj, recipe.getOutput(), x + 26, y, ""); + mc.getRenderItem().renderItemOverlays(mc.fontRendererObj, recipe.getOutput(), x + 26, y); net.minecraft.client.renderer.RenderHelper.disableStandardItemLighting(); GlStateManager.disableLighting(); diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconIndex.java b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconIndex.java index 433cd8c83..6f00e5c3c 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconIndex.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconIndex.java @@ -243,7 +243,7 @@ public class GuiLexiconIndex extends GuiLexicon implements IParented { ItemStack paper = new ItemStack(Items.PAPER, currentEntry.pages.size()); mc.getRenderItem().renderItemAndEffectIntoGUI(paper, 14, -28); - mc.getRenderItem().renderItemOverlayIntoGUI(mc.fontRendererObj, paper, 14, -28, ""); + mc.getRenderItem().renderItemOverlays(mc.fontRendererObj, paper, 14, -28); List stacks = currentEntry.getDisplayedRecipes(); if(stacks.size() > 0) { diff --git a/src/main/java/vazkii/botania/common/block/tile/TileHourglass.java b/src/main/java/vazkii/botania/common/block/tile/TileHourglass.java index 092716fc9..ca8d8d48b 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileHourglass.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileHourglass.java @@ -154,7 +154,7 @@ public class TileHourglass extends TileSimpleInventory { RenderHelper.enableGUIStandardItemLighting(); GlStateManager.enableRescaleNormal(); mc.getRenderItem().renderItemIntoGUI(stack, x, y); - mc.getRenderItem().renderItemOverlayIntoGUI(mc.fontRendererObj, stack, x, y, ""); + mc.getRenderItem().renderItemOverlays(mc.fontRendererObj, stack, x, y); GlStateManager.disableRescaleNormal(); RenderHelper.disableStandardItemLighting(); diff --git a/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java b/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java index 1daa3ac33..8c9245145 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java +++ b/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java @@ -589,7 +589,7 @@ public class ItemCraftingHalo extends ItemMod implements ICraftAchievement { } mc.getRenderItem().renderItemAndEffectIntoGUI(recipe[9], x + 72, y + 18); - mc.getRenderItem().renderItemOverlayIntoGUI(mc.fontRendererObj, recipe[9], x + 72, y + 18, ""); + mc.getRenderItem().renderItemOverlays(mc.fontRendererObj, recipe[9], x + 72, y + 18); net.minecraft.client.renderer.RenderHelper.disableStandardItemLighting(); } diff --git a/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java b/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java index f8f469fd6..e6e0ebe3f 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java @@ -95,7 +95,6 @@ public class ItemBlockSpecialFlower extends ItemBlockMod implements IRecipeKeyPr stacks.add(TextFormatting.ITALIC + refLocalized); } - System.out.println(type); String mod = BotaniaAPI.subTileMods.get(type); if(!mod.equals(LibMisc.MOD_ID)) stacks.add(TextFormatting.ITALIC + "[" + mod + "]"); diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageRecipe.java b/src/main/java/vazkii/botania/common/lexicon/page/PageRecipe.java index d0ef3ae09..bac21ab62 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageRecipe.java @@ -146,7 +146,7 @@ public class PageRecipe extends LexiconPage { GlStateManager.pushMatrix(); GlStateManager.translate(xPos, yPos, 0); render.renderItemAndEffectIntoGUI(stack, 0, 0); - render.renderItemOverlayIntoGUI(Minecraft.getMinecraft().fontRendererObj, stack, 0, 0, ""); + render.renderItemOverlays(Minecraft.getMinecraft().fontRendererObj, stack, 0, 0); GlStateManager.popMatrix(); RenderHelper.disableStandardItemLighting(); GlStateManager.popMatrix(); diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageShedding.java b/src/main/java/vazkii/botania/common/lexicon/page/PageShedding.java index 0e7ba0d54..6cbe76290 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageShedding.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageShedding.java @@ -10,6 +10,13 @@ */ package vazkii.botania.common.lexicon.page; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import org.lwjgl.input.Mouse; +import org.lwjgl.opengl.GL11; + import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.renderer.GlStateManager; @@ -24,18 +31,12 @@ import net.minecraft.util.math.MathHelper; import net.minecraft.util.text.TextFormatting; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import org.lwjgl.input.Mouse; -import org.lwjgl.opengl.GL11; import vazkii.botania.api.internal.IGuiLexiconEntry; import vazkii.botania.api.lexicon.LexiconRecipeMappings; import vazkii.botania.api.lexicon.LexiconRecipeMappings.EntryData; import vazkii.botania.client.gui.lexicon.GuiLexiconEntry; import vazkii.botania.client.lib.LibResources; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - public class PageShedding extends PageEntity { private static final ResourceLocation sheddingOverlay = new ResourceLocation(LibResources.GUI_SHEDDING_OVERLAY); @@ -120,7 +121,7 @@ public class PageShedding extends PageEntity { GlStateManager.enableRescaleNormal(); GlStateManager.enableDepth(); render.renderItemAndEffectIntoGUI(stack, xPos, yPos); - render.renderItemOverlayIntoGUI(Minecraft.getMinecraft().fontRendererObj, stack, xPos, yPos, ""); + render.renderItemOverlays(Minecraft.getMinecraft().fontRendererObj, stack, xPos, yPos); RenderHelper.disableStandardItemLighting(); GlStateManager.popMatrix(); diff --git a/src/main/java/vazkii/botania/common/lib/LibLexicon.java b/src/main/java/vazkii/botania/common/lib/LibLexicon.java index ea550e651..104fb65f1 100644 --- a/src/main/java/vazkii/botania/common/lib/LibLexicon.java +++ b/src/main/java/vazkii/botania/common/lib/LibLexicon.java @@ -251,7 +251,6 @@ public final class LibLexicon { public static final String MISC_STARFIELD = "starfield"; public static final String MISC_MUSHROOMS = "mushrooms"; public static final String MISC_PHANTOM_INK = "phantomInk"; - public static final String MISC_STONE_ALCHEMY = "stoneAlchemy"; public static final String MISC_BLAZE_BLOCK = "blazeBlock"; public static final String MISC_CHALLENGES = "challenges"; public static final String MISC_CACOPHONIUM = "cacophonium";