diff --git a/src/main/java/vazkii/botania/client/integration/nei/NEIHelper.java b/src/main/java/vazkii/botania/client/integration/nei/NEIHelper.java new file mode 100644 index 000000000..cd369c687 --- /dev/null +++ b/src/main/java/vazkii/botania/client/integration/nei/NEIHelper.java @@ -0,0 +1,13 @@ +package vazkii.botania.client.integration.nei; + +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.FontRenderer; +import net.minecraft.client.renderer.entity.RenderItem; +import net.minecraft.client.renderer.texture.TextureManager; + +public class NEIHelper { + public static final RenderItem renderItem = new RenderItem(); + public static final Minecraft mc = Minecraft.getMinecraft(); + public static final TextureManager textureManager = mc.getTextureManager(); + public static final FontRenderer font = mc.fontRenderer; +} diff --git a/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerLexicaBotania.java b/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerLexicaBotania.java index e34452d4d..ad619642c 100644 --- a/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerLexicaBotania.java +++ b/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerLexicaBotania.java @@ -15,9 +15,7 @@ import java.util.Collection; import java.util.List; import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.GuiScreen; -import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.StatCollector; @@ -26,16 +24,15 @@ import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.lexicon.KnowledgeType; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.lexicon.LexiconRecipeMappings; +import vazkii.botania.client.integration.nei.NEIHelper; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lexicon.page.PageText; +import codechicken.lib.gui.GuiDraw; import codechicken.nei.PositionedStack; import codechicken.nei.recipe.TemplateRecipeHandler; public class RecipeHandlerLexicaBotania extends TemplateRecipeHandler { - - private static final RenderItem renderItem = new RenderItem(); - private static final Minecraft mc = Minecraft.getMinecraft(); private static final ItemStack lexicaStack = new ItemStack(ModItems.lexicon); public class CachedLexicaBotaniaRecipe extends CachedRecipe { @@ -84,35 +81,48 @@ public class RecipeHandlerLexicaBotania extends TemplateRecipeHandler { public void drawBackground(int recipe) { super.drawBackground(recipe); - FontRenderer font = Minecraft.getMinecraft().fontRenderer; CachedLexicaBotaniaRecipe recipeObj = ((CachedLexicaBotaniaRecipe) arecipes.get(recipe)); - renderItem.renderItemAndEffectIntoGUI(font, mc.getTextureManager(), lexicaStack, 51, 5); + NEIHelper.renderItem.renderItemIntoGUI(NEIHelper.font, NEIHelper.textureManager, lexicaStack, 51, 5); - String s = EnumChatFormatting.UNDERLINE + StatCollector.translateToLocal(recipeObj.entry.getUnlocalizedName()); - font.drawString(s, 82 - font.getStringWidth(s) / 2, 30, 0x404040); + GuiDraw.drawStringC( + EnumChatFormatting.UNDERLINE + StatCollector.translateToLocal(recipeObj.entry.getUnlocalizedName()), + 82, + 30, + 0x404040, + false); KnowledgeType type = recipeObj.entry.getKnowledgeType(); - s = type.color + StatCollector.translateToLocal(type.getUnlocalizedName()).replaceAll("&.", ""); - font.drawString(s, 82 - font.getStringWidth(s) / 2, 42, 0x404040); + GuiDraw.drawStringC( + type.color + StatCollector.translateToLocal(type.getUnlocalizedName()).replaceAll("&.", ""), + 82, + 42, + 0x404040, + false); - s = "\"" + StatCollector.translateToLocal(recipeObj.entry.getTagline()) + "\""; - PageText.renderText(5, 42, 160, 200, s); + PageText.renderText( + 5, + 42, + 160, + 200, + "\"" + StatCollector.translateToLocal(recipeObj.entry.getTagline()) + "\""); String key = LexiconRecipeMappings.stackToString(recipeObj.item.item); String quickInfo = "botania.nei.quickInfo:" + key; String quickInfoLocal = StatCollector.translateToLocal(quickInfo); + String s; if (GuiScreen.isShiftKeyDown() && GuiScreen.isCtrlKeyDown() && Minecraft.getMinecraft().gameSettings.advancedItemTooltips) s = "name: " + key; else if (quickInfo.equals(quickInfoLocal)) s = StatCollector.translateToLocal("botania.nei.lexicaNoInfo"); else { - font.drawString( + GuiDraw.drawStringC( StatCollector.translateToLocal("botania.nei.lexicaSeparator"), - 82 - font.getStringWidth(s) / 2, + 82, 80, - 0x404040); + 0x404040, + false); s = quickInfoLocal; } diff --git a/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerManaPool.java b/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerManaPool.java index 05aea0bc2..370341ebb 100644 --- a/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerManaPool.java +++ b/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerManaPool.java @@ -2,11 +2,8 @@ package vazkii.botania.client.integration.nei.recipe; import java.awt.Rectangle; -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.renderer.RenderHelper; -import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; import net.minecraftforge.oredict.OreDictionary; @@ -16,6 +13,7 @@ import org.lwjgl.opengl.GL11; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.recipe.RecipeManaInfusion; import vazkii.botania.client.core.handler.HUDHandler; +import vazkii.botania.client.integration.nei.NEIHelper; import vazkii.botania.client.lib.LibResources; import vazkii.botania.client.render.tile.RenderTilePool; import vazkii.botania.common.block.ModBlocks; @@ -27,8 +25,6 @@ import vazkii.botania.common.core.helper.ItemNBTHelper; public class RecipeHandlerManaPool extends TemplateRecipeHandler { - private static final RenderItem renderItem = new RenderItem(); - private static final Minecraft mc = Minecraft.getMinecraft(); private static final ItemStack poolStack = new ItemStack(ModBlocks.pool); public class CachedManaPoolRecipe extends CachedRecipe { @@ -104,17 +100,22 @@ public class RecipeHandlerManaPool extends TemplateRecipeHandler { GuiDraw.drawTexturedModalRect(45, 20, 38, 35, 92, 50); // Mana bar int tempMana = ((CachedManaPoolRecipe) arecipes.get(recipe)).mana; - HUDHandler.renderManaBar(32, 80, 0x0000FF, 0.75F, GuiScreen.isShiftKeyDown() ? tempMana : tempMana * 10, TilePool.MAX_MANA / 10); - FontRenderer font = Minecraft.getMinecraft().fontRenderer; + HUDHandler.renderManaBar( + 32, + 80, + 0x0000FF, + 0.75F, + GuiScreen.isShiftKeyDown() ? tempMana : tempMana * 10, + TilePool.MAX_MANA / 10); String size = GuiScreen.isShiftKeyDown() ? "1x" : "10x"; String localized = StatCollector.translateToLocalFormatted("botaniamisc.neiratio", size); - font.drawString(localized, 84 - font.getStringWidth(localized) / 2, 71, 0x000000); + GuiDraw.drawStringC(localized, 84, 71, 0x000000, false); GL11.glDisable(GL11.GL_BLEND); // Mana pool item RenderHelper.enableGUIStandardItemLighting(); GL11.glEnable(GL11.GL_DEPTH_TEST); RenderTilePool.forceMana = true; - renderItem.renderItemIntoGUI(font, mc.getTextureManager(), poolStack, 71, 37); + NEIHelper.renderItem.renderItemIntoGUI(NEIHelper.font, NEIHelper.textureManager, poolStack, 71, 37); GL11.glDisable(GL11.GL_DEPTH_TEST); RenderHelper.disableStandardItemLighting(); }