From 3e7e37cebe69a4fff683523cf911c29f3603b84e Mon Sep 17 00:00:00 2001 From: asiekierka Date: Mon, 28 Sep 2015 10:46:08 +0200 Subject: [PATCH] restore proper engine breaking icons, re-optimize textures --- .../textures/blocks/builderBlock/top.png | Bin 282 -> 281 bytes .../textures/blocks/engineBlock/default.png | Bin 186 -> 0 bytes .../items/fillerParameters/hollow.png | Bin 306 -> 305 bytes .../textures/items/paintbrush/red.png | Bin 345 -> 344 bytes .../textures/items/stoneGearItem.png | Bin 978 -> 977 bytes .../textures/blocks/engineCreative/icon.png | Bin 0 -> 184 bytes .../textures/blocks/engineIron/icon.png | Bin 344 -> 250 bytes .../textures/blocks/engineStone/icon.png | Bin 223 -> 259 bytes .../textures/entities/robot_builder_base.png | Bin 407 -> 406 bytes .../items/triggers/action_robot_filter.png | Bin 209 -> 208 bytes .../triggers/action_robot_goto_station.png | Bin 209 -> 208 bytes .../triggers/action_station_allow_craft.png | Bin 456 -> 455 bytes .../blocks/integrationTable/default.png | Bin 789 -> 787 bytes .../textures/gui/assembly_table.png | Bin 977 -> 976 bytes .../blocks/gates/gate_expansion_pulsar.png | Bin 759 -> 758 bytes .../textures/gui/gate_interface_4.png | Bin 760 -> 759 bytes .../textures/gui/gate_interface_5.png | Bin 708 -> 707 bytes .../textures/items/triggers/redstone_14.png | Bin 212 -> 211 bytes common/buildcraft/BuildCraftCore.java | 2 +- common/buildcraft/BuildCraftEnergy.java | 7 +++-- common/buildcraft/core/BlockEngine.java | 18 ++++++++++++- common/buildcraft/core/TileEngineWood.java | 5 ---- .../core/lib/engines/BlockEngineBase.java | 25 ++++++++++++++++++ .../core/lib/engines/TileEngineBase.java | 10 +++---- .../core/proxy/CoreProxyClient.java | 5 +++- .../buildcraft/energy/TileEngineCreative.java | 5 ---- common/buildcraft/energy/TileEngineIron.java | 5 ---- common/buildcraft/energy/TileEngineStone.java | 5 ---- 28 files changed, 54 insertions(+), 33 deletions(-) delete mode 100644 buildcraft_resources/assets/buildcraftcore/textures/blocks/engineBlock/default.png create mode 100644 buildcraft_resources/assets/buildcraftenergy/textures/blocks/engineCreative/icon.png diff --git a/buildcraft_resources/assets/buildcraftbuilders/textures/blocks/builderBlock/top.png b/buildcraft_resources/assets/buildcraftbuilders/textures/blocks/builderBlock/top.png index d45aa35972d19c9b103b284f7d2c800631764563..e961f94ee9a6b264253b5320294eb04ef271da0f 100755 GIT binary patch delta 189 zcmV;u07Czo0+|AkM+r|)Psqr~T3T9>P$7SRLaVR<004|hL_t(|UR96@3Irhx1k;^F zoqO;7|4+9aVPM-3LQz4~in8j2n#O9iF=L8}!2nsU;J|`pL&NRPVr7C|p+LoCyPNOk zK7b6L#d;^SBI62D-~oGXw)we&mz6jA=qF=05_Tmi0GiLe=3xY>QPo*O2Kj$W{qkkE@BY#qo0-&zzwGKy+8daTTPa*$PDqkwV sf`tul9K(TNFr$UIK+(%%9)BQx09%0sZ6ig3r~m)}07*qoM6N<$g0Lu3hX4Qo diff --git a/buildcraft_resources/assets/buildcraftcore/textures/blocks/engineBlock/default.png b/buildcraft_resources/assets/buildcraftcore/textures/blocks/engineBlock/default.png deleted file mode 100644 index ef838ac8ddfe3c628a0c29afc6401c3ebd0bb9af..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 186 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9JOMr-u8OiUYD$Wlswz4f>P)&l z>Ok>KPZ!6Kia6GWgTjwePXBmB&7*8=&p_ jmlJQ`^BVnG@K37@LJ|a>%CJh&00000NkvXXu0mjf;&)X; delta 182 zcmV;n07?I`0-J_G01GLb$Qk$N5m@8CP^+&7U~8-McSJ<`G*^yNV3*fZVEDd5m6 zP?v4{0001NNklIQk-2Z^PFN=iaWPU~rvJo^#TJDyxQL=;g zO>SX%&=p*0Hc)R#1pc9QB(jkZdin+2BMby$SSS{ZWWlWv)^X_u=ftyTkDmSHbcQb1 k+dYH_^c#G=E&QPgUo7MVsX*EW^Z)<=07*qoM6N<$f^M}_G5`Po diff --git a/buildcraft_resources/assets/buildcraftcore/textures/items/paintbrush/red.png b/buildcraft_resources/assets/buildcraftcore/textures/items/paintbrush/red.png index 0406b9c50ba967176ef686f440a3aa5691867d54..842b294c310277401c9db8e6578d3bb433da015a 100755 GIT binary patch delta 184 zcmV;p07w7X0@wnOO%o^{3ub0!Xigr9XD3xvRlX}HqLE-q1O^tItC6l5e|$+qK~#8N zUC+l3!!Qg3P$k`zcUJe_|Nns%lG=d7n;yY~Xf;X?6vIpzu(2u!YcgP?RGJu;Ud{+k zS?MXk_M?^b2{z}o*8G?GbW&HqLB#Zc0CawL+B-K)p5Gd%ZpZ73h5)|tc;7?(W${3O mzo3k;3@w_nC}!!~QGPz45(!$+yN-7N0000{%mXD3xvRiY~=zL8)`1fQGp=#j1&e|g<4ltP)tdgl#id9mVkP7xV5rj`pA8gVFE;d7fD1xRCrzm00VX$0rZd7 zjBTr&wQa?=ZQHhOyYA)kAO!L8rm!w-C7yur2s#x3Kk#o1=65y=MPAWee1Z;a-}_=) z%n#*%TaeBmMga&#?&OURvw+P|kEUnmZ)Idw?KO#jfG9jr*QPvK*gico z-BCCwJp9vt^gaG^I*eJC9F-zZ057frrKPYaG|W?4R$fu52W?GlU3~)?iIL)#R(E>` zNTl68y+0k#vi^a=p<&4g#Kv*PU8V`^)bz}(o<@rYEMd{$URqvRU0dJSBzcJd(PUgqIqZfkbB@80)@G-C?N2&w5+_MQU{uv+PeA%G6W+Ez>izb2=I=3b5!UegE>x>e~9o<`&6|0U&oR zd!~cKqvI2q(#B^(Y@Awh5r1{ diff --git a/buildcraft_resources/assets/buildcraftenergy/textures/blocks/engineCreative/icon.png b/buildcraft_resources/assets/buildcraftenergy/textures/blocks/engineCreative/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..a212ef98e6b4c68893d2eca2fbd2b1d70dd39bdb GIT binary patch literal 184 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPE^4e$wZjg^#~#Lr*H%ezcSsEnJt zo}0U!m-nsh`U5}(ah@)YAr*19XB@eX8gRGR{{g}>_;YAr3V zsId8wwZDtu`ID1A7gpFD@oN!Vv`V@4oMh8Z$yZ(4DhjNgcWsa63BKI9Gj8Q!fs|)^ gzc>9`e`+=Rf}6aN3U^Ok2inBo>FVdQ&MBb@03@nI^#A|> literal 0 HcmV?d00001 diff --git a/buildcraft_resources/assets/buildcraftenergy/textures/blocks/engineIron/icon.png b/buildcraft_resources/assets/buildcraftenergy/textures/blocks/engineIron/icon.png index b3808b8a6f8d42c97e4683928d97943a49593c0a..9823c445c41ed3c0bd79723c9adf201a8ec6c5ba 100755 GIT binary patch delta 222 zcmV<403rX_0{Q`vB!4+jOjJdur>D%!%*)Hm%F4>e$H&IT#;K{PrlzLF#l^_T$i&3N zsHmvJ!^6G3y}!S|&CSiu&d$ERzRAhS2;5_Z0001dNklNsa|k2*aGf8*1w5 z{)g>CNZ+htSv|X37C+N|k;Z*AT%fJ>NY?#_)I9DB-5->+9>#(9qM<)9C2v>gwvx&(F=x&B(~e#Kgp>r>E@f?AqGe(b3V} z-QBINt<==i+}zwaFD2vSZwu>&UH`Nw_J8?b@3#qR`Q_ol P00000NkvXXu0mjf$_TLn diff --git a/buildcraft_resources/assets/buildcraftenergy/textures/blocks/engineStone/icon.png b/buildcraft_resources/assets/buildcraftenergy/textures/blocks/engineStone/icon.png index a07932a348cae42cd2cc9b47101d0c4129bee431..3842df9eecd2c197e1da664df5e1e31fa7673df8 100755 GIT binary patch delta 231 zcmV)kg0053jL_t(|UKNco3c^4TML)Z+Y6@YB1wo4e12&3- z1VcJmPcSzKZonWVeZNL-68|cZLebw;z{|_<)FvIh>sbK4B-N5})m(or!VHjR; z@AaZ&$BS1nl4rR7s!FcKly6JQX3j+8=vxFP%LIWFQvI5F3&lkYoTm(HJw9bw?YCwQ h=gyv;fT9>+`~kT#7m~nrbguva002ovPDHLkV1kgNVr>8b delta 195 zcmV;!06hPL0^b3UB!3=IOjJd5baYZuQh$GckB^TwFC}PbXf-b;GcF}JF()`LC5o+O zqyPW_d`Uz>RCr!Jjynp%KomvKObl4Y$p$7b2HV7^#4?~*tBpIb9&`hOdvLwJ5%HGi zaz8A7B6LFOrJ;`ac3m`7v)lV{oE-HI(APk9jdYUEMxu&jvOI*6$x>r4tv-y5_)AO! xVO8`ey_>c1qOvz@o(rFju>EcsA#dUSH$DyO5+D#dHCzAy002ovPDHLkV1kUFP_F<0 diff --git a/buildcraft_resources/assets/buildcraftrobotics/textures/entities/robot_builder_base.png b/buildcraft_resources/assets/buildcraftrobotics/textures/entities/robot_builder_base.png index 5ec85ef07e463490f33c281e637f49018b9e067a..97fb5703a5b993dfb3c5fd4d93dce28f72b216ff 100755 GIT binary patch delta 239 zcmVIpqA3-6+tzuOrUK pQ+A_3@4n;Q|EIEhJ#jc3jyLZK5_mHec&w$*D0HV>Ggqi8!I$jhK{hSEMHBzQ-D1p~oO zK!Rz$dcjBlkf3pk2tNqIky`>VKVdPBA($9Hah^dC*24uI5d^1r)?1)T(`)YR72*4x|L-{0Tq>FLYM z%k1pzxw*NUo14eS$NvBTeTC+|00001bW%=J06^y0W&i*HLPU6T$IQ&k&d$!#($bMZ8*l#r0DQdhB>(^b z0d!JMQvg8b*k%9#07FScK~#8NmCQE|03i%SQB2NZ_x^WOc$kB{4bSxf0T!e@SpWb407*qoM6N<$f_o%E A*8l(j diff --git a/buildcraft_resources/assets/buildcraftrobotics/textures/items/triggers/action_robot_goto_station.png b/buildcraft_resources/assets/buildcraftrobotics/textures/items/triggers/action_robot_goto_station.png index c20dd69450dd15f7f79e5290213787385c1712f0..6da7d7c5118ed6302746bbbdc68355a8a8bec806 100755 GIT binary patch delta 160 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 RI$obZf}XB^F6*2UngGzE^_~C# diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/blocks/gates/gate_expansion_pulsar.png b/buildcraft_resources/assets/buildcrafttransport/textures/blocks/gates/gate_expansion_pulsar.png index fca10473af489507ef37249760983ba606a5ffe7..b6bbbbee44383d055c660427a475537dff3ec944 100755 GIT binary patch delta 595 zcmV-Z0<8V_1@;AyFB9hg0N?=u=l}rW007qj0PO$(>ybz@Gr0o;%m4u5006uJ0mA?Q z&;S6Y1O&bU0(l1qv;Y9F0RgxI0)PMj(EtGH007be0M!8jk;_zn(*Xgx0Rh$l0i^>2 zuLcI!0Rh|r0pkDw%>n}B0Rg%K0@(rr*a8BV1O%!90d)lhqyq!D006cC0FM9w$^Zb) z0s^Q51KGBYzXUS@j#cUal~ST`!Qrh}D(`X;ErN0z!H%bJnljDNf%>GDHZNL5QKea4%C~0Fb3iNLB&bB7-Np(SXRlgAh3J~ zfirNZNgc3!XAT^h5(ZZPpjLpJVT`%%X~d32YzThHL?Ebt4IJuT2W*)~b8s&c!=UE6 zHP^NS+zeyP^PXSUeiv>b*pewg5SPK6tl3}Y;n`u32^ zC66HZDwBj@Lgoa5DIM@XxiAM!nHdb4)oMDONCdbU##p^RKU-O9w;|Y+!C*z^5`qOC zc#=6Z2Mw8iISd-b;_l+uSb&>hjAgTDH?3AQ3c-6B3_i;oL-0ulzROh1L09G@2Hi|% zboBZ^(8m}nm)AEsoqQgGZ5a%9WX>Vj(}ABd@65p$nGYEJ8Xy1j_a6p~G5&r)F~<1+ hB#JS{_aBBb_6ju8EiKEqa6bS5002ovPDHLkV1k<+=br!o delta 596 zcmV-a0;~P@1@{GzFB$Cs0OtSz-~j>X007|t0M`Hj>i__>0082VLNZaj0Rh7R0MGyc zz5)Vy2M6N-0J#GL%m4tm0s^lA0j2~5fB*o|007ki0nz{fj{pF=0Rhti0i**1w*UZj z1qICl0(u1nmjnc=0RgrE0OCOnlZyL zl>dN01x_Crp9T~L$}s$Agv&6-lv1AmfWQl!K2VZ?_@Xlfht9W(eDD iK8a$C@&6BBGWHLfXe#r$Xh6LH0000gX>cO diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/gui/gate_interface_4.png b/buildcraft_resources/assets/buildcrafttransport/textures/gui/gate_interface_4.png index 38e4c68ebb4e174a857e0cdf6e84a739872a84ba..e9b6954f7fc1ccf956268b64b2a8bfc014b29385 100755 GIT binary patch literal 759 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K58911MRQ8&P5Flk1;1lBd|Nnm=^B59%_wL;- z28QnLZlE|&7AW(Gfx+C|JTfveG&J-b1H)+s2IXfncLAl@N`m}?85nqYo*Jfil~K7S>lkt?g*0wuS~;L&I1v_H5We0 zoq3&d;DYLZp#ysY&i-S*u&QL97{lkA`3zBp4L^mn8{CdCNck2u+?Xe+@GYIKK)#uHan`6UmiUiv(N@x)yaQy0YSF;!){k^bRe z-`+I}Jj{U%UnN&5{ri8vD?_YE{7^vPjAHTF7L^OmMiYK2Im}xlvUo|(rOKHnB#IH0}Q@_>HV10hWYkutu9pa0J?PTR*|?B{S= zi6dc|Dnr8?u5#uZZeffJ6V$ccg%+4C-|~vtp}TK_HZZ(^KfNfAd7n_+=+NqT!< zE(3!jL&HlBo`3(>`a2xDFz>>{hQC$JEF1y~4h;;9ObABJx3_m$7zEf3FDSDU_z#YsX-HR{jb?WG+3O~yAH!Vjr_vji(Wpu+IPST~j7$*RAM3_I0r r%WgL^O95qC9KZSJ_VbGY0}Tnt+;pf{3lUpy3KH{l^>bP0l+XkKGSB;- literal 760 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K58911MRQ8&P5Flk1;1lBd|Nnm=^B59%_wF4~ zY!*ZG>9_w}0veMQtlrz~;EUw4Gbf>);D3g>|c&@`8HS3dnL)g;KQy6BPuVcQ@#dv0V1fz};+lGuu%tyYRVc2MI?C|D1kHBwX zW*0ZU1i`1GH~KHswFZ|kNFVqmB;63VuJQzfUg&vewgua><%}AluYR7u*kh{9bR+%4 z!M?p~6nK~e8NNztYW@3vzsp0cNW697B7^68yErlzwx4u(*3A$ZxpNZ3R@<%H?HG<} z&t_7|S*PNV>;Lz(aKfI;VhLwV*k+vXV_>)^d6u#6BFl6S#swdqGR*jYUnb!tx4~kj zC^JU}V_imuCm}ne57=$uWN28kCdRYj*1Sv6+6=mCPC%_7&|$Khk2!*ufnk;ch$|Dt zoZ{2s(;~yja6I@smxVPG1H%qJU?e#Rvw-9o)SQ4?55$9_jiKSS0gyCt1hE+sl)j|2 z_vJD$I5IT6e8SNAzy7rF1cNQ=B^C+$?=dhkv2X||I5Z$Jj_#A4&A@OdK;(*-%hA8v zOBvXIC|zG>gW_L}%F1pVH#R0qGdO6lED8$D`1Jk$HANoQk9o{-oYQYShp3*+FyZ@_DU1_Ve`9BOGVjZc pTz0+;po{?9P5Z63b`cUNW)?JPpSM|@(2xug^>p=fS?83{1OOGG`C9-0 diff --git a/buildcraft_resources/assets/buildcrafttransport/textures/gui/gate_interface_5.png b/buildcraft_resources/assets/buildcrafttransport/textures/gui/gate_interface_5.png index d08bacea8084abb27c44552a3042062b43981ef6..4b52dffc56482a447b01aa3a8871bbe7919daef7 100755 GIT binary patch delta 593 zcmX@YdYE;BwdySfhVJfe1_p-z|NkF5b}TY7@(}}rxw-i}28PoN456W+9$rpACnkt6 zT1_lftxuZIaK`lbbk}#m440<|Wz=u`!S8T;>2pq|FXj6gGiEb>=?`I?!^v#%`Vm9S zdY%J+Pchs9QHL1L9A%tS>e}#G&?^4nB$)$@A7X--H)KcH8aABHxgyNGp&G=z4Pws7 zUdLK6@1XeaZ=0G7cvu;)gnwXc`u~5cmX=~leW1ofk!NQ<=`qO_ZI*bopW)Z+t$CN2 zchb9eoPlPZq{5>0Gp2^5IZx4gOWsXQj247&9Fet3yXV@UYz+lq^ z;%%_o&g5(2B&Dd$@SwnFKjZQg25klhd5~1U0*GX|z>(Rq2Fzl(zz(DjD06^$CQi5c z85kyiWE8ER>!auT+#jL_i4@)^ILqcD$YL-^Fhs~fY((%OtP31JZ_5CgTMqp~mttrL z`*E^Q_A&!QgM&bF%lr@P#bi}%Ic3ia{T7G>DVDJ;$zfq&Xfl{!lz#NzmwickkW-MQ$-L zba!_@0!#h>|35M^(%jq}C~=yBAv849`Z9w&P!VfMkY6wZ4{w~bp2g%G1_mZ;PZ!6K zinuq|Ecp%_2sj6ZZO+(O`~NaqPE*e=jk(uIHb z-mGW1rDxkOn6T$JufuJggqkH>0zMK7Hw4%pRHZV!3uk*!2c*Q=5)}Caax|Fc^k4YN zHT?+#pTiebQ-=MQUUxFayo>bbIq?2VRT9JY>TANxGqM-57R);+{`=deCIcQ;#w+1V zG@AbZ->Rjhm=dTlk)t@RQk;>0XC%+paE8BUZ<%E>vdxcSJf-c-Sal8>A2_q!fE6h$6U9Rz}O8Ts|N>DzO$r&O!T6!g0P_1_lR(j)ejVb^kMG zHZL)EdK#G|4{~3Faywry14DuU+aje^H|lSl@@shTOIpQ`N8qv8OvXo<{}&$L#>@^< l$-8s| delta 98 zcmV-o0Gu2&%$^ZZW07*qoM6N<$ Ef?XXcFaQ7m diff --git a/common/buildcraft/BuildCraftCore.java b/common/buildcraft/BuildCraftCore.java index 33a81d1e..2e8fd59a 100644 --- a/common/buildcraft/BuildCraftCore.java +++ b/common/buildcraft/BuildCraftCore.java @@ -361,7 +361,7 @@ public class BuildCraftCore extends BuildCraftMod { engineBlock = (BlockEngine) CompatHooks.INSTANCE.getBlock(BlockEngine.class); CoreProxy.proxy.registerBlock(engineBlock, ItemEngine.class); - engineBlock.registerTile((Class) CompatHooks.INSTANCE.getTile(TileEngineWood.class), "tile.engineWood"); + engineBlock.registerTile((Class) CompatHooks.INSTANCE.getTile(TileEngineWood.class), "tile.engineWood", "buildcraftcore:engineWood"); CoreProxy.proxy.registerTileEntity(TileEngineWood.class, "net.minecraft.src.buildcraft.energy.TileEngineWood"); markerBlock = (BlockMarker) CompatHooks.INSTANCE.getBlock(BlockMarker.class); diff --git a/common/buildcraft/BuildCraftEnergy.java b/common/buildcraft/BuildCraftEnergy.java index 28f50ad4..4053eb3d 100644 --- a/common/buildcraft/BuildCraftEnergy.java +++ b/common/buildcraft/BuildCraftEnergy.java @@ -100,7 +100,6 @@ public class BuildCraftEnergy extends BuildCraftMod { public static Item bucketRedPlasma; public static Item fuel; - public static Achievement engineAchievement1; public static Achievement engineAchievement2; public static Achievement engineAchievement3; @@ -288,9 +287,9 @@ public class BuildCraftEnergy extends BuildCraftMod { BuildcraftFuelRegistry.coolant.addSolidCoolant(StackKey.stack(Blocks.ice), StackKey.fluid(FluidRegistry.WATER), 1.5f); BuildcraftFuelRegistry.coolant.addSolidCoolant(StackKey.stack(Blocks.packed_ice), StackKey.fluid(FluidRegistry.WATER), 2.0f); - BuildCraftCore.engineBlock.registerTile(TileEngineStone.class, "tile.engineStone"); - BuildCraftCore.engineBlock.registerTile(TileEngineIron.class, "tile.engineIron"); - BuildCraftCore.engineBlock.registerTile(TileEngineCreative.class, "tile.engineCreative"); + BuildCraftCore.engineBlock.registerTile(TileEngineStone.class, "tile.engineStone", "buildcraftenergy:engineStone"); + BuildCraftCore.engineBlock.registerTile(TileEngineIron.class, "tile.engineIron", "buildcraftenergy:engineIron"); + BuildCraftCore.engineBlock.registerTile(TileEngineCreative.class, "tile.engineCreative", "buildcraftenergy:engineCreative"); InterModComms.registerHandler(new IMCHandlerEnergy()); diff --git a/common/buildcraft/core/BlockEngine.java b/common/buildcraft/core/BlockEngine.java index 27c8fc94..6fc301f4 100644 --- a/common/buildcraft/core/BlockEngine.java +++ b/common/buildcraft/core/BlockEngine.java @@ -15,6 +15,7 @@ import buildcraft.core.lib.engines.TileEngineBase; public class BlockEngine extends BlockEngineBase { private final ArrayList> engineTiles; private final ArrayList names; + private final ArrayList texturePaths; public BlockEngine() { super(); @@ -22,6 +23,20 @@ public class BlockEngine extends BlockEngineBase { engineTiles = new ArrayList>(16); names = new ArrayList(16); + texturePaths = new ArrayList(16); + } + + @Override + public String getTexturePrefix(int meta, boolean addPrefix) { + if (meta < texturePaths.size()) { + if (addPrefix) { + return texturePaths.get(meta).replaceAll(":", ":textures/blocks/"); + } else { + return texturePaths.get(meta); + } + } else { + return null; + } } @Override @@ -29,9 +44,10 @@ public class BlockEngine extends BlockEngineBase { return names.get(metadata % names.size()); } - public void registerTile(Class engineTile, String name) { + public void registerTile(Class engineTile, String name, String texturePath) { engineTiles.add(engineTile); names.add(name); + texturePaths.add(texturePath); } @Override diff --git a/common/buildcraft/core/TileEngineWood.java b/common/buildcraft/core/TileEngineWood.java index 3baf574d..80f883fb 100644 --- a/common/buildcraft/core/TileEngineWood.java +++ b/common/buildcraft/core/TileEngineWood.java @@ -22,11 +22,6 @@ public class TileEngineWood extends TileEngineBase implements IRedstoneEngine { private boolean hasSent = false; - @Override - public String getResourcePrefix() { - return "buildcraftcore:textures/blocks/engineWood"; - } - @Override public ResourceLocation getTrunkTexture(EnergyStage stage) { return super.getTrunkTexture(stage == EnergyStage.RED && progress < 0.5 ? EnergyStage.YELLOW : stage); diff --git a/common/buildcraft/core/lib/engines/BlockEngineBase.java b/common/buildcraft/core/lib/engines/BlockEngineBase.java index 26f8c113..e4ef4a33 100644 --- a/common/buildcraft/core/lib/engines/BlockEngineBase.java +++ b/common/buildcraft/core/lib/engines/BlockEngineBase.java @@ -13,16 +13,20 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.IIcon; import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.Vec3; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraftforge.common.util.ForgeDirection; import buildcraft.BuildCraftCore; @@ -45,6 +49,27 @@ public abstract class BlockEngineBase extends BlockBuildCraft implements ICustom super(Material.iron); } + public abstract String getTexturePrefix(int meta, boolean addPrefix); + + @Override + @SideOnly(Side.CLIENT) + public IIcon getIconAbsolute(int side, int metadata) { + return icons[metadata] == null ? icons[0][0] : icons[metadata][0]; + } + + @Override + @SideOnly(Side.CLIENT) + public void registerBlockIcons(IIconRegister register) { + icons = new IIcon[16][]; + for (int meta = 0; meta < 16; meta++) { + String prefix = getTexturePrefix(meta, false); + if (prefix != null) { + icons[meta] = new IIcon[1]; + icons[meta][0] = register.registerIcon(prefix + "/icon"); + } + } + } + @Override public boolean isOpaqueCube() { return false; diff --git a/common/buildcraft/core/lib/engines/TileEngineBase.java b/common/buildcraft/core/lib/engines/TileEngineBase.java index b853c6bc..894fdbe7 100644 --- a/common/buildcraft/core/lib/engines/TileEngineBase.java +++ b/common/buildcraft/core/lib/engines/TileEngineBase.java @@ -73,19 +73,17 @@ public abstract class TileEngineBase extends TileBuildCraft implements IPipeConn } } - public abstract String getResourcePrefix(); - public ResourceLocation getBaseTexture() { - return new ResourceLocation(getResourcePrefix() + "/base.png"); + return new ResourceLocation(((BlockEngineBase) getBlockType()).getTexturePrefix(getBlockMetadata(), true) + "/base.png"); } public ResourceLocation getChamberTexture() { - return new ResourceLocation(getResourcePrefix() + "/chamber.png"); + return new ResourceLocation(((BlockEngineBase) getBlockType()).getTexturePrefix(getBlockMetadata(), true) + "/chamber.png"); } public ResourceLocation getTrunkTexture(EnergyStage stage) { - if (ResourceUtils.resourceExists(getResourcePrefix() + "/trunk.png")) { - return new ResourceLocation(getResourcePrefix() + "/trunk.png"); + if (ResourceUtils.resourceExists(((BlockEngineBase) getBlockType()).getTexturePrefix(getBlockMetadata(), true) + "/trunk.png")) { + return new ResourceLocation(((BlockEngineBase) getBlockType()).getTexturePrefix(getBlockMetadata(), true) + "/trunk.png"); } switch (stage) { diff --git a/common/buildcraft/core/proxy/CoreProxyClient.java b/common/buildcraft/core/proxy/CoreProxyClient.java index 74ff8f7e..5e0f49a1 100644 --- a/common/buildcraft/core/proxy/CoreProxyClient.java +++ b/common/buildcraft/core/proxy/CoreProxyClient.java @@ -99,7 +99,10 @@ public class CoreProxyClient extends CoreProxy { ClientRegistry.bindTileEntitySpecialRenderer(TileEngineBase.class, new RenderEngine()); for (int i = 0; i < BuildCraftCore.engineBlock.getEngineCount(); i++) { - RenderingEntityBlocks.blockByEntityRenders.put(new RenderingEntityBlocks.EntityRenderIndex(BuildCraftCore.engineBlock, i), new RenderEngine((TileEngineBase) BuildCraftCore.engineBlock.createTileEntity(null, i))); + TileEngineBase engineTile = (TileEngineBase) BuildCraftCore.engineBlock.createTileEntity(null, i); + engineTile.blockType = BuildCraftCore.engineBlock; + engineTile.blockMetadata = i; + RenderingEntityBlocks.blockByEntityRenders.put(new RenderingEntityBlocks.EntityRenderIndex(BuildCraftCore.engineBlock, i), new RenderEngine(engineTile)); } } diff --git a/common/buildcraft/energy/TileEngineCreative.java b/common/buildcraft/energy/TileEngineCreative.java index 9b98fa42..b7b8cbc1 100644 --- a/common/buildcraft/energy/TileEngineCreative.java +++ b/common/buildcraft/energy/TileEngineCreative.java @@ -32,11 +32,6 @@ public class TileEngineCreative extends TileEngineBase { return EnergyStage.BLUE; } - @Override - public String getResourcePrefix() { - return "buildcraftenergy:textures/blocks/engineCreative"; - } - @Override public boolean onBlockActivated(EntityPlayer player, ForgeDirection side) { if (!getWorldObj().isRemote) { diff --git a/common/buildcraft/energy/TileEngineIron.java b/common/buildcraft/energy/TileEngineIron.java index f3f29668..2d9a8111 100644 --- a/common/buildcraft/energy/TileEngineIron.java +++ b/common/buildcraft/energy/TileEngineIron.java @@ -64,11 +64,6 @@ public class TileEngineIron extends TileEngineWithInventory implements IFluidHan tankManager.add(tankCoolant); } - @Override - public String getResourcePrefix() { - return "buildcraftenergy:textures/blocks/engineIron"; - } - @Override public boolean onBlockActivated(EntityPlayer player, ForgeDirection side) { if (super.onBlockActivated(player, side)) { diff --git a/common/buildcraft/energy/TileEngineStone.java b/common/buildcraft/energy/TileEngineStone.java index 1fc555e6..95367f12 100644 --- a/common/buildcraft/energy/TileEngineStone.java +++ b/common/buildcraft/energy/TileEngineStone.java @@ -41,11 +41,6 @@ public class TileEngineStone extends TileEngineWithInventory { super(1); } - @Override - public String getResourcePrefix() { - return "buildcraftenergy:textures/blocks/engineStone"; - } - @Override public boolean onBlockActivated(EntityPlayer player, ForgeDirection side) { if (super.onBlockActivated(player, side)) {