From 804edfbf95832e660c2f600fd79268f9c5b22cb3 Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Sat, 9 May 2015 21:07:33 -0400 Subject: [PATCH] Make CTM extendable and make ctm field of RenderBlocksCTM nonstatic --- .../java/com/cricketcraft/chisel/api/rendering/CTM.java | 8 ++++---- .../chisel/api/rendering/RenderBlocksCTM.java | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/cricketcraft/chisel/api/rendering/CTM.java b/src/main/java/com/cricketcraft/chisel/api/rendering/CTM.java index 1ce46f12..0bc17db6 100644 --- a/src/main/java/com/cricketcraft/chisel/api/rendering/CTM.java +++ b/src/main/java/com/cricketcraft/chisel/api/rendering/CTM.java @@ -68,9 +68,9 @@ import static com.cricketcraft.chisel.api.rendering.Dir.*; public class CTM { /** Some hardcoded offset values for the different corner indeces */ - private static int[] submapOffsets = { 4, 5, 1, 0 }; - private static TIntObjectMap submapMap = new TIntObjectHashMap(); - private static EnumMap connectionMap = Maps.newEnumMap(Dir.class); + protected static int[] submapOffsets = { 4, 5, 1, 0 }; + protected static TIntObjectMap submapMap = new TIntObjectHashMap(); + protected static EnumMap connectionMap = Maps.newEnumMap(Dir.class); /** For use via the Chisel 2 config only, altering this could cause unintended behavior */ public static boolean disableObscuredFaceCheckConfig = false; @@ -87,7 +87,7 @@ public class CTM { submapMap.put(3, new Dir[] { TOP, LEFT, TOP_LEFT }); } - private CTM() { + protected CTM() { } public static CTM getInstance() { diff --git a/src/main/java/com/cricketcraft/chisel/api/rendering/RenderBlocksCTM.java b/src/main/java/com/cricketcraft/chisel/api/rendering/RenderBlocksCTM.java index a382ba59..b4fb5143 100644 --- a/src/main/java/com/cricketcraft/chisel/api/rendering/RenderBlocksCTM.java +++ b/src/main/java/com/cricketcraft/chisel/api/rendering/RenderBlocksCTM.java @@ -148,7 +148,7 @@ public class RenderBlocksCTM extends RenderBlocks { } } - protected static CTM ctm = CTM.getInstance(); + public CTM ctm = CTM.getInstance(); // globals added to save the JVM some trouble. No need to constantly create // and destroy ints if we don't have to