From 88fbcb1aaf7282f6ba7d266dd7f6f8e80a5d1d76 Mon Sep 17 00:00:00 2001 From: Prospector Date: Tue, 29 Mar 2016 19:01:21 -0700 Subject: [PATCH] Fix lightning rod texture --- .../blocks/generator/BlockLightningRod.java | 8 ++++---- .../machine/generators/lightning_rod_side.png | Bin 0 -> 739 bytes .../machine/generators/lightning_rod_side_off.png | Bin 0 -> 722 bytes .../machine/generators/lightning_rod_side_on.png | Bin 0 -> 708 bytes .../machine/generators/lightning_rod_top.png | Bin 475 -> 0 bytes .../machine/generators/lightning_rod_top_off.png | Bin 0 -> 622 bytes .../machine/generators/lightning_rod_top_on.png | Bin 0 -> 608 bytes 7 files changed, 4 insertions(+), 4 deletions(-) create mode 100644 src/main/resources/assets/techreborn/textures/blocks/machine/generators/lightning_rod_side.png create mode 100644 src/main/resources/assets/techreborn/textures/blocks/machine/generators/lightning_rod_side_off.png create mode 100644 src/main/resources/assets/techreborn/textures/blocks/machine/generators/lightning_rod_side_on.png delete mode 100644 src/main/resources/assets/techreborn/textures/blocks/machine/generators/lightning_rod_top.png create mode 100644 src/main/resources/assets/techreborn/textures/blocks/machine/generators/lightning_rod_top_off.png create mode 100644 src/main/resources/assets/techreborn/textures/blocks/machine/generators/lightning_rod_top_on.png diff --git a/src/main/java/techreborn/blocks/generator/BlockLightningRod.java b/src/main/java/techreborn/blocks/generator/BlockLightningRod.java index f4b4c2f61..cce00b3c9 100644 --- a/src/main/java/techreborn/blocks/generator/BlockLightningRod.java +++ b/src/main/java/techreborn/blocks/generator/BlockLightningRod.java @@ -20,24 +20,24 @@ public class BlockLightningRod extends BlockMachineBase implements IAdvancedRota @Override public String getFront(boolean isActive) { - return prefix + "plasma_generator_side_off"; + return isActive ? prefix + "lightning_rod_side_on" : prefix + "lightning_rod_side_off"; } @Override public String getSide(boolean isActive) { - return prefix + "plasma_generator_side_off"; + return isActive ? prefix + "lightning_rod_side_on" : prefix + "lightning_rod_side_off"; } @Override public String getTop(boolean isActive) { - return prefix + "plasma_generator_side_off"; + return isActive ? prefix + "lightning_rod_top_on" : prefix + "lightning_rod_top_off"; } @Override public String getBottom(boolean isActive) { - return prefix + "plasma_generator_side_off"; + return prefix + "generator_machine_bottom"; } } diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/generators/lightning_rod_side.png b/src/main/resources/assets/techreborn/textures/blocks/machine/generators/lightning_rod_side.png new file mode 100644 index 0000000000000000000000000000000000000000..16f2dd319bb474100b3940b40c7c4123ea6fc2bb GIT binary patch literal 739 zcmV<90v!E`P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGmbN~PnbOGLGA9w%&02p*dSaefwW^{L9 za%BK;VQFr3E^cLXAT%y8E;(#7eog=Y0#r#vK~y+TO;PJlQgIkQANnUsZc;A3#0p0N zM}xJb)(5||)mB?;edso`<*E~bySOy-cOf$WE0oCwlBu83*w@I^x5?>|SlmA|3;dXl z;?*}XIUEX8$+h*w>RNndbvN*ZAhxu;_sE3;>E#0H6`tb8Xgt9h#Ah^xrIlRSH6C4& z+5DH?+9EZ*u?bIfVKJPW3#QUg`@#__wZ4(t-o`PhkOD-Cdrr*Fhte6Y{3cIPAyig* z10l8pzw{2Wi^?=Gz)x;6_4^Oz!59Ft$vi{Badv3v2oMZE)L6iHHiv7BC6d7YGOa*) zw@`I|a4bmSibu~e02vp47@&p@kys8k24F?tYzM4z_cm23l}siRi9}MVl%{ELvQ0pE zqPovNLJf=t1jnm9-~AtleD3~1u~@uk=V3S;w@|27t6hBqAG}|1ifVDZp&Xw)Z$EpT zo_+vap-@O968X*pjy~pIr>VP_Uve8A>U7OiTUQTW1j>6wr|azQ_g1Id=6Yv&?dt4t z;Hcg95^C@c`zsKgv5jI{+Hnj(N^~R=QUD&{Pcu>Lht)^;i?SJ!= V=+5>DrT_o{002ovPDHLkV1m;fMfCsx literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/generators/lightning_rod_side_off.png b/src/main/resources/assets/techreborn/textures/blocks/machine/generators/lightning_rod_side_off.png new file mode 100644 index 0000000000000000000000000000000000000000..09af237dd37efe4b6615b3c87bbdbeb42dd8952c GIT binary patch literal 722 zcmV;@0xkWCP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGmbN~PnbOGLGA9w%&02p*dSaefwW^{L9 za%BK;VQFr3E^cLXAT%y8E;(#7eog=Y0z*keK~y+TO;OuVl5rS*DQm4e*IH}y$}6t8 zV9^jVF&fKiU3k-07yTb~(Ojn0Ks4|K##s{(ENqb^kZ6$#2zcOp(hi;v=^xPZ`P-P^ zp1pg%@Ao{<`+MJyGTS@p&8^kH8_D%wu~IpbFZ@hpW|GUZODl7kYAUZ$G!Ym)+St4SZq9Y;DuEE)w@qgO1l|o6qJrL+t}^O|yffW@>Vj4*!*pj#w=o z9Kw^@*o;@!qJ<*Vp?H!C`v;ZdV;r*zDZr$-XJTzVRxDBD2;H=wm3sn_7}tTCJ;*-S z5`Y1Ic9Z4be=rZm0Fce*2}T#Wp`l|yF#J$s0gL4duCb8I1Jn{G`DeQA^DjgRSG@cv z0kCo5hXHEn5Q*hrV*pkJ&UL^lPj6EulZnM*KA$fViKJ2~INK(-P(^SuJV#UW5xO@* z=wldl>TRPW8%Kwi%5EAk4|6Z_FTDG4tNWwL>9)8&7#*&mVLOfnEhA8a>#XlVl-dDO z^$y|~fRyQ2B%}a5z{S@1nLE=YHNEQAQm0yT<#8Op;{3f?#Ax4{`;69pla0lr_8Kfz zw7*f)i`QM6A(KXLgtSVkHjt}N(w81asA-I@Yuh@N)S>F38&;moRogmq;jaI!&Hx~c z^XrX>V15vMf7aH)8PFPG08(*QHGnV=D!95||MYqLe~gFjkE6h*@&Et;07*qoM6N<$ Eg6oP!iU0rr literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/generators/lightning_rod_side_on.png b/src/main/resources/assets/techreborn/textures/blocks/machine/generators/lightning_rod_side_on.png new file mode 100644 index 0000000000000000000000000000000000000000..a5a59004ea0a8a218580348ca0de4e73a1c36653 GIT binary patch literal 708 zcmV;#0z3VQP)N2bZe?^J zG%heMIczh2P5=M`LP`}9`%rdk zJF~I5{C7RI_A5~;#|p)t>FiW$ae85CCYy^cXMi6|X}m^~3*QnP6?XUXJG;5>UmuHYJT`2s-dC@DYF%|LK2PPpR52T6d93qK4{Lx)H#2O9&h zB5=L~R(W!p3WY){l?sJIi9{lo%fZ<;`Gu;&IN)2qZ!gF zsoFp;KgwKaj#0x1UDda=YpAW`HC?j{6rS3qsdIONZww{?VZ7gHMg;SN;QN!7Hr{~N q2m_Fcv#J4vc~HT%y~f8+TmJ*^s_%ZLzoyv$0000*bd literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/generators/lightning_rod_top.png b/src/main/resources/assets/techreborn/textures/blocks/machine/generators/lightning_rod_top.png deleted file mode 100644 index bcd1fdbe52c74fe7bd38a1f041fad34baf68636f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 475 zcmV<10VMv3P)fua@}H@!pQ^2(tFEK2v8c1QtGBwWxVx~tzp=f*vcAEyzrw-K z(Zti$*5~MefPmQP>e=h;-0tt*@bTB^>B7;|!_w5$<>sxqyvEhn$k*AVudjw%i;0ny%-r42 z;Nj5W;?v~idx3`4=I5!jx2m?exyQ-b>g$x9p}Wb;m7b!%&CkHj(3qj6!qC!wgo&F& z8btsA0K`c|K~#8NJ&sk515peF4R4qk!^~M^hWlS>osp9IEVtSXe~;HUW8<~`jc3l* z9zDasb^Csj&xxK`&_J@fh93lRja7+sC#PkX=v5?O-KBzD~L}4%}b;P$L3-4WmQ!0w|$~H7@48Hf`^pjzm%xqJ{;vdum5zQCx R&p7}9002ovPDHLkV1mSw1i1hJ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/generators/lightning_rod_top_off.png b/src/main/resources/assets/techreborn/textures/blocks/machine/generators/lightning_rod_top_off.png new file mode 100644 index 0000000000000000000000000000000000000000..c3bd3b9e4f69a8136c5c870444160b370b12b26c GIT binary patch literal 622 zcmV-!0+IcRP)N2bZe?^J zG%heMIczh2P5=M_>`6pHR5(vPlF3dRQ4mF2mhh9>7O?PwO)M5+1_>mT-(bZ)#1d>E z5eWW;DS=2VfCiHgL=+++W-x=XjR!md353CIW(+bK+LuXVWMXpM z2pT_^7B{xmBC(C5#Cj}FuzDEXj3;+e>D^3rKbJqqpG5zjYZQ`K*Qx89bivHt-hoW< zR!#{dPMbvtYtbW(9=W^wk~eK7mF@28fG_|_Kv34)ThaQlwBbE{Ex}eIWeF1i5UL=5|3JnX#w@DZZcfOyfZFj*ft!p5=fLN=ZxR5p6`3WF zk$|`l8#78N?e*vL`9@}gB*ll0JfP)p`uK!^EUBSs1FGNe*LB_N^$yR>LbU`1GjVxk zUz&N);J_&Ym&^6)p$$$=GbfE;vxJp!MB7dtI|42<_I;lA9*;)^eEfB*mh literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/generators/lightning_rod_top_on.png b/src/main/resources/assets/techreborn/textures/blocks/machine/generators/lightning_rod_top_on.png new file mode 100644 index 0000000000000000000000000000000000000000..d31321e3ead3403090c357189cbcd01866a9f195 GIT binary patch literal 608 zcmV-m0-ybfP)N2bZe?^J zG%heMIczh2P5=M_-bqA3R5(vPl37n8Q4obYB-%~GBhUN^6XT-`8XtIYe$_ndlj1tY zDB1#!V>Do5+z@eL09j;nopGUY_Xqg3)oF5aQ&gQ(r|zv*rozVfTzJNa8XJlA{e#_X ze*dhvmoE_P{LLi`rNeUNs9HOzH%=QDxtm*sLh1gY{P0+5nzg5AP;EWQDS^Zlvjt%{ zcc##z{`}I`@w2^iMD1P>1|SIt+`)wYBccT+>1zoNie(DzUBgo5ym);B^4D=wduKUq z2g+(sSQtVTG+tiGSi_httv}8Q*%nYce{6D-iD(Q=##ST%Vk>dymH>f|=Dnl;rjhtdS6qy88II{`};G@oR0( z0eX`1bXaYjWE3_JRUg_Ejer=?2+*5(v|x%)V>5kh3*19d@o}j35}Ib={~aHa7FbDF zs)@rROF&s0nAZB{wZXX4Sl&K=`_COrYJr&AJ%3!Q$5Uzh(#{?vkTuahb9n`imy}O< ueJ`oVMwpUjlyS$C8VqKj9dHEOnd}$4jYmUb_bqe)0000