From 75ab2102276cf9f550e723ef772af52adbd85ecc Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 3 Jan 2016 19:59:27 -0600 Subject: [PATCH] Item models fully working. TESRs may be changed in future --- .../botania/common/item/block/ItemBlockPool.java | 4 +--- .../assets/botania/blockstates/pool.json | 4 ++-- .../botania/textures/model/dilutedPoolCopy.png | Bin 0 -> 2196 bytes .../botania/textures/model/infinitePoolCopy.png | Bin 0 -> 1942 bytes 4 files changed, 3 insertions(+), 5 deletions(-) create mode 100644 src/main/resources/assets/botania/textures/model/dilutedPoolCopy.png create mode 100644 src/main/resources/assets/botania/textures/model/infinitePoolCopy.png diff --git a/src/main/java/vazkii/botania/common/item/block/ItemBlockPool.java b/src/main/java/vazkii/botania/common/item/block/ItemBlockPool.java index b4951a548..05e195ea1 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockPool.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockPool.java @@ -17,6 +17,7 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.util.StatCollector; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -25,8 +26,6 @@ import vazkii.botania.client.core.handler.ClientTickHandler; public class ItemBlockPool extends ItemBlockWithMetadataAndName { - private final Random rand = new Random(); - public ItemBlockPool(Block par2Block) { super(par2Block); } @@ -43,7 +42,6 @@ public class ItemBlockPool extends ItemBlockWithMetadataAndName { public int getColorFromItemStack(ItemStack stack, int renderPass) { if (stack.getItemDamage() == PoolVariant.FABULOUS.ordinal() && renderPass == 0) { float time = ClientTickHandler.ticksInGame + ClientTickHandler.partialTicks; - time += rand.nextInt(100000); return Color.getHSBColor(time * 0.005F, 0.6F, 1F).hashCode(); } else { return 16777215; diff --git a/src/main/resources/assets/botania/blockstates/pool.json b/src/main/resources/assets/botania/blockstates/pool.json index e515b21c9..ea7047149 100644 --- a/src/main/resources/assets/botania/blockstates/pool.json +++ b/src/main/resources/assets/botania/blockstates/pool.json @@ -7,10 +7,10 @@ "variants": { "variant": { "default": { "textures": { "all": "botania:model/poolCopy" } }, - "diluted": { "textures": { "all": "botania:model/poolCopy" } }, + "diluted": { "textures": { "all": "botania:model/dilutedPoolCopy" } }, "creative": { "model": "botania:pool_filled", - "textures": { "all": "botania:model/poolCopy", "liquid": "botania:blocks/manaWater" } + "textures": { "all": "botania:model/infinitePoolCopy", "liquid": "botania:blocks/manaWater" } }, "fabulous": { "model": "botania:pool_tinted", diff --git a/src/main/resources/assets/botania/textures/model/dilutedPoolCopy.png b/src/main/resources/assets/botania/textures/model/dilutedPoolCopy.png new file mode 100644 index 0000000000000000000000000000000000000000..7eae61d149292da1d36e9f8d99af6cc323f9d538 GIT binary patch literal 2196 zcma);`#;nD8^=ehKHS`9g-~X=)iU{h9U{iJHp-GiBaN?PxMwLMr!hpDLnxzF&dMom z4x1=Ubvvb4Wh}z%c3O9nVK+-leRux{-|O+X-q%mp`|*BUujlJ=y>mR=PN^#ED1$&C zRjjikPF|1ylfW+d*+`7$%M17_8tVnfgA9abgFt`_*71Z_V%e8_*eJh2jT_H(_|tnP z4SrKE+;4aC68K+CbEeYzEKB7!I9lN7mN!v&M%9%$Ijdd@yB-X~j;Nt!Lt@9Y$f zF_Jl^3ah;{#>-O$KG2YE;o^3I1T`N+iddBn6bMm%`Xa5W0WAul`((!2^}8IM2;?(Xo~E8PosgF!lf8r z{n{#4!2rIEx-6o7^fjo(FCbW!!T!8hjyfV|qXMFc1N;Co=~-XW+s7k%45Nz>*0Kr? zSR(#m;G&MMstxrCZR5T7O@R6;r+cr%lf^q*_)^_MszHIXVLmhiZ<6|P8QXS&+6TZV zyj5@Is=yR?WkJ}Go2W2NMKn-RITD`dgne1m9rRFEq<9-0#1__n(L;c9yn(7^6$w&7 z|JFn9Us;gE_@jn6C>&h4Z0)D(0;H2lP=41+F+(ZiRlCm3S6{lboK{7n;t^;7bzdVB zG}u{vl!k?du}%_sE~B3$vwf>nkX>AkCqShWy2ec)v62TsGSzLMP;Yn3BZu z<&EQ$+UqudB&9)JO@>5Y(xdp(tFcG_yg+?O@$@93Ly!v2PX?0Q)lV7q+SAZiF4>U* z5LvcKtE_yB&Dvl{+j#0GPFnlpZBk5OsXG_ui6;mLcq9(97>}qJR;D^%y<|5Ue6>7I z4iFEYYcscmZ?!GE9;tXWrYQM=MqE0%XQo-*KDfU#ilrQ4vVe7%PJFgXWp zGoF3wJd(GJ*^Cro4P8T!7s8vm>K2zg6!fpT&d8@YUcK-xzOCJCgmbKil+xQn+zMv* zZ~chW6>oi*p>#3p;tJBH>66x`S?wYIm*I7y!RL`2G>0`0}YR z6<+cY<6~&xV#p&~3|-?qX6J#aUlBVa@lm!<$4XCh-%58Yo?F2eI+b+D47o;i*@gjh z9=OV!!n6bg?_v{SPwl;tl02^n{_-uqC^d4@3d!8`Hrk_4y%l$`lsvn;SSuXvmNu(r zBA>!tEg_PbDS!Kf4$bLg2$B&er&~+BVq<2`be2XM$aefiPksstOpDn#;qXnoanu?9 zwfBuR>M)aw?U{kOtFEQo<>5v<`BrV8OFtX9wDR|;=D*+i@k3lf8}O~ePM;rH-Et~{ z5c_>-F<0qVFdHcRHMMPltbkr4i1`XPrE%SX-vcsuSN8BI?E0hc#ZjQ3@x zue4UqsB`n=ydb5oMzV+vQjJEQW5y zu<j7s;I2dg8oKFP`rs_OjwzoKCMa0jnjjJ;b2?g*SVOX z4{w_t$if{k@45hw$W)eXc75NMI%jy=B5`t*P4Q}s_B{10r1&Ofks^)7W zkjHnOPU<;L-_ejD|BRs)4W5N%g5XJ0WwlB;pj)k;ysEDd(A_oP)VStwrJ}x#S2(Et z0_CPbd*kUV{N~}s+g@mpapj&FAdLxT@>|CSs3*S_ zuSsm?WK+pKNl7QhwJSKrWkPM~Iad(VSrWq%%1V<{B|{nvDe`8Xb4sRi;=f}B%}qz{ z*Qe|&#Fa6>U6`2eh>F^ZeHK(0t z{zp__xU#1T_kAnrhWC2g=4X!>tI9cY(0MC)YXhTSWlsY%V>a!lx!lQx)am_)Q`_%B z5&fS%n6|}bi-_RF<`%w0I$jc1!F+{N#Hh(t#M(A&4Q-Xlm`j`Zv+=tuREz=xj%-D< zYlm(7-i^zttE)I=?O zsFIL$QvK8+IPju~n68%YI&=F|D*Y(0`i@b)Wov4pL`VDoj;+e?yUXo9u?4<8-tun- N22@oLv{}*HxAaD{G zV<(QsvOPVLTHVb@vFc`VDUP$rVtRmN!LyRUCRugsoO92m1L(ioX*ne1ETThUxIN&{ zYy9;BO@(~d5^h$MVg2VcSrS z$xdi6ZFhfrLpdhW_m9(pH5Jl#yUE!!)S!Wm}j>#ym#td0SG#B#g#tQl#5L^^%ZIvg#Zj4$BPyg~B3TT_j zO$*{E#{>%bu0<|tqz>fQ4a4mLeX$|jEO8>pG8ltWo)!+6p9C2laeU4)Qhj!btRus= zL60UuZS&+U{kIRurb3p%yabF*Pi^>=0xW;`{GIw}dbL*s+CTq{zgpn0Y5<0xk5RN4K4`b#hT&vK)7Bp+#VQyI^aZzUu?_|?mJK=yjV|x zN;VY~MJ{TS*NJ#%8*RVZ(*EV=$vdXNql%V-ECcby#>}%BtYAUjGGk0~@#78s%X_pP zEZi(SQU^0Xf%IxWJ{QU%G5mCxq||+VcX9#VnE_9sNY-)E{nVnOWddt=0TrXUcG;5O z6V&>-zggnXYX*O`j+4gJS$pJ5YnL!G3n=@Z?(c6XyY95zb3y^a^%DPqY4DekRMr(v z9QloP3t2_-uCu%VcG7VSOeqtt&L~YH-?jFv@tUhV<&bb*ru^{)O_}P`3*@&q@4EcA z`*_zIWgU&mY9S@>I;u}Ez&nQ9gKZ*uYnw$WZEt>YUYiW+%EHyUvNoK?v{wrK%X?%~ z5uU9qou+~lH?c?76=mO}-Fuh?hBu9Bn`ys#P1*Mra(11?;php^RyK^Znf{x5{CPcT z7**TgnCvtabe|c18asjHw=%%mq5ohxwMWf`^4MFuyQq<6u-3Sa`0E93;iudWmMi>u zZABT%lpIegK>zaI=%?T>7q*zC5yQ#YvQ`oQ;hN$-_{+uQ z4JQ|%9251IA0X?>qNW4C2uK}}wViDD^&RoWX8KNmx4|Z-exh#Pj=Had(SF~9v)Gz< z9dR9DJhjpc=tE~_*$(FFUv14#?wlFqwjn$}qvS-{_xPKoeILkbz94Y?(+?`=mC0?} z5I#J^1tD)+hV9W91Jio@m-oiDarz7Z)#sPfBo{tflOJ00T}N(hLx`jL?1JHk!!+A# zZ}iq~7?WXzTLoOPsjWP8$j0;y*ko9H3pOIuUtXQ`A>(}^`0FLwWlFIH%BC7;^kIsy z;rYrWa%HsCWP^%}_KjfJAE`FgTW$B5VcQTFfpQ%1>k2uq=)ZZu1(~|X{{zC)$&_Zm zB?~Ps3T_cBvx^;+4#mC@d53cz?Z?e_#t_7GUz)*YgQwX&+eq!AN6sRp8A#th{tvhO zp9nZ?qp6U`snB07kc-MFU(_bFON*Y`mvOeYZ+QN)9tV|ZdarGoqp0=&=&j8S1@R84 zJ^CKZYsQQjGiJ<~F=NJz88c?gm@#9z>% literal 0 HcmV?d00001