From 6df931a5eb150637e7690cb09cce1435416233d5 Mon Sep 17 00:00:00 2001 From: Mohammad-Ali Minaie Date: Sun, 8 Jan 2017 17:10:35 -0500 Subject: [PATCH] fixed firebox model and fixed bellows bounding boxes --- .DS_Store | Bin 6148 -> 0 bytes 1.11/To-Dos | 4 +- 1.11/gradle.properties | 2 +- .../nmd/primal/forgecraft/blocks/Firebox.java | 2 +- .../forgecraft/blocks/PistonBellows.java | 65 ++--- .../primal/forgecraft/init/ModCrafting.java | 5 + .../forgecraft/renders/TileFireboxRender.java | 14 +- .../renders/TilePistonBellowsRender.java | 4 +- .../assets/forgecraft/lang/en_US.lang | 2 + .../forgecraft/models/block/firebox.json | 160 ++++++++++- .../forgecraft/models/block/firebox_lit.json | 172 +++++++++++- .../forgecraft/models/block/fireboxv2.json | 256 ++++++++++++++++++ 12 files changed, 621 insertions(+), 65 deletions(-) delete mode 100644 .DS_Store create mode 100644 1.11/src/main/resources/assets/forgecraft/models/block/fireboxv2.json diff --git a/.DS_Store b/.DS_Store deleted file mode 100644 index fdb19e0bf90a0d2049dc9d6dd00e3053a6449f7a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHK%WlFz475vHA#vf@<9-2Z`UNWlU%(F_ii#>BaVWj##&0uzfP$i2dq88!o~+lC zP392CBBIN`eJe5-kty6zE*6Gn`{o0C$;>NI?H>EzujB4?Iu0tw6UJ?1AqV-9bD#ev zEz+%gAbyT+d}HT!Vv~%vUwu#ZE5{#)J5+!QPys4H1)g33^lY=~ERc~3Pys4%SHQjx z1#VaqyFmYRAovIXY>;-twa*g3VhLbP>;jR2X;6Vd)f_Q2=*X9>tBGA;&_#3j&^%dl zLQy{*_b*;9S_2uW02O#tU=qu@_5U?|Wd467aYY5Fz*8xp&1$n+;+3+u4qncBZGms$ qH$$zLBX}zYdMn1lTJd|YuGls9YhoAZbmW~5 public void renderTileEntityAt(TileFirebox tile, double x, double y, double z, float partialTicks, int destroyStage) { GL11.glPushMatrix(); - GL11.glTranslated(x + 0.5D, y + 0.825D, z + 0.5D); - + GL11.glTranslated(x + 0.5D, y + 0.95D, z + 0.5D); + //GL11.glRotatef(90.0F, 0.0F, 0.0F, 1.0F); Minecraft.getMinecraft().getTextureManager().bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); float prevLGTX = OpenGlHelper.lastBrightnessX; float prevLGTY = OpenGlHelper.lastBrightnessY; @@ -51,16 +51,22 @@ public class TileFireboxRender extends TileEntitySpecialRenderer ItemStack stack1 = tile.getSlotStack(0); boolean is_block = stack1.getItem() instanceof ItemBlock; - float scale = is_block ? 0.1725F : 0.5F; + float scale = is_block ? 0.1725F : 0.3F; double xTrans = is_block ? -1.6D : -0.45D; - double yTrans = is_block ? -1.26D : -0.25D; + double yTrans = is_block ? -1.26D : 0.75D; if (!stack1.isEmpty()) { int stackRotation = stack1.getCount(); + GL11.glPushMatrix(); + GL11.glScalef(scale, scale, scale); + GL11.glRotated(90.0F, 1.0F, 0.0F, 0.0F); + renderItem.renderItem(stack1, renderItem.getItemModelMesher().getItemModel(stack1)); + GL11.glPopMatrix(); for(int i = 0; i < Math.ceil(stackRotation/8) + 1; i++){ GL11.glPushMatrix(); GL11.glScalef(scale, scale, scale); GL11.glRotated(45.0F * i, 0.0F, 1.0F, 0.0F); + GL11.glRotated(90.0F, 1.0F, 0.0F, 0.0F); GL11.glTranslated(xTrans, yTrans, 0.0D); renderItem.renderItem(stack1, renderItem.getItemModelMesher().getItemModel(stack1)); GL11.glPopMatrix(); diff --git a/1.11/src/main/java/nmd/primal/forgecraft/renders/TilePistonBellowsRender.java b/1.11/src/main/java/nmd/primal/forgecraft/renders/TilePistonBellowsRender.java index 41faf2ab..f532c9e7 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/renders/TilePistonBellowsRender.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/renders/TilePistonBellowsRender.java @@ -63,7 +63,7 @@ public class TilePistonBellowsRender extends TileEntitySpecialRenderer