From 1cbfa10eeac6009b1da79aa2da37838e3c36a6eb Mon Sep 17 00:00:00 2001 From: Calclavia Date: Sun, 16 Feb 2014 21:28:08 +0800 Subject: [PATCH] New textures for metal caster --- .../archaic/process/BlockCast.java | 27 ++++++++---------- .../archaic/process/RenderCast.java | 2 +- .../archaic/process/RenderMillstone.java | 2 +- .../textures/blocks/metalCast_side_1.png | Bin 0 -> 1221 bytes .../textures/blocks/metalCast_side_2.png | Bin 0 -> 1218 bytes .../textures/blocks/metalCast_top.png | Bin 0 -> 993 bytes 6 files changed, 14 insertions(+), 17 deletions(-) create mode 100644 src/main/resources/assets/resonantinduction/textures/blocks/metalCast_side_1.png create mode 100644 src/main/resources/assets/resonantinduction/textures/blocks/metalCast_side_2.png create mode 100644 src/main/resources/assets/resonantinduction/textures/blocks/metalCast_top.png diff --git a/archaic/src/main/java/resonantinduction/archaic/process/BlockCast.java b/archaic/src/main/java/resonantinduction/archaic/process/BlockCast.java index aec1a1b36..46866d82e 100644 --- a/archaic/src/main/java/resonantinduction/archaic/process/BlockCast.java +++ b/archaic/src/main/java/resonantinduction/archaic/process/BlockCast.java @@ -17,7 +17,9 @@ import cpw.mods.fml.relauncher.SideOnly; public class BlockCast extends BlockTile { - Icon top; + Icon topIcon; + Icon side1Icon; + Icon side2Icon; public BlockCast(int id) { @@ -29,28 +31,24 @@ public class BlockCast extends BlockTile @Override public void registerIcons(IconRegister iconReg) { - this.top = iconReg.registerIcon(Reference.PREFIX + "material_wood_top"); + topIcon = iconReg.registerIcon(Reference.PREFIX + "metalCast_top"); + side1Icon = iconReg.registerIcon(Reference.PREFIX + "metalCast_side_1"); + side2Icon = iconReg.registerIcon(Reference.PREFIX + "metalCast_side_2"); super.registerIcons(iconReg); } - @Override - @SideOnly(Side.CLIENT) - public Icon getBlockTexture(IBlockAccess world, int x, int y, int z, int side) - { - return getIcon(side, 0); - } - /** Returns the block texture based on the side being looked at. Args: side */ @Override @SideOnly(Side.CLIENT) public Icon getIcon(int side, int meta) { - if (side == 1) - { - return top; - } + if (side == 0) + return blockIcon; - return blockIcon; + if (side == 1) + return topIcon; + + return side % 2 == 0 ? side1Icon : side2Icon; } @Override @@ -60,7 +58,6 @@ public class BlockCast extends BlockTile if (tile != null) tile.updateEntity(); - } @Override diff --git a/archaic/src/main/java/resonantinduction/archaic/process/RenderCast.java b/archaic/src/main/java/resonantinduction/archaic/process/RenderCast.java index cb81c071a..cf8cce0eb 100644 --- a/archaic/src/main/java/resonantinduction/archaic/process/RenderCast.java +++ b/archaic/src/main/java/resonantinduction/archaic/process/RenderCast.java @@ -17,7 +17,7 @@ public class RenderCast extends RenderItemOverlayTile if (tileEntity instanceof TileCast) { TileCast tile = (TileCast) tileEntity; - renderItemOnSides(tileEntity, tile.getStackInSlot(0), x, y, z, "Empty"); + renderItemOnSides(tileEntity, tile.getStackInSlot(0), x, y, z, ""); } } } diff --git a/archaic/src/main/java/resonantinduction/archaic/process/RenderMillstone.java b/archaic/src/main/java/resonantinduction/archaic/process/RenderMillstone.java index a2083a6e8..3d9bab2d8 100644 --- a/archaic/src/main/java/resonantinduction/archaic/process/RenderMillstone.java +++ b/archaic/src/main/java/resonantinduction/archaic/process/RenderMillstone.java @@ -17,7 +17,7 @@ public class RenderMillstone extends RenderItemOverlayTile if (tileEntity instanceof TileMillstone) { TileMillstone tile = (TileMillstone) tileEntity; - renderItemOnSides(tileEntity, tile.getStackInSlot(0), x, y, z, "Empty"); + renderItemOnSides(tileEntity, tile.getStackInSlot(0), x, y, z, ""); } } } diff --git a/src/main/resources/assets/resonantinduction/textures/blocks/metalCast_side_1.png b/src/main/resources/assets/resonantinduction/textures/blocks/metalCast_side_1.png new file mode 100644 index 0000000000000000000000000000000000000000..214b737bbc389997a25a2d7d6afe9b1bf7fae769 GIT binary patch literal 1221 zcmV;$1UmbPP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02*{fSaefwW^{L9 za%BKeVQFr3E>1;MAa*k@H7+qRNAp5A000CuNkl|xhpVIpjQ+ux3etnS{}*jO_#Fz_uhI5^n!{Mp>x z{1zz$OrYQIHwz03&Ft)KGdDL^)|r`^W@>7xnVz05`r_hZk>TOtf)ztwT3TvWS67P- zmdHWp6DwwZe!k@77Yn0yA&|rofwj)Ryu94{B&hwQYf}&jdxaIO{cJ4(<6x}E)7883 zFaO_sv0FDbHhvPohEb#6RyT|?R89dEd;Ph7m@CT$py<;b0KT-5^6oiwzjtRi$6I` zK<(bc!$TpUs6vePRt$|hHaKG3L=t|!#AK~8R=6CU99Fdpfv>NxB3Nd8|5Mabw-E3( zy1Tn;uCK3~&(F`6%;V!@k@xraVt;yiYVPmvo9E}}VtadgEAsmK+QtyLmzS63+Av()sOrq{ym&BCV(mhG;OrU&-CMPGq?G6+I z^($CeSt;W(BG1ILG#T%n?n!yqFmz+&gNbgRuN*9!w@;VX_d%`p75L-407Jm)Ela+$ zvr`fz5gQD#XR{9(d&EPQjn3~LAYczy2w;YQqCOBh5Gcrqe6=JA0T{tGX))~lx z$g{`BZyMcLxH>ij$}{B1IE^|4beu#v0=}Fxv9Ip{zkT=kLO>maO&hL!h(<<6T8DrT zsDX;401R75=ML1dM(#(6k06v-x!A-{OicWo04GM017ICsI<>-t1d<`n4(|@Q*p3#S zUoONF>ypds*Rh>Io{R)QgdTE4GPq12cYw}rBEjb7M@K*mTL?I&@?#W7-3`h4M(0C{ zjo8xq+#8G#L5Hj9%OG)iPa<# z&(;z!mUJL#&OC+ad@z|nlG!J=z5|)6OPE+TBF6n|2>=?2ZbE?Y=_JKqGJ*OIuuCjn zL0>&hC6_%+Y+}lHAOskbOhHL90bPYT96uX>E)+Xq&oe{@My?dKA_S*)&r^^9Fa#6= z>JkVB0lK{v#$F+Wj30p%L`W>1-yS*ko*?3Uy8m^~$HPSmj-BMpja4Va-oG#STsXSD jLSp3+3yWmG-*0{Z-q>BL5EpO`00000NkvXXu0mjfCV)C& literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/resonantinduction/textures/blocks/metalCast_side_2.png b/src/main/resources/assets/resonantinduction/textures/blocks/metalCast_side_2.png new file mode 100644 index 0000000000000000000000000000000000000000..4d8d7c794aea8b1d4c33554f049652d9fe84e4b3 GIT binary patch literal 1218 zcmV;z1U>tSP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02*{fSaefwW^{L9 za%BKeVQFr3E>1;MAa*k@H7+qRNAp5A000CrNklgam44fw zVmCH6s&oXf(S16N^mo3zy!?~@R};t-f2SM0<6y4@a&8fzj4k7gE^uOEqK+|knB1E- zCWTu9;#&ghRRYEm0sOZ$(yzC+Kdq5UAh#2&L195HSp2|r(AvbGp29FbEFtJ;;o*Vk7SEZY(NU!s<}m4Mgi z?(VK!UtgEc&(Ds`r>Cdo?Ch)@A0L;aqoWFBZ}s!@^Kx-;o)IXyS@XvyStriZ*P~qy}i2M-{1d-v{wQqG`wIMVUVtHB^({-jv$InZ zBoP}7v1hXn8GFP-mW|Hu9w1;3R|#N-fTA7<9S9U;L|!jRLI6f^OIi#&zb=taEWd{c z7RCxA2V4)+5D+jnHdX;vdTf%%CYb1k*axS}{#b=#YYEVM*dfpc0HgzAuTYy<4D#%; z@ta0}EL)0Ka|z@r8go2%9!seTasKhdYOW5NLsl zqyP+CNaqf;u}1DkiH{(ZSh?85kB^W4JpoRPBnQAcz;tSb2?-=aoE_dBaIqaNJilCs zCDtXE*RNwYfqXI&01E2=nCg#F9Bnrw=Np|5DK=u? z-hnpO5oo53RmYSvSBVZ2&kVx zFbL4?tuXcqA!Pgrq##0K>HPM{vG)WK=hOdR=R6)RQgG}fXKt)IA@=@#!RNx!?G+L$ gk62hF7Zw)EU&IDpUgiygWdHyG07*qoM6N<$f|FY(t^fc4 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/resonantinduction/textures/blocks/metalCast_top.png b/src/main/resources/assets/resonantinduction/textures/blocks/metalCast_top.png new file mode 100644 index 0000000000000000000000000000000000000000..f4b7613c5f144f9edf380c67c6587a9b9ec0d512 GIT binary patch literal 993 zcmV<710MW|P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02*{fSaefwW^{L9 za%BKeVQFr3E>1;MAa*k@H7+qRNAp5A0009}Nkl2FEhc81w(Hp1cI;kdWAH^=_|{&;$N8v2uylb8ea zK!1FEJRTh#jRyw@0pp8{i?E%apNDLGcXtgsB|y}b?D^ZNRFe0zHf+4JGyA)dgg^&DHv_Wb-DIx*7k)6>&@&VUW$?(Xgf z?Ck6Wwzs!GfUeHz_V18ujl~o@2w=*P45bmfWo6Fmj=LQJIwcMQkB^U^2y_RF$Tswy z9Ra1(LxZ0rpoaegNkEeheh^TfoS^aQf<@(yZqLm+6@xk;fK{dlJ6-w{xz@bf5pbfM zx*)(<31Fv=%gUWVx68Jkh#p{cE)g(Z7I}e9**atZ0hiKX;1a4$__sB$H|OT&W?+iM zS3TgC92nhJl$jzreK951plfSu;Ywp9#DcL;7WCF^+jH>HE0G| zUtgaG??gP!?fz00OP?S%F!mBua8#WqR##Uea6WTRCAPJ-HR)5oAr!~Z&v!k5KnBX- zWP!lA5`j*j`h$%1iGUQnzP?7vl*PDbAcJjeY3L;UJ^)uoj_zj6DEP0rUU}raSv7r2%4Dk2Vyw|(S&|5s|0$@l0-!|o8W&6 zI@JTR62~ylE2XDwDuj79W1dxiCk?(OlF^?}0^Nvk1gDp|9dj0OPt~QMser5pV}Y z6IKH11NuUfEGw(60AJa~k^%ZTf$RYvD{M*zxBS0dFa+eLA_tj4`iYw{}KnZtlj;I7`_LXO3F)#gB2`j7nfW z#Jj*13GQWAZ9;m~h~9C@dGtW9iFC4^fUz^rh6LGIAZz)t)?B1!v)T9ykT;ejzi3R| P00000NkvXXu0mjfc_7ym literal 0 HcmV?d00001