From cfc43dad719bd86c58c8342fdc9c2699a9f51035 Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Fri, 3 Jul 2015 17:14:58 -0400 Subject: [PATCH] Some more voidstone fixes --- .../com/cricketcraft/chisel/Features.java | 4 ++-- .../client/render/SubmapManagerVoidstone.java | 12 ++++++------ .../blocks/voidstone/animated/bevel-ctm.png | Bin 7444 -> 7444 bytes 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/cricketcraft/chisel/Features.java b/src/main/java/com/cricketcraft/chisel/Features.java index f8ac0c62..75770a38 100644 --- a/src/main/java/com/cricketcraft/chisel/Features.java +++ b/src/main/java/com/cricketcraft/chisel/Features.java @@ -1074,14 +1074,14 @@ public enum Features { @Override void addBlocks() { - BlockCarvable hexPlating = (BlockCarvable) new BlockCarvableGlow("animations/archetype2").setCreativeTab(ChiselTabs.tabMetalChiselBlocks).setHardness(2.0F).setResistance(9001.0F); + BlockCarvable hexPlating = (BlockCarvable) new BlockCarvableGlow("animations/archetype2").setCreativeTab(ChiselTabs.tabMetalChiselBlocks).setHardness(2).setResistance(12); for (int i = 0; i < 16; i++) { hexPlating.carverHelper.addVariation("tile.hexPlating." + ItemDye.field_150921_b[i] + ".desc", i, "hexPlating/hexBase"); } hexPlating.carverHelper.registerAll(hexPlating, "hexPlating"); Carving.chisel.registerOre("hexPlating", "hexPlating"); - BlockCarvable hexLargePlating = (BlockCarvable) new BlockCarvableGlow("animations/archetype2").setCreativeTab(ChiselTabs.tabMetalChiselBlocks).setHardness(2.0F).setResistance(9001.0F); + BlockCarvable hexLargePlating = (BlockCarvable) new BlockCarvableGlow("animations/archetype2").setCreativeTab(ChiselTabs.tabMetalChiselBlocks).setHardness(2).setResistance(12); for (int i = 0; i < 16; i++) { hexLargePlating.carverHelper.addVariation("tile.hexPlating." + ItemDye.field_150921_b[i] + ".desc", i, "hexPlating/hexNew", (i+20)); } diff --git a/src/main/java/com/cricketcraft/chisel/client/render/SubmapManagerVoidstone.java b/src/main/java/com/cricketcraft/chisel/client/render/SubmapManagerVoidstone.java index b03c495d..139827f7 100644 --- a/src/main/java/com/cricketcraft/chisel/client/render/SubmapManagerVoidstone.java +++ b/src/main/java/com/cricketcraft/chisel/client/render/SubmapManagerVoidstone.java @@ -26,7 +26,7 @@ public class SubmapManagerVoidstone extends SubmapManagerBase { @Override public void renderFaceXNeg(Block block, double x, double y, double z, IIcon icon) { super.renderFaceXNeg(block, x, y, z, icon); - setRenderBounds(0.001, 0, 0, 1, 1, 1); + renderMinX += 0.001; setOverrideBlockTexture(getBase(x, y, z, ForgeDirection.WEST.ordinal())); super.renderFaceXNeg(block, x, y, z, null); clearOverrideBlockTexture(); @@ -36,7 +36,7 @@ public class SubmapManagerVoidstone extends SubmapManagerBase { public void renderFaceXPos(Block block, double x, double y, double z, IIcon icon) { super.renderFaceXPos(block, x, y, z, icon); setOverrideBlockTexture(getBase(x, y, z, ForgeDirection.EAST.ordinal())); - setRenderBounds(0, 0, 0, 0.999, 1, 1); + renderMaxX -= 0.001; super.renderFaceXPos(block, x, y, z, null); clearOverrideBlockTexture(); } @@ -45,7 +45,7 @@ public class SubmapManagerVoidstone extends SubmapManagerBase { public void renderFaceYNeg(Block block, double x, double y, double z, IIcon icon) { super.renderFaceYNeg(block, x, y, z, icon); setOverrideBlockTexture(getBase(x, y, z, ForgeDirection.DOWN.ordinal())); - setRenderBounds(0, 0.001, 0, 1, 1, 1); + renderMinY += 0.001; super.renderFaceYNeg(block, x, y, z, null); clearOverrideBlockTexture(); } @@ -54,7 +54,7 @@ public class SubmapManagerVoidstone extends SubmapManagerBase { public void renderFaceYPos(Block block, double x, double y, double z, IIcon icon) { super.renderFaceYPos(block, x, y, z, icon); setOverrideBlockTexture(getBase(x, y, z, ForgeDirection.UP.ordinal())); - setRenderBounds(0, 0, 0, 1, 0.999, 1); + renderMaxY -= 0.001; super.renderFaceYPos(block, x, y, z, null); clearOverrideBlockTexture(); } @@ -63,7 +63,7 @@ public class SubmapManagerVoidstone extends SubmapManagerBase { public void renderFaceZNeg(Block block, double x, double y, double z, IIcon icon) { super.renderFaceZNeg(block, x, y, z, icon); setOverrideBlockTexture(getBase(x, y, z, ForgeDirection.NORTH.ordinal())); - setRenderBounds(0, 0, 0.001, 1, 1, 1); + renderMinZ += 0.001; super.renderFaceZNeg(block, x, y, z, null); clearOverrideBlockTexture(); } @@ -72,7 +72,7 @@ public class SubmapManagerVoidstone extends SubmapManagerBase { public void renderFaceZPos(Block block, double x, double y, double z, IIcon icon) { super.renderFaceZPos(block, x, y, z, icon); setOverrideBlockTexture(getBase(x, y, z, ForgeDirection.SOUTH.ordinal())); - setRenderBounds(0, 0, 0, 1, 1, 0.999); + renderMaxZ -= 0.001; super.renderFaceZPos(block, x, y, z, null); clearOverrideBlockTexture(); } diff --git a/src/main/resources/assets/chisel/textures/blocks/voidstone/animated/bevel-ctm.png b/src/main/resources/assets/chisel/textures/blocks/voidstone/animated/bevel-ctm.png index a1cdc54002453dbee3d9d33c130ce98f13747271..2ea57fcff0f620b2346449a60c98aead1237f023 100644 GIT binary patch delta 236 zcmW-Zy-LGi7=@qrOKeO`nkXIWU^|G5=-8!h{tPbSQk;Z>w;>4LLV6d92!i+ED2~~J zIu&f`U{jm#HR*xFIUF9&s6XmIzlG}#$$sbZaW{PrZ$#2w)D=w!(Xi^TQTI-b#%!3F zndZ1-$#Cr!f8vvv7J)YSaX*Q)T>)dfWdlzXQ3sUR#_8Z{c;VQX?31nH?tjl4rrPl9vxh1lgJ+1dbomL2Ju7G`o6u& RZTN9gPv>VBr%%Vj`+sbVN)G@4 delta 236 zcmW-Zy-EW?7)8%F?z)b%o0S;<3QZL;pk?uALvQ|>}>?B>!`=ow~aw$fo zjNB_zp@|4=!mn6TsZt~6BY0z0Es;~8OU*QqmjXm!$N;SjW1C~F0rP$~`ufCIKHF5C zV2hF>9FpfhI2mKD_3mT=R+k~DZ-1U0RbEy_vndtTl87}4WLf5