From 90720d4009f9f2733d6da1918a62bfcb2a4f86cc Mon Sep 17 00:00:00 2001 From: Calclavia Date: Mon, 17 Feb 2014 22:00:24 +0800 Subject: [PATCH] Added and improved firebox textures --- .../archaic/firebox/BlockFirebox.java | 44 ++++++++++++------ .../textures/blocks/electricHotPlate.png | Bin 1305 -> 0 bytes .../blocks/firebox_electric_side_off.png | Bin 0 -> 1290 bytes .../blocks/firebox_electric_side_on.png | Bin 0 -> 1494 bytes .../blocks/firebox_electric_top_off.png | Bin 0 -> 1104 bytes .../blocks/firebox_electric_top_on.png | Bin 0 -> 1242 bytes .../textures/blocks/firebox_side_off.png | Bin 0 -> 1372 bytes .../{firebox.png => firebox_side_on.png} | Bin 8 files changed, 30 insertions(+), 14 deletions(-) delete mode 100644 src/main/resources/assets/resonantinduction/textures/blocks/electricHotPlate.png create mode 100644 src/main/resources/assets/resonantinduction/textures/blocks/firebox_electric_side_off.png create mode 100644 src/main/resources/assets/resonantinduction/textures/blocks/firebox_electric_side_on.png create mode 100644 src/main/resources/assets/resonantinduction/textures/blocks/firebox_electric_top_off.png create mode 100644 src/main/resources/assets/resonantinduction/textures/blocks/firebox_electric_top_on.png create mode 100644 src/main/resources/assets/resonantinduction/textures/blocks/firebox_side_off.png rename src/main/resources/assets/resonantinduction/textures/blocks/{firebox.png => firebox_side_on.png} (100%) diff --git a/archaic/src/main/java/resonantinduction/archaic/firebox/BlockFirebox.java b/archaic/src/main/java/resonantinduction/archaic/firebox/BlockFirebox.java index 82491772..4cac760d 100644 --- a/archaic/src/main/java/resonantinduction/archaic/firebox/BlockFirebox.java +++ b/archaic/src/main/java/resonantinduction/archaic/firebox/BlockFirebox.java @@ -22,11 +22,19 @@ public class BlockFirebox extends BlockTile { private Icon topOn; private Icon topOff; + private Icon sideOn; + private Icon sideOff; + + private Icon topElectricOn; + private Icon topElectricOff; + private Icon sideOnElectric; + private Icon sideOffElectric; public BlockFirebox(int id) { super(id, Material.rock); setTickRandomly(true); + setTextureName(Reference.PREFIX + "material_stone_slab"); } @Override @@ -34,8 +42,16 @@ public class BlockFirebox extends BlockTile public void registerIcons(IconRegister iconReg) { super.registerIcons(iconReg); + sideOn = iconReg.registerIcon(Reference.PREFIX + "firebox_side_on"); + sideOff = iconReg.registerIcon(Reference.PREFIX + "firebox_side_off"); topOn = iconReg.registerIcon(Reference.PREFIX + "firebox_top_on"); topOff = iconReg.registerIcon(Reference.PREFIX + "firebox_top_off"); + + sideOnElectric = iconReg.registerIcon(Reference.PREFIX + "firebox_electric_side_on"); + sideOffElectric = iconReg.registerIcon(Reference.PREFIX + "firebox_electric_side_off"); + topElectricOn = iconReg.registerIcon(Reference.PREFIX + "firebox_electric_top_on"); + topElectricOff = iconReg.registerIcon(Reference.PREFIX + "firebox_electric_top_off"); + } @Override @@ -67,36 +83,36 @@ public class BlockFirebox extends BlockTile @Override public Icon getBlockTexture(IBlockAccess access, int x, int y, int z, int side) { + boolean isElectric = access.getBlockMetadata(x, y, z) == 1; + boolean isBurning = false; TileEntity tile = access.getBlockTileEntity(x, y, z); if (tile instanceof TileFirebox) { - if (side == 1) - { - if (((TileFirebox) tile).isBurning()) - { - return topOn; - } - else - { - return topOff; - } - } + isBurning = ((TileFirebox) tile).isBurning(); } - return blockIcon; + if (side == 1) + { + return isBurning ? (isElectric ? topElectricOn : topOn) : (isElectric ? topElectricOff : topOff); + } + + return isBurning ? (isElectric ? sideOnElectric : sideOn) : (isElectric ? sideOffElectric : sideOff); } @Override @SideOnly(Side.CLIENT) public Icon getIcon(int side, int meta) { + boolean isElectric = meta == 1; + boolean isBurning = false; + if (side == 1) { - return topOff; + return isBurning ? (isElectric ? topElectricOn : topOn) : (isElectric ? topElectricOff : topOff); } - return blockIcon; + return isBurning ? (isElectric ? sideOnElectric : sideOn) : (isElectric ? sideOffElectric : sideOff); } @Override diff --git a/src/main/resources/assets/resonantinduction/textures/blocks/electricHotPlate.png b/src/main/resources/assets/resonantinduction/textures/blocks/electricHotPlate.png deleted file mode 100644 index 590da9954ffb1a5f9f8a850b41afe3321a5eb2e4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1305 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 A?EnA( literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/resonantinduction/textures/blocks/firebox_electric_side_on.png b/src/main/resources/assets/resonantinduction/textures/blocks/firebox_electric_side_on.png new file mode 100644 index 0000000000000000000000000000000000000000..f11fcf20dad2365240ba322478315db28f55db07 GIT binary patch literal 1494 zcmV;{1u6Q8P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02*{fSaefwW^{L9 za%BKeVQFr3E>1;MAa*k@H7+qRNAp5A000F=NklOyU8ZD?p{$k+Dv_R!VU6>46<+@H*wZN)>27Ol%Xz97+o2?}E;4+30E%>Wb~bc( zcYA7LURqijX0pto3?L(oKs?oxLu3R%z~W6!P5%Z!dJv3`j(TcT68PZYpr`fin{wB^Vzc_ctb5aiT^C(9y~OGBSm}c&bN3O2&&Q z062SeGn7fk=H{l?hCKnq9MB7-lz=2-A9K!8Tj{Y%*4WtSFDl;I+3A7$Er9Io?094- z@n+(@VcOl2=_-k*dITUD0q`Q?1n9SbA)?f*tgQGx<;89RGSaGkfv0*Z0Wtzr!@_w{ zeCLA*!P?r|u>i!2-GXAesh)yE#y+)+Zx4WUAXr^p^&0B_!bxMXTaZpdbW^?5PV7ge z_FF)05YQZ?h2{`PG3{<-k^}8iJ)BBLgJMe@8M+>TQZ+F#;WI&33yv}B$%+x`$eY0R zAp-yPF_N9QTyXlw1E6svn4h0NrU=LR)337-9vPk+o*AAV?OA^{{C>3FH|!W*8vf4m zhAn27z25?^j;7h-;-aTXwSr^h;G7x!%J8k>rs0NR$k1-+HVhiRFC zD*EW+)hX43h@R@uh)2 zA^krXW(+?c&H~xdhf6#UfHWZ3+S>8~Aw_YNly0S2YnpyKKjxg39eRN0;^=w_s4a7v z+AtzLUwm|!@|OXHxUAHqC7ZjDIGSD?#l*B@Wm0o zWw>LwZWuKz8I}!y9Nq%iq0eYMac+cPL!6TiH3wftQY(&;2cMY1D+aDwuYq808?G6+ zayaEG(gzO>KN?;f1|T~G5H~x1@a;XoFWLI~x{pYrj5*nO_^BDhX@}vWfhJ=n5YWEi zdqazXIq;K#?AV~@z?m!@d~}F?!@X0s zeqj7`7VdtSg$MSnxM$c0_8jmJ!CBd%EI^zW#kV&h4vB`8a0~cObC?>j@+Le(PF>Nb w{>XX83V4PL9iDTRhL#;{U>{%T6$*v$4)XL7?>5A^CjbBd07*qoM6N<$f=R}^lK=n! literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/resonantinduction/textures/blocks/firebox_electric_top_off.png b/src/main/resources/assets/resonantinduction/textures/blocks/firebox_electric_top_off.png new file mode 100644 index 0000000000000000000000000000000000000000..ac0e192e9a1f6a62e957057a9f27e963430cc4d6 GIT binary patch literal 1104 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 eR^Z#&miz-wb`uN5N^DjD0000