From c7b0870b1aa13a23a30c4b72107c7f92877f35a9 Mon Sep 17 00:00:00 2001 From: Alix_the_Alicorn/Jmanpenilla Date: Fri, 14 Mar 2014 19:35:03 -0700 Subject: [PATCH 1/3] Fixed derpiness of connected textures. --- .../blocks/GlassBlockConnected.java | 34 +++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/src/main/java/tconstruct/blocks/GlassBlockConnected.java b/src/main/java/tconstruct/blocks/GlassBlockConnected.java index 52b33301..65921055 100644 --- a/src/main/java/tconstruct/blocks/GlassBlockConnected.java +++ b/src/main/java/tconstruct/blocks/GlassBlockConnected.java @@ -15,7 +15,7 @@ import cpw.mods.fml.relauncher.SideOnly; /** * @author fuj1n - * + * @author jmanpenilla aka Alix_The_Alicorn */ public class GlassBlockConnected extends MantleBlock @@ -371,11 +371,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) { @@ -395,19 +395,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) { @@ -419,11 +419,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; case 4: @@ -535,11 +535,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) { @@ -559,19 +559,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) { @@ -583,11 +583,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; } From 1f7a5195c54087b8707bc76600c64b03d661f524 Mon Sep 17 00:00:00 2001 From: Alix_the_Alicorn/Jmanpenilla Date: Fri, 14 Mar 2014 19:35:41 -0700 Subject: [PATCH 2/3] Well, I guess not --- src/main/java/tconstruct/blocks/GlassBlockConnected.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/tconstruct/blocks/GlassBlockConnected.java b/src/main/java/tconstruct/blocks/GlassBlockConnected.java index 65921055..a55389e2 100644 --- a/src/main/java/tconstruct/blocks/GlassBlockConnected.java +++ b/src/main/java/tconstruct/blocks/GlassBlockConnected.java @@ -15,7 +15,7 @@ import cpw.mods.fml.relauncher.SideOnly; /** * @author fuj1n - * @author jmanpenilla aka Alix_The_Alicorn + * */ public class GlassBlockConnected extends MantleBlock From 66bf6d890f8c32e0175f408991bedfc2696d3056 Mon Sep 17 00:00:00 2001 From: Alix_the_Alicorn/Jmanpenilla Date: Fri, 14 Mar 2014 19:39:47 -0700 Subject: [PATCH 3/3] Fixed connected texture derp in glass panes. The reason I'm making this PR is because I used the connected textures code for my mod, fixed this issue, and would feel bad if I didn't give back to TiC :D --- .../tconstruct/blocks/GlassPaneConnected.java | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/src/main/java/tconstruct/blocks/GlassPaneConnected.java b/src/main/java/tconstruct/blocks/GlassPaneConnected.java index 895f4441..c3673e8f 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[14]; + return icons[13]; } else if (isOpenUp && isOpenDown && isOpenRight) { - return icons[13]; + return icons[14]; } else if (isOpenUp && isOpenLeft && isOpenRight) { @@ -362,19 +362,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) { @@ -386,11 +386,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; case 4: @@ -526,19 +526,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) { @@ -550,11 +550,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; }