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 1aacc220..264c15f3 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 00000000..545ddbc3 --- /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 00000000..25560c93 --- /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 5ea74cfa..e411fe53 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 literal 4734 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 aAF!v7u6^honnb+d0RtUV?IxIW%>Mwzh_+7v literal 2021 zcmcIl`#;nBAODQ8;mDm_#%3kAgPj%Sl5L2|Wz4N|o6C{Ny)Bn&ZYgQ5nM)I<3vvlD zMj~AltK1?PU0l*g6CIbFvmSl_h3^lq_v`h3UEa_4<8^twE)$$=CB;?50RWK1+gZB` zIOZ2YMFnR~Xf#*Az#&*iECAfgme?kV2<~E0cE@4?U{~)i0x4+QQw2(uI2*4xV&va( z6jDquKp=%i#2Gl*xWUP2g98RAlj!Tgh^$Yx2H&G zAC-7sd5O1waA;iL*c1)ddU6nrLTSkz*qIMmqIl8WSK;%p1fW2puvez zLnKJ&awgj%UogxlpXLTjUDZ@2ZH6|GYU=9G1?t)1+s^#WwXlutjpn57e_XiT7YrMG zyIi+-<~8`sQ)cJpCVP64HM1qVnROkl&f9eDcdTeDV`Jl>u&|>Zo}M>bJ@b1iDpr=o=W=pJD4>8+0r#DamVZKU93<2HiGW9pCOf_Ek?$k3To4ioa*o z($VUpS*`8OCOew#H!^~!rlvNvwe7P~7Ab!uUG1jZ)YbK8X)+XCSXfxa->yFI=j%JR z3F=0%(IFf=3Z?D3MWV-727{5gygFaSWLkA}bjXh*ynQAOa^2(;5)<7|mx|s$?zp+R z+1nN=_H@QXLPFv#mRCDkL)*>m+j{$?!@=2E?-;j-!=a5`WytL3Lwn7B2r_a(0c4g| z8#cK&FB3OSK*hCIev%xoELqtWz-x3L)1DSt>LH)^De}UOFJ7IA7fH^g! z`8QS&Xqnqp3oc&G*03yWuk(@g%?bRDut1}kGsS$mp`O~?D5II-1apB9{VGJ-t!L5nID!~cXoXAEkzVzGXzMO{|S6Y(DgW5NC-*rk

=DE&-#PYc)1vl?)c9QYxloK1lRG&Mv<+Kf-nY+yvWCJcOw+=`qMt0i4|6!_AHwoF;@kK@=pnV>#==aYT=3e3we#piB2 zJ+yNzZ0mAR&yg+gqN|2Na^=~~STLQH>`sLkCY)D_tI5S0MOY$tum>-StwgTqx_ft? zb(zZ9pdV08bIA0G(^}~HlBgv}nmVAFjzh>5<+G|Lum)j@m!qP$WI7*&;FJMQlGl|E7h7$mpN#vL0yR_K>-tLXN$AX9nz*dI2I>rMc(`*Hlezbh9 z$t04be5cWZ(iN(hF6OTJPn1s}sC8ciref3I0KNCjse>7|W5T8K6tmxBoCg=}XDGc~QyyZO z<7N~JqMz35h`_Jxv5OC~z?9TAPUJQ&>{vXS7X5ae^%E+1x`IT+&|8e?gS$XYJC64R z&Lwg!3vi}QV?ZA?yfg8FYKuF(!RI28)bO=9M<28JT2Vdcjq#)E#y3A4>`Y|?_h7kM zv_yO3XCoWaw7zGYD3dwAbBY(QxH@4p1CfVFWgp7iwwuQvrv)xp+7Wt^is;AjEVOMg zy@Vk``0RbBAg1yFwmO&Wz!+H%5VTxS$ZnE1x4NJAx>+auRDKnK!^l((efk}L+E7c) z%EJHW=hg^&#gxpTQ`bi-|Ef=040qI-m(E9Wh283PTUJ-lxib$eece$E*C+%OQ zO3ktmTu=7?KDxtPU zM}MOMHZG^b!yPVWWCWi-W2J}484!Jgb62VV`s!tXk{qo