From 1dc0a57085e24c1ecff5b9b0b11a789b15075e7e Mon Sep 17 00:00:00 2001 From: Robert Sosnitzka Date: Wed, 18 May 2016 12:09:35 +0200 Subject: [PATCH] Better texture-colors for regular metals. Added bismuth texture to tool. Fixed explosion of tiberiumOre. --- .../ztic_addon/blocks/BlockTiberium.java | 10 +++++++--- .../ztic_addon/proxy/ClientProxy.java | 9 ++++++++- .../com/sosnitzka/ztic_addon/util/Utils.java | 1 - .../textures/blocks/bismuth_block.png | Bin 15645 -> 16156 bytes .../textures/blocks/bysmuid_block.png | Bin 16221 -> 16214 bytes .../textures/blocks/dyonite_block.png | Bin 16253 -> 16350 bytes .../textures/blocks/eternite_block.png | Bin 16332 -> 16265 bytes .../textures/blocks/ultranite_block.png | Bin 15734 -> 15675 bytes .../textures/items/tic/ultranite_ingot.png | Bin 15853 -> 15853 bytes .../textures/items/tic/violium_ingot.png | Bin 15861 -> 15861 bytes 10 files changed, 15 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/sosnitzka/ztic_addon/blocks/BlockTiberium.java b/src/main/java/com/sosnitzka/ztic_addon/blocks/BlockTiberium.java index 85255e5..560958c 100644 --- a/src/main/java/com/sosnitzka/ztic_addon/blocks/BlockTiberium.java +++ b/src/main/java/com/sosnitzka/ztic_addon/blocks/BlockTiberium.java @@ -43,15 +43,19 @@ public class BlockTiberium extends BasicBlock { @Override public void onBlockDestroyedByExplosion(World worldIn, BlockPos pos, Explosion explosionIn) { - if (MathHelper.getRandomIntegerInRange(random, 1, 15) > 10) { - worldIn.newExplosion(null, pos.getX(), pos.getY(), pos.getZ(), 1.3f, true, true); + if (!worldIn.isRemote) { + if (MathHelper.getRandomIntegerInRange(random, 1, 15) > 10) { + worldIn.newExplosion(null, pos.getX(), pos.getY(), pos.getZ(), 1.6f, true, true); + } } } @Override public void onBlockDestroyedByPlayer(World worldIn, BlockPos pos, IBlockState state) { if (MathHelper.getRandomIntegerInRange(random, 1, 30) < 3) { - worldIn.newExplosion(null, pos.getX(), pos.getY(), pos.getZ(), 1.0f, true, true); + if (!worldIn.isRemote) { + worldIn.newExplosion(null, pos.getX(), pos.getY() + 1 / 16f, pos.getZ(), 1.1f, true, true); + } } } diff --git a/src/main/java/com/sosnitzka/ztic_addon/proxy/ClientProxy.java b/src/main/java/com/sosnitzka/ztic_addon/proxy/ClientProxy.java index da57024..dbac5d6 100644 --- a/src/main/java/com/sosnitzka/ztic_addon/proxy/ClientProxy.java +++ b/src/main/java/com/sosnitzka/ztic_addon/proxy/ClientProxy.java @@ -7,10 +7,13 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.item.Item; import net.minecraftforge.fluids.Fluid; +import slimeknights.tconstruct.library.client.MaterialRenderInfo; import slimeknights.tconstruct.library.materials.Material; import java.lang.reflect.Field; +import static com.sosnitzka.ztic_addon.Materials.bismuth; + public class ClientProxy extends ServerProxy { private static void registerBlockModel(Block block) { @@ -53,6 +56,10 @@ public class ClientProxy extends ServerProxy { } public void setRenderInfo(Material material, Fluid fluid) { - material.setRenderInfo(fluid.getColor()); + if (material != bismuth) { + material.setRenderInfo(new MaterialRenderInfo.Metal(fluid.getColor(), 0.8f, 0.2f, 0f)); + } else bismuth.setRenderInfo(new MaterialRenderInfo.BlockTexture("ztic_addon:blocks/bismuth_block")); + + } } diff --git a/src/main/java/com/sosnitzka/ztic_addon/util/Utils.java b/src/main/java/com/sosnitzka/ztic_addon/util/Utils.java index d958282..408fdb5 100644 --- a/src/main/java/com/sosnitzka/ztic_addon/util/Utils.java +++ b/src/main/java/com/sosnitzka/ztic_addon/util/Utils.java @@ -16,7 +16,6 @@ public class Utils { public static String PREFIX_ORE = "ore"; public static String PREFIX_BLOCK = "block"; - public static void registerBlockWithItem(Block block) { System.out.println(String.format("Register Block: %s", block.getUnlocalizedName())); GameRegistry.register(block); diff --git a/src/main/resources/assets/ztic_addon/textures/blocks/bismuth_block.png b/src/main/resources/assets/ztic_addon/textures/blocks/bismuth_block.png index 5f5e499a7491b75957440c171a5b4ebec2470e58..c9fa1b57aaa365d17f52cb3811f87f984b771ce7 100644 GIT binary patch delta 961 zcmbPRHK%TZ1(WrRjaIeHToxgQhE}HLRwibX4>H>zbJ6k3QVU29lIku+B=h?Y7 zKjg4BWa;>Qp=Gjym45v{PZ!6Kid!aUPUlI7GBiA_KbF4k&^z3U)i4wod*Q+_O(Uc;$>Ky{x-G&M8;7?Q7P{*Vhx6+}#mYzexGK?xp73 zHGA4uFTL?p^z`cVkSl_5H(WSw%;1X5`B1k#vd#bHF|}Xw%#Qvm>b!l|HRtZ4*?duw z3yztc{it4Xl}#g{QRU{Ez$=u& zqUxO-`@?T{pQvQ_J}c1XV9vvGN`d8JbYW`TgJ0PpyP7^W6zy?wQ$4Enbd}k`>1Gp43a(E1e{*&5HgU_hA7u_s z>;0A8l=t(5kCNG>6)zlTd8R4g(cgSwNm5&m&}@yO z9cFDQo=wa2FW#S7YPRy2)72B+^6~EkrKB3~sg(WlIigy&L#e}vji=&7(VmBb`%P5* z7AVW?>`&giz^MLh!S#2=?sF$+G-PwJMfObtu*iOO*pXHsoemPiZZNI)#pIGcY$s1z-`55@mPG?td T*dE2ez`)??>gTe~DWM4fzX+_F delta 776 zcmbPJH@9kn1(W5yjaIeHlf5~FCZA+B0n_{}QzyS+SKEAwC5&bBEv`QXEFtGwswdyF z*00~`>EaktaVuqlcfNEeL+k#X#mDy<&%5H8d^w_Xf|Q_xLWDvc6L+0heGekp6B}_MO3uxUcNc^XpVm7vv~L7haOWMG&52stz)@@-195Hxm$ERn$>cQh|FW?hJCy53NK+Ijo0DNgmrznvE~ zdRbyv9&9u*A=bgte~a?BS=B;??dd1}d$2^h7v8S!6loUxDsQh4+OE>+lKlTI!-TGC zohJTgoJWKiRv9Vxd4=siH$ng0dd`K%_qCd63Ir-0owM}S#{BwaIiI>b>yDhfD|zZ~ z)B5ufH@)ZmwK%r3f1>)fC;PT^T= zkCPlNZ)1fIGdgCJ-R$bUv*FXkYg;0+I~k8v`Ux0+ialA~&1cB6K}?b5QdBo5pJJ2` z*FklT_aE>jA_U&P(61*wZmh=gcAmmLPA1} zn-mf@rrKotufMvrhAHmfk<-`hr(M4;Bg)-#PE`1^iq!UObzRr0Z(mL(@G{i=`^3p0 z;jpKwI&{g=2h5yB9#8&QT}|Xkwcqfj|CuI3J;Q+=s|4S)pXU7~pk%!Ho8vn}$-OhS z+*aB#tzc=IdGtPB;!-G)ku5;vd63NP7U$Q`%hLe}$XQRaJNs*HPnFMIy? z{{1Z$Ml-MJxx`Om_siYVA$O78=<0$!yAyXAAI#A?bMwoa2QhY4{}#=dvcUEHj9Xp> z{u}jEbqvDl10z(`uWe%vKj*vE`UKD1Id@jyy|KO4S#ndk;{+3FA1~{9vrL%u$ zu=uz2&A!+@$5-3i7cCY`H4|NvF=^IJ#o|*=>gU?}7QW`>mg~H8SVvBNo}zK@;)u7q z4!2}4jB-e_XOmyNX4Z{BL-|+Bo?a1TxbErs`?hyoP27*%NjCKnF9cfd{Cu%>-tL39 z&gCVkFImF(D1Q3Vnu zwm5wID!1Hg1H((D*=9Fh=w3KK!@tyi8Rz#Wf!0%e=m zhW%Kf$lAHxIaw(Y4_m5 v+V2btiVjR*zj>a|e}8?gx)RfY{frDUG08kCm12Di3=9mOu6{1-oD!M<%V1a~ delta 791 zcmcasceifCc4jW)5JM9y6H_Y_i^&I>ZIHN|*;z^$l~arjjZ@8yO?4AZjVyJO%}o+@ zlZ;GEbW=@@P0TC}lhP7XHqT?d&q9pC$qTrUEtsssd3y6k?mq@BI<|}dP2OmuU!URW z;uunKOXc+GJP~&hh6~mCci*jg_wwb;kJ&P}C7N0yCdi-2e=_|O?;jRzvx!Qn;+wif zG=+ptY!Y|q>3M$h^7&U)F=Cd#oA>YA8D0BV%TRR5ix@*w-$j|*3r`h2nIE@TW({LQ z{lCA`3@i-s|I6Z2jy_;kwoWRmoBYzCZIgVx%UAVo9tMVlnCmRx&d=8UDX^%c(_8$W^GpAdIOMC+|lI3icExdYe?UuZ%t)J2) z_xpL8>$(`F)n&ML*P?;L-$Yd%d*)Jqe0zy9jy`TZi7g-pIV z&0HH$Ro_>;GRbjcS4Obu)@`y&it?7-4b1!T=FO_I_c zqL+0hK7R6f)$bqg_;>w(pO{hipm}L&c{k>8zdCaB0%wVBu%hzj>S@O>Kjs#C zSa{^?K5M@v$F{I0eN6sfxN23Wta$gryr`2h%pP;6)Ku)5STBCP^}g!K%S-tfuikTC z|Md{>wX!m4>yR$%j{A3>)EH@3Y^*6d68y+AWu{ZS$`p~Ew@aq#&6~S2*H?Pc>W2pp zFEtPlRG#$Xm&0ZeR>z$h%XrPIxc_MSr3qWAnw}_K(#81dZ`-%kzXjB-0&m@NToSk` z_0_Y=n_-R%+!hs{_ncc+U-zZ(`;XS=%cr}kv+$goH#0+_iOFTVcV#BK!;vW*3(j9o zzW?-T6XOE027_~%Yo)Rts+ecquM1O5&zRA+6 diff --git a/src/main/resources/assets/ztic_addon/textures/blocks/dyonite_block.png b/src/main/resources/assets/ztic_addon/textures/blocks/dyonite_block.png index 0dbce2440b3d33dab23dedca95245f36ae3782ee..12e43b7af42378c5a987a3a25dbe7ca01d4afcd4 100644 GIT binary patch delta 908 zcmexccdvfKc4jV%5JN*NQwu92v&jdUZIHN|*;z^$RV+->OpOc^Q*_f(EzERH4Na1C zlZ=y-b1}wfGM0ZTyZ=+v- z+tbA{q~ey&p<18NQVI4C%+Jf;*-rOnoOp>Xm6LN3V_u-PO4M7ibr-o`MeSM`ktYx{ z*Jz9HrJ}tD#7u8Sm?WIzjorCzj;Wi@@`CpXQ~Ba2&Sp}+IZIG@=XAd3f95^^`OSZR zEzk2@`>WcoI9}-I-hFv_Z(Z$`OSxUUru_4I*C<9PPub|RQ*er1_iba|S6+)J#(1y@HP`UJZ2QOeF7ZRz4$%Vb z2^vTDny2iEs8{m8@SI;N&YR2Cc|!32>&G9+w#qPERoKXTx_8HZ(Q@;TPj!BphRVk! zUf`VVX70Fap}+HX$5|Wi@T801VY7Ijuu|ajYJ=(e=Eka0U-(ibt|SMi=-y%5@&54I z<3+l6*a}Qvuv#ddd7At!aOanf7@vubx9?6&yWnX*SG)C})GpzA6OMJP*PBi~oN_?( z;2*6cp9RiOmS*f^+q-Llqph0j{O0e1Pb8jj?2yV66snBSI&%N!kL5hUM`zTz>9MIw zeL2L~d@ENfikGkPdsFs=8*SC0Gu9ueQGFJ7>kJ=;C zhzi!rihl$Tt^K;=pHAMhM_D^vigwsLzu(UDcjnRkDW~5u>Eup%$vflp@hhu$d=*;O zWf<7FQLATal9IFDjX%vRXa8;c=Wx=4tAB~7j(1XI(Nc%HX!Yq_DJ8u8_L_(Ly-QW5 zp0`(M?%Hp-(lDXm#*uR>bNnVPOnGPiv*)D!>_3Z7-k()-=gDNX@3XF~e&Kw1t?6Ce zQ$NbP`@gY$aolewaKX3k{oMxfZ?FH_-A&nfTUY?#c4jW~5F;ZiQ)4Rw)5!;!ZIHN|*;z^$Rm=>NQ%uZFlXWc%r%u@^u(>Bj%eZxYO%E{}wtU2K}PPXJcvw1)F9|M-RKkuEJyx&H@ zzRJ_ZF{I*F%p`x0U`Cna^WVSq{l4t!1-50*N{)iu-A6pm>Mj0|#Niq+QJT|du1Z}s?IYJQZHcc5r&`t7MP{CAy6I)}`*`W1 z-VYbEQdUj7R?n)o>gR8cvo$qmrW`!n#lkz|t&9Cd{~sNEQN3Hv1xjViO!M%SeCa^_mB3@&Gc=aYJinq{ z+mfgHhq18Y@-L~H92q}Kdmb&_5-c@yRq7v$#i>2hKKdKhKPl9l?!9wPu~Nq5-EB?h zUv|t{6zaaZ@Ag!mX~r*8_cUdc&n?l$rd6xEn*E$x;62cPFvw~yArImT{ zp}}Wo3GGfv4;PznZ8%4lpI7pRer?;2w?+QbfA6x{usD3WwbicD)ps}6ss4V?ATnY0 X?`La2A1z^EU|{fc^>bP0l+XkK+cs%K diff --git a/src/main/resources/assets/ztic_addon/textures/blocks/eternite_block.png b/src/main/resources/assets/ztic_addon/textures/blocks/eternite_block.png index 80a7254dc0d349847be416459df8d16dd6a0907f..cd92458ebde5213878fc5abd49281d319affb57e 100644 GIT binary patch delta 823 zcmX?8-&wz5J2RI>h@qjCsil>H(d2{7Hb~sf>?|dWDygZdred8T)<{-Nw&Fa!c|Z3b1C~99x9y(1-$uW_ z&C|s(q~aFK!QcMD=@RT8KG*wxZ$9YY?bv#WdoROQlMA=E&#XSzJ~J!!U!ilyVbaqS?Qh*RU(Zc^kZ!zN+d|}Jrwn7N z0=LP`XrI`C*cD4ocFj`V6{EiYp@N0qvHRUNOz*hUL#~Nxhk1#KE^V4INu_+k8fCxZ z@1$7kEja4-{;U74wq#YeYU~=${MDYEZ#6|*%Nk=p$QB5y4moId3kE!$hNqcjTC70uAX`#RP>Rlc;HzXWxI`%!` znxg2@RY7J_PkMeIIrt~{(fxoYS5rhvrNweXHYFZ&Q{$87=OZ2g5rT;UX z50_c&Q2piLdu-9#jMZD#PH~;@9N#6=u}vhp$=$~DqU+Ixh4yoE^iTxF6hiBKY7&uke+c-Awhl$C`cj zy|I2`yExKwEB_Z3cO~1Yv+5VI-Da+Hj&VP>66Xs?><{?bv~?em*oHA+3u$7lgn(hj)+G-PR*Rv?Oy$4>EiR1QsIjn zE#>Ykz4-0Xh($ delta 890 zcmeCIKU2S9J2RJYh@pv?|dWDi%p;#>QqQ=DKEP7HPT`1}3Ju z7AYx4x+X@c7RiaG28KzdW}D};zF{Fs<>d8T)<{-Nw&Fa!c|Z3b1D5klvxO$_x6!XZ z>FMGaQgMsrV6}H}q6EW-&%D3%JKRol%{(+|33sfCp?3LZlhSp%#+Nr(hM(=ybE%!% zq12QWaHB*rDr8FAlGrOY@80B`K37?O@AJO%pZ8pNzkKcf8!;y;!{n;Fe$Gl-w{XVo zz%xHj8QT@FT4xlSoU(n|vaFt*wg0YUr|ey-*m!G}NF5(qF8yi1$KLqp+K|K3q9(4J zBpo(E$wP3Nh}wjAjJ6Ikj#8>G9Cy5Yb^Ofs>aAa&-@fsl^CZJr&{)#S&+^2)(u2IdO}) z($n(ZTel{^J=7z7m;Ho7k8&CZJ13iC3`6;h2&U7F?(d(TKEBqUw_dKw^zY2+uN4mj zHY6@u5+v!mnB}j+rAf=59E*&UoRsDvmHy`Z?^8eLM!meNx2>c}cbnz@zE4}twk1nE z(q4OQ`{kOYhiCO~$k(lTdE{8m;=f-RqAhZKOtOAW_FbAe|KqN66>m*H|GRYi*M4Jb zt@q{OX;NO3|LqU9`<=Y^>%sGB*{Aihwe@ZOvoko=svG?J5&fKjfq}u()z4*}Q$iB} Do|uZIHR_EOS*%jLZy7&5|s2QfQwwY4)#vK9Xg&)`*UBd&XwQt(AKtZvwCFQ+j zS(?r?)@wOeo;)ctzd!SRU$gFcvE!egavnPxwjnf!H`;gQ+EB$yM_GDaC+I6Uuo{TP zrCKwa{grvMvw7`8xd)W}R^PAt1?}uk>E&af{8;qD3Y?i`jp^YUiG)Csf|CJ7fNi=6x#f z-Wjf)qPA>msFFkPr~9*VSDsteFZJ$uzL%%>FRr(X|L*O~TYQ_{OYWHS@6MoD6_J@; zKCX#}SSoH#_SCSvaZFxnX6t5`ljjA#cT{J3pB2f!9^|az^ImkBPs{c>ERUDz{_Xb= zm(5{)oOI`|eBA0oT2@D=ZFqh|Xq!p2jQW}B>i3x$jF`){63Uk^U|?Wi@O1TaS?83{ F1OR}1&B6cx diff --git a/src/main/resources/assets/ztic_addon/textures/items/tic/ultranite_ingot.png b/src/main/resources/assets/ztic_addon/textures/items/tic/ultranite_ingot.png index 0517e7dc0c3bef6e1c7db35fa3e72a17fd8aff7d..1d0393d0b57ec6e10cc5ecbfbf198ee250522bb7 100644 GIT binary patch delta 146 zcmaD`{kD3;c4jV%5CcOi14}DY%gG0sZIHR_EOS+o(^4%{%q)_0jV&xJb(1Yk(sUD( yjV*O8)6CM0lMT|$5)G3#pI~{zLX^tMavWCNh6o!s%W@qzWbX9azWKQ|8xsJhu`4kE delta 146 zcmaD`{kD3;c4jW)5JO`tBXcVQ^T`L9ZIHR_EOS*-k`vR+O^uCpjV%leb&V}djCB)D y4b628jnk40l2VcqjV+QkpI~{zLX^tMavWCNh6o!s%W@qzWd8WxZu4_%HYNZtVJaj5 diff --git a/src/main/resources/assets/ztic_addon/textures/items/tic/violium_ingot.png b/src/main/resources/assets/ztic_addon/textures/items/tic/violium_ingot.png index 6393ea2d9673d0b3194f7a3cbcfeb14f2c5d5379..b1dab28d98ae5031a23690b50de2821ec1d52c44 100644 GIT binary patch delta 147 zcmexb{k3|-c4jV%5CcOi14}DYv&jdUZIHR_EOS-NQxlC74J=Z1lM|E8bW==C40SDy z%uIBXQ;ZBPEzK>Bl8ur#pI~{zLX^tMavWCNh6o!s%W@qzWJ!88jc@Y{YhES*hJGqd delta 147 zcmexb{k3|-c4jW~5F;Zi6Jskw)5!;!ZIHR_EOS-Nl9LiGlPxTD%~O+&bdAhROm!12 zElqSS%`Hun4N{Gaj0}u6pI~{zLX^tMavWCNh6o!s%W@qzWNFA~TD|#&H7^qYK$t08