From 40cb3a501a008301ecceb78139c351546e2a59fc Mon Sep 17 00:00:00 2001 From: Nick Date: Thu, 8 Oct 2015 23:56:22 -0700 Subject: [PATCH] Fix all (known) instances of ugly 2D item model rendering --- .../block/RenderAlchemicCalcinator.java | 11 +++++++++++ .../common/renderer/block/RenderPedestal.java | 4 +++- .../common/renderer/block/RenderPlinth.java | 17 ++++++++++++----- 3 files changed, 26 insertions(+), 6 deletions(-) diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/renderer/block/RenderAlchemicCalcinator.java b/src/main/java/WayofTime/alchemicalWizardry/common/renderer/block/RenderAlchemicCalcinator.java index 26ace13d..e36e6da4 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/renderer/block/RenderAlchemicCalcinator.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/renderer/block/RenderAlchemicCalcinator.java @@ -6,6 +6,7 @@ import WayofTime.alchemicalWizardry.api.alchemy.energy.ReagentStack; import WayofTime.alchemicalWizardry.common.renderer.model.ModelAlchemicalCalcinator; import WayofTime.alchemicalWizardry.common.tileEntity.TEAlchemicCalcinator; import cpw.mods.fml.client.FMLClientHandler; +import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.client.renderer.entity.RenderManager; @@ -59,6 +60,10 @@ public class RenderAlchemicCalcinator extends TileEntitySpecialRenderer if (tileAltar.getStackInSlot(1) != null) { + + boolean fancySaved = Minecraft.isFancyGraphicsEnabled(); + Minecraft.getMinecraft().gameSettings.fancyGraphics = true; + float scaleFactor = getGhostItemScaleFactor(tileAltar.getStackInSlot(1)); EntityItem ghostEntityItem = new EntityItem(tileAltar.getWorldObj()); ghostEntityItem.hoverStart = 0.0F; @@ -80,6 +85,7 @@ public class RenderAlchemicCalcinator extends TileEntitySpecialRenderer } customRenderItem.doRender(ghostEntityItem, 0, 0, 0, 0, 0); + Minecraft.getMinecraft().gameSettings.fancyGraphics = fancySaved; } @@ -88,6 +94,10 @@ public class RenderAlchemicCalcinator extends TileEntitySpecialRenderer if (tileAltar.getStackInSlot(0) != null) { + + boolean fancySaved = Minecraft.isFancyGraphicsEnabled(); + Minecraft.getMinecraft().gameSettings.fancyGraphics = true; + float scaleFactor = getGhostItemScaleFactor(tileAltar.getStackInSlot(0)); EntityItem ghostEntityItem = new EntityItem(tileAltar.getWorldObj()); ghostEntityItem.hoverStart = 0.0F; @@ -109,6 +119,7 @@ public class RenderAlchemicCalcinator extends TileEntitySpecialRenderer } customRenderItem.doRender(ghostEntityItem, 0, 0, 0, 0, 0); + Minecraft.getMinecraft().gameSettings.fancyGraphics = fancySaved; } GL11.glPopMatrix(); diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/renderer/block/RenderPedestal.java b/src/main/java/WayofTime/alchemicalWizardry/common/renderer/block/RenderPedestal.java index b5319f98..42c92c88 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/renderer/block/RenderPedestal.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/renderer/block/RenderPedestal.java @@ -3,6 +3,7 @@ package WayofTime.alchemicalWizardry.common.renderer.block; import WayofTime.alchemicalWizardry.common.renderer.model.ModelPedestal; import WayofTime.alchemicalWizardry.common.tileEntity.TEPedestal; import cpw.mods.fml.client.FMLClientHandler; +import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; @@ -52,7 +53,8 @@ public class RenderPedestal extends TileEntitySpecialRenderer if (tileAltar.getStackInSlot(0) != null) { float scaleFactor = getGhostItemScaleFactor(tileAltar.getStackInSlot(0)); - float rotationAngle = (float) (720.0 * (System.currentTimeMillis() & 0x3FFFL) / 0x3FFFL); + float rotationAngle = Minecraft.isFancyGraphicsEnabled() ? (float) (720.0 * (System.currentTimeMillis() & 0x3FFFL) / 0x3FFFL) : 0; + EntityItem ghostEntityItem = new EntityItem(tileAltar.getWorldObj()); ghostEntityItem.hoverStart = 0.0F; ghostEntityItem.setEntityItemStack(tileAltar.getStackInSlot(0)); diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/renderer/block/RenderPlinth.java b/src/main/java/WayofTime/alchemicalWizardry/common/renderer/block/RenderPlinth.java index a8a867e4..28deb98c 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/renderer/block/RenderPlinth.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/renderer/block/RenderPlinth.java @@ -3,6 +3,7 @@ package WayofTime.alchemicalWizardry.common.renderer.block; import WayofTime.alchemicalWizardry.common.renderer.model.ModelPlinth; import WayofTime.alchemicalWizardry.common.tileEntity.TEPlinth; import cpw.mods.fml.client.FMLClientHandler; +import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; @@ -37,7 +38,7 @@ public class RenderPlinth extends TileEntitySpecialRenderer { if (tileEntity instanceof TEPlinth) { - TEPlinth tileAltar = (TEPlinth) tileEntity; + TEPlinth tilePlinth = (TEPlinth) tileEntity; GL11.glPushMatrix(); GL11.glTranslatef((float) d0 + 0.5F, (float) d1 + 1.5F, (float) d2 + 0.5F); ResourceLocation test = new ResourceLocation("alchemicalwizardry:textures/models/Plinth.png"); @@ -49,12 +50,16 @@ public class RenderPlinth extends TileEntitySpecialRenderer GL11.glPopMatrix(); GL11.glPushMatrix(); - if (tileAltar.getStackInSlot(0) != null) + if (tilePlinth.getStackInSlot(0) != null) { - float scaleFactor = getGhostItemScaleFactor(tileAltar.getStackInSlot(0)); - EntityItem ghostEntityItem = new EntityItem(tileAltar.getWorldObj()); + + boolean fancySaved = Minecraft.isFancyGraphicsEnabled(); + Minecraft.getMinecraft().gameSettings.fancyGraphics = true; + + float scaleFactor = getGhostItemScaleFactor(tilePlinth.getStackInSlot(0)); + EntityItem ghostEntityItem = new EntityItem(tilePlinth.getWorldObj()); ghostEntityItem.hoverStart = 0.0F; - ghostEntityItem.setEntityItemStack(tileAltar.getStackInSlot(0)); + ghostEntityItem.setEntityItemStack(tilePlinth.getStackInSlot(0)); float displacement = 0.2F; if (ghostEntityItem.getEntityItem().getItem() instanceof ItemBlock) @@ -72,6 +77,8 @@ public class RenderPlinth extends TileEntitySpecialRenderer } customRenderItem.doRender(ghostEntityItem, 0, 0, 0, 0, 0); + + Minecraft.getMinecraft().gameSettings.fancyGraphics = fancySaved; } GL11.glPopMatrix();