From 6ca6f9eacf701d0ae98838db31690f49cf0ffbfd Mon Sep 17 00:00:00 2001 From: Alexander Behrhof Date: Thu, 26 Jun 2014 16:40:59 -0400 Subject: [PATCH] Updating to 1.7.10 :D Fixing glass --- build.properties | 6 +-- .../blocks/GlassBlockConnected.java | 51 ++++++++----------- .../tconstruct/blocks/GlassPaneConnected.java | 35 ++++++------- 3 files changed, 40 insertions(+), 52 deletions(-) diff --git a/build.properties b/build.properties index d6282785..9abbffbe 100644 --- a/build.properties +++ b/build.properties @@ -1,7 +1,7 @@ -minecraft_version=1.7.10_pre4 +minecraft_version=1.7.10 minecraft_version_old=1.7.2 -forge_version=10.12.2.1143-prerelease -mantle_version=150.1d8388b +forge_version=10.13.0.1151 +mantle_version=152.e3820d9 FMP_version=1.1.0.268 CCLIB_version=1.1.0.77 NEI_version=1.0.1 diff --git a/src/main/java/tconstruct/blocks/GlassBlockConnected.java b/src/main/java/tconstruct/blocks/GlassBlockConnected.java index fc469816..0733bdb6 100644 --- a/src/main/java/tconstruct/blocks/GlassBlockConnected.java +++ b/src/main/java/tconstruct/blocks/GlassBlockConnected.java @@ -61,18 +61,11 @@ public class GlassBlockConnected extends MantleBlock /** * This is checked to see if the texture should connect to this block - * - * @param par2 - * x - * @param par3 - * y - * @param par4 - * z - * @param par5 - * ID this block is asking to connect to (may be 0 if there is no - * block) - * @param par6 - * Metadata of the block this block is trying to connect to + * @param par2 x + * @param par3 y + * @param par4 z + * @param par5 ID this block is asking to connect to (may be 0 if there is no block) + * @param par6 Metadata of the block this block is trying to connect to * @return true if should connect */ public boolean shouldConnectToBlock (IBlockAccess par1IBlockAccess, int par2, int par3, int par4, Block par5, int par6) @@ -371,11 +364,11 @@ public class GlassBlockConnected extends MantleBlock } else if (isOpenUp && isOpenDown && isOpenLeft) { - return icons[13]; + return icons[14]; } else if (isOpenUp && isOpenDown && isOpenRight) { - return icons[14]; + return icons[13]; } else if (isOpenUp && isOpenLeft && isOpenRight) { @@ -395,19 +388,19 @@ public class GlassBlockConnected extends MantleBlock } else if (isOpenDown && isOpenLeft) { - return icons[9]; + return icons[10]; } else if (isOpenDown && isOpenRight) { - return icons[10]; + return icons[9]; } else if (isOpenUp && isOpenLeft) { - return icons[7]; + return icons[8]; } else if (isOpenUp && isOpenRight) { - return icons[8]; + return icons[7]; } else if (isOpenDown) { @@ -419,11 +412,11 @@ public class GlassBlockConnected extends MantleBlock } else if (isOpenLeft) { - return icons[4]; + return icons[3]; } else if (isOpenRight) { - return icons[3]; + return icons[4]; } break; case 4: @@ -535,11 +528,11 @@ public class GlassBlockConnected extends MantleBlock } else if (isOpenUp && isOpenDown && isOpenLeft) { - return icons[14]; + return icons[13]; } else if (isOpenUp && isOpenDown && isOpenRight) { - return icons[13]; + return icons[14]; } else if (isOpenUp && isOpenLeft && isOpenRight) { @@ -559,19 +552,19 @@ public class GlassBlockConnected extends MantleBlock } else if (isOpenDown && isOpenLeft) { - return icons[10]; + return icons[9]; } else if (isOpenDown && isOpenRight) { - return icons[9]; + return icons[10]; } else if (isOpenUp && isOpenLeft) { - return icons[8]; + return icons[7]; } else if (isOpenUp && isOpenRight) { - return icons[7]; + return icons[8]; } else if (isOpenDown) { @@ -583,11 +576,11 @@ public class GlassBlockConnected extends MantleBlock } else if (isOpenLeft) { - return icons[3]; + return icons[4]; } else if (isOpenRight) { - return icons[4]; + return icons[3]; } break; } @@ -648,4 +641,4 @@ public class GlassBlockConnected extends MantleBlock { return true; } -} +} \ No newline at end of file diff --git a/src/main/java/tconstruct/blocks/GlassPaneConnected.java b/src/main/java/tconstruct/blocks/GlassPaneConnected.java index c3673e8f..a9b845fc 100644 --- a/src/main/java/tconstruct/blocks/GlassPaneConnected.java +++ b/src/main/java/tconstruct/blocks/GlassPaneConnected.java @@ -338,11 +338,11 @@ public class GlassPaneConnected extends GlassBlockConnected } else if (isOpenUp && isOpenDown && isOpenLeft) { - return icons[13]; + return icons[14]; } else if (isOpenUp && isOpenDown && isOpenRight) { - return icons[14]; + return icons[13]; } else if (isOpenUp && isOpenLeft && isOpenRight) { @@ -362,19 +362,19 @@ public class GlassPaneConnected extends GlassBlockConnected } else if (isOpenDown && isOpenLeft) { - return icons[9]; + return icons[10]; } else if (isOpenDown && isOpenRight) { - return icons[10]; + return icons[9]; } else if (isOpenUp && isOpenLeft) { - return icons[7]; + return icons[8]; } else if (isOpenUp && isOpenRight) { - return icons[8]; + return icons[7]; } else if (isOpenDown) { @@ -386,11 +386,11 @@ public class GlassPaneConnected extends GlassBlockConnected } else if (isOpenLeft) { - return icons[4]; + return icons[3]; } else if (isOpenRight) { - return icons[3]; + return icons[4]; } break; case 4: @@ -526,19 +526,19 @@ public class GlassPaneConnected extends GlassBlockConnected } else if (isOpenDown && isOpenLeft) { - return icons[10]; + return icons[9]; } else if (isOpenDown && isOpenRight) { - return icons[9]; + return icons[10]; } else if (isOpenUp && isOpenLeft) { - return icons[8]; + return icons[7]; } else if (isOpenUp && isOpenRight) { - return icons[7]; + return icons[8]; } else if (isOpenDown) { @@ -550,11 +550,11 @@ public class GlassPaneConnected extends GlassBlockConnected } else if (isOpenLeft) { - return icons[3]; + return icons[4]; } else if (isOpenRight) { - return icons[4]; + return icons[3]; } break; } @@ -690,11 +690,6 @@ public class GlassPaneConnected extends GlassBlockConnected @Override public boolean shouldSideBeRendered (IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5) { - // if(par5 == 0 || par5 == 1){ - // return par1IBlockAccess.getBlock(par2, par3, par4) != this.blockID; - // }else{ - // return true; - // } return true; } -} +} \ No newline at end of file