From 9e5761d77d051cd51fc0783ffcc64813cba83f0f Mon Sep 17 00:00:00 2001 From: Arona Jones Date: Mon, 15 Dec 2014 19:53:19 +0000 Subject: [PATCH] Pumpkin Work --- .../chisel/block/BlockCarvablePumpkin.java | 32 +++++++++--------- .../textures/blocks/pumpkin/pumpkin_top.png | Bin 0 -> 272 bytes 2 files changed, 16 insertions(+), 16 deletions(-) create mode 100644 src/main/resources/assets/chisel/textures/blocks/pumpkin/pumpkin_top.png diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockCarvablePumpkin.java b/src/main/java/com/cricketcraft/chisel/block/BlockCarvablePumpkin.java index 682ca65d..31766e8a 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockCarvablePumpkin.java +++ b/src/main/java/com/cricketcraft/chisel/block/BlockCarvablePumpkin.java @@ -33,22 +33,22 @@ public class BlockCarvablePumpkin extends BlockPumpkin implements ICarvable{ this.isJackolantern = isOn; } - @Override - public IIcon getIcon(int side, int meta) { - if(side == 1 || side == 0){ - return this.top; - } else if(meta == 2 && side == 2){ - return this.face[meta]; - } else if(meta == 3 && side == 5){ - return this.face[meta]; - } else if(meta == 0 && side == 3){ - return this.face[meta]; - } else if(meta == 1 && side == 4){ - return this.face[meta]; - } else { - return this.side; - } - } + @SideOnly(Side.CLIENT) + @Override + public IIcon getIcon(int side, int meta) + { + switch(side) + { + case 0: + return this.top;// bottom + case 1: + return this.top;// top + case 3: + return this.face[meta]; + default: + return this.side; // sides + } + } @Override public void registerBlockIcons(IIconRegister icon){ diff --git a/src/main/resources/assets/chisel/textures/blocks/pumpkin/pumpkin_top.png b/src/main/resources/assets/chisel/textures/blocks/pumpkin/pumpkin_top.png new file mode 100644 index 0000000000000000000000000000000000000000..297ce3c8244854ca04ddba535f299227261746ad GIT binary patch literal 272 zcmV+r0q_2aP)M|?P>QftWkJ9n@DV`dO5`el zF?c}$c$qC?q$2k~EJWek+UNcw(PCC=+z^m>kryk8HnTTTZ9oM`M)LD9k`1<^y