From b643162dad3896d1f237c63aae4f8979b182f54f Mon Sep 17 00:00:00 2001 From: TheDoctorSoda <thedoctorsoda@gmail.com> Date: Sun, 21 Feb 2016 13:32:03 -0800 Subject: [PATCH 1/2] Fix rubber log texture names and fix treetap texture --- .../java/techreborn/blocks/BlockRubberLog.java | 4 ++-- .../techreborn/items/tools/ItemTreeTap.java | 7 +++++-- .../techreborn/textures/blocks/rubber_log.png | Bin 895 -> 0 bytes .../textures/blocks/rubber_log_side.png | Bin 838 -> 895 bytes .../textures/blocks/rubber_log_top.png | Bin 0 -> 838 bytes 5 files changed, 7 insertions(+), 4 deletions(-) delete mode 100644 src/main/resources/assets/techreborn/textures/blocks/rubber_log.png create mode 100644 src/main/resources/assets/techreborn/textures/blocks/rubber_log_top.png diff --git a/src/main/java/techreborn/blocks/BlockRubberLog.java b/src/main/java/techreborn/blocks/BlockRubberLog.java index 1eb071997..05d479370 100644 --- a/src/main/java/techreborn/blocks/BlockRubberLog.java +++ b/src/main/java/techreborn/blocks/BlockRubberLog.java @@ -87,14 +87,14 @@ public class BlockRubberLog extends Block implements ITexturedBlock { @Override public String getTextureNameFromState(IBlockState iBlockState, EnumFacing enumFacing) { if(enumFacing == EnumFacing.DOWN || enumFacing == EnumFacing.UP){ - return "techreborn:blocks/rubber_log_side"; + return "techreborn:blocks/rubber_log_top"; } if(iBlockState.getValue(HAS_SAP)){ if(iBlockState.getValue(SAP_SIDE) == enumFacing){ return "techreborn:blocks/rubber_log_sap"; } } - return "techreborn:blocks/rubber_log"; + return "techreborn:blocks/rubber_log_side"; } @Override diff --git a/src/main/java/techreborn/items/tools/ItemTreeTap.java b/src/main/java/techreborn/items/tools/ItemTreeTap.java index 7dec178df..1596557e1 100644 --- a/src/main/java/techreborn/items/tools/ItemTreeTap.java +++ b/src/main/java/techreborn/items/tools/ItemTreeTap.java @@ -32,12 +32,15 @@ public class ItemTreeTap extends Item implements ITexturedItem { @Override public boolean showDurabilityBar(ItemStack stack) { - return true; + if(stack.getMetadata()!=0){ + return true; + } + return false; } @Override public String getTextureName(int damage) { - return "techreborn:items/tool/rockcutter"; + return "techreborn:items/tool/treetap"; } @Override diff --git a/src/main/resources/assets/techreborn/textures/blocks/rubber_log.png b/src/main/resources/assets/techreborn/textures/blocks/rubber_log.png deleted file mode 100644 index 8bb9ac7cba7d9d6df7c7bf7447e5647538fb5f06..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 895 zcmV-_1AzRAP)<h;3K|Lk000e1NJLTq000mG000mO0ssI2kdbIM0000WV@Og>004R= z004l4008;_004mL004C`008P>0026e000+nl3&F}00009a7bBm000XS000XS0e@s) zkpKVy7<5HgbW?9;ba!ELWdLwtX>N2bZe?^JG%heMIczh2P5=M`;Ymb6R5(u!l50=e za2Un=C6*;FaW8bv%S=F2U?9{M3Y0=AEyY49^pCV$<WejJEvRL3^ES6-y17kfwz=)4 z$v)uv=Da&6=lPun!ko{VB6{^^d)#Cgbmnd>0cLgFN$%#6YR26XeX5M-7^jqQae)<q zvO#g=MMuU};JZDo?gC%C7%Xx2ZFYUAB}~s@J;q`SdzEOFM`&aTP);Zlw)UG$KEA4L z`(wyVs}yJeCl^`XtCD?{?N*|CnW*xfM%Gu)_{*tHC{0+h@zo0NR&sFA@$|Sw^_$Vc zmi_byguSydWbXH8eWY<2!dl_rrs#(%Y1i3-&=58TjaZRg8>qCQ#B=m|4Pd*aNUKcx zozwpw&PmVQ*Ar#j=Afu&`qNl$0r>lgoTrv=&ueBFU|dofF6B@;{hEu}Da?wy=l9FB zx*dQB*VNmCj0%u%qmoezUmgl<a8Z@R67MZ>UbPUUe9KY9in$jA%6(90AwIk~XeD|@ z{Jk!8Wxt_BBk**4Csf#S31N%LN~CQ$dIPmT=SZi-p^!*fAMg7nqANo@R>%(qUtq0z z9j|A-8RFG`88s9FQ0rp+b%wMj0v1T$iG1kidu9CYY)3DK25M5IEK0%qcyCbN*-jBN znq-z(0ddcul}qC`s9&W%jf(98dfH*zV&LK3zPZk1Z);d5^Whau3Jx^-%SkOyBUK?1 zbj(2AO5~j(n(TjGR*uS%Yon41Sto6F)F8S5y%|WuPVCpmZW6akT+qB5n&>IL7S<d1 zUJ1Q9&YP9U&DrY-xEW=Yw8yB^7e}JZ!391<pf-^3LO-rFv*kfO^yj9TBQ5WbB?4VA zv}CVJ4itXe7EJaGwgi$0Pazq?4)u5Gp~{pP+eBkRj;Y=b<#)XVNw`;z7by4jP#$V2 z+PBCNjzrKQ(=cQv{k>{m8{ndw!q%Rc2GYBbXW&|DBaO|Q+E)_hpC&LH0b9sT+kf_0 V8<p6&_{9JK002ovPDHLkV1gCBm4*NS diff --git a/src/main/resources/assets/techreborn/textures/blocks/rubber_log_side.png b/src/main/resources/assets/techreborn/textures/blocks/rubber_log_side.png index daa1eabba0adb5d1da75ea3b0f8f964b07465e19..8bb9ac7cba7d9d6df7c7bf7447e5647538fb5f06 100644 GIT binary patch delta 784 zcmV+r1MmFC2LA?-SPBsU01FWTe`H^gkzyx*;Ymb6R5(u!l50=ea2Un=C6*;FaW8bv z%S=F2U?9{M3Y0=AEyY49^pCV$<WejJEvRL3^ES6-y17kfwz=)4$v)uv=Da&6=lPun z!ko{VB6{^^d)#Cgbmnd>0cLgFN$%#6YR26XeX5M-7^jqQae)<qvO#g=MMuU};JZD4 zt?mL}yBI8S_HA~3s3lC#VLirT3wxDll}Bh~2~bWb6Snr7Og_G<ZTn-$Osf=V04En& z-m8**mF-rddYP#5o<`PJ&-lx!O(;!Rvhmdl?^bef(DC%RMfID}!j}E?2!y?}F=X!d zXMLn`8NyoO;HKz@Drwi*fzS{(28~#MkzE_8w4uav^m+|oyQN60O!}SE{~pds&)nA& zW!&bVsAu}qSZ)FM`-z;VmT%8%W*A^xQW`GhP&xgYi`gm6io56c%e1;3fC$&r+k=b> zkZ+@sQ43!l3T$vumBSM6EpcA85Tty|QN)V57X-?EP-h`Nyf|njdPV%bE_7vozoA4U z@N|18RM>I}VT;L1q-{BR1GPWrNT<Z1kVsh{@B1dAD?>b1$PWfzV6A!`uV=j(;?;f` zH539+>tg(MhO{RF7D(TTeCX$UW&G}JM=yp3YEq;uO2PYhZ&2RZP7yPjWR_R~anGQY zOXD`EU!^{citPe=+F{#b;NjhWzPZk1Z);d5^Whau3Jx^-%SkOyBUK?1bj(2AO5~j( zn(TjGR*uS%Yon41Sto6F)F8S5y%|WuPVCpmZW6akT+qB5n&>IL7S<d1UJ1Q9&YP9U z&DrY-xEW=Yw8yB^7e}JZ!391<pf-^3LO-rFv*kfO^yj9TBQ5WbB?4W0FtlW^N)8l$ z+!jps47LQ42u~py!VdL!>7mM$7~4c+LXN544&`^f1WCA8ju$BR^-vyaDcZNl5spOA zA=5BqCjGr?UmM_}o5I$fm<H0jkZ0gpY9o!!o7z_r=AR}o8v$F$P1}F=SR0ktxcJ2Y O0000<MNUMnLSTYXfPYK? delta 727 zcmV;|0x13e2F3=ESPBvV01FZU(%pXikzyx*s7XXYR5(v1Qu|MmVHkb?ht_JYTBSBI zn=rC4NkI}SK*CQXKva;h6!6jo7huzoKv`BQj9F2sm1T+7lJJs?#4yUD?0&V|FRiwI zZR<3)ci+DE`JQv0bI$V-il0(jmfLDoJL?KvwFN$>-fP#&1<4+VUSE{aT(7XzP;w!E z-K6G~idi~p3n|D=e%M_&e|2}*C;2f|^Cf7AT~|HnReT!T7wwTfz9Pq`*$cZKT`u|= zI;fRq619+VuTzNX{d3}pjy!;Ip5IWv9@M@WDn}n!Ui!;`{2ZvPRC0+*M92NrfM&5@ z6m%p-y_@Dd8^dk%*>*<Y=-O~cdg#=D2E4!MFa3CXZ=EKORH?Ec1NZ4x8dL%KeX=@q zR`lUk1y~_w@lF*0-zH3Waheq*KYP`}&63Ea0)NA@cO!dHMK{D?ESdm#KdPT>SvTbo zJh&)5pc4>LR>IS3%D2P1=@Y3i1FwF|^3a*Ih3@R2D-lD`7jZM8=UHEILv;~<DHf(e z1Bf9V7NKq4#{&JdcL#{kH0a74YD~a1AoU6!(MTD;!}Ulo>`upone+Kj3?)F0+1Ee` z<P9HLff&Ie6VQppAP$`7!UF(b$BoEzta&vkgU1p_?JNI8EO2<Yg%-D@+Q}qMMkxXr zZ{HU4u|YiGWI-;n`ZZ&Q0ZfK}y{Y3V!8RUdZf7MDYn2#id<eCrVR!MpLOKps4kR|X z(36esxh|?i$|f$05~aT}JC+3*Fwl2+$^VEPNeCMGz<RVZBc7yImP5MShropC;D~eM zM~eRx7>o4K3Pv2{rWS1`P5UW$fGU)r2YWyOBQ0z!5gibT3b?=sNfi`AhuDmgUborP zs6A;_@-vp&3{puBt-O$9Qf^i8Q}Ar6l~K9tWqhWHLzi%w{{Rsuneih>gns}4002ov JPDHLkV1h62QlS6< diff --git a/src/main/resources/assets/techreborn/textures/blocks/rubber_log_top.png b/src/main/resources/assets/techreborn/textures/blocks/rubber_log_top.png new file mode 100644 index 0000000000000000000000000000000000000000..daa1eabba0adb5d1da75ea3b0f8f964b07465e19 GIT binary patch literal 838 zcmV-M1G)T(P)<h;3K|Lk000e1NJLTq000mG000mO0ssI2kdbIM0000WV@Og>004R= z004l4008;_004mL004C`008P>0026e000+nl3&F}00009a7bBm000XT000XT0n*)m z`~Uy|7<5HgbW?9;ba!ELWdLwtX>N2bZe?^JG%heMIczh2P5=M`s7XXYR5(v1Qu|Mm zVHkb?ht_JYTBSBIn=rC4NkI}SK*CQXKva;h6!6jo7huzoKv`BQj9F2sm1T+7lJJs? z#4yUD?0&V|FRiwIZR<3)ci+DE`JQv0bI$V-il0(jmfLDoJL?KvwFN$>-fP#&1<4+V zUSE{aT(7XzP;w#Nq~?{1SvqP9DacKJ*j+e(b$8e&`7u@VC1{9US3T)fd>Y#q?U6mc zBFCrM3%ed&F8UcdsFh|CwUBYIQ;6#QbK;4PJb-bY-%!6E)V>)iM;};T`pba)9H^{R za*0Yr$NklSX0cxsbR<Q+o8~+l!)^50c1Gan+HgmD=+p+hzvwUhczbW1CXZC9vLFNZ z=~fz40r`EhI&@a_;Z_A$A!hMT6#(BROn7mc6(m1<)xyn^$fW{*!?JfHdr(C;#9%C% z0C+#DpKMt-<q<r%C_SJP5K&gb(`(AN!@B7csW1bte#`REnY4xO?4T<VL(ms-Goj~M zUvWcq5h)g?LIa2)9TuT&-p2y{w08%H(KP7F9BNF!G$8c~9??h{zr*!NFzimpgqidC zPz)tNj@j2h3FHkQS%DbAA`{Sw#UKux=E4I2U&oEebgX$bD1*lmN9`;BL@aQ4w}lqB zq}s_OO-3mK8E@Yf^RYoZ;ABBAvidb+h5<~5y{Y3V!8RUdZf7MDYn2#id<eCrVR!Mp zLOKps4kR|X(36esxh|?i$|f$05~aT}JC+3*Fwl2+$^VEPNeCMGz<RVZBc7yImP5MS zhropC;D~eMM~eRx7>o4K3Pv2{rWS1`P5UW$fGU)r2YWyOBQ0z!5gibT3b?=sNfi`_ z*o=~1x7pLEJ!w_)GnU#6Qb`W2ypUs3ZdLJ9@NBA;QMv17e5Qy)mvEW?01+pd@gqls Qe*gdg07*qoM6N<$f?zvo6aWAK literal 0 HcmV?d00001 From 18a89d1e082be483a40aa0f467ccc6bd59e44e80 Mon Sep 17 00:00:00 2001 From: TheDoctorSoda <thedoctorsoda@gmail.com> Date: Sun, 21 Feb 2016 14:00:47 -0800 Subject: [PATCH 2/2] Update electronic circuit texture --- src/main/resources/assets/techreborn/lang/en_US.lang | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/resources/assets/techreborn/lang/en_US.lang b/src/main/resources/assets/techreborn/lang/en_US.lang index b7e8215f5..cc9f89902 100644 --- a/src/main/resources/assets/techreborn/lang/en_US.lang +++ b/src/main/resources/assets/techreborn/lang/en_US.lang @@ -573,6 +573,8 @@ item.techreborn.part.thickNeutronReflector.name=Thick Neutron Reflector item.techreborn.part.rubberSap.name=Sap item.techreborn.part.rubber.name=Rubber item.techreborn.part.scrap.name=Scrap +item.techreborn.part.electronicCircuit.name=Electronic Circuit +item.techreborn.part.advancedCircuit.name=Advanced Electronic Circuit #Tools item.techreborn.rockcutter.name=Rockcutter