From f0c13c8f661db54595a2959d021dbd6497c70b56 Mon Sep 17 00:00:00 2001 From: "Aidan C. Brady" Date: Wed, 25 Mar 2015 22:00:18 -0400 Subject: [PATCH] Added Oredictionificator & Factory dynamic texture support --- .../mekanism/common/block/BlockMachine.java | 84 +++--------------- .../textures/blocks/AdvancedFactoryBottom.png | Bin 0 -> 890 bytes .../textures/blocks/BasicFactoryBottom.png | Bin 0 -> 2247 bytes .../textures/blocks/EliteFactoryBottom.png | Bin 0 -> 915 bytes ...torPort.png => OredictionificatorLeft.png} | Bin .../blocks/OredictionificatorRight.png | Bin 0 -> 1162 bytes 6 files changed, 13 insertions(+), 71 deletions(-) create mode 100644 src/main/resources/assets/mekanism/textures/blocks/AdvancedFactoryBottom.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/BasicFactoryBottom.png create mode 100644 src/main/resources/assets/mekanism/textures/blocks/EliteFactoryBottom.png rename src/main/resources/assets/mekanism/textures/blocks/{OredictionificatorPort.png => OredictionificatorLeft.png} (100%) create mode 100644 src/main/resources/assets/mekanism/textures/blocks/OredictionificatorRight.png diff --git a/src/main/java/mekanism/common/block/BlockMachine.java b/src/main/java/mekanism/common/block/BlockMachine.java index b0d81d841..6faf3afb5 100644 --- a/src/main/java/mekanism/common/block/BlockMachine.java +++ b/src/main/java/mekanism/common/block/BlockMachine.java @@ -183,15 +183,9 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IPer MekanismRenderer.loadDynamicTextures(register, MachineType.OSMIUM_COMPRESSOR, BASE_ICON, icons[1]); MekanismRenderer.loadDynamicTextures(register, MachineType.COMBINER, BASE_ICON, icons[2]); MekanismRenderer.loadDynamicTextures(register, MachineType.CRUSHER, BASE_ICON, icons[3]); - icons[5][0] = register.registerIcon("mekanism:BasicFactoryFront"); - icons[5][1] = register.registerIcon("mekanism:BasicFactorySide"); - icons[5][2] = register.registerIcon("mekanism:BasicFactoryTop"); - icons[6][0] = register.registerIcon("mekanism:AdvancedFactoryFront"); - icons[6][1] = register.registerIcon("mekanism:AdvancedFactorySide"); - icons[6][2] = register.registerIcon("mekanism:AdvancedFactoryTop"); - icons[7][0] = register.registerIcon("mekanism:EliteFactoryFront"); - icons[7][1] = register.registerIcon("mekanism:EliteFactorySide"); - icons[7][2] = register.registerIcon("mekanism:EliteFactoryTop"); + MekanismRenderer.loadDynamicTextures(register, MachineType.BASIC_FACTORY, register.registerIcon("mekanism:BasicFactorySide"), icons[5]); + MekanismRenderer.loadDynamicTextures(register, MachineType.ADVANCED_FACTORY, register.registerIcon("mekanism:AdvancedFactorySide"), icons[6]); + MekanismRenderer.loadDynamicTextures(register, MachineType.ELITE_FACTORY, register.registerIcon("mekanism:EliteFactorySide"), icons[7]); MekanismRenderer.loadDynamicTextures(register, MachineType.PURIFICATION_CHAMBER, BASE_ICON, icons[9]); MekanismRenderer.loadDynamicTextures(register, MachineType.ENERGIZED_SMELTER, BASE_ICON, icons[10]); icons[11][0] = register.registerIcon("mekanism:Teleporter"); @@ -203,10 +197,7 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IPer case MACHINE_BLOCK_3: icons[0][0] = register.registerIcon("mekanism:AmbientAccumulator"); icons[2][0] = BASE_ICON; - icons[3][0] = register.registerIcon("mekanism:OredictionificatorBack"); - icons[3][1] = register.registerIcon("mekanism:OredictionificatorFront"); - icons[3][2] = register.registerIcon("mekanism:OredictionificatorPort"); - icons[3][3] = register.registerIcon("mekanism:OredictionificatorSide"); + MekanismRenderer.loadDynamicTextures(register, MachineType.OREDICTIONIFICATOR, register.registerIcon("mekanism:OredictionificatorSide"), icons[3]); break; } } @@ -369,23 +360,12 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IPer case 1: case 2: case 3: - case 9: - case 10: - return icons[meta][side == 3 ? 2 : (side == 2 ? 3 : side)]; case 5: case 6: case 7: - if(side == 3) - { - return icons[meta][0]; - } - else if(side == 0 || side == 1) - { - return icons[meta][2]; - } - else { - return icons[meta][1]; - } + case 9: + case 10: + return icons[meta][side == 3 ? 2 : (side == 2 ? 3 : side)]; default: return icons[meta][0] != null ? icons[meta][0] : BASE_ICON; } @@ -402,21 +382,7 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IPer switch(meta) { case 3: - if(side == 3) - { - return icons[3][1]; - } - else if(side == 4 || side == 5) - { - return icons[3][2]; - } - else if(side == 2) - { - return icons[3][0]; - } - else { - return icons[3][3]; - } + return icons[meta][side == 3 ? 2 : (side == 2 ? 3 : side)]; default: return icons[meta][0] != null ? icons[meta][0] : BASE_ICON; } @@ -441,24 +407,13 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IPer case 1: case 2: case 3: + case 5: + case 6: + case 7: case 9: case 10: boolean active = MekanismUtils.isActive(world, x, y, z); return icons[meta][MekanismUtils.getBaseOrientation(side, tileEntity.facing)+(active ? 6 : 0)]; - case 5: - case 6: - case 7: - if(side == tileEntity.facing) - { - return icons[meta][0]; - } - else if(side == 0 || side == 1) - { - return icons[meta][2]; - } - else { - return icons[meta][1]; - } default: return icons[meta][0]; } @@ -476,21 +431,8 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IPer switch(meta) { case 3: - if(side == tileEntity.facing) - { - return icons[3][1]; - } - else if(side == MekanismUtils.getLeft(tileEntity.facing).ordinal() || side == MekanismUtils.getRight(tileEntity.facing).ordinal()) - { - return icons[3][2]; - } - else if(side == ForgeDirection.OPPOSITES[tileEntity.facing]) - { - return icons[3][0]; - } - else { - return icons[3][3]; - } + boolean active = MekanismUtils.isActive(world, x, y, z); + return icons[meta][MekanismUtils.getBaseOrientation(side, tileEntity.facing)+(active ? 6 : 0)]; default: return icons[meta][0]; } diff --git a/src/main/resources/assets/mekanism/textures/blocks/AdvancedFactoryBottom.png b/src/main/resources/assets/mekanism/textures/blocks/AdvancedFactoryBottom.png new file mode 100644 index 0000000000000000000000000000000000000000..18e2eb83d4171289a075cbd0673928aa570ed1dc GIT binary patch literal 890 zcmV-=1BLvFP)Gc{RS?na=(M&ylaSjW^HEf46VcmbF8J;MDGc1*T^7qSTNUvG z5DdUHOh$voshb%+zu(dNZj}$3Ovf~yoag%M?+3bjy2|w*zwQh6=)Zry$@R;4Leo_6 zKXx(@@QIXmETc~gKPmutc)8^X&&Lt#S2qhLL)KTf z%X9%}6a*u>+yH=2@S?M~x5s%!V=}M{5s(RWK<^(<1ps6aiiT`SC*EFUJ&|WD!}e=9Li;0EpP_!wuUD0Qh78rdj5|`u>{c%UL~u zzb~wdgXFplKqLI;SbnqDvYAUPji~GP95^l@4PS7eIsWt)tKCuV!Y1l-< z&!#1Ah=6V*5#TD&0aTS!@`*^)aiGe!0011oMWT*`di`%(y`Jy51^|3=6@Unnp`V`x zb+z79dQF7WqmgU?z$XK+(^61LsFuvOjb_`vP(@^k0Fy8+06q=nN~SZnF3$kiR4GXX zkyX%H3c~C{f)uC#+CGdb0jL{M+jl}q0d_*(2X=OL3T4>#o$!AZgjpG?9EiW*PFNyg z6$je96DCRoYB|v6ov;L;jstDo2}>lzLs0;H<T{rzuQ6?k}7D>4`i z`0KhZ9UL6ca5&5b_TY`@xfF&W`TmGkhITh?lkqZ#=y(9B^Z0?EUdtW&2VW_{MA2qm Qpa1{>07*qoM6N<$f+>!b761SM literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/mekanism/textures/blocks/BasicFactoryBottom.png b/src/main/resources/assets/mekanism/textures/blocks/BasicFactoryBottom.png new file mode 100644 index 0000000000000000000000000000000000000000..cdf498a6d9316db4c6b5e240d93cdc891a980735 GIT binary patch literal 2247 zcmV;&2srnNP)4Tx05}naRo`#hR1`jmZ&IWdKOk5~hl<6oRa0BJ8yc;~21%2p?MfD<>DVeH z9(p*dx19w`~g7O0}n_%Aq@s%d)fBDv`JHkDym6Hd+5XuAtvnwRpGmK zVkc9?T=n|PIo~X-eVh__(Z?q}P9Z-Dj?gOW6|D%o20XmjW-qs4UjrD(li^iv8@eK9k+ZFm zVRFymFOPAzG5-%Pn|1W;U4vNroTa&AxDScmEA~{ri9gr1^c?U@uwSpaNnw8l_>cP1 zd;)kMQS_;jeRSUEM_*s96y65j1$)tOrwdK{YIQMt92l|D^(E_=$Rjw{b!QT@q!)ni zR`|5oW9X5n$Wv+HVc@|^eX5yXnsHX8PF3UX~a6)MwxDE0HaPjyrlI!;jX{6Kvuh*8ej?;85ekN$?5uuCiS zBTvvVG+XTxAO{m@bvM#Jr)z6J><&E22D|vq?Y?Vkbo_DijopiF$2PET#mZ8eu=y$(ArYkv7@Ex`GL?QCc!_*KFrd&;n1r7 zqW-CFs9&fT)ZaU5gc&=gBz-DaCw(vdOp0__x+47~U6sC(E(JNe@4cTT*n6*E zVH4eoU1-&7pEV~_PRe`a7v+@vy!^5}8?Y3)UmlaER000DDNkl$`v4AtE6#))HMd-)KGyC|yQ z|NkLA1S+s38;Hkq@t(TX?r{yp)^4(BYWk8|QmbEI$zrh>1e7F+{==ZvP|ovAx~`|l zh_Wmdl|+KB_|w2|+g8h2mPykz!km<*5CpYtCuS#S!^Oo)y0(`rPr>XZM?T_?&v_ng2@)wo_Q zHRk|>ck^YXjj!K6m#5F31k>l6m7JeH3iUVdU&^yr7yJ6V7bAJ{pTB+@`0GDcvcXR} zJ}ot8lsR}EZr{6kR}PY{bEW0^nHFY8rIh$j7AIOKUh2D6jISU7C)8bcSu7V?s%90Y zsFV484j?!j&?fbyMNx|3Ck3!b9y3~IQXW-O76q{3z{HL*HT4*zR?ob#>Zp*}@l3iN za(=9|sSZ$4??5ZPN4rHJHWHVKlV;cAccI#T-^Oeysxgj=GKcd;SPc|5o4GENd_1DA z>7?E@Bc-DX^dDnHz1MOO5EbpQf?`TB=UJ9`2qMbfCUB7GDxk0;5_wj*Q2+J$tLm^R zv3j%JNioahi|5}V0`+bu#_zF|Nyg_MF<^;af4vD)z@p>=RBFIDoiVd?LZNk1gj8b=?>0BPo zu~$c7rLdAI11}f=gQKGp+C~}cYx2H3Gs;k2%dn{tU}X}76AD~U7$MK|V`qYKRl1LA zEMsNb42O{_wj?%;atN{UEw_=PZc540i1<;eLsO2L4)!Gm+(m-5@s=FqB4eS=7c8Vx z?aKQ}U)scs;Ec#~9KUWeibrcFqvaz5Q%dRlL_3`b5sC(AHg(PLxFne%*J|vHDyDM# zAv+4SDMn5mhd&zj(e+N!CU@bSNNjQXDNzA-tFrQFofr}2xY?AIJFr~GC^cuS$#fu( zr;9ejR&27&|LI{=e~ZqLSivvK$4eJ&6VoY3lksRC@=j>eY`5u@7m`3eTy`U}JKnwC z3B57i2Xr6cD(HuCIPC&rj@|2>kV*%4Ui1T;AP@q109gb=`$6G9-3ehMwyCGUAqM`B zJE7T}#K42z34ya1cgfk=*|6Cx)94GoT+u*G>^$6v%nQC{i*gr)7&Eu3h zfPq9leZqA)B7%fFB&ooQD5mXp>#kCG*YT-U*NxoX-sE)4@7_0W002ovPDHLkV1n3YLG1tl literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/mekanism/textures/blocks/EliteFactoryBottom.png b/src/main/resources/assets/mekanism/textures/blocks/EliteFactoryBottom.png new file mode 100644 index 0000000000000000000000000000000000000000..491eda5ec7c3252439dbc12f9a76fed847e48103 GIT binary patch literal 915 zcmV;E18n?>P)a4ShB+CvDbsu)Dm1Ldc-LsNh z+uhw2utuXHn#~qH^>z@3vfb3IMTY(`2!-$a(jpPJ+hkE3i>Bw%oG^@NZO`+`@D2>? zqJKwP4UOLPS{#q(*)yHdvo~IfqjXx>Pd2*9`lKb}S+0-G?&Gz9T?120*lEOMzVB6P zi~|xxpe4fvHt6)?3!3!&ekWFUSL&s7G7_V7sQlMo5901=sr>Ih?~VBwzkj|_{`oW& z6KQCB(TK2siImC+_@bN64FV4@x3u7JG$4O@GZ*tq8OD=@{I}na(x0kv0P6FZz+l)X z|LS%jKj2h!yT_8igs^}KUDWpW_9(CD4B|^80=%G2=>6l#AYhNf2Z6IR^B-SV^bvl90M0VUTg9tAH32pa|eZQYnxNHN2!0;4>tQR66Dx`@mKaZpn8}pbj1Bb5sN* zCiWmY4NFD%$+WnHSTu(tKvj?<;3%gu@Y0ABl(j(s8o))ONQAli-}3c2eK<%03z$>| z5W?3%s?LJKS}!TRGQs7dAq`l-BmzMY7$Ve5X4^)yZC`K-c^v^@q5$YLe;gskXL3M3|7NRR@ZK;?&#i-5inRedK^DUdrM?F03C-6+GV?}VxfWCYfy;YI`Y zt+NSs56Z83KGlT;-&tWo2dMeI>6ciN|RTLFfm6TMKmDN>L z)KyhAR8%xnRW;SrwA9r#H8iv|HMO*~wY7D0G&FQHHFdSLbhWj0b#!!fboKQO40Lo1 zboGq%^o;cN4Gj#8jZI7q3``9T&5VsrO-#(p%q@(KElo@;O--%M&220!Y%MJvZET!u zZC&i`T^$_U939=AoIISJyw*3q1*0KAFa+EuX5|7EaTa()7BevL9R^{>nJEuZ&%Y`EB9#V~Khs@T}+ zp?iC`A1Y;dylwW`eSdAYo&7P-;6dT-_-FrKzrQl`vAd>%-tqjkSEBB&`;w|BDB--Z zkn>}0^wAf_0*QxA6_0#+%RX%xXM)DjHj5*lbXo=36c%gjDA%1`<>ILsHsQ__r|8oU zf<>Qra>+T*i`Ls}yGo^qe}kOV($ZjBIADLJNorxhMB8sbpEG#6`njxgN@xNA Dl{e1y literal 0 HcmV?d00001