From 044a9f3b8e91a5b91686f6d926142d3aee9d2e63 Mon Sep 17 00:00:00 2001 From: Sebastian Hartte Date: Mon, 3 Oct 2016 02:52:32 +0200 Subject: [PATCH] Fixes #2379: Changed texture of smooth sky stone chest to remove z-fighting between the overlapping parts. Added block-state files for both chests to fix both loading error logs and add a particle texture. Fixed small alignment issue for the knob in the item model. Fixed orientation issue of the chest (this only fixes north/south). --- .../client/render/tesr/SkyChestTESR.java | 35 ++++++++++++------ .../blockstates/sky_stone_chest.json | 6 +++ .../blockstates/smooth_sky_stone_chest.json | 6 +++ .../models/item/sky_stone_chest.json | 4 +- .../textures/models/skyblockchest.png | Bin 2021 -> 4734 bytes 5 files changed, 38 insertions(+), 13 deletions(-) create mode 100644 src/main/resources/assets/appliedenergistics2/blockstates/sky_stone_chest.json create mode 100644 src/main/resources/assets/appliedenergistics2/blockstates/smooth_sky_stone_chest.json diff --git a/src/main/java/appeng/client/render/tesr/SkyChestTESR.java b/src/main/java/appeng/client/render/tesr/SkyChestTESR.java index 1aacc2202..264c15f3b 100644 --- a/src/main/java/appeng/client/render/tesr/SkyChestTESR.java +++ b/src/main/java/appeng/client/render/tesr/SkyChestTESR.java @@ -22,6 +22,7 @@ package appeng.client.render.tesr; import net.minecraft.client.model.ModelChest; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; +import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -69,7 +70,6 @@ public class SkyChestTESR extends TileEntitySpecialRenderer } else { - // TODO 1.10.2-R - So this is weirdly half working. Either fix it or deal with it. if( te != null ) { this.bindTexture( ( (BlockSkyChest) te.getBlockType() ).type == SkyChestType.STONE ? TEXTURE_STONE : TEXTURE_BLOCK ); @@ -82,21 +82,34 @@ public class SkyChestTESR extends TileEntitySpecialRenderer GlStateManager.pushMatrix(); GlStateManager.enableRescaleNormal(); - - if( destroyStage < 0 ) - { - GlStateManager.color( 1.0F, 1.0F, 1.0F, 1.0F ); - } - + GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); GlStateManager.translate( (float) x, (float) y + 1.0F, (float) z + 1.0F ); GlStateManager.scale( 1.0F, -1.0F, -1.0F ); - GlStateManager.translate( 0.5F, 0.5F, 0.5F ); - if( te != null ) { - FacingToRotation.get( te.getForward(), te.getUp() ).glRotateCurrentMat(); + GlStateManager.translate( 0.5F, 0.5F, 0.5F ); + // In the vanilla chest model, north and south are flipped + EnumFacing forward = te.getForward(); + EnumFacing up = te.getUp(); + if( forward == EnumFacing.SOUTH ) + { + forward = EnumFacing.NORTH; + } + else if( forward == EnumFacing.NORTH ) + { + forward = EnumFacing.SOUTH; + } + if( up == EnumFacing.SOUTH ) + { + up = EnumFacing.NORTH; + } + else if( up == EnumFacing.NORTH ) + { + up = EnumFacing.SOUTH; + } + FacingToRotation.get( forward, up ).glRotateCurrentMat(); + GlStateManager.translate( -0.5F, -0.5F, -0.5F ); } - GlStateManager.translate( -0.5F, -0.5F, -0.5F ); float f = te != null ? te.getPrevLidAngle() + ( te.getLidAngle() - te.getPrevLidAngle() ) * partialTicks : 0; f = 1.0F - f; diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/sky_stone_chest.json b/src/main/resources/assets/appliedenergistics2/blockstates/sky_stone_chest.json new file mode 100644 index 000000000..545ddbc3b --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/blockstates/sky_stone_chest.json @@ -0,0 +1,6 @@ +{ + "__comment": "This block is rendered via TESR, so this is only used for the particle texture.", + "variants": { + "normal": { "model": "appliedenergistics2:sky_stone_block" } + } +} diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/smooth_sky_stone_chest.json b/src/main/resources/assets/appliedenergistics2/blockstates/smooth_sky_stone_chest.json new file mode 100644 index 000000000..25560c934 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/blockstates/smooth_sky_stone_chest.json @@ -0,0 +1,6 @@ +{ + "__comment": "This block is rendered via TESR, so this is only used for the particle texture.", + "variants": { + "normal": { "model": "appliedenergistics2:smooth_sky_stone_block" } + } +} diff --git a/src/main/resources/assets/appliedenergistics2/models/item/sky_stone_chest.json b/src/main/resources/assets/appliedenergistics2/models/item/sky_stone_chest.json index 5ea74cfaa..e411fe535 100644 --- a/src/main/resources/assets/appliedenergistics2/models/item/sky_stone_chest.json +++ b/src/main/resources/assets/appliedenergistics2/models/item/sky_stone_chest.json @@ -35,8 +35,8 @@ }, { "name": "Knob", - "from": [ 7.0, 6.0, 0.0 ], - "to": [ 9.0, 10.0, 1.0 ], + "from": [ 7.0, 7.0, 0.0 ], + "to": [ 9.0, 11.0, 1.0 ], "shade": false, "faces": { "north": { "texture": "#0", "uv": [ 0.25, 0.25, 0.75, 1.25 ] }, diff --git a/src/main/resources/assets/appliedenergistics2/textures/models/skyblockchest.png b/src/main/resources/assets/appliedenergistics2/textures/models/skyblockchest.png index cd6cb14ef33741fa3d89c0ec1c2dd8d4c41f555e..e6b7f80e736fb53ac5e6166775a2b71cef5dac87 100644 GIT binary patch delta 4724 zcmaFL|4(It%0v^9dM^J=XXk)`jQo=P;*9(P1y5&Zg@U5|w9K4T28N1TbA!`Ef?tZ+ ze!us{$-ARrig$jHD2GCjQ+I>NL^Ul%P64kD#f3LT0}l$iy0S>0SkS@T*VoV^8mPn5 z#dU-IiQ=NZ=EWUdr+z=IUYvbx&-Z6%|82c)_k7Lgxtq_kAK>7bR_|dPXxhND(n(J6 zLG$q=#~wb>b7d=7!LT(K42iz{-6Jq z)65vgh8D&HB@->YIT}P59IE=9mN7WEF*eMdp%%=rfQ2F9baK*Th5%iL1oir7ml+!7 z{+L+Tp1z^7(~*%k61F?&}A_23{Uf5*sz`9 zz&Qc#O$;173f3sABHCsdOzeTF=STf?c7nFYQPTR!q zu$5uK%Uj`}3qYacx^TkIn>U|6d2+++h*Napsqor=>4)MEg#XR?S!eU-`_~8i9;q}M z#WuRL{CIHa%om@fGUq38wj|wo*6&{bXFK=*KeCsVj(8^RjL;H!94J)S=Q6A3v(Zwe zPNzwlM^!KVPkD4-=Qp$6eN%=FS$2%o6LnX_CNqEYRu_mUIq>K^1H-4?`3J9Pa4P+ti?&?$RQ^IC$5wRnW6;EHBC+$ZD%*gY9;7jaga4R5SY<6xqwgaQ0NXm+XDVy zi5&9|YV2v`WN|#fA)KgqtAjDAD?+)CLwsiI5524k8#^I(fR~~QPZEcJ?@568aD;n)?eY->b!G>xm1hWBJK+*C5E&5#TLxI zP_#wLw#RJY^9!pp_;2;wIUhGT@Ir#!_(+a{-m$|@8!dD=CnulYsI-P>^)aapVQZLo zcYaMizpMQxYh z&m$5^Muzq65gt0q*M$0o^#!UsoR65R2z5FesqdV?6tqvYKAHRE@Dt-F(oYmWMRUzfawuH#BlwX<(5Wmh$)^HOO`fu) z&MQ44-9^m%Am8hZvX} zzMk=XCjZR*&{xaP2y`P~+go zD><)BTOGP;Zounc>EQJGmDVfTSEaAW53yfT7x}l7E%LC>VSnc(feSXqKi+dpfje1p zbA^s#Ht*`T(nixGY8%hqtSQslJ>#$J?rz&vD;HWi8+#dtZw~rACC#4w@r=SBb4vU; zpKC0i{<*H}p2&O6N1D>hOni14rp9Einl^n}#A=V#fveqL?=@TZcKO_8dtK{yNB(Z) zb3E>)9;5D_-hYmD?(^WA!FQK)Ef@2(wfeeFZ&mhE>4m#p%J=6je>Y>^zPN^YKKaY< zRqlQMOQu%;Z^+-=U(3I`^F*+1=22n0&2vt|=BR05zKyK@@!KB*onsF>I4@0{nmGMo z%fy`*Z5Cg3>viMr$vhVGSmkl-Sx}Dx^>0@_K?0w=@^0hGbVb!Itb7ya!edz6q z+w0$%y~}*perNs}llhwSB8`hL96sUvAn@r$d+zyD4YKdAsq?RQ_HRtz`dnE*S$|^q z+Upy(FD+m7J@LJ`-8Z|U`H$@$+nC=ox)&LL#{9tc6WdSwAI_f_-+JGbFfd-#Ydz*y$+h*x$6a>FL3>iWw)~OjxV< z{rQY@6VGMxwFcC^xORa(@mYOh_u)Do_15;*@HYFtf{qBOi-yxp%P-z>F23*b%VnC& zz1iu8{+8=?y-c<2R_SHg+%n%~vdjLMURvats}XY}JafEdEcLY3ndRl|yZ`6y=k`Z) zA8|jf7N4PiBDSD%;kiR!T9=Eh)DzONn&#ls;b$@BgQI}f3b7v5Pr~J@eO#6Ghhz_> zE9qY}yV!BVIYvv)?~{j?Z`GtX6Ze=_svI?5s`GSbi~7n5dwh6(?#{NFCpN20A=k*( zYOi7Qq=^#>omMIOPTrROD*ahn+37W@t(*QG&FkK-FE^F_WcKC>Ygi+7xwbhidl3?) zab1gjQ+jH6+Wxbhr!1$fo~M2G?U~J|ZcnH;pYwkH|F=SigdR@XwzSPVTvs;Y+1@o- zmYZw}D{pf>7G>3L3u9Yjv!iR9R_;~*)o;V6udCauR^^-B7B|w(R|ZZO@B6>FOT=;tu4Iw!?wKr`pxyW{`9jNw|6&hbKbdlzs-(4smo8E zJ8NwpvLxh7$gdEycbD#NO}zdi@8Ub@>OJ2~-dw#Mz32O1yOaBFhcbrxUQN52`rGsO z=I{3FI#<2?G3|G5>{`Fv!nennFERgRSLWMxedm>{vX^W_g8Hx3Yrl5qJ1)QP-`w}* zy1Zt*p}ljCJyI@kseJPCJLmoHa=ccz%6h8TJY>HtUnZL_tDogG>(eZ^*}=1ZM<+$^ z@;_sD@!G3eCpElioDjdEeeAara_}o_|uWbHJzU+T|_nh6c z*6obR-ubR-@7C(H?=Pk2nV-A+WpCw2vH#bu&aK3}}!{++G0`TW0$U;Fu;S^H=9 z*Pm|VZF@b>!p_q2k$utMmw%Q!pHDfjHc$NDqJO8?iHqsi{kZ!2`niiUE-sw@Y5L^- zxiw4wzB=$)a{cXNhmOhZJ6U0D822UY_uGTzcgkhoFTT(3|D;BtUgLkp&y8P$FD(B( zS#t8^|18WiKL1HJ*1gTZz@U)q5#-CjP^HSi(9q1lQ2+Bk14F}028L1t28LG&3=CE? z7#PI!C&eFiV_;xk>FMGaQgQ3eth@QQPDmZAuGU+{;(Y1uY8D~8C?TOq#{xDq=i2;} z;!oK3#_aAqxjl|ui{8kEuF?wiy!!u-rMN+uRHnIE?xv9T?!W^N6K(AGf3D;8XW;n# z`}c|vt%`qtEc@!?I~f%2n4dd;{^P^L>@`0>u}+^p{l~Ab+Ie|-A6{NokBNzS@aPd! z{h#mtHGh5xii?Zy*tyeDqK)IQ!Ng~uJ_$X4{(SrUm+|&RHkwntKG^U-{wOimk3BvA zd_lz8d)$fn`TSFYzEs&pOlzHJ?^JK#u=*;KB1>DML!gMkv4lvmnELBSuU-`uyV#oe zqky5TyxdXq=)r@GeEj?$zrBqPNoG=LS#bUJ!u#(Jf3M|XW0q)RyuIyW{dcw&0gFCn zFHMc5A8O@erk_mNuyJGK*|WYmIXMmjEF4V@z47xDr+O*Q^;4ef*BsQfdiCmd<^Tl$(zgC23-MD}M`0MNIlOr8=# zUsxSGbQ}a)JhqoG#O?30_Ml+`9AU*ptPtiy2xbJY@;co4&Aql~&H}w#>*2rLtE_AMVnVIX*LXdv3-o zw$s}ZXQ?f_thuAldhcz%e&z?)Ssgn{y6-)2W?Uf`zEHzUWSh_Bmdsf%N~{cgh1(Jj z6v=$4|9xJ^$bwI8GUtxI*;ere=Jk#O3QI2EsQAXs;@I%k;xy-j2%AQYt_!8IXVZk= zmPxO(t}pItOLUl|Vlvye_INQQy^)0daQOM+H%97r%Z zRA3Qf$I#y1uF&Fe{j0{g`E&pC9WT9@we^CUN*7c8-8}KfA0-kcnqKGG|4iTiudBpL z*3$W(`Q(!cHgflQn@=+?2+=yYNk^iM@%-ltFH0`S^Bt6E&YUIjxB8Q>oPkvDgWq;y z7w>j5on}nP&*$I0d$-0^FAcG74YBTukB?aS`1u1@h6HF$4bYl8;q=o09kIpVtE;PT z+`HHJ^=6D-d;QzDZ+Fjp(9ine=P#?m(DKU4P6Hm{+Hcj*e#*Vw%kZg{Ddu`>YGgu> z>%!jj%D)F0lcyv@ ze-2s2USGIM%g^6GaQ*d#LEOD=%wMZ)Ps#XRZn5=W(xlLkDAD~6>L+y^|tKM&!or$O26y7%gZLcd+fT)F;PN^qpAHf<7e^Cy|0t454LwOY-jv) z^~Y)b`?qd+#qhQzcDR<5S2c0#eradEarbWPs#O)Ao_MZFoTavI-MRy%o~uqsbY6JO zd?IagfQYIYL$%zw9eSRkJGY1_bS335IR21x6li!oDP*E|CZn~rb*D~(!TFav>-9WE zE0=5Ukzpv>DZ`<-k?}*;1dt-btj79dOgg8#coR&d60PPoy`B`(YW*A`W}2QPv|)t zbURPH@9~1mFB=To{FXD{-Zov>VP614{ZbP%hU=wj$3#|A;bUgPd{9{7A8`hAD%cR zNWdv=>a8E9Cce#y5`oQ+(k~wU)ySgA(w2E{UrOAZh-s#)&&i~RZIfd2x$Ls~>Y);= zqxH$JYVOBZ?5k!>*&I2cGWT4Q@r%#b=NK&4^%OGkZC3G|;kUfP=kD{@uUnsYr!wv} zw=0Qle`z7$D!4W3?d)}{bxsSo3NBy1d_~ym89r(iKC;^zT%UDc72T%U`>jvsw1tI5 zgGSecRLR`fcAe7!BCL~C7RIelwvc&bSZY%rk+QEoA~rG4>1>+t)+pZfvwS-ibxd2; z)a!o1gm>1mg%>jx+{{tpV6s`(_ng1`jQDA$3gt&vSBG0zSv6h!cp<~&Le|y==WTO# z-~IQjtxhafhhdY>;;_|@BCay>@{5;hthkz$VK#e$3g;#r=V_@jva$=qR=aYZO@3(? zAFpq7|F8Yz)mb4E&Ocwwd@gBYM~z*7(8`t^v+ksg9eWoyYdC9*aGglo{3Ei2zs%~7 iaIa_saWLagK0_35PN`mv#O3D+9QW*jgGxJLH{9Hp6 z%8d0)^$ZQ&KRcN-Ft8_jx;TbZ#J!z$(?7&h(?$FJw30|-C9%6`p%p+Ytqi0mNVziub=MTFXy>4=GuF0ZS7Cb z&Psc3bl$RSTddMbjhNkKzSbrN1`5s1&6~DwS9g|VU2s@nWr)_My?b?MH*&B{n>KC9 zr#~y};^X43{bJm2xZ61WoJV>2_BpoIVejY8o!j;9^YbN(7d!9TwM*oNVodC9y@??r zRn^s@xwF}}M*05w_3O~~`h3pg56ro_xoT+K9eMBIxpRHj zdglt7eBwA{{r&QC|9VkI>z38ow^b)~Io%I1EZMf`iC|)Rx%p&vhm@6D7RkD>xcxsl zS)I#e!JC84>{<+RiR*I8zA{Ppv;;5rTgkxDEPLqc*0(~Qt!xKHW@sCiD@N4E#ReM| zR4!vpea2|>Se7H9tjCCDcb^9{%YrjD4e6U9mZdPhySH~W%goRH^7hkqu8rl5n~?lP z(bm{_@q?M4rt8Od-E`!eB&*1FW%r-!pOhIlWP33dq;@#uDfV1?^JdMIrrnP=RWwdx zS2(A1KJlJ%!%fF?CuXtFUr( z-%?XK&j0@XJE?5K=1hh&e?=WT-W5OpD!F@^$N~#1rNxUETYVB17Jl`r$F7j!(B#RJ zqxMya2$b{HU1i8D>)F7%``5+gJP{5@_#Q%S>1R|{wwlC|P+X%r;kn-zdCvO#m2uJ0 zzc+ccq)y7nD|_}xt%0-X(-Y5HGsX?hJ9hk)Dd?1*#F}uK#gQf9isRc4tvc-b38^zU z@8^g*u$0YWG2Xmd{%5hc-iy0U3-1at?#_@r!##b6VkE=13p#;2tY6y|?-z38QtV*7 z8vkwoP4*3eNzRj##Md%aJ`^%n;XY7Rf6h$G>H7Nk@H@Loz1?T{iavdCYO40Hv-dXc zE_oTW?Ea^7`HSZ!#O*l3+q&Pb=EU5qAFbU~&*%4FK3ABNe8`Z?R#9A`>hZK43w3jM zC=}21>Fw!#|Kgw>X#~Y5VnBdd*)1CRv$CnI}@}i$*m27QoPnHR&JJ{9y2zYmYzy9T=uA&X; zw=ISEcPO(sPO$pCt-Pe~fsnb#jC2hygGI?HMSFyo1Wa)_V%>Y$@Y>VIHykGkrX2Cy zb4*=*ip@NSnYGLP4tNAj+rHOFZi3L1i0RUq>=Q+HFRm|UnZBbjw1Hi}s!qIQ)kH^w zJbUGTjuvg4AM!tFg~sfu2)sMt=X6u)7N4%z615ixUstQCa37FkP-=Bj6rM48$C8_l zdf8%~1%V+zwwgTTF?_of&wFn@F8#SZst%!^Nk-FTzGc5<%x`LB|fcG%QAJrJEzczm5Et3tPm zM`enw!>qL%Zcg0r;-Br|`)nWQ?D)$Oci(tnVz9&XEe6xi@-c4u=etppRbiI!mKO?( zT{k2h;mFxjT`#>QRAGH=TX5p~_cJHxIJ~+jCO6@_+2NHNu7CIOuo6mEalF^lSM6nX z;>yqaeMe55D=>c+Un|zu9aQhj^nKgY`OLlYE$NUUS4z4>V$8jjC*NG$teKNFc}c*zxn0tk$G>>y z>Z{2(+a~;dxh>C2tf?y{YtEHLM(bK$<@jno7np2pv#3b^kRmsZ4hRZ-{jau7SBZIX-Re?WuL8&f1C-&aho~3YA*-{=)erapAs&Ob@Iyx@H|s z3S8#ox+j>E_mk`eji=idW=@f