From 335f7e437762f3769399cfb9b1d1cbd7c7226dcb Mon Sep 17 00:00:00 2001 From: CptSpaceToaster Date: Wed, 24 Dec 2014 15:37:53 -0500 Subject: [PATCH] fixed a couple of the rendering issues, now to find out why each chest still has it's unique inventory, and why they rotate whichever way they want to. --- .../client/render/tile/RenderPresent.java | 17 +++++++++++++---- .../presentChest0_double.png} | Bin .../presentChest10_double.png} | Bin .../presentChest11_double.png} | Bin .../presentChest12_double.png} | Bin .../presentChest13_double.png} | Bin .../presentChest14_double.png} | Bin .../presentChest15_double.png} | Bin .../presentChest1_double.png} | Bin .../presentChest2_double.png} | Bin .../presentChest3_double.png} | Bin .../presentChest4_double.png} | Bin .../presentChest5_double.png} | Bin .../presentChest6_double.png} | Bin .../presentChest7_double.png} | Bin .../presentChest8_double.png} | Bin .../presentChest9_double.png} | Bin .../textures/blocks/presentDouble/red.png | Bin 2911 -> 0 bytes 18 files changed, 13 insertions(+), 4 deletions(-) rename src/main/resources/assets/chisel/textures/blocks/{presentDouble/giftboxDouble0.png => present/presentChest0_double.png} (100%) rename src/main/resources/assets/chisel/textures/blocks/{presentDouble/giftboxDouble10.png => present/presentChest10_double.png} (100%) rename src/main/resources/assets/chisel/textures/blocks/{presentDouble/giftboxDouble11.png => present/presentChest11_double.png} (100%) rename src/main/resources/assets/chisel/textures/blocks/{presentDouble/giftboxDouble12.png => present/presentChest12_double.png} (100%) rename src/main/resources/assets/chisel/textures/blocks/{presentDouble/giftboxDouble13.png => present/presentChest13_double.png} (100%) rename src/main/resources/assets/chisel/textures/blocks/{presentDouble/giftboxDouble14.png => present/presentChest14_double.png} (100%) rename src/main/resources/assets/chisel/textures/blocks/{presentDouble/giftboxDouble15.png => present/presentChest15_double.png} (100%) rename src/main/resources/assets/chisel/textures/blocks/{presentDouble/giftboxDouble1.png => present/presentChest1_double.png} (100%) rename src/main/resources/assets/chisel/textures/blocks/{presentDouble/giftboxDouble2.png => present/presentChest2_double.png} (100%) rename src/main/resources/assets/chisel/textures/blocks/{presentDouble/giftboxDouble3.png => present/presentChest3_double.png} (100%) rename src/main/resources/assets/chisel/textures/blocks/{presentDouble/giftboxDouble4.png => present/presentChest4_double.png} (100%) rename src/main/resources/assets/chisel/textures/blocks/{presentDouble/giftboxDouble5.png => present/presentChest5_double.png} (100%) rename src/main/resources/assets/chisel/textures/blocks/{presentDouble/giftboxDouble6.png => present/presentChest6_double.png} (100%) rename src/main/resources/assets/chisel/textures/blocks/{presentDouble/giftboxDouble7.png => present/presentChest7_double.png} (100%) rename src/main/resources/assets/chisel/textures/blocks/{presentDouble/giftboxDouble8.png => present/presentChest8_double.png} (100%) rename src/main/resources/assets/chisel/textures/blocks/{presentDouble/giftboxDouble9.png => present/presentChest9_double.png} (100%) delete mode 100644 src/main/resources/assets/chisel/textures/blocks/presentDouble/red.png diff --git a/src/main/java/com/cricketcraft/chisel/client/render/tile/RenderPresent.java b/src/main/java/com/cricketcraft/chisel/client/render/tile/RenderPresent.java index bff58038..26a76b0b 100644 --- a/src/main/java/com/cricketcraft/chisel/client/render/tile/RenderPresent.java +++ b/src/main/java/com/cricketcraft/chisel/client/render/tile/RenderPresent.java @@ -6,6 +6,7 @@ import com.cricketcraft.chisel.block.tileentity.TileEntityPresent; import cpw.mods.fml.common.FMLLog; import net.minecraft.block.Block; import net.minecraft.client.model.ModelChest; +import net.minecraft.client.model.ModelLargeChest; import net.minecraft.client.renderer.tileentity.TileEntityChestRenderer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; @@ -13,7 +14,8 @@ import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; public class RenderPresent extends TileEntityChestRenderer { - private ModelChest chest = new ModelChest(); + private ModelChest smallChest = new ModelChest(); + private ModelChest largeChest = new ModelLargeChest(); public RenderPresent() { } @@ -41,7 +43,14 @@ public class RenderPresent extends TileEntityChestRenderer { if (present.adjacentChestZNeg == null && present.adjacentChestXNeg == null) { BlockPresent blockPresent = (BlockPresent) present.getWorldObj().getBlock(present.xCoord, present.yCoord, present.zCoord); - this.bindTexture(new ResourceLocation(Chisel.MOD_ID, blockPresent.getKindOfChest(present.type) + ".png")); + ModelChest smallOrLargeChest; + if (present.adjacentChestZPos == null && present.adjacentChestXPos == null) { + smallOrLargeChest = smallChest; + this.bindTexture(new ResourceLocation(Chisel.MOD_ID, blockPresent.getKindOfChest(present.type) + ".png")); + } else { + smallOrLargeChest = largeChest; + this.bindTexture(new ResourceLocation(Chisel.MOD_ID, blockPresent.getKindOfChest(present.type) + "_double.png")); + } GL11.glPushMatrix(); GL11.glEnable(GL12.GL_RESCALE_NORMAL); @@ -98,8 +107,8 @@ public class RenderPresent extends TileEntityChestRenderer { f1 = 1.0F - f1; f1 = 1.0F - f1 * f1 * f1; - this.chest.chestLid.rotateAngleX = -(f1 * (float) Math.PI / 2.0F); - this.chest.renderAll(); + smallOrLargeChest.chestLid.rotateAngleX = -(f1 * (float) Math.PI / 2.0F); + smallOrLargeChest.renderAll(); GL11.glDisable(GL12.GL_RESCALE_NORMAL); GL11.glPopMatrix(); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); diff --git a/src/main/resources/assets/chisel/textures/blocks/presentDouble/giftboxDouble0.png b/src/main/resources/assets/chisel/textures/blocks/present/presentChest0_double.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/presentDouble/giftboxDouble0.png rename to src/main/resources/assets/chisel/textures/blocks/present/presentChest0_double.png diff --git a/src/main/resources/assets/chisel/textures/blocks/presentDouble/giftboxDouble10.png b/src/main/resources/assets/chisel/textures/blocks/present/presentChest10_double.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/presentDouble/giftboxDouble10.png rename to src/main/resources/assets/chisel/textures/blocks/present/presentChest10_double.png diff --git a/src/main/resources/assets/chisel/textures/blocks/presentDouble/giftboxDouble11.png b/src/main/resources/assets/chisel/textures/blocks/present/presentChest11_double.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/presentDouble/giftboxDouble11.png rename to src/main/resources/assets/chisel/textures/blocks/present/presentChest11_double.png diff --git a/src/main/resources/assets/chisel/textures/blocks/presentDouble/giftboxDouble12.png b/src/main/resources/assets/chisel/textures/blocks/present/presentChest12_double.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/presentDouble/giftboxDouble12.png rename to src/main/resources/assets/chisel/textures/blocks/present/presentChest12_double.png diff --git a/src/main/resources/assets/chisel/textures/blocks/presentDouble/giftboxDouble13.png b/src/main/resources/assets/chisel/textures/blocks/present/presentChest13_double.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/presentDouble/giftboxDouble13.png rename to src/main/resources/assets/chisel/textures/blocks/present/presentChest13_double.png diff --git a/src/main/resources/assets/chisel/textures/blocks/presentDouble/giftboxDouble14.png b/src/main/resources/assets/chisel/textures/blocks/present/presentChest14_double.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/presentDouble/giftboxDouble14.png rename to src/main/resources/assets/chisel/textures/blocks/present/presentChest14_double.png diff --git a/src/main/resources/assets/chisel/textures/blocks/presentDouble/giftboxDouble15.png b/src/main/resources/assets/chisel/textures/blocks/present/presentChest15_double.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/presentDouble/giftboxDouble15.png rename to src/main/resources/assets/chisel/textures/blocks/present/presentChest15_double.png diff --git a/src/main/resources/assets/chisel/textures/blocks/presentDouble/giftboxDouble1.png b/src/main/resources/assets/chisel/textures/blocks/present/presentChest1_double.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/presentDouble/giftboxDouble1.png rename to src/main/resources/assets/chisel/textures/blocks/present/presentChest1_double.png diff --git a/src/main/resources/assets/chisel/textures/blocks/presentDouble/giftboxDouble2.png b/src/main/resources/assets/chisel/textures/blocks/present/presentChest2_double.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/presentDouble/giftboxDouble2.png rename to src/main/resources/assets/chisel/textures/blocks/present/presentChest2_double.png diff --git a/src/main/resources/assets/chisel/textures/blocks/presentDouble/giftboxDouble3.png b/src/main/resources/assets/chisel/textures/blocks/present/presentChest3_double.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/presentDouble/giftboxDouble3.png rename to src/main/resources/assets/chisel/textures/blocks/present/presentChest3_double.png diff --git a/src/main/resources/assets/chisel/textures/blocks/presentDouble/giftboxDouble4.png b/src/main/resources/assets/chisel/textures/blocks/present/presentChest4_double.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/presentDouble/giftboxDouble4.png rename to src/main/resources/assets/chisel/textures/blocks/present/presentChest4_double.png diff --git a/src/main/resources/assets/chisel/textures/blocks/presentDouble/giftboxDouble5.png b/src/main/resources/assets/chisel/textures/blocks/present/presentChest5_double.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/presentDouble/giftboxDouble5.png rename to src/main/resources/assets/chisel/textures/blocks/present/presentChest5_double.png diff --git a/src/main/resources/assets/chisel/textures/blocks/presentDouble/giftboxDouble6.png b/src/main/resources/assets/chisel/textures/blocks/present/presentChest6_double.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/presentDouble/giftboxDouble6.png rename to src/main/resources/assets/chisel/textures/blocks/present/presentChest6_double.png diff --git a/src/main/resources/assets/chisel/textures/blocks/presentDouble/giftboxDouble7.png b/src/main/resources/assets/chisel/textures/blocks/present/presentChest7_double.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/presentDouble/giftboxDouble7.png rename to src/main/resources/assets/chisel/textures/blocks/present/presentChest7_double.png diff --git a/src/main/resources/assets/chisel/textures/blocks/presentDouble/giftboxDouble8.png b/src/main/resources/assets/chisel/textures/blocks/present/presentChest8_double.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/presentDouble/giftboxDouble8.png rename to src/main/resources/assets/chisel/textures/blocks/present/presentChest8_double.png diff --git a/src/main/resources/assets/chisel/textures/blocks/presentDouble/giftboxDouble9.png b/src/main/resources/assets/chisel/textures/blocks/present/presentChest9_double.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/presentDouble/giftboxDouble9.png rename to src/main/resources/assets/chisel/textures/blocks/present/presentChest9_double.png diff --git a/src/main/resources/assets/chisel/textures/blocks/presentDouble/red.png b/src/main/resources/assets/chisel/textures/blocks/presentDouble/red.png deleted file mode 100644 index 9e44eebba39952d3c5a0c23effd30a935d67d82e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2911 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 JPDHLkV1nWrXE*==