From 9cbd9cc6b6117c86093ca530e94f61c3dc351172 Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Tue, 22 Dec 2015 14:58:25 +0100 Subject: [PATCH] How about we actually fix everything whoops --- .../actuallyadditions/blocks/BlockAtomicReconstructor.java | 4 ++-- .../ellpeck/actuallyadditions/blocks/BlockCompost.java | 3 +-- .../actuallyadditions/booklet/page/PageCoffeeRecipe.java | 3 ++- .../actuallyadditions/booklet/page/PageCrusherRecipe.java | 3 ++- .../actuallyadditions/nei/NEIReconstructorRecipe.java | 7 ++----- 5 files changed, 9 insertions(+), 11 deletions(-) diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockAtomicReconstructor.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockAtomicReconstructor.java index 688002b30..8bba6500c 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockAtomicReconstructor.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockAtomicReconstructor.java @@ -13,9 +13,9 @@ package ellpeck.actuallyadditions.blocks; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import ellpeck.actuallyadditions.blocks.base.BlockContainerBase; -import ellpeck.actuallyadditions.booklet.page.BookletPage; import ellpeck.actuallyadditions.items.lens.ItemLens; import ellpeck.actuallyadditions.tile.TileEntityAtomicReconstructor; +import ellpeck.actuallyadditions.util.AssetUtil; import ellpeck.actuallyadditions.util.ModUtil; import ellpeck.actuallyadditions.util.StringUtil; import net.minecraft.block.Block; @@ -154,7 +154,7 @@ public class BlockAtomicReconstructor extends BlockContainerBase implements IHud else{ strg = slot.getItem().getItemStackDisplayName(slot); - BookletPage.renderItem(null, slot, resolution.getScaledWidth()/2+15, resolution.getScaledHeight()/2-29, 1F); + AssetUtil.renderStackToGui(slot, resolution.getScaledWidth()/2+15, resolution.getScaledHeight()/2-29, 1F); } minecraft.fontRenderer.drawStringWithShadow(EnumChatFormatting.YELLOW+""+EnumChatFormatting.ITALIC+strg, resolution.getScaledWidth()/2+35, resolution.getScaledHeight()/2-25, StringUtil.DECIMAL_COLOR_WHITE); } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockCompost.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockCompost.java index 33838dcc3..491a33170 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockCompost.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockCompost.java @@ -13,7 +13,6 @@ package ellpeck.actuallyadditions.blocks; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import ellpeck.actuallyadditions.blocks.base.BlockContainerBase; -import ellpeck.actuallyadditions.booklet.page.BookletPage; import ellpeck.actuallyadditions.items.ItemFertilizer; import ellpeck.actuallyadditions.items.ItemMisc; import ellpeck.actuallyadditions.items.metalists.TheMiscItems; @@ -164,7 +163,7 @@ public class BlockCompost extends BlockContainerBase implements IHudDisplay{ else{ strg = slot.getItem().getItemStackDisplayName(slot); - BookletPage.renderItem(null, slot, resolution.getScaledWidth()/2+15, resolution.getScaledHeight()/2-29, 1F); + AssetUtil.renderStackToGui(slot, resolution.getScaledWidth()/2+15, resolution.getScaledHeight()/2-29, 1F); } minecraft.fontRenderer.drawStringWithShadow(EnumChatFormatting.YELLOW+""+EnumChatFormatting.ITALIC+strg, resolution.getScaledWidth()/2+35, resolution.getScaledHeight()/2-25, StringUtil.DECIMAL_COLOR_WHITE); } diff --git a/src/main/java/ellpeck/actuallyadditions/booklet/page/PageCoffeeRecipe.java b/src/main/java/ellpeck/actuallyadditions/booklet/page/PageCoffeeRecipe.java index 901785f06..122720b84 100644 --- a/src/main/java/ellpeck/actuallyadditions/booklet/page/PageCoffeeRecipe.java +++ b/src/main/java/ellpeck/actuallyadditions/booklet/page/PageCoffeeRecipe.java @@ -17,6 +17,7 @@ import ellpeck.actuallyadditions.items.InitItems; import ellpeck.actuallyadditions.items.ItemCoffee; import ellpeck.actuallyadditions.items.metalists.TheMiscItems; import ellpeck.actuallyadditions.proxy.ClientProxy; +import ellpeck.actuallyadditions.util.AssetUtil; import ellpeck.actuallyadditions.util.Util; import net.minecraft.item.ItemStack; @@ -92,7 +93,7 @@ public class PageCoffeeRecipe extends BookletPage{ int xShow = gui.guiLeft+19+coordsOffsetX; int yShow = gui.guiTop+20+coordsOffsetY; if(!tooltip){ - renderItem(gui, stack, xShow, yShow, 1.0F); + AssetUtil.renderStackToGui(stack, xShow, yShow, 1.0F); } else{ if(mouseX >= xShow && mouseX <= xShow+16 && mouseY >= yShow && mouseY <= yShow+16){ diff --git a/src/main/java/ellpeck/actuallyadditions/booklet/page/PageCrusherRecipe.java b/src/main/java/ellpeck/actuallyadditions/booklet/page/PageCrusherRecipe.java index 21bb96396..edaa88df2 100644 --- a/src/main/java/ellpeck/actuallyadditions/booklet/page/PageCrusherRecipe.java +++ b/src/main/java/ellpeck/actuallyadditions/booklet/page/PageCrusherRecipe.java @@ -15,6 +15,7 @@ import cpw.mods.fml.relauncher.SideOnly; import ellpeck.actuallyadditions.booklet.GuiBooklet; import ellpeck.actuallyadditions.proxy.ClientProxy; import ellpeck.actuallyadditions.recipe.CrusherRecipeRegistry; +import ellpeck.actuallyadditions.util.AssetUtil; import ellpeck.actuallyadditions.util.ModUtil; import ellpeck.actuallyadditions.util.StringUtil; import ellpeck.actuallyadditions.util.Util; @@ -99,7 +100,7 @@ public class PageCrusherRecipe extends BookletPage{ int xShow = gui.guiLeft+37+(j == 0 ? 1 : (j == 1 ? 43 : (j == 2 ? 43 : 0))); int yShow = gui.guiTop+20+(j == 0 ? 21 : (j == 1 ? 11 : (j == 2 ? 29 : 0))); if(!tooltip){ - renderItem(gui, stack, xShow, yShow, 1.0F); + AssetUtil.renderStackToGui(stack, xShow, yShow, 1.0F); } else{ if(mouseX >= xShow && mouseX <= xShow+16 && mouseY >= yShow && mouseY <= yShow+16){ diff --git a/src/main/java/ellpeck/actuallyadditions/nei/NEIReconstructorRecipe.java b/src/main/java/ellpeck/actuallyadditions/nei/NEIReconstructorRecipe.java index 7de60cf2c..16448b5d6 100644 --- a/src/main/java/ellpeck/actuallyadditions/nei/NEIReconstructorRecipe.java +++ b/src/main/java/ellpeck/actuallyadditions/nei/NEIReconstructorRecipe.java @@ -20,10 +20,7 @@ import ellpeck.actuallyadditions.booklet.page.BookletPage; import ellpeck.actuallyadditions.items.InitItems; import ellpeck.actuallyadditions.items.lens.LensColor; import ellpeck.actuallyadditions.items.lens.LensNoneRecipeHandler; -import ellpeck.actuallyadditions.util.ItemUtil; -import ellpeck.actuallyadditions.util.ModUtil; -import ellpeck.actuallyadditions.util.StringUtil; -import ellpeck.actuallyadditions.util.Util; +import ellpeck.actuallyadditions.util.*; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.inventory.GuiContainer; @@ -153,7 +150,7 @@ public class NEIReconstructorRecipe extends TemplateRecipeHandler implements INE @Override public void drawForeground(int recipe){ if(Minecraft.getMinecraft().currentScreen != null){ - BookletPage.renderItem(Minecraft.getMinecraft().currentScreen, new ItemStack(InitBlocks.blockAtomicReconstructor), 32+34, 19, 1.0F); + AssetUtil.renderStackToGui(new ItemStack(InitBlocks.blockAtomicReconstructor), 32+34, 19, 1.0F); } if(((CachedReconstructorRecipe)this.arecipes.get(recipe)).showColorLens){ String text = InitItems.itemColorLens.getItemStackDisplayName(new ItemStack(InitItems.itemColorLens));