From 927db3c08839808683af03d6735bec8eade2e292 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 2 Sep 2017 11:00:38 -0500 Subject: [PATCH 1/3] Readd missing waterbowl textures --- .../botania/textures/items/waterbowl_base.png | Bin 0 -> 149 bytes .../botania/textures/items/waterbowl_cover.png | Bin 0 -> 299 bytes .../botania/textures/items/waterbowl_fluid.png | Bin 0 -> 118 bytes 3 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/main/resources/assets/botania/textures/items/waterbowl_base.png create mode 100644 src/main/resources/assets/botania/textures/items/waterbowl_cover.png create mode 100644 src/main/resources/assets/botania/textures/items/waterbowl_fluid.png diff --git a/src/main/resources/assets/botania/textures/items/waterbowl_base.png b/src/main/resources/assets/botania/textures/items/waterbowl_base.png new file mode 100644 index 0000000000000000000000000000000000000000..63d16ad6ba640c5f4761dce13b0d9605a4b695c8 GIT binary patch literal 149 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`F`h1tAr-fh6C_x-FowO#`M)u7 zktthr(Len!&)p9y817*^*==;tG})LTjf124N|Gr<+eS&I%N&OzcpEg`!a8~q;|^po x>{2}8*Os_v*2TR|>m-+7=9F~VbZj9zL(+qhu0cvkLxY>}0aWm1`H(dEf>frV zp|nH;5?NlQ8r0ZR`TIOV9B-{tZ7v)8|s_qrS0-8ckc>>4de?G20;JM+6mzdghNJS~pyeB4R)QOYhl x73miS<*$qe*A;%b{;I6rXmD literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/items/waterbowl_fluid.png b/src/main/resources/assets/botania/textures/items/waterbowl_fluid.png new file mode 100644 index 0000000000000000000000000000000000000000..524fb39bee985ecdd1af737fc730ddd95ee5d744 GIT binary patch literal 118 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vfzopr07W$*IRF3v literal 0 HcmV?d00001 From 0efc8e9fdba57ca770df3d35ba204c131598b8c2 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 2 Sep 2017 11:16:22 -0500 Subject: [PATCH 2/3] Get rid of spreader item model warnings --- .../model/spreader_item/elven_inside.png | Bin 15515 -> 365 bytes .../model/spreader_item/gaia_inside.png | Bin 15525 -> 364 bytes .../model/spreader_item/mana_inside.png | Bin 15419 -> 344 bytes .../model/spreader_item/redstone_inside.png | Bin 15416 -> 343 bytes 4 files changed, 0 insertions(+), 0 deletions(-) diff --git a/src/main/resources/assets/botania/textures/model/spreader_item/elven_inside.png b/src/main/resources/assets/botania/textures/model/spreader_item/elven_inside.png index adf3ae5edd8f9d4c34d6b5e44d51904d766efcc2..a0fd952ebc3b9056ed7053bc5643561a2eb8c48e 100644 GIT binary patch delta 330 zcmbPT`IbqsGr-TCmrII^fq{Y7)59eQNDF{42OE%-|NK93@^Wkadd>om$YKTtZXpn6 zymYtj4^URJ#5JNMI6tkVJh3R1p&&6cuS72|wM4;0&p^-6+&FK3GEmVuPZ!4!3;(kh z7jhj6kYIg~Z1|3~hPAn=sp*%B*g>@p=Ew-alowr&0x4JZB#y8Pq-~ttqr{eOuwz5P zUEAG{?GEr(J?O4~-tzzWf0e@TO;*ue4+45vT_plL^j6O5`{_`qsv@4sbz#v~p+)|7 zQcJR|jxo|u(+fFQffe(A zX(>54gTe~DWM4f66k>> literal 15515 zcmeI3TZkJ~7=Wh_YF(*T>J6Vls-o1hb31c28*P);T`{$8SGpC^o;h=7cWjbLGqX*$ zsEDlv6)#w!qEdYlL@3oKMNl8~$p;Gxm3plfyx;}&NfGo+CYxl>CdXBLJb~Th|Nrw} z<~#qnyv!pzw%@#N?8-4olGaU4mZ$0W+VpSjx%B^g7rp%${W`xfxjUAm3pS*GYozC1 zxI&U{AmPkxGF!RT#Zhe>`H@G)+qDKAElGtN+YN;Gk|gJmxv)Nw|K+WB^10BT$nP>L zN~KXE^Wo%yCfRvl`wTv?7dw9b#^P9^?a}}>lAv6>R;|Zwdm`V7>(bw;TF&P>Lz2A{ z`ORs<+-zk>t`s#%&KNfVR!l2rIpeBfSyix!fJd_GOo`*feH*61aw$6a=mqTEIeSshp8VNO2o`7{=q)lO+XmPwV= zNIi+EpE}g9F&`ySJRgln*)xw!Oy{Ih>E#|;Z>=^ob)0P7PZ4yH4)u&@78^vKCULaT z#ANG!`Y0QRJ$(`e{mEGtDYcBOowUOdZmA`6>$E~PLk0S*ZmCI75;bR{s9MarY{wG9 zT&dLQs@%1^!nz-|;_C`B>(Za^el$`>2`SQkw1A=mRi9B+7wWEN-8tZ&4Px9Yksk(& z1MW6Zv>8RAzOJflQdCz_vKRv+*%)-`_$WcEiZVEMAdZjSAZpf7QVeToj>wJrTtV(D z2S)Z9$}L6Js7cErMZF*oQxEkjM|dIa=*@LZVmc4;!2Hlz>a5u&e)0u=-pI>6D13b3Oi&$3PE z2YA)NJOu}y>RG@dh!&;803aMVKr>D3c)FumCR%kc3~kR>GzHN8UIQe65O@ahfngb@ zL3OHzS6`X0pa5F|rp!zNOdBHFBeoAz(}J4jlOS;XRaZt!A(%!3zK3W;2l@aJn@%ax zO;e|p*~W;+%u+1x^T9>LTP5kfQ>nO9^*BLv5lxkgX?KNbcj-!?W2^&mYJ z0&HLPpoSeQ@M%3O-23aH8+s{wH*}|Q|3&Bl_Z6XUYlig3fT{yydTZlfq!mZ9Nn^4b6jRom%Fjyhp(?p zyL@Vvnswz=7SelxOWT0fg*y1@{=P!j&zy~)O{cTE&>3%O3jN4x`oHTsXl7k^^IZqc ztZU!%j(V6B=?32^lu-|OrI(lNc-=|w*`#P1hHeyOR?T|s2-~DOTMp^*8mA3ucU@Th zP`}+H{08)0zigrg?!%q6lxgX0n_l$g-c5hSGV3jZ|MN%xf&R~^Oe~Rv0m2srEE_1#Q@=p0vDeTV->gFA7|IK8#i1Vu0{Pfs4apAI2(hF+ljDz{TgoSOqQy2wxPq_}%)7cTw0T(Z78=Z)5y(g$>R;FFdo_Asaq*p}rhh%9%^th!s#6#2yYJO|PaS>ayq!NKmuV;O z-~Y$wAANjc%Lm6cJ$ZU>Y4^6ur%yzGoPGG~#-6hm&g?n%#ie6kG=F~azK`$ubM5no zr;mU0?vLMn_WIqYU-{|NN55I8+-@Y-9l7}6B}aC>nESK!TT41ozUh)HU)w-mES99H Mt=r4Tx9oZ7Z~2JYqW}N^ diff --git a/src/main/resources/assets/botania/textures/model/spreader_item/gaia_inside.png b/src/main/resources/assets/botania/textures/model/spreader_item/gaia_inside.png index 3d3f5055c505b1e77c5e94d8fdcd73efdb42fe53..3f802f2386acfe68372426871b55bf108d7fa7b0 100644 GIT binary patch delta 329 zcmZ2l`G!fcGr-TCmrII^fq{Y7)59eQNDF{42OE%-|NK93@^Wkadd>om$YKTtZXpn6 zymYtj4^URJ#5JNMI6tkVJh3R1p&&6cuS72|wM4;0&p^-6+&FK3GEmW3PZ!4!3;(lc z&T}73kU9SG?|eQ!KN(Za#LtTrGmFB4oU8-1mv5bRcv4wlcDOlv`cL2ZdFSWZl%H=b z-|KhZF8*o#B7eR5mUkS>wy{20n;^&2c;4mXjIU3dO=UYgml`L$vVAd4>H#bBiPfSH zj3<6+zR=epX@0w4x6mDbe~T8u8L6T_d{q7>JZC?W(Z=X<{Kikl=FVdQ&MBb@01c>wrT_o{ literal 15525 zcmeI3Yls^~9Kg4TRj;-d#RnB6M2nR=+4s|2UQL(6$Rs>NHLGTHJSYJr}(kgzCeyE6#Pihqkf=>!Mo6RM;xnw-Wj}u5X|M}1V zF~9lGCzSlg_RuiLKo+nl^W?S2>IKaHHh}&IOF1(pgNpAf8v8|Ch&%{JN1%O zs*U2=U~GRKZ{NRl3hm#EY%hCzVJP2ph=U4_VWwFrS0kr6oNf7a$p55S%w}3$;=RM! zktASdx-^j)4eL0g=L~=(!_1g=PS#CRGjGi(lB|o8DykAtR7aB>P06%B*}@R{m#=%i zGg;i!4o9Tn>}(v@98qjE8o7p=3+pqYY}>XdDWakP(gQ^MsxfSWYII}jWZq8^N2ngu z;vlSM62H(5=i=dPHVM@Ew8vGcbplnRHakL5Y{Hr-=OnS8k%u}qwYhq^m70e{T*eh# zjU!?w_qD6dhH)6ph66%&)B^*PIVqJovHRv*sq_sU#T)M@2--;dT1Hd*YFM1aQ8-se zc;o$KC^z;SeH{4R$ywkj(G1KTH-iCYi6%8`l|nj0c`{aKw2omM)~CX-Tu7^IVjf{; zbhK4fnRPpZsuwn*Tk;}p(w*n z%q<`(QZ7M8?Sm{G55{mwUV8iX`05k!r zDDa$aP|cJ*4f#IMTv-RQj7B)R|Snp9EFBN?kMgr+B9pdniWNYzYW>k_+tWx=F2q39Bv)2lRkt*I$<8d*kTu`efDU~b_(-#XtzsDvwDhFDnVy^DyoN|Jr2RC30vQ4Gl<8ZQ=->Iz78LD@4bACU@hB~lOy z$;Y)^f}M<2k!_O{DL?1Vc zLX8E<{<3f3a&PS~+wpx1Tf6&9>uj&VdW4gcYdAZ9bagHR>6X#nI9ey515t7-D4^tE z!K8W?w06_#Smx6X!GE2=MdpKJG-h#iz`>MyX>}NEABBG0fOR}FL$>Ut9G9urg=Vz- z{_87kT{t!K#kzPZ^U1xyA!R`Ff-U@He_zzrjhyzMPNuUw*XnO768VU7^4m7;Rnw-s z*rvT|+O%uAqZ-5ovcb0!rJ8%JlFLhaylyA=Y+NvOUDfj<-Ar3d1WjC?E(YXyjgo@2 z+9q^+U%Ooc?0VYUcIia*+=p9hDQzXUZF12UJ2(AB%dE2q{?9+%0sWs|DPKGY1%xef zTx>p+mgAy;utkoG&4TzKE;b)Z%W+Xa*doWp=0j;YE(!=+ zDwgXJoH+jSW`F0+_O@g1ym`}8pRBn4 z!_`l1cw^Iv#<$w;&v$6c&piItH`Vg^<`=xvYft|8=>xCG_kAY3zU=o4<~8SUUiIC| z6Gxu?<)ViVUtE67Iy`mx4)gi5?n{?kcIe%s?twGbJoGozO4+vn diff --git a/src/main/resources/assets/botania/textures/model/spreader_item/mana_inside.png b/src/main/resources/assets/botania/textures/model/spreader_item/mana_inside.png index c8765746aacb495b6d07b3a4fbef2859859d2e3e..a60aa24951543beebcbe8b8b9e5265b845e3d6a9 100644 GIT binary patch delta 309 zcmdm8af3;*Gr-TCmrII^fq{Y7)59eQNDF{42OE%-|NK93a+I}xJ!gSOWHAE+w-5+3 zUb-L1P>`6JSE84fTB2a0XP{?jZk#ti8K`Kdr;B5Vh5y-$ z)?7@65-bn)Z@x791@E5T_78mD${ulZ3$A(Va*+GStv7ihjv{MxQVMTg?e%;%T}Gjm zuV#XhF^kiG;i)F|Q%cuHWqO3EE$Db?$G&do5B@t@ry{nVoRr+rKH*G)J;S=475qyk z)@>@Azopr E08Wp0d;kCd literal 15419 zcmeI3ONbmr7{^-?(G5!o1`|Yam>_DBntnf>ov^#JaThXivsuZm2wGiTz1wDHdNSRc znO#xD7l|T1P!x&rpm;D4@gO+}iC{z&e4c^_i3&=*L=P%@P^)KV=TSRTZY0MVnCbcI ztM6aczwfK6zVy-Qy>|`|-7q8w!tm5&euiAHNxs)yO@7aAJpDAeTw9r(j|5@Eb;ugZ!R%Z-SJ>mAu#|yb=;BPhR3W_uA-k(yf#@KPQ!ZWz$|LEE@1IGh0&gUJ zKrcvz$~ayOCReI>|H|H3v~m#HUV2w!zuhJ5!1z>!PHJsst3((IiJxQms!qH$?tr ztDf)7f~{R zszD_V!g4Cng>JYMkEGMdK|AVsakAI%|jwC z;u0>$5s8!g##I)>IE)s<0YkRk0|zEKDHPgc_nmL4)OYA8o;XYpw2=0VjAoZBSe(I8 zxKu@W;xM_DZT;>(4*X7XdXy5+z`5gkFd!`PG{YLD(9BSl+^aKQ#V`)5vtd}wHLGlT z6=7<8yirxD+YSU}FRVqkXGJ=slkbii&chhzNIjZBQh}__%Ce)Wj$+=^72oVcg%?6E z@Rz&74Ir7b5{cCuRo@}WjwCfTx_Z(YWa)S?hU-%4?%So~A;%A^B^c*|5?sJyrM!?8 zJB?jE+Xdx}hsCf;riF8AR_xc@H!2^ZrKF-q%Lqp#4^dZsNR}FFb__1`wyrvgL9V%D zcp(Zrr!%N#%ASUNA84+u16jrV7JpO9~<&1>u|6RG?`CRo5XfktUNI%A}4h?7C3VY|XVA8$fS(r-WP5tE0E1 zlUlnJ>8|iK(sxw@a>&DCSD)2#zLX*Q$gCM^GDx&&~hM34)PpI&H_xTr>C_ut#)L#*&+D930xCCc#PU2E)O_M znktPBgX5#nk87}sM;FL0yPgxSsoEPx%d?h5Z)#SHb!{rM$x-f*G9dGU4g6$FUeneY zx!Hd%NoR4X(ce@g@)70aw-ws$rbFl1q1|pev=e!EIf!#)Pi{<5;TJRp;2 zbFuw!zGj)V7s2KH)48F`sY+?_K`0<>ljCCZp}ZUy1%z#KTx>p+m*b*U;qE;b*^%W+Xa*e1ut=0kZoE(!?S|d?+u+MFC-(92c7p<>k02AZ(N4V)LQA92W(IZE{>} zK9rZ^qJXeXj*HEQ@^V}h5Vpz0HPm_C6_?37t~K&9>+kaq-A`VGO`*w|f*`EiA_$K> zCJ2B2L#`JDVM!8%pNZdjMG&@xFWmRhZqoO)sr=|{{hPM<$*+H-C1wbnVo;`SgkJUmn|V!ukz8IkoA#Gn>!+41YYshvGue)_XphrQ{S-dVZnt&K}RY;j}J{gFmvqW2M>Sp<7*#2m7P5LtoYaDsq){$!o7#oo0qnH Sy^~B-n3~v|KRI^)qyGXcExL>V diff --git a/src/main/resources/assets/botania/textures/model/spreader_item/redstone_inside.png b/src/main/resources/assets/botania/textures/model/spreader_item/redstone_inside.png index 5b3498b1a7e06cbdeedb20730688c3a5c3651bfb..874290ec9f8fa062f6184b73bfdcdba36609129b 100644 GIT binary patch delta 308 zcmdl{ah*xAGr-TCmrII^fq{Y7)59eQNDF{42OE%-|NK93a+I}xJ!gSOWHAE+w-5+3 zUb-L1P>`6JSE84fTB2a0XP{?jZk#ti8K`K7r;B5Vh5y-$ z)?9}iL|8AhuX7K7su$C=ckU16*50`j{6y|F+^=EV*qM;3cyL0-v69;)RGD*hsFPPJCC1wwM*O8c; zJI*LBX5(IY^3>YOu0koWa9r1xrA!esHeD5cFS{{=2dG(Y#knPGk8`cEwQ-%>DAfeg xyKldyDhOgSMIFf|D)j|&k961vM+Ag{MgdI`}+hzSUNnEA0gL8$#>BL@_TmK>4W65xH7aO5`-mpC*OI( zu~%0K!lSE#(Xn`}@PvcHQU-dVi!=37h4dDL?D~2IqFp#nxp+J%_opwv_dz-pc>U?^ zdO<2w2Ju8Nw6BV{?%O4LAfb<@<$bty%Xbx~49RRW6YXp*BTsn#c*>m&cN zRnK=u@|#-25vxBv5yurr6l=9wrlw}X>bNM|wk=AEs3?H+0MXuZ4C|mAt!|1;>Ev;Q zszD_V!g4Cng>E<*_ovgzK|AVvRZ6R%|jwC z;u0>$5s8y~##JW5IE*I3S%z%8XC0X2q)=#&-E+RBQqQ5Ic;g;|poO$&WHh?Bg2fRW zg_Bi;H|`;~vbxvZ$ARBT&NQXOGwa-OJ(wjd@ifC4rO?b!mfWi|Sj8|7tD|99%r&cQ z%M`-Y;9#SwQV(qp%3fHD9?pt%NGIPNHJpbr&XIaFfusUi9hGHAQys;8x+}ifi3%@- zUf}QT3O9gcj!Gm}b`*WBBs-GS)adF-YmlYm!5Gd-rMqvJj)xpStd?M$3rcVtirVDa{p7BR8htwGge&)O;5r=L$(Hxs+qvnB?L4Nsg?~b zh-78XV!E%p8a6$EJmdr0)5xS;h=Hm}uB^JMZfW+M#Vpm3HQ(2O4t*K;NV9>hVi_P? zg|2BCn&+cAiy_T&JxP%O*`gJIeN6+djy<58x}lRcSwV9b^Caja(?{es4GauRgCwn% z2V}$46ve~7Z+ml|8JP-3L=AW@B#O4?0f;S<1*jT^N@iy1u(w#Vb$V%b*FCGSldYmq zaE8lK3`yM&=W|Ix1f(DgC>xfAC4e<-kz3MyV5zzd5H=NG(KOjtNDgO&cS^V=JvDku zI;pi=k?sngA^l`EAcs6GcJ-Mm=UW+~hs=zjhJs{E*gJiNHnxPVc=zeiBip7QOWa0^F-WA z9*uF%&~;VMigYs_u_dVE;#fW)Ct{Qoq}2+c+k3|Cm?f^Oy%pC?U)LjSV=XmX$pbQZ zHW%9u=QEaBdlB5uKb;%8ovM@;AA|zJHaRXfAIi&dQ9#%x$HnGDc{wf$2;1bi*nB82 z$3+2Qn;aLL59Q^!C?IT;<6`rnyc`z=gl%$MY(A8ip+m*b*U;qE;b*^%W+Xa*e1ut z=0kZoE(!?SUX~S7XlSG$2>Tusg#8Bu z;qRN|`ime;N`i24ryw}52*SPL(Pz$WB7Khy=LbgXUp@b6|KoSSRU5zm`G$XKb$a>A zk$0BwUi|x+8+h5gfwiBEeR*nlC~X`#apB|l?>V{i<@47ocbUp(r@#2_O6KilPhCEI z^z)U!z4YzmriIUD-+jQizUIQQD_ehh>*_yuzOm=h4~I^EePa27A4B=q74t8Cc Date: Sat, 2 Sep 2017 11:20:10 -0500 Subject: [PATCH 3/3] Get rid of a model error --- .../common/item/material/ItemManaResource.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java b/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java index b2c46a84f..9eca2eae7 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java @@ -10,6 +10,7 @@ */ package vazkii.botania.common.item.material; +import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; @@ -23,6 +24,7 @@ import net.minecraft.util.NonNullList; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.player.PlayerInteractEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; @@ -38,6 +40,7 @@ import vazkii.botania.common.entity.EntityDoppleganger; import vazkii.botania.common.entity.EntityEnderAirBottle; import vazkii.botania.common.item.ItemMod; import vazkii.botania.common.lib.LibItemNames; +import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; @@ -158,7 +161,14 @@ public class ItemManaResource extends ItemMod implements IFlowerComponent, IElve @SideOnly(Side.CLIENT) @Override public void registerModels() { - ModelHandler.registerItemMetas(this, LibItemNames.MANA_RESOURCE_NAMES.length, i -> LibItemNames.MANA_RESOURCE_NAMES[i]); + for (int i = 0; i < LibItemNames.MANA_RESOURCE_NAMES.length; i++) { + if (!"UNUSED".equals(LibItemNames.MANA_RESOURCE_NAMES[i])) { + ModelLoader.setCustomModelResourceLocation( + this, i, + new ModelResourceLocation(LibMisc.MOD_ID + ":" + LibItemNames.MANA_RESOURCE_NAMES[i], "inventory") + ); + } + } } }