From 2f989caa60d2c683a22f579baadb2003a5d48363 Mon Sep 17 00:00:00 2001 From: Pokefenn Date: Tue, 17 Sep 2013 09:56:56 +0100 Subject: [PATCH 1/4] Added some peoples names onto the list. Updated! Updated with a few more names. --- capes.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/capes.txt b/capes.txt index 0963576e..09920c05 100644 --- a/capes.txt +++ b/capes.txt @@ -41,3 +41,8 @@ Leilana:http://i.imgur.com/lMXcbre.png evaluno2:http://i.imgur.com/YYqlRRp.png andypie1010:http://oi41.tinypic.com/mlj9jm.jpg hayden_swanick:https://raw.github.com/mDiyo/TinkersConstruct/master/capes/default_orange.png +PeggleFrank:https://dl.dropboxusercontent.com/s/etrersgka8n7g3s/vineCape.png +the_j485:https://dl.dropboxusercontent.com/s/etrersgka8n7g3s/vineCape.png +dgdas12:https://dl.dropboxusercontent.com/s/etrersgka8n7g3s/vineCape.png +SatanicSanta:https://dl.dropboxusercontent.com/s/etrersgka8n7g3s/vineCape.png +GPuzzle:https://dl.dropboxusercontent.com/s/etrersgka8n7g3s/vineCape.png From 0cbf8b270860413aaded2fd4287548f3096037b7 Mon Sep 17 00:00:00 2001 From: Arthur Uzulin Date: Tue, 17 Sep 2013 20:00:54 +1000 Subject: [PATCH 2/4] Work done on new pane renderer(WIP) --- .../blocks/glass/clear/glass_side.png | Bin 0 -> 215 bytes src/tconstruct/blocks/GlassPaneConnected.java | 463 ++++++++++++++-- .../client/block/PaneConnectedRender.java | 516 ++---------------- src/tconstruct/common/TContent.java | 224 +------- 4 files changed, 502 insertions(+), 701 deletions(-) create mode 100644 resources/assets/tinker/textures/blocks/glass/clear/glass_side.png diff --git a/resources/assets/tinker/textures/blocks/glass/clear/glass_side.png b/resources/assets/tinker/textures/blocks/glass/clear/glass_side.png new file mode 100644 index 0000000000000000000000000000000000000000..577da454e1dc35081893accca3083841d04bf635 GIT binary patch literal 215 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmP)ry!@Q_+x{ar9hz+PZ!4!i_=#pZRBk*;9=n}*PPMV zWV^|P+l9xmSz`vHYe_!Wj05X_Jd4>|vnexH@8sewuWcAQE*;BcQ#iG-)Uq=|_q~AX z>214J`Y$nD`>or3!Q+_GzpXW_lC1y!cmC8~BDzW1rsAmF=R&Kx4M6)CJYD@<);T3K F0RUe)NT2`! literal 0 HcmV?d00001 diff --git a/src/tconstruct/blocks/GlassPaneConnected.java b/src/tconstruct/blocks/GlassPaneConnected.java index 25873ca5..394f795e 100644 --- a/src/tconstruct/blocks/GlassPaneConnected.java +++ b/src/tconstruct/blocks/GlassPaneConnected.java @@ -1,5 +1,7 @@ package tconstruct.blocks; +import tconstruct.util.PHConstruct; + import java.util.List; import tconstruct.client.block.PaneConnectedRender; @@ -13,60 +15,431 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.ForgeDirection; -public class GlassPaneConnected extends GlassBlockConnected -{ +public class GlassPaneConnected extends GlassBlockConnected { - private Icon theIcon; + private Icon theIcon; - public GlassPaneConnected(int par1, String location, boolean hasAlpha) - { - super(par1, location, hasAlpha); - } + public GlassPaneConnected(int par1, String location, boolean hasAlpha) { + super(par1, location, hasAlpha); + } - @Override - public int getRenderType () - { - return PaneConnectedRender.model; - } + @Override + public int getRenderType() { + return PaneConnectedRender.model; +// return 0; + } + + @Override + public Icon getBlockTexture(IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5){ + if(par5 == 0 || par5 == 1){ + return getSideTextureIndex(); + }else{ + return super.getBlockTexture(par1IBlockAccess, par2, par3, par4, par5); + } + } - @Override - public void addCollisionBoxesToList (World par1World, int par2, int par3, int par4, AxisAlignedBB par5AxisAlignedBB, List par6List, Entity par7Entity) - { - Block.thinGlass.addCollisionBoxesToList(par1World, par2, par3, par4, par5AxisAlignedBB, par6List, par7Entity); - } + @Override + public Icon getConnectedBlockTexture(IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5, Icon[] icons) { + if(par5 == 0 || par5 == 1){ + return getSideTextureIndex(); + } + + if (PHConstruct.connectedTexturesMode == 0) { + return icons[0]; + } - @Override - public void setBlockBoundsForItemRender () - { - Block.thinGlass.setBlockBoundsForItemRender(); - } + boolean isOpenUp = false, isOpenDown = false, isOpenLeft = false, isOpenRight = false; - @Override - public void setBlockBoundsBasedOnState (IBlockAccess par1IBlockAccess, int par2, int par3, int par4) - { - Block.thinGlass.setBlockBoundsBasedOnState(par1IBlockAccess, par2, par3, par4); - } + switch (par5) { + case 0: + if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlockId(par2 - 1, par3, par4), par1IBlockAccess.getBlockMetadata(par2 - 1, par3, par4))) { + isOpenDown = true; + } - public Icon getSideTextureIndex () - { - return this.theIcon; - } + if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlockId(par2 + 1, par3, par4), par1IBlockAccess.getBlockMetadata(par2 + 1, par3, par4))) { + isOpenUp = true; + } - public final boolean canThisPaneConnectToThisBlockID (int par1) - { - return Block.opaqueCubeLookup[par1] || par1 == this.blockID || par1 == Block.glass.blockID; - } + if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlockId(par2, par3, par4 - 1), par1IBlockAccess.getBlockMetadata(par2, par3, par4 - 1))) { + isOpenLeft = true; + } - public void registerIcons (IconRegister par1IconRegister) - { - super.registerIcons(par1IconRegister); - this.theIcon = par1IconRegister.registerIcon("tinkersconstruct:glass/" + folder + "/glass_side"); - } + if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlockId(par2, par3, par4 + 1), par1IBlockAccess.getBlockMetadata(par2, par3, par4 + 1))) { + isOpenRight = true; + } - public boolean canPaneConnectTo (IBlockAccess access, int x, int y, int z, ForgeDirection dir) - { - return canThisPaneConnectToThisBlockID(access.getBlockId(x + dir.offsetX, y + dir.offsetY, z + dir.offsetZ)) - || access.isBlockSolidOnSide(x + dir.offsetX, y + dir.offsetY, z + dir.offsetZ, dir.getOpposite(), false); - } + if (isOpenUp && isOpenDown && isOpenLeft && isOpenRight) { + return icons[15]; + } else if (isOpenUp && isOpenDown && isOpenLeft) { + return icons[11]; + } else if (isOpenUp && isOpenDown && isOpenRight) { + return icons[12]; + } else if (isOpenUp && isOpenLeft && isOpenRight) { + return icons[13]; + } else if (isOpenDown && isOpenLeft && isOpenRight) { + return icons[14]; + } else if (isOpenDown && isOpenUp) { + return icons[5]; + } else if (isOpenLeft && isOpenRight) { + return icons[6]; + } else if (isOpenDown && isOpenLeft) { + return icons[8]; + } else if (isOpenDown && isOpenRight) { + return icons[10]; + } else if (isOpenUp && isOpenLeft) { + return icons[7]; + } else if (isOpenUp && isOpenRight) { + return icons[9]; + } else if (isOpenDown) { + return icons[3]; + } else if (isOpenUp) { + return icons[4]; + } else if (isOpenLeft) { + return icons[2]; + } else if (isOpenRight) { + return icons[1]; + } + break; + case 1: + if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlockId(par2 - 1, par3, par4), par1IBlockAccess.getBlockMetadata(par2 - 1, par3, par4))) { + isOpenDown = true; + } + + if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlockId(par2 + 1, par3, par4), par1IBlockAccess.getBlockMetadata(par2 + 1, par3, par4))) { + isOpenUp = true; + } + + if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlockId(par2, par3, par4 - 1), par1IBlockAccess.getBlockMetadata(par2, par3, par4 - 1))) { + isOpenLeft = true; + } + + if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlockId(par2, par3, par4 + 1), par1IBlockAccess.getBlockMetadata(par2, par3, par4 + 1))) { + isOpenRight = true; + } + + if (isOpenUp && isOpenDown && isOpenLeft && isOpenRight) { + return icons[15]; + } else if (isOpenUp && isOpenDown && isOpenLeft) { + return icons[11]; + } else if (isOpenUp && isOpenDown && isOpenRight) { + return icons[12]; + } else if (isOpenUp && isOpenLeft && isOpenRight) { + return icons[13]; + } else if (isOpenDown && isOpenLeft && isOpenRight) { + return icons[14]; + } else if (isOpenDown && isOpenUp) { + return icons[5]; + } else if (isOpenLeft && isOpenRight) { + return icons[6]; + } else if (isOpenDown && isOpenLeft) { + return icons[8]; + } else if (isOpenDown && isOpenRight) { + return icons[10]; + } else if (isOpenUp && isOpenLeft) { + return icons[7]; + } else if (isOpenUp && isOpenRight) { + return icons[9]; + } else if (isOpenDown) { + return icons[3]; + } else if (isOpenUp) { + return icons[4]; + } else if (isOpenLeft) { + return icons[2]; + } else if (isOpenRight) { + return icons[1]; + } + break; + case 2: + if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlockId(par2, par3 - 1, par4), par1IBlockAccess.getBlockMetadata(par2, par3 - 1, par4))) { + isOpenDown = true; + } + + if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlockId(par2, par3 + 1, par4), par1IBlockAccess.getBlockMetadata(par2, par3 + 1, par4))) { + isOpenUp = true; + } + + if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlockId(par2 - 1, par3, par4), par1IBlockAccess.getBlockMetadata(par2 - 1, par3, par4))) { + isOpenLeft = true; + } + + if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlockId(par2 + 1, par3, par4), par1IBlockAccess.getBlockMetadata(par2 + 1, par3, par4))) { + isOpenRight = true; + } + + if (isOpenUp && isOpenDown && isOpenLeft && isOpenRight) { + return icons[15]; + } else if (isOpenUp && isOpenDown && isOpenLeft) { + return icons[13]; + } else if (isOpenUp && isOpenDown && isOpenRight) { + return icons[14]; + } else if (isOpenUp && isOpenLeft && isOpenRight) { + return icons[11]; + } else if (isOpenDown && isOpenLeft && isOpenRight) { + return icons[12]; + } else if (isOpenDown && isOpenUp) { + return icons[6]; + } else if (isOpenLeft && isOpenRight) { + return icons[5]; + } else if (isOpenDown && isOpenLeft) { + return icons[9]; + } else if (isOpenDown && isOpenRight) { + return icons[10]; + } else if (isOpenUp && isOpenLeft) { + return icons[7]; + } else if (isOpenUp && isOpenRight) { + return icons[8]; + } else if (isOpenDown) { + return icons[1]; + } else if (isOpenUp) { + return icons[2]; + } else if (isOpenLeft) { + return icons[4]; + } else if (isOpenRight) { + return icons[3]; + } + break; + case 3: + if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlockId(par2, par3 - 1, par4), par1IBlockAccess.getBlockMetadata(par2, par3 - 1, par4))) { + isOpenDown = true; + } + + if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlockId(par2, par3 + 1, par4), par1IBlockAccess.getBlockMetadata(par2, par3 + 1, par4))) { + isOpenUp = true; + } + + if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlockId(par2 - 1, par3, par4), par1IBlockAccess.getBlockMetadata(par2 - 1, par3, par4))) { + isOpenLeft = true; + } + + if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlockId(par2 + 1, par3, par4), par1IBlockAccess.getBlockMetadata(par2 + 1, par3, par4))) { + isOpenRight = true; + } + + if (isOpenUp && isOpenDown && isOpenLeft && isOpenRight) { + return icons[15]; + } else if (isOpenUp && isOpenDown && isOpenLeft) { + return icons[14]; + } else if (isOpenUp && isOpenDown && isOpenRight) { + return icons[13]; + } else if (isOpenUp && isOpenLeft && isOpenRight) { + return icons[11]; + } else if (isOpenDown && isOpenLeft && isOpenRight) { + return icons[12]; + } else if (isOpenDown && isOpenUp) { + return icons[6]; + } else if (isOpenLeft && isOpenRight) { + return icons[5]; + } else if (isOpenDown && isOpenLeft) { + return icons[10]; + } else if (isOpenDown && isOpenRight) { + return icons[9]; + } else if (isOpenUp && isOpenLeft) { + return icons[8]; + } else if (isOpenUp && isOpenRight) { + return icons[7]; + } else if (isOpenDown) { + return icons[1]; + } else if (isOpenUp) { + return icons[2]; + } else if (isOpenLeft) { + return icons[3]; + } else if (isOpenRight) { + return icons[4]; + } + break; + case 4: + if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlockId(par2, par3 - 1, par4), par1IBlockAccess.getBlockMetadata(par2, par3 - 1, par4))) { + isOpenDown = true; + } + + if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlockId(par2, par3 + 1, par4), par1IBlockAccess.getBlockMetadata(par2, par3 + 1, par4))) { + isOpenUp = true; + } + + if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlockId(par2, par3, par4 - 1), par1IBlockAccess.getBlockMetadata(par2, par3, par4 - 1))) { + isOpenLeft = true; + } + + if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlockId(par2, par3, par4 + 1), par1IBlockAccess.getBlockMetadata(par2, par3, par4 + 1))) { + isOpenRight = true; + } + + if (isOpenUp && isOpenDown && isOpenLeft && isOpenRight) { + return icons[15]; + } else if (isOpenUp && isOpenDown && isOpenLeft) { + return icons[14]; + } else if (isOpenUp && isOpenDown && isOpenRight) { + return icons[13]; + } else if (isOpenUp && isOpenLeft && isOpenRight) { + return icons[11]; + } else if (isOpenDown && isOpenLeft && isOpenRight) { + return icons[12]; + } else if (isOpenDown && isOpenUp) { + return icons[6]; + } else if (isOpenLeft && isOpenRight) { + return icons[5]; + } else if (isOpenDown && isOpenLeft) { + return icons[10]; + } else if (isOpenDown && isOpenRight) { + return icons[9]; + } else if (isOpenUp && isOpenLeft) { + return icons[8]; + } else if (isOpenUp && isOpenRight) { + return icons[7]; + } else if (isOpenDown) { + return icons[1]; + } else if (isOpenUp) { + return icons[2]; + } else if (isOpenLeft) { + return icons[3]; + } else if (isOpenRight) { + return icons[4]; + } + break; + case 5: + if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlockId(par2, par3 - 1, par4), par1IBlockAccess.getBlockMetadata(par2, par3 - 1, par4))) { + isOpenDown = true; + } + + if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlockId(par2, par3 + 1, par4), par1IBlockAccess.getBlockMetadata(par2, par3 + 1, par4))) { + isOpenUp = true; + } + + if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlockId(par2, par3, par4 - 1), par1IBlockAccess.getBlockMetadata(par2, par3, par4 - 1))) { + isOpenLeft = true; + } + + if (shouldConnectToBlock(par1IBlockAccess, par2, par3, par4, par1IBlockAccess.getBlockId(par2, par3, par4 + 1), par1IBlockAccess.getBlockMetadata(par2, par3, par4 + 1))) { + isOpenRight = true; + } + + if (isOpenUp && isOpenDown && isOpenLeft && isOpenRight) { + return icons[15]; + } else if (isOpenUp && isOpenDown && isOpenLeft) { + return icons[13]; + } else if (isOpenUp && isOpenDown && isOpenRight) { + return icons[14]; + } else if (isOpenUp && isOpenLeft && isOpenRight) { + return icons[11]; + } else if (isOpenDown && isOpenLeft && isOpenRight) { + return icons[12]; + } else if (isOpenDown && isOpenUp) { + return icons[6]; + } else if (isOpenLeft && isOpenRight) { + return icons[5]; + } else if (isOpenDown && isOpenLeft) { + return icons[9]; + } else if (isOpenDown && isOpenRight) { + return icons[10]; + } else if (isOpenUp && isOpenLeft) { + return icons[7]; + } else if (isOpenUp && isOpenRight) { + return icons[8]; + } else if (isOpenDown) { + return icons[1]; + } else if (isOpenUp) { + return icons[2]; + } else if (isOpenLeft) { + return icons[4]; + } else if (isOpenRight) { + return icons[3]; + } + break; + } + + return icons[0]; + } + + @Override + public void addCollisionBoxesToList(World par1World, int par2, int par3, int par4, AxisAlignedBB par5AxisAlignedBB, List par6List, Entity par7Entity) { + boolean flag = this.canPaneConnectTo(par1World, par2, par3, par4, ForgeDirection.NORTH); + boolean flag1 = this.canPaneConnectTo(par1World, par2, par3, par4, ForgeDirection.SOUTH); + boolean flag2 = this.canPaneConnectTo(par1World, par2, par3, par4, ForgeDirection.WEST); + boolean flag3 = this.canPaneConnectTo(par1World, par2, par3, par4, ForgeDirection.EAST); + + if ((!flag2 || !flag3) && (flag2 || flag3 || flag || flag1)) { + if (flag2 && !flag3) { + this.setBlockBounds(0.0F, 0.0F, 0.4375F, 0.5F, 1.0F, 0.5625F); + super.addCollisionBoxesToList(par1World, par2, par3, par4, par5AxisAlignedBB, par6List, par7Entity); + } else if (!flag2 && flag3) { + this.setBlockBounds(0.5F, 0.0F, 0.4375F, 1.0F, 1.0F, 0.5625F); + super.addCollisionBoxesToList(par1World, par2, par3, par4, par5AxisAlignedBB, par6List, par7Entity); + } + } else { + this.setBlockBounds(0.0F, 0.0F, 0.4375F, 1.0F, 1.0F, 0.5625F); + super.addCollisionBoxesToList(par1World, par2, par3, par4, par5AxisAlignedBB, par6List, par7Entity); + } + + if ((!flag || !flag1) && (flag2 || flag3 || flag || flag1)) { + if (flag && !flag1) { + this.setBlockBounds(0.4375F, 0.0F, 0.0F, 0.5625F, 1.0F, 0.5F); + super.addCollisionBoxesToList(par1World, par2, par3, par4, par5AxisAlignedBB, par6List, par7Entity); + } else if (!flag && flag1) { + this.setBlockBounds(0.4375F, 0.0F, 0.5F, 0.5625F, 1.0F, 1.0F); + super.addCollisionBoxesToList(par1World, par2, par3, par4, par5AxisAlignedBB, par6List, par7Entity); + } + } else { + this.setBlockBounds(0.4375F, 0.0F, 0.0F, 0.5625F, 1.0F, 1.0F); + super.addCollisionBoxesToList(par1World, par2, par3, par4, par5AxisAlignedBB, par6List, par7Entity); + } + } + + @Override + public void setBlockBoundsForItemRender() { + this.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F); + } + + @Override + public void setBlockBoundsBasedOnState(IBlockAccess par1IBlockAccess, int par2, int par3, int par4) { + float f = 0.4375F; + float f1 = 0.5625F; + float f2 = 0.4375F; + float f3 = 0.5625F; + boolean flag = this.canPaneConnectTo(par1IBlockAccess, par2, par3, par4, ForgeDirection.NORTH); + boolean flag1 = this.canPaneConnectTo(par1IBlockAccess, par2, par3, par4, ForgeDirection.SOUTH); + boolean flag2 = this.canPaneConnectTo(par1IBlockAccess, par2, par3, par4, ForgeDirection.WEST); + boolean flag3 = this.canPaneConnectTo(par1IBlockAccess, par2, par3, par4, ForgeDirection.EAST); + + if ((!flag2 || !flag3) && (flag2 || flag3 || flag || flag1)) { + if (flag2 && !flag3) { + f = 0.0F; + } else if (!flag2 && flag3) { + f1 = 1.0F; + } + } else { + f = 0.0F; + f1 = 1.0F; + } + + if ((!flag || !flag1) && (flag2 || flag3 || flag || flag1)) { + if (flag && !flag1) { + f2 = 0.0F; + } else if (!flag && flag1) { + f3 = 1.0F; + } + } else { + f2 = 0.0F; + f3 = 1.0F; + } + + this.setBlockBounds(f, 0.0F, f2, f1, 1.0F, f3); + } + + public Icon getSideTextureIndex() { + return this.theIcon; + } + + public final boolean canThisPaneConnectToThisBlockID(int par1) { + return Block.opaqueCubeLookup[par1] || par1 == this.blockID || par1 == Block.glass.blockID; + } + + public void registerIcons(IconRegister par1IconRegister) { + super.registerIcons(par1IconRegister); + this.theIcon = par1IconRegister.registerIcon("tinker:glass/" + folder + "/glass_side"); + } + + public boolean canPaneConnectTo(IBlockAccess access, int x, int y, int z, ForgeDirection dir) { + return canThisPaneConnectToThisBlockID(access.getBlockId(x + dir.offsetX, y + dir.offsetY, z + dir.offsetZ)) || access.isBlockSolidOnSide(x + dir.offsetX, y + dir.offsetY, z + dir.offsetZ, dir.getOpposite(), false); + } } diff --git a/src/tconstruct/client/block/PaneConnectedRender.java b/src/tconstruct/client/block/PaneConnectedRender.java index 6ea5ebb3..0d4d525b 100644 --- a/src/tconstruct/client/block/PaneConnectedRender.java +++ b/src/tconstruct/client/block/PaneConnectedRender.java @@ -14,468 +14,70 @@ import tconstruct.blocks.GlassPaneConnected; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.client.registry.RenderingRegistry; -public class PaneConnectedRender implements ISimpleBlockRenderingHandler -{ +public class PaneConnectedRender implements ISimpleBlockRenderingHandler { - public static int model = RenderingRegistry.getNextAvailableRenderId(); + public static int model = RenderingRegistry.getNextAvailableRenderId(); - @Override - public void renderInventoryBlock (Block block, int metadata, int modelID, RenderBlocks renderer) - { + @Override + public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer) { - } + } - @Override - public boolean renderWorldBlock (IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) - { - GlassPaneConnected paneConnected = (GlassPaneConnected) block; - int l = world.getHeight(); - Tessellator tessellator = Tessellator.instance; - tessellator.setBrightness(paneConnected.getMixedBrightnessForBlock(world, x, y, z)); - float f = 1.0F; - int i1 = paneConnected.colorMultiplier(world, x, y, z); - float f1 = (float) (i1 >> 16 & 255) / 255.0F; - float f2 = (float) (i1 >> 8 & 255) / 255.0F; - float f3 = (float) (i1 & 255) / 255.0F; + @Override + public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { + GlassPaneConnected pane = (GlassPaneConnected)block; + + boolean flag = pane.canPaneConnectTo(world, x, y, z, EAST); + boolean flag1 = pane.canPaneConnectTo(world, x, y, z, WEST); + boolean flag2 = pane.canPaneConnectTo(world, x, y, z, SOUTH); + boolean flag3 = pane.canPaneConnectTo(world, x, y, z, NORTH); + + Icon sideTexture = pane.getSideTextureIndex(); + + if(!flag && !flag1 && !flag2 && !flag3){ + renderer.setRenderBounds(0D, 0D, 0.45D, 1D, 1D, 0.55D); + renderer.renderStandardBlock(block, x, y, z); + renderer.setRenderBounds(0.45D, 0D, 0D, 0.55D, 1D, 1D); + renderer.renderStandardBlock(block, x, y, z); + }else{ +// renderer.setRenderBounds(0.45D, 0D, 0.45D, 0.55D, 1D, 0.55D); +// renderer.renderStandardBlock(block, x, y, z); + } + + if(flag){ + renderer.setRenderBounds(0.45D, 0D, 0.45D, 1D, 1D, 0.55D); + renderer.renderStandardBlock(block, x, y, z); + } + + if(flag1){ + renderer.setRenderBounds(0D, 0D, 0.45D, 0.45D, 1D, 0.55D); + renderer.renderStandardBlock(block, x, y, z); + } + + if(flag2){ + renderer.setRenderBounds(0.45D, 0D, 0.45D, 0.55D, 1D, 1D); + renderer.renderStandardBlock(block, x, y, z); + } + + if(flag3){ + renderer.setRenderBounds(0.45D, 0D, 0D, 0.55D, 1D, 0.45D); + renderer.renderStandardBlock(block, x, y, z); + } + + + + renderer.clearOverrideBlockTexture(); + return true; + } - if (EntityRenderer.anaglyphEnable) - { - float f4 = (f1 * 30.0F + f2 * 59.0F + f3 * 11.0F) / 100.0F; - float f5 = (f1 * 30.0F + f2 * 70.0F) / 100.0F; - float f6 = (f1 * 30.0F + f3 * 70.0F) / 100.0F; - f1 = f4; - f2 = f5; - f3 = f6; - } + @Override + public boolean shouldRender3DInInventory() { + return false; + } - tessellator.setColorOpaque_F(f * f1, f * f2, f * f3); - Icon icon; - Icon icon1; - - if (renderer.hasOverrideBlockTexture()) - { - icon = renderer.overrideBlockTexture; - icon1 = renderer.overrideBlockTexture; - } - else - { - int j1 = world.getBlockMetadata(x, y, z); - icon = renderer.getBlockIconFromSideAndMetadata(paneConnected, 0, j1); - icon1 = paneConnected.getSideTextureIndex(); - } - - double d0 = (double) icon.getMinU(); - double d1 = (double) icon.getInterpolatedU(8.0D); - double d2 = (double) icon.getMaxU(); - double d3 = (double) icon.getMinV(); - double d4 = (double) icon.getMaxV(); - double d5 = (double) icon1.getInterpolatedU(7.0D); - double d6 = (double) icon1.getInterpolatedU(9.0D); - double d7 = (double) icon1.getMinV(); - double d8 = (double) icon1.getInterpolatedV(8.0D); - double d9 = (double) icon1.getMaxV(); - double d10 = (double) x; - double d11 = (double) x + 0.5D; - double d12 = (double) (x + 1); - double d13 = (double) z; - double d14 = (double) z + 0.5D; - double d15 = (double) (z + 1); - double d16 = (double) x + 0.5D - 0.0625D; - double d17 = (double) x + 0.5D + 0.0625D; - double d18 = (double) z + 0.5D - 0.0625D; - double d19 = (double) z + 0.5D + 0.0625D; - boolean flag = paneConnected.canPaneConnectTo(world, x, y, z, NORTH); - boolean flag1 = paneConnected.canPaneConnectTo(world, x, y, z, SOUTH); - boolean flag2 = paneConnected.canPaneConnectTo(world, x, y, z, WEST); - boolean flag3 = paneConnected.canPaneConnectTo(world, x, y, z, EAST); - boolean flag4 = paneConnected.shouldSideBeRendered(world, x, y + 1, z, 1); - boolean flag5 = paneConnected.shouldSideBeRendered(world, x, y - 1, z, 0); - double d20 = 0.01D; - double d21 = 0.005D; - - if ((!flag2 || !flag3) && (flag2 || flag3 || flag || flag1)) - { - if (flag2 && !flag3) - { - tessellator.addVertexWithUV(d10, (double) (y + 1), d14, d0, d3); - tessellator.addVertexWithUV(d10, (double) (y + 0), d14, d0, d4); - tessellator.addVertexWithUV(d11, (double) (y + 0), d14, d1, d4); - tessellator.addVertexWithUV(d11, (double) (y + 1), d14, d1, d3); - tessellator.addVertexWithUV(d11, (double) (y + 1), d14, d0, d3); - tessellator.addVertexWithUV(d11, (double) (y + 0), d14, d0, d4); - tessellator.addVertexWithUV(d10, (double) (y + 0), d14, d1, d4); - tessellator.addVertexWithUV(d10, (double) (y + 1), d14, d1, d3); - - if (!flag1 && !flag) - { - tessellator.addVertexWithUV(d11, (double) (y + 1), d19, d5, d7); - tessellator.addVertexWithUV(d11, (double) (y + 0), d19, d5, d9); - tessellator.addVertexWithUV(d11, (double) (y + 0), d18, d6, d9); - tessellator.addVertexWithUV(d11, (double) (y + 1), d18, d6, d7); - tessellator.addVertexWithUV(d11, (double) (y + 1), d18, d5, d7); - tessellator.addVertexWithUV(d11, (double) (y + 0), d18, d5, d9); - tessellator.addVertexWithUV(d11, (double) (y + 0), d19, d6, d9); - tessellator.addVertexWithUV(d11, (double) (y + 1), d19, d6, d7); - } - - if (flag4 || y < l - 1 && world.isAirBlock(x - 1, y + 1, z)) - { - tessellator.addVertexWithUV(d10, (double) (y + 1) + 0.01D, d19, d6, d8); - tessellator.addVertexWithUV(d11, (double) (y + 1) + 0.01D, d19, d6, d9); - tessellator.addVertexWithUV(d11, (double) (y + 1) + 0.01D, d18, d5, d9); - tessellator.addVertexWithUV(d10, (double) (y + 1) + 0.01D, d18, d5, d8); - tessellator.addVertexWithUV(d11, (double) (y + 1) + 0.01D, d19, d6, d8); - tessellator.addVertexWithUV(d10, (double) (y + 1) + 0.01D, d19, d6, d9); - tessellator.addVertexWithUV(d10, (double) (y + 1) + 0.01D, d18, d5, d9); - tessellator.addVertexWithUV(d11, (double) (y + 1) + 0.01D, d18, d5, d8); - } - - if (flag5 || y > 1 && world.isAirBlock(x - 1, y - 1, z)) - { - tessellator.addVertexWithUV(d10, (double) y - 0.01D, d19, d6, d8); - tessellator.addVertexWithUV(d11, (double) y - 0.01D, d19, d6, d9); - tessellator.addVertexWithUV(d11, (double) y - 0.01D, d18, d5, d9); - tessellator.addVertexWithUV(d10, (double) y - 0.01D, d18, d5, d8); - tessellator.addVertexWithUV(d11, (double) y - 0.01D, d19, d6, d8); - tessellator.addVertexWithUV(d10, (double) y - 0.01D, d19, d6, d9); - tessellator.addVertexWithUV(d10, (double) y - 0.01D, d18, d5, d9); - tessellator.addVertexWithUV(d11, (double) y - 0.01D, d18, d5, d8); - } - } - else if (!flag2 && flag3) - { - tessellator.addVertexWithUV(d11, (double) (y + 1), d14, d1, d3); - tessellator.addVertexWithUV(d11, (double) (y + 0), d14, d1, d4); - tessellator.addVertexWithUV(d12, (double) (y + 0), d14, d2, d4); - tessellator.addVertexWithUV(d12, (double) (y + 1), d14, d2, d3); - tessellator.addVertexWithUV(d12, (double) (y + 1), d14, d1, d3); - tessellator.addVertexWithUV(d12, (double) (y + 0), d14, d1, d4); - tessellator.addVertexWithUV(d11, (double) (y + 0), d14, d2, d4); - tessellator.addVertexWithUV(d11, (double) (y + 1), d14, d2, d3); - - if (!flag1 && !flag) - { - tessellator.addVertexWithUV(d11, (double) (y + 1), d18, d5, d7); - tessellator.addVertexWithUV(d11, (double) (y + 0), d18, d5, d9); - tessellator.addVertexWithUV(d11, (double) (y + 0), d19, d6, d9); - tessellator.addVertexWithUV(d11, (double) (y + 1), d19, d6, d7); - tessellator.addVertexWithUV(d11, (double) (y + 1), d19, d5, d7); - tessellator.addVertexWithUV(d11, (double) (y + 0), d19, d5, d9); - tessellator.addVertexWithUV(d11, (double) (y + 0), d18, d6, d9); - tessellator.addVertexWithUV(d11, (double) (y + 1), d18, d6, d7); - } - - if (flag4 || y < l - 1 && world.isAirBlock(x + 1, y + 1, z)) - { - tessellator.addVertexWithUV(d11, (double) (y + 1) + 0.01D, d19, d6, d7); - tessellator.addVertexWithUV(d12, (double) (y + 1) + 0.01D, d19, d6, d8); - tessellator.addVertexWithUV(d12, (double) (y + 1) + 0.01D, d18, d5, d8); - tessellator.addVertexWithUV(d11, (double) (y + 1) + 0.01D, d18, d5, d7); - tessellator.addVertexWithUV(d12, (double) (y + 1) + 0.01D, d19, d6, d7); - tessellator.addVertexWithUV(d11, (double) (y + 1) + 0.01D, d19, d6, d8); - tessellator.addVertexWithUV(d11, (double) (y + 1) + 0.01D, d18, d5, d8); - tessellator.addVertexWithUV(d12, (double) (y + 1) + 0.01D, d18, d5, d7); - } - - if (flag5 || y > 1 && world.isAirBlock(x + 1, y - 1, z)) - { - tessellator.addVertexWithUV(d11, (double) y - 0.01D, d19, d6, d7); - tessellator.addVertexWithUV(d12, (double) y - 0.01D, d19, d6, d8); - tessellator.addVertexWithUV(d12, (double) y - 0.01D, d18, d5, d8); - tessellator.addVertexWithUV(d11, (double) y - 0.01D, d18, d5, d7); - tessellator.addVertexWithUV(d12, (double) y - 0.01D, d19, d6, d7); - tessellator.addVertexWithUV(d11, (double) y - 0.01D, d19, d6, d8); - tessellator.addVertexWithUV(d11, (double) y - 0.01D, d18, d5, d8); - tessellator.addVertexWithUV(d12, (double) y - 0.01D, d18, d5, d7); - } - } - } - else - { - tessellator.addVertexWithUV(d10, (double) (y + 1), d14, d0, d3); - tessellator.addVertexWithUV(d10, (double) (y + 0), d14, d0, d4); - tessellator.addVertexWithUV(d12, (double) (y + 0), d14, d2, d4); - tessellator.addVertexWithUV(d12, (double) (y + 1), d14, d2, d3); - tessellator.addVertexWithUV(d12, (double) (y + 1), d14, d0, d3); - tessellator.addVertexWithUV(d12, (double) (y + 0), d14, d0, d4); - tessellator.addVertexWithUV(d10, (double) (y + 0), d14, d2, d4); - tessellator.addVertexWithUV(d10, (double) (y + 1), d14, d2, d3); - - if (flag4) - { - tessellator.addVertexWithUV(d10, (double) (y + 1) + 0.01D, d19, d6, d9); - tessellator.addVertexWithUV(d12, (double) (y + 1) + 0.01D, d19, d6, d7); - tessellator.addVertexWithUV(d12, (double) (y + 1) + 0.01D, d18, d5, d7); - tessellator.addVertexWithUV(d10, (double) (y + 1) + 0.01D, d18, d5, d9); - tessellator.addVertexWithUV(d12, (double) (y + 1) + 0.01D, d19, d6, d9); - tessellator.addVertexWithUV(d10, (double) (y + 1) + 0.01D, d19, d6, d7); - tessellator.addVertexWithUV(d10, (double) (y + 1) + 0.01D, d18, d5, d7); - tessellator.addVertexWithUV(d12, (double) (y + 1) + 0.01D, d18, d5, d9); - } - else - { - if (y < l - 1 && world.isAirBlock(x - 1, y + 1, z)) - { - tessellator.addVertexWithUV(d10, (double) (y + 1) + 0.01D, d19, d6, d8); - tessellator.addVertexWithUV(d11, (double) (y + 1) + 0.01D, d19, d6, d9); - tessellator.addVertexWithUV(d11, (double) (y + 1) + 0.01D, d18, d5, d9); - tessellator.addVertexWithUV(d10, (double) (y + 1) + 0.01D, d18, d5, d8); - tessellator.addVertexWithUV(d11, (double) (y + 1) + 0.01D, d19, d6, d8); - tessellator.addVertexWithUV(d10, (double) (y + 1) + 0.01D, d19, d6, d9); - tessellator.addVertexWithUV(d10, (double) (y + 1) + 0.01D, d18, d5, d9); - tessellator.addVertexWithUV(d11, (double) (y + 1) + 0.01D, d18, d5, d8); - } - - if (y < l - 1 && world.isAirBlock(x + 1, y + 1, z)) - { - tessellator.addVertexWithUV(d11, (double) (y + 1) + 0.01D, d19, d6, d7); - tessellator.addVertexWithUV(d12, (double) (y + 1) + 0.01D, d19, d6, d8); - tessellator.addVertexWithUV(d12, (double) (y + 1) + 0.01D, d18, d5, d8); - tessellator.addVertexWithUV(d11, (double) (y + 1) + 0.01D, d18, d5, d7); - tessellator.addVertexWithUV(d12, (double) (y + 1) + 0.01D, d19, d6, d7); - tessellator.addVertexWithUV(d11, (double) (y + 1) + 0.01D, d19, d6, d8); - tessellator.addVertexWithUV(d11, (double) (y + 1) + 0.01D, d18, d5, d8); - tessellator.addVertexWithUV(d12, (double) (y + 1) + 0.01D, d18, d5, d7); - } - } - - if (flag5) - { - tessellator.addVertexWithUV(d10, (double) y - 0.01D, d19, d6, d9); - tessellator.addVertexWithUV(d12, (double) y - 0.01D, d19, d6, d7); - tessellator.addVertexWithUV(d12, (double) y - 0.01D, d18, d5, d7); - tessellator.addVertexWithUV(d10, (double) y - 0.01D, d18, d5, d9); - tessellator.addVertexWithUV(d12, (double) y - 0.01D, d19, d6, d9); - tessellator.addVertexWithUV(d10, (double) y - 0.01D, d19, d6, d7); - tessellator.addVertexWithUV(d10, (double) y - 0.01D, d18, d5, d7); - tessellator.addVertexWithUV(d12, (double) y - 0.01D, d18, d5, d9); - } - else - { - if (y > 1 && world.isAirBlock(x - 1, y - 1, z)) - { - tessellator.addVertexWithUV(d10, (double) y - 0.01D, d19, d6, d8); - tessellator.addVertexWithUV(d11, (double) y - 0.01D, d19, d6, d9); - tessellator.addVertexWithUV(d11, (double) y - 0.01D, d18, d5, d9); - tessellator.addVertexWithUV(d10, (double) y - 0.01D, d18, d5, d8); - tessellator.addVertexWithUV(d11, (double) y - 0.01D, d19, d6, d8); - tessellator.addVertexWithUV(d10, (double) y - 0.01D, d19, d6, d9); - tessellator.addVertexWithUV(d10, (double) y - 0.01D, d18, d5, d9); - tessellator.addVertexWithUV(d11, (double) y - 0.01D, d18, d5, d8); - } - - if (y > 1 && world.isAirBlock(x + 1, y - 1, z)) - { - tessellator.addVertexWithUV(d11, (double) y - 0.01D, d19, d6, d7); - tessellator.addVertexWithUV(d12, (double) y - 0.01D, d19, d6, d8); - tessellator.addVertexWithUV(d12, (double) y - 0.01D, d18, d5, d8); - tessellator.addVertexWithUV(d11, (double) y - 0.01D, d18, d5, d7); - tessellator.addVertexWithUV(d12, (double) y - 0.01D, d19, d6, d7); - tessellator.addVertexWithUV(d11, (double) y - 0.01D, d19, d6, d8); - tessellator.addVertexWithUV(d11, (double) y - 0.01D, d18, d5, d8); - tessellator.addVertexWithUV(d12, (double) y - 0.01D, d18, d5, d7); - } - } - } - - if ((!flag || !flag1) && (flag2 || flag3 || flag || flag1)) - { - if (flag && !flag1) - { - tessellator.addVertexWithUV(d11, (double) (y + 1), d13, d0, d3); - tessellator.addVertexWithUV(d11, (double) (y + 0), d13, d0, d4); - tessellator.addVertexWithUV(d11, (double) (y + 0), d14, d1, d4); - tessellator.addVertexWithUV(d11, (double) (y + 1), d14, d1, d3); - tessellator.addVertexWithUV(d11, (double) (y + 1), d14, d0, d3); - tessellator.addVertexWithUV(d11, (double) (y + 0), d14, d0, d4); - tessellator.addVertexWithUV(d11, (double) (y + 0), d13, d1, d4); - tessellator.addVertexWithUV(d11, (double) (y + 1), d13, d1, d3); - - if (!flag3 && !flag2) - { - tessellator.addVertexWithUV(d16, (double) (y + 1), d14, d5, d7); - tessellator.addVertexWithUV(d16, (double) (y + 0), d14, d5, d9); - tessellator.addVertexWithUV(d17, (double) (y + 0), d14, d6, d9); - tessellator.addVertexWithUV(d17, (double) (y + 1), d14, d6, d7); - tessellator.addVertexWithUV(d17, (double) (y + 1), d14, d5, d7); - tessellator.addVertexWithUV(d17, (double) (y + 0), d14, d5, d9); - tessellator.addVertexWithUV(d16, (double) (y + 0), d14, d6, d9); - tessellator.addVertexWithUV(d16, (double) (y + 1), d14, d6, d7); - } - - if (flag4 || y < l - 1 && world.isAirBlock(x, y + 1, z - 1)) - { - tessellator.addVertexWithUV(d16, (double) (y + 1) + 0.005D, d13, d6, d7); - tessellator.addVertexWithUV(d16, (double) (y + 1) + 0.005D, d14, d6, d8); - tessellator.addVertexWithUV(d17, (double) (y + 1) + 0.005D, d14, d5, d8); - tessellator.addVertexWithUV(d17, (double) (y + 1) + 0.005D, d13, d5, d7); - tessellator.addVertexWithUV(d16, (double) (y + 1) + 0.005D, d14, d6, d7); - tessellator.addVertexWithUV(d16, (double) (y + 1) + 0.005D, d13, d6, d8); - tessellator.addVertexWithUV(d17, (double) (y + 1) + 0.005D, d13, d5, d8); - tessellator.addVertexWithUV(d17, (double) (y + 1) + 0.005D, d14, d5, d7); - } - - if (flag5 || y > 1 && world.isAirBlock(x, y - 1, z - 1)) - { - tessellator.addVertexWithUV(d16, (double) y - 0.005D, d13, d6, d7); - tessellator.addVertexWithUV(d16, (double) y - 0.005D, d14, d6, d8); - tessellator.addVertexWithUV(d17, (double) y - 0.005D, d14, d5, d8); - tessellator.addVertexWithUV(d17, (double) y - 0.005D, d13, d5, d7); - tessellator.addVertexWithUV(d16, (double) y - 0.005D, d14, d6, d7); - tessellator.addVertexWithUV(d16, (double) y - 0.005D, d13, d6, d8); - tessellator.addVertexWithUV(d17, (double) y - 0.005D, d13, d5, d8); - tessellator.addVertexWithUV(d17, (double) y - 0.005D, d14, d5, d7); - } - } - else if (!flag && flag1) - { - tessellator.addVertexWithUV(d11, (double) (y + 1), d14, d1, d3); - tessellator.addVertexWithUV(d11, (double) (y + 0), d14, d1, d4); - tessellator.addVertexWithUV(d11, (double) (y + 0), d15, d2, d4); - tessellator.addVertexWithUV(d11, (double) (y + 1), d15, d2, d3); - tessellator.addVertexWithUV(d11, (double) (y + 1), d15, d1, d3); - tessellator.addVertexWithUV(d11, (double) (y + 0), d15, d1, d4); - tessellator.addVertexWithUV(d11, (double) (y + 0), d14, d2, d4); - tessellator.addVertexWithUV(d11, (double) (y + 1), d14, d2, d3); - - if (!flag3 && !flag2) - { - tessellator.addVertexWithUV(d17, (double) (y + 1), d14, d5, d7); - tessellator.addVertexWithUV(d17, (double) (y + 0), d14, d5, d9); - tessellator.addVertexWithUV(d16, (double) (y + 0), d14, d6, d9); - tessellator.addVertexWithUV(d16, (double) (y + 1), d14, d6, d7); - tessellator.addVertexWithUV(d16, (double) (y + 1), d14, d5, d7); - tessellator.addVertexWithUV(d16, (double) (y + 0), d14, d5, d9); - tessellator.addVertexWithUV(d17, (double) (y + 0), d14, d6, d9); - tessellator.addVertexWithUV(d17, (double) (y + 1), d14, d6, d7); - } - - if (flag4 || y < l - 1 && world.isAirBlock(x, y + 1, z + 1)) - { - tessellator.addVertexWithUV(d16, (double) (y + 1) + 0.005D, d14, d5, d8); - tessellator.addVertexWithUV(d16, (double) (y + 1) + 0.005D, d15, d5, d9); - tessellator.addVertexWithUV(d17, (double) (y + 1) + 0.005D, d15, d6, d9); - tessellator.addVertexWithUV(d17, (double) (y + 1) + 0.005D, d14, d6, d8); - tessellator.addVertexWithUV(d16, (double) (y + 1) + 0.005D, d15, d5, d8); - tessellator.addVertexWithUV(d16, (double) (y + 1) + 0.005D, d14, d5, d9); - tessellator.addVertexWithUV(d17, (double) (y + 1) + 0.005D, d14, d6, d9); - tessellator.addVertexWithUV(d17, (double) (y + 1) + 0.005D, d15, d6, d8); - } - - if (flag5 || y > 1 && world.isAirBlock(x, y - 1, z + 1)) - { - tessellator.addVertexWithUV(d16, (double) y - 0.005D, d14, d5, d8); - tessellator.addVertexWithUV(d16, (double) y - 0.005D, d15, d5, d9); - tessellator.addVertexWithUV(d17, (double) y - 0.005D, d15, d6, d9); - tessellator.addVertexWithUV(d17, (double) y - 0.005D, d14, d6, d8); - tessellator.addVertexWithUV(d16, (double) y - 0.005D, d15, d5, d8); - tessellator.addVertexWithUV(d16, (double) y - 0.005D, d14, d5, d9); - tessellator.addVertexWithUV(d17, (double) y - 0.005D, d14, d6, d9); - tessellator.addVertexWithUV(d17, (double) y - 0.005D, d15, d6, d8); - } - } - } - else - { - tessellator.addVertexWithUV(d11, (double) (y + 1), d15, d0, d3); - tessellator.addVertexWithUV(d11, (double) (y + 0), d15, d0, d4); - tessellator.addVertexWithUV(d11, (double) (y + 0), d13, d2, d4); - tessellator.addVertexWithUV(d11, (double) (y + 1), d13, d2, d3); - tessellator.addVertexWithUV(d11, (double) (y + 1), d13, d0, d3); - tessellator.addVertexWithUV(d11, (double) (y + 0), d13, d0, d4); - tessellator.addVertexWithUV(d11, (double) (y + 0), d15, d2, d4); - tessellator.addVertexWithUV(d11, (double) (y + 1), d15, d2, d3); - - if (flag4) - { - tessellator.addVertexWithUV(d17, (double) (y + 1) + 0.005D, d15, d6, d9); - tessellator.addVertexWithUV(d17, (double) (y + 1) + 0.005D, d13, d6, d7); - tessellator.addVertexWithUV(d16, (double) (y + 1) + 0.005D, d13, d5, d7); - tessellator.addVertexWithUV(d16, (double) (y + 1) + 0.005D, d15, d5, d9); - tessellator.addVertexWithUV(d17, (double) (y + 1) + 0.005D, d13, d6, d9); - tessellator.addVertexWithUV(d17, (double) (y + 1) + 0.005D, d15, d6, d7); - tessellator.addVertexWithUV(d16, (double) (y + 1) + 0.005D, d15, d5, d7); - tessellator.addVertexWithUV(d16, (double) (y + 1) + 0.005D, d13, d5, d9); - } - else - { - if (y < l - 1 && world.isAirBlock(x, y + 1, z - 1)) - { - tessellator.addVertexWithUV(d16, (double) (y + 1) + 0.005D, d13, d6, d7); - tessellator.addVertexWithUV(d16, (double) (y + 1) + 0.005D, d14, d6, d8); - tessellator.addVertexWithUV(d17, (double) (y + 1) + 0.005D, d14, d5, d8); - tessellator.addVertexWithUV(d17, (double) (y + 1) + 0.005D, d13, d5, d7); - tessellator.addVertexWithUV(d16, (double) (y + 1) + 0.005D, d14, d6, d7); - tessellator.addVertexWithUV(d16, (double) (y + 1) + 0.005D, d13, d6, d8); - tessellator.addVertexWithUV(d17, (double) (y + 1) + 0.005D, d13, d5, d8); - tessellator.addVertexWithUV(d17, (double) (y + 1) + 0.005D, d14, d5, d7); - } - - if (y < l - 1 && world.isAirBlock(x, y + 1, z + 1)) - { - tessellator.addVertexWithUV(d16, (double) (y + 1) + 0.005D, d14, d5, d8); - tessellator.addVertexWithUV(d16, (double) (y + 1) + 0.005D, d15, d5, d9); - tessellator.addVertexWithUV(d17, (double) (y + 1) + 0.005D, d15, d6, d9); - tessellator.addVertexWithUV(d17, (double) (y + 1) + 0.005D, d14, d6, d8); - tessellator.addVertexWithUV(d16, (double) (y + 1) + 0.005D, d15, d5, d8); - tessellator.addVertexWithUV(d16, (double) (y + 1) + 0.005D, d14, d5, d9); - tessellator.addVertexWithUV(d17, (double) (y + 1) + 0.005D, d14, d6, d9); - tessellator.addVertexWithUV(d17, (double) (y + 1) + 0.005D, d15, d6, d8); - } - } - - if (flag5) - { - tessellator.addVertexWithUV(d17, (double) y - 0.005D, d15, d6, d9); - tessellator.addVertexWithUV(d17, (double) y - 0.005D, d13, d6, d7); - tessellator.addVertexWithUV(d16, (double) y - 0.005D, d13, d5, d7); - tessellator.addVertexWithUV(d16, (double) y - 0.005D, d15, d5, d9); - tessellator.addVertexWithUV(d17, (double) y - 0.005D, d13, d6, d9); - tessellator.addVertexWithUV(d17, (double) y - 0.005D, d15, d6, d7); - tessellator.addVertexWithUV(d16, (double) y - 0.005D, d15, d5, d7); - tessellator.addVertexWithUV(d16, (double) y - 0.005D, d13, d5, d9); - } - else - { - if (y > 1 && world.isAirBlock(x, y - 1, z - 1)) - { - tessellator.addVertexWithUV(d16, (double) y - 0.005D, d13, d6, d7); - tessellator.addVertexWithUV(d16, (double) y - 0.005D, d14, d6, d8); - tessellator.addVertexWithUV(d17, (double) y - 0.005D, d14, d5, d8); - tessellator.addVertexWithUV(d17, (double) y - 0.005D, d13, d5, d7); - tessellator.addVertexWithUV(d16, (double) y - 0.005D, d14, d6, d7); - tessellator.addVertexWithUV(d16, (double) y - 0.005D, d13, d6, d8); - tessellator.addVertexWithUV(d17, (double) y - 0.005D, d13, d5, d8); - tessellator.addVertexWithUV(d17, (double) y - 0.005D, d14, d5, d7); - } - - if (y > 1 && world.isAirBlock(x, y - 1, z + 1)) - { - tessellator.addVertexWithUV(d16, (double) y - 0.005D, d14, d5, d8); - tessellator.addVertexWithUV(d16, (double) y - 0.005D, d15, d5, d9); - tessellator.addVertexWithUV(d17, (double) y - 0.005D, d15, d6, d9); - tessellator.addVertexWithUV(d17, (double) y - 0.005D, d14, d6, d8); - tessellator.addVertexWithUV(d16, (double) y - 0.005D, d15, d5, d8); - tessellator.addVertexWithUV(d16, (double) y - 0.005D, d14, d5, d9); - tessellator.addVertexWithUV(d17, (double) y - 0.005D, d14, d6, d9); - tessellator.addVertexWithUV(d17, (double) y - 0.005D, d15, d6, d8); - } - } - } - - return true; - } - - @Override - public boolean shouldRender3DInInventory () - { - return false; - } - - @Override - public int getRenderId () - { - return model; - } + @Override + public int getRenderId() { + return model; + } } diff --git a/src/tconstruct/common/TContent.java b/src/tconstruct/common/TContent.java index 36f92f3e..5d3648f8 100644 --- a/src/tconstruct/common/TContent.java +++ b/src/tconstruct/common/TContent.java @@ -1,216 +1,42 @@ package tconstruct.common; +import cpw.mods.fml.common.*; +import cpw.mods.fml.common.event.FMLInterModComms; +import cpw.mods.fml.common.registry.*; import java.lang.reflect.Field; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; - -import net.minecraft.block.Block; -import net.minecraft.block.BlockDispenser; -import net.minecraft.block.StepSound; -import net.minecraft.block.material.MapColor; -import net.minecraft.block.material.Material; -import net.minecraft.block.material.MaterialLiquid; +import java.util.*; +import net.minecraft.block.*; +import net.minecraft.block.material.*; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.FurnaceRecipes; -import net.minecraft.item.crafting.ShapedRecipes; +import net.minecraft.item.*; +import net.minecraft.item.crafting.*; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.potion.Potion; import net.minecraft.util.WeightedRandomChestContent; -import net.minecraftforge.common.ChestGenHooks; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidContainerRegistry; +import net.minecraftforge.common.*; +import net.minecraftforge.fluids.*; import net.minecraftforge.fluids.FluidContainerRegistry.FluidContainerData; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.oredict.OreDictionary; -import net.minecraftforge.oredict.ShapedOreRecipe; -import net.minecraftforge.oredict.ShapelessOreRecipe; +import net.minecraftforge.oredict.*; import tconstruct.TConstruct; -import tconstruct.blocks.BlockLandmine; -import tconstruct.blocks.CastingChannelBlock; -import tconstruct.blocks.ConveyorBase; -import tconstruct.blocks.CraftingSlab; -import tconstruct.blocks.CraftingStationBlock; -import tconstruct.blocks.DryingRack; -import tconstruct.blocks.EquipBlock; -import tconstruct.blocks.EssenceExtractor; -import tconstruct.blocks.GlassBlockConnected; -import tconstruct.blocks.GlassBlockConnectedMeta; -import tconstruct.blocks.GlassPane; -import tconstruct.blocks.GlassPaneStained; -import tconstruct.blocks.GravelOre; -import tconstruct.blocks.LavaTankBlock; -import tconstruct.blocks.LiquidMetalFinite; -import tconstruct.blocks.MeatBlock; -import tconstruct.blocks.MetalOre; -import tconstruct.blocks.MultiBrick; -import tconstruct.blocks.MultiBrickFancy; -import tconstruct.blocks.OreberryBush; -import tconstruct.blocks.OreberryBushEssence; -import tconstruct.blocks.RedstoneMachine; -import tconstruct.blocks.SearedBlock; -import tconstruct.blocks.SearedSlab; -import tconstruct.blocks.SlabBase; -import tconstruct.blocks.SlimePad; -import tconstruct.blocks.SmelteryBlock; -import tconstruct.blocks.SoilBlock; -import tconstruct.blocks.SpeedBlock; -import tconstruct.blocks.SpeedSlab; -import tconstruct.blocks.StoneTorch; -import tconstruct.blocks.TMetalBlock; -import tconstruct.blocks.ToolForgeBlock; -import tconstruct.blocks.ToolStationBlock; -import tconstruct.blocks.logic.CastingBasinLogic; -import tconstruct.blocks.logic.CastingChannelLogic; -import tconstruct.blocks.logic.CastingTableLogic; -import tconstruct.blocks.logic.CraftingStationLogic; -import tconstruct.blocks.logic.DrawbridgeLogic; -import tconstruct.blocks.logic.DryingRackLogic; -import tconstruct.blocks.logic.EssenceExtractorLogic; -import tconstruct.blocks.logic.FaucetLogic; -import tconstruct.blocks.logic.FirestarterLogic; -import tconstruct.blocks.logic.FrypanLogic; -import tconstruct.blocks.logic.LavaTankLogic; -import tconstruct.blocks.logic.MultiServantLogic; -import tconstruct.blocks.logic.PartBuilderLogic; -import tconstruct.blocks.logic.PatternChestLogic; -import tconstruct.blocks.logic.SmelteryDrainLogic; -import tconstruct.blocks.logic.SmelteryLogic; -import tconstruct.blocks.logic.StencilTableLogic; -import tconstruct.blocks.logic.TileEntityLandmine; -import tconstruct.blocks.logic.ToolForgeLogic; -import tconstruct.blocks.logic.ToolStationLogic; -import tconstruct.blocks.slime.SlimeFluid; -import tconstruct.blocks.slime.SlimeGel; -import tconstruct.blocks.slime.SlimeGrass; -import tconstruct.blocks.slime.SlimeLeaves; -import tconstruct.blocks.slime.SlimeSapling; -import tconstruct.blocks.slime.SlimeTallGrass; -import tconstruct.blocks.traps.BarricadeBlock; -import tconstruct.blocks.traps.Punji; +import tconstruct.blocks.*; +import tconstruct.blocks.logic.*; +import tconstruct.blocks.slime.*; +import tconstruct.blocks.traps.*; import tconstruct.client.StepSoundSlime; import tconstruct.compat.mystcraft.MystImcHandler; -import tconstruct.entity.Automaton; -import tconstruct.entity.BlueSlime; -import tconstruct.entity.Crystal; -import tconstruct.entity.FancyEntityItem; -import tconstruct.entity.MiniGardy; -import tconstruct.entity.SlimeClone; -import tconstruct.entity.projectile.ArrowEntity; -import tconstruct.entity.projectile.DaggerEntity; -import tconstruct.entity.projectile.LaunchedPotion; -import tconstruct.items.Bowstring; -import tconstruct.items.CraftingItem; -import tconstruct.items.DiamondApple; -import tconstruct.items.EssenceCrystal; -import tconstruct.items.FilledBucket; -import tconstruct.items.Fletching; -import tconstruct.items.GoldenHead; -import tconstruct.items.Jerky; -import tconstruct.items.Manual; -import tconstruct.items.MaterialItem; -import tconstruct.items.MetalPattern; -import tconstruct.items.OreBerries; -import tconstruct.items.Pattern; -import tconstruct.items.StrangeFood; -import tconstruct.items.TitleIcon; -import tconstruct.items.ToolPart; -import tconstruct.items.ToolPartHidden; -import tconstruct.items.ToolShard; -import tconstruct.items.armor.HeartCanister; -import tconstruct.items.armor.Knapsack; -import tconstruct.items.blocks.BarricadeItem; -import tconstruct.items.blocks.CastingChannelItem; -import tconstruct.items.blocks.CraftedSoilItemBlock; -import tconstruct.items.blocks.CraftingSlabItemBlock; -import tconstruct.items.blocks.GlassBlockItem; -import tconstruct.items.blocks.GlassPaneItem; -import tconstruct.items.blocks.GravelOreItem; -import tconstruct.items.blocks.ItemBlockLandmine; -import tconstruct.items.blocks.LavaTankItemBlock; -import tconstruct.items.blocks.MetalItemBlock; -import tconstruct.items.blocks.MetalOreItemBlock; -import tconstruct.items.blocks.MultiBrickFancyItem; -import tconstruct.items.blocks.MultiBrickItem; -import tconstruct.items.blocks.OreberryBushItem; -import tconstruct.items.blocks.OreberryBushSecondItem; -import tconstruct.items.blocks.RedstoneMachineItem; -import tconstruct.items.blocks.SearedSlabItem; -import tconstruct.items.blocks.SearedTableItemBlock; -import tconstruct.items.blocks.SlimeGelItemBlock; -import tconstruct.items.blocks.SlimeGrassItemBlock; -import tconstruct.items.blocks.SlimeLeavesItemBlock; -import tconstruct.items.blocks.SlimeSaplingItemBlock; -import tconstruct.items.blocks.SlimeTallGrassItem; -import tconstruct.items.blocks.SmelteryItemBlock; -import tconstruct.items.blocks.SpeedBlockItem; -import tconstruct.items.blocks.SpeedSlabItem; -import tconstruct.items.blocks.StainedGlassClearItem; -import tconstruct.items.blocks.StainedGlassClearPaneItem; -import tconstruct.items.blocks.ToolForgeItemBlock; -import tconstruct.items.blocks.ToolStationItemBlock; -import tconstruct.items.blocks.WoolSlab1Item; -import tconstruct.items.blocks.WoolSlab2Item; -import tconstruct.items.tools.Arrow; -import tconstruct.items.tools.BattleSign; -import tconstruct.items.tools.Battleaxe; -import tconstruct.items.tools.Broadsword; -import tconstruct.items.tools.Chisel; -import tconstruct.items.tools.Cleaver; -import tconstruct.items.tools.Cutlass; -import tconstruct.items.tools.Dagger; -import tconstruct.items.tools.Excavator; -import tconstruct.items.tools.FryingPan; -import tconstruct.items.tools.Hammer; -import tconstruct.items.tools.Hatchet; -import tconstruct.items.tools.Longsword; -import tconstruct.items.tools.LumberAxe; -import tconstruct.items.tools.Mattock; -import tconstruct.items.tools.Pickaxe; -import tconstruct.items.tools.PotionLauncher; -import tconstruct.items.tools.Rapier; -import tconstruct.items.tools.Scythe; -import tconstruct.items.tools.Shortbow; -import tconstruct.items.tools.Shovel; +import tconstruct.entity.*; +import tconstruct.entity.projectile.*; +import tconstruct.items.*; +import tconstruct.items.armor.*; +import tconstruct.items.blocks.*; +import tconstruct.items.tools.*; import tconstruct.library.TConstructRegistry; import tconstruct.library.client.TConstructClientRegistry; -import tconstruct.library.crafting.Detailing; -import tconstruct.library.crafting.DryingRackRecipes; -import tconstruct.library.crafting.LiquidCasting; -import tconstruct.library.crafting.PatternBuilder; -import tconstruct.library.crafting.Smeltery; -import tconstruct.library.crafting.ToolBuilder; +import tconstruct.library.crafting.*; import tconstruct.library.tools.ToolCore; import tconstruct.library.util.IPattern; -import tconstruct.modifiers.ModAntiSpider; -import tconstruct.modifiers.ModAttack; -import tconstruct.modifiers.ModAutoSmelt; -import tconstruct.modifiers.ModBlaze; -import tconstruct.modifiers.ModButtertouch; -import tconstruct.modifiers.ModDurability; -import tconstruct.modifiers.ModElectric; -import tconstruct.modifiers.ModExtraModifier; -import tconstruct.modifiers.ModInteger; -import tconstruct.modifiers.ModLapis; -import tconstruct.modifiers.ModPiston; -import tconstruct.modifiers.ModRedstone; -import tconstruct.modifiers.ModReinforced; -import tconstruct.modifiers.ModRepair; -import tconstruct.modifiers.ModSmite; -import tconstruct.modifiers.TActiveOmniMod; -import tconstruct.util.PHConstruct; -import tconstruct.util.RecipeRemover; -import tconstruct.util.TDispenserBehaviorSpawnEgg; -import cpw.mods.fml.common.IFuelHandler; -import cpw.mods.fml.common.Loader; -import cpw.mods.fml.common.event.FMLInterModComms; -import cpw.mods.fml.common.registry.EntityRegistry; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.common.registry.LanguageRegistry; +import tconstruct.modifiers.*; +import tconstruct.util.*; public class TContent implements IFuelHandler { @@ -904,7 +730,7 @@ public class TContent implements IFuelHandler clearGlass.stepSound = Block.soundGlassFootstep; GameRegistry.registerBlock(clearGlass, GlassBlockItem.class, "GlassBlock"); - glassPane = new GlassPane(PHConstruct.glassPane); + glassPane = new GlassPaneConnected(PHConstruct.glassPane, "clear", false); GameRegistry.registerBlock(glassPane, GlassPaneItem.class, "GlassPane"); stainedGlassClear = new GlassBlockConnectedMeta(PHConstruct.stainedGlassClear, "stained", true, "white", "orange", "magenta", "light_blue", "yellow", "lime", "pink", "gray", "light_gray", From a94591818c42851200cc536913ab0b344b58965d Mon Sep 17 00:00:00 2001 From: Arthur Uzulin Date: Tue, 17 Sep 2013 20:25:24 +1000 Subject: [PATCH 3/4] ShouldSideBeRendered fix --- .../blocks/GlassBlockConnected.java | 2 +- src/tconstruct/blocks/GlassPaneConnected.java | 25 +++++++++++++------ .../client/block/PaneConnectedRender.java | 2 ++ 3 files changed, 21 insertions(+), 8 deletions(-) diff --git a/src/tconstruct/blocks/GlassBlockConnected.java b/src/tconstruct/blocks/GlassBlockConnected.java index 93fb31e0..1569d3ce 100644 --- a/src/tconstruct/blocks/GlassBlockConnected.java +++ b/src/tconstruct/blocks/GlassBlockConnected.java @@ -17,7 +17,7 @@ import net.minecraft.world.World; public class GlassBlockConnected extends Block { - private Icon[] icons = new Icon[16]; + protected Icon[] icons = new Icon[16]; private boolean shouldRenderSelectionBox = true; protected String folder; private int renderPass; diff --git a/src/tconstruct/blocks/GlassPaneConnected.java b/src/tconstruct/blocks/GlassPaneConnected.java index 394f795e..757e1bce 100644 --- a/src/tconstruct/blocks/GlassPaneConnected.java +++ b/src/tconstruct/blocks/GlassPaneConnected.java @@ -26,24 +26,24 @@ public class GlassPaneConnected extends GlassBlockConnected { @Override public int getRenderType() { return PaneConnectedRender.model; -// return 0; + // return 0; } - + @Override - public Icon getBlockTexture(IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5){ - if(par5 == 0 || par5 == 1){ + public Icon getBlockTexture(IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5) { + if (par5 == 0 || par5 == 1) { return getSideTextureIndex(); - }else{ + } else { return super.getBlockTexture(par1IBlockAccess, par2, par3, par4, par5); } } @Override public Icon getConnectedBlockTexture(IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5, Icon[] icons) { - if(par5 == 0 || par5 == 1){ + if (par5 == 0 || par5 == 1) { return getSideTextureIndex(); } - + if (PHConstruct.connectedTexturesMode == 0) { return icons[0]; } @@ -442,4 +442,15 @@ public class GlassPaneConnected extends GlassBlockConnected { return canThisPaneConnectToThisBlockID(access.getBlockId(x + dir.offsetX, y + dir.offsetY, z + dir.offsetZ)) || access.isBlockSolidOnSide(x + dir.offsetX, y + dir.offsetY, z + dir.offsetZ, dir.getOpposite(), false); } + @Override + public boolean shouldSideBeRendered(IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5) { + int i1 = par1IBlockAccess.getBlockId(par2, par3, par4); + if(par5 == 0 || par5 == 1){ + return i1 == this.blockID ? false : super.shouldSideBeRendered(par1IBlockAccess, par2, par3, par4, par5); + }else{ + return true; + } +// return true; + } + } diff --git a/src/tconstruct/client/block/PaneConnectedRender.java b/src/tconstruct/client/block/PaneConnectedRender.java index 0d4d525b..21769f8e 100644 --- a/src/tconstruct/client/block/PaneConnectedRender.java +++ b/src/tconstruct/client/block/PaneConnectedRender.java @@ -44,6 +44,8 @@ public class PaneConnectedRender implements ISimpleBlockRenderingHandler { // renderer.renderStandardBlock(block, x, y, z); } +// renderer.setOverrideBlockTexture(sideTexture); + if(flag){ renderer.setRenderBounds(0.45D, 0D, 0.45D, 1D, 1D, 0.55D); renderer.renderStandardBlock(block, x, y, z); From be73c39bda6b683d1097426c1a189d9601320169 Mon Sep 17 00:00:00 2001 From: Arthur Uzulin Date: Tue, 17 Sep 2013 20:45:50 +1000 Subject: [PATCH 4/4] Small tweaks to clear panes --- .../textures/blocks/glass/clear/glass_side.png | Bin 215 -> 233 bytes src/tconstruct/blocks/GlassPaneConnected.java | 4 +--- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/resources/assets/tinker/textures/blocks/glass/clear/glass_side.png b/resources/assets/tinker/textures/blocks/glass/clear/glass_side.png index 577da454e1dc35081893accca3083841d04bf635..9b92ba24ae44c111d22e81eea8798b28729acb0f 100644 GIT binary patch delta 157 zcmV;O0Al~w0qFsdRDTLA3naC`DgXcgc1c7*R5;6HV88?Z{rmU-z}J8O@u^{AAOJo; zyvsn50lf0cD43 zPK1T_=ZAM0c;%I`MxVEaGTacDI=tY(SHfYyFw9dTF@W}7AQl7wNhm_|nx)$y00000 LNkvXXu0mjfB(qF; delta 139 zcmV;60CfN90oMVLRDTI27vnIQbpQYWWJyFpR5;7klCcedFbo6_cPW^Gf<3Y{3q%Y- zgD98*MRacpn82?1=3KpevT0o|$)mLEJOGH&#%Ts1%As{RiC8V~5GBjDyCjd&0M`30 ti_l2MGXAxE1sMhY|B3l4q!qFoJb1+(^Km+UumAu607*qoL