From 86fc2ddbf312490847faebd414d3691a3a29937a Mon Sep 17 00:00:00 2001 From: Bernhard Bonigl Date: Sun, 5 Oct 2014 21:04:11 +0200 Subject: [PATCH] Bowstring Textures fixing --- .../textures/items/longbow/_bowstring.png | Bin 314 -> 315 bytes .../textures/items/longbow/_bowstring_1.png | Bin 360 -> 365 bytes .../textures/items/longbow/_bowstring_2.png | Bin 363 -> 347 bytes .../textures/items/longbow/_bowstring_3.png | Bin 166 -> 179 bytes .../items/longbow/_bowstring_broken.png | Bin 161 -> 174 bytes .../textures/items/shortbow/_bowstring.png | Bin 304 -> 305 bytes .../textures/items/shortbow/_bowstring_1.png | Bin 339 -> 353 bytes .../textures/items/shortbow/_bowstring_2.png | Bin 371 -> 347 bytes .../textures/items/shortbow/_bowstring_3.png | Bin 178 -> 179 bytes .../items/shortbow/_bowstring_broken.png | Bin 174 -> 175 bytes .../library/weaponry/BowBaseAmmo.java | 25 +++++++----------- 11 files changed, 9 insertions(+), 16 deletions(-) diff --git a/resources/assets/tinker/textures/items/longbow/_bowstring.png b/resources/assets/tinker/textures/items/longbow/_bowstring.png index cb478b8272a39ab76db7e4c0de78a54afc9dc90a..d4e08f37038431582bde460da222a9203a8a26a9 100644 GIT binary patch delta 177 zcmV;i08an90=oi`Uw;Y(5;zAB*I_CE006s5L_t(I%VS`m5HOOW*waiDg}?pOYr+Pg zYjQ9YVz~eOJA(_~Izxt^9D{}&H-`MaeF6KC-!~-&cv4oBoM_LuVj006p4L_t(I%VS`m5HOOW*waiDg}?pOYX%ll zH8~gxG2DOtok3BOli@d?{(lxi8etk37#J87B{>=9Z-2tTz`($8=bPpKJ$v>rGUCz< z(|F**TNJq)kG?XvxVZe^vu6(@PMbT^)fqDU-!~*gUQm?egeOn3 evLz|bMg{<1c~je=Up*860000T&VEUB$hrV~W45KFO))k0$a3{E%fy#2nJorOQ6QKxwB zTB-bWepFxZ4b8@FF84Q%Z8BNyW1|Yx0Dxng98Na?mfK@2gnwulMX&}n01$)_U0+Bk z%PsHLLpF;Zqh2d>E~P{%73;iNq#T4#qU$RI`@UbUUZxDB)N`%Zg;Oo)Y1gscEZc!3 ztdxp{5ShI(l5g(VCPA2nwe38(u>Z<|egB2IYtiqR1mTnJV2bB?)vC!BwEgAw_%oP^ dU+m_^2OHvMa1f7N@1Otx002ovPDHLkV1n=pf?xmu delta 274 zcmV+t0qy?n0_XyeUw;W03oQg!PrK;=008JoL_t(I%cavXiUKhd#_|8iG=s2(AUGf{ z)2w!4BTQ%U8XK>nSJ_kSF>GEjwbhgsf*^v0SgM6ZY>Z^oaW=c@Lh>W;eM#V-Bk)n|oj<|gEO;`mj07&A9pZOMm)hRWq8h?ak*g^{cvK*G1BO+3s zfs3>Jz;bgetlzLv)c~O8i&gb~V6#bwUZ?)FX3G{4Q;NT*U2j}y!KUp~cJ198aIuKo zgL6md-gy#7WO)(WvR~oS{wo7}{0rk@lh0N}mLF(;r2y5Zx-Ho9SEuyX@Ks>uFW>nJ Yi9Krka@QH~01E&B07*qoM6N<$f<{(@G5`Po diff --git a/resources/assets/tinker/textures/items/longbow/_bowstring_2.png b/resources/assets/tinker/textures/items/longbow/_bowstring_2.png index e9e02e078274c73280a64d2cc7bd67c52ca350f0..d6681c652dc2fdd38e1ecb25311693b407f874d4 100644 GIT binary patch delta 260 zcmV+f0sH>z0^0(RUw;Y(5;zt7ZV+Ms007%bL_t(I%VS`m5HOOW*waiDg}?pOYX%ll zH8~gxG2DOtok3BOli~i0Z@66m(+JbRz`($uD9On%fBO@-nj4S4VmH9kOcbv1z=gLc zayK4*WpHtEVW_IA`tRiA#K=NO^NmMeQRH1*T=4t1GhLk_!+lSVK|_ukLmsAi-@bkS zVPZ_^ityRIXU`toE`ZsN&t?}F7ZlquTmTDgY&H{>NYMR`>|AWNqi9C=0AQm;07p4axxsaz`#&dRYjCW41g{Ahyeh8#BOS6A(Ku30000< KMNUMnLSTZ&^?MNj delta 277 zcmV+w0qXwS0_y^hUw;W03oJYMGN+XQ008SrL_t(I%cYaO3c@fHg-@kRa1#m^q|!xQ zT?%dvS-SWd`YJv}AEQf#&Q2Y>6-q%tI#$QJn2?yHKX|v~-Y@6m-URqFoGHa|dFT^lx%JK(EDqogCP`~CX9?~AzyyoG5Jw)?OM)zKu-Y7iVjrkEknE2FwJ?ou bOnd-P{cj?yH4bo500000NkvXXu0mjf0zi84 diff --git a/resources/assets/tinker/textures/items/longbow/_bowstring_3.png b/resources/assets/tinker/textures/items/longbow/_bowstring_3.png index 8f76ed1e612007e1ce56831ee6dabc9fa9e1a512..8ea152791c57b6400c6d22d89f24351cc00be127 100644 GIT binary patch delta 106 zcmZ3+xS4T+3KwH>kh>GZx^prwCn_3*-s55wvM`EFS<1=4z+mj@;uvCaIypgtm6`q9 z+uPsgHv&PXL+H4SG)}= zJa|CbVdDRli)Ky~;jRAmCQ;>gTe~DWM4fJrg2% diff --git a/resources/assets/tinker/textures/items/longbow/_bowstring_broken.png b/resources/assets/tinker/textures/items/longbow/_bowstring_broken.png index 8ccc79df47f7e5542f99819d66044574bd762de6..70cb036f6accc2d9e420aa7bad435602c29bba39 100644 GIT binary patch delta 101 zcmV-r0Gj`y0j>d%Bnkm@Qb$4nuFf3kks&Zp-U??>}DulC2qL07aTR)744V%!JH=g*LiooB@Vz0I8bc2EgK6QIeA+%{cu}Fu<^R r0p@>_Y(_Q!=6q5#qX2BtM+^V}BC}HfYe8ed00000NkvXXu0mjfVb40K delta 136 zcmV;30C)ef0c5II2jIHc*`K8X30=hRYllV kAY3jW##XEVTl5hF0Ln~fCdR{8-T(jq07*qoM6N<$f@0H91poj5 delta 168 zcmV;Z09XIv0@DJJVG9v36*loCGXMYp(~)dee=s&S{@>Zz$%s{RXSzB=hMydRh8#DB zyo-wqLwR}me;A($pUpQOeZ|ncXU`t|0fx_J1_lNc+p#*GRLv+}fQ2?m&c^3_n9cZ{ z&Vn50ijtfR2QHx64AY1;%5eFgV1S{!0NMYrL}F}gjNevt17Oa_nZgJGY|%#y008hn W5@F~LMf>vr0000#Sv)4;&Mz@R9}$uNKW6S$fikG^6zz|%|=uJOQyw4+c8`K3vFyR6O~BN{f_KhY__9lM)v};v+-)i=6`fQ zCa&mIQn_u7tC`xiN9Js*1P*qh$ltv7IE&7N70Di=7YG@&oP5=M^07*qo IM6N<$f}K=)>;M1& delta 283 zcmV+$0p$MM0`mfpVSf=Y4!o4@-v9sr^GQTOR5;6}ld%qhFc5}+3=45HA(6yjSk%=t zA#roKg~ivw+r4#s zxx@Sw+HYqlu1|Q5h2r)YcfcS60N^wFD?d#a3ApmzdhV4KVxXXb@cl`RYzzzxMxHK?Ar_~T6C_xf*-xE5{omLC2zXb#4JkZ$K-yvA s|CNhoP88vtJ9lo6%Wap5!Jdo^s&9poRB!!=1?pz-boFyt=akR{0F3G&vH$=8 diff --git a/resources/assets/tinker/textures/items/shortbow/_bowstring_broken.png b/resources/assets/tinker/textures/items/shortbow/_bowstring_broken.png index 84f13dbaba64932b34fd6d97b3094fd9d52c200b..722baa87af8d0e233dfbd25165e1537de0049af6 100644 GIT binary patch delta 85 zcmV-b0IL740j~j&VNMb`8gF5tfqnb-{im8{CQ4nyG~i*t rMArZ#*+8;w-?wkye~L5@tz-=VUwI%wl;?iL00000NkvXXu0mjfo`)gL delta 84 zcmV-a0IUD60j>d%VNDS*5iy+LDgXcgE=fc|R5;6HU>F5tf%5Y5|5Ve=M5$|-20RRy q=o(-o8%Vb8<>lr7DbhT&k~ILId>8K^81%;g0000 custom coloring - // todo: move this into the custom material itself - int mat = stack.getTagCompound().getCompoundTag("InfiTool").getInteger("Handle"); - switch(mat) - { - case 0: return 0xffffffff; // string = white - case 1: return 0xffccccff; // macig string = light blue - case 2: return 0xffffcccc; // flamestring = light red - } - return super.getColorFromItemStack(stack, renderPass); + @Override + protected int getDefaultColor(int renderPass, int materialID) { + // bowstring uses custom material + if(renderPass == 0) + return TConstructRegistry.getCustomMaterial(materialID, BowstringMaterial.class).color; + + return super.getDefaultColor(renderPass, materialID); } - */ }