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 9e44eebb..00000000 Binary files a/src/main/resources/assets/chisel/textures/blocks/presentDouble/red.png and /dev/null differ