blaze

2 files changed, 21 insertions, 19 deletions

diff --git a/src/main/java/kr/syeyoung/dungeonsguide/features/FeatureRegistry.java b/src/main/java/kr/syeyoung/dungeonsguide/features/FeatureRegistry.java
index 23a1a1f6..90732771 100644
--- a/src/main/java/kr/syeyoung/dungeonsguide/features/FeatureRegistry.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/features/FeatureRegistry.java
@@ -1,5 +1,6 @@
 package kr.syeyoung.dungeonsguide.features;
 
+import kr.syeyoung.dungeonsguide.config.types.AColor;
 import kr.syeyoung.dungeonsguide.features.impl.advanced.FeatureDebuggableMap;
 import kr.syeyoung.dungeonsguide.features.impl.advanced.FeatureRoomCoordDisplay;
 import kr.syeyoung.dungeonsguide.features.impl.advanced.FeatureRoomDebugInfo;
@@ -50,7 +51,9 @@ public class FeatureRegistry {
 
     public static final SimpleFeature SOLVER_RIDDLE = register(new SimpleFeature("Solver", "Riddle Puzzle (3 weirdo) Solver", "Highlights the correct box after clicking on all 3 weirdos",  "solver.riddle"));
     public static final SimpleFeature SOLVER_KAHOOT = register(new SimpleFeature("Solver", "Trivia Puzzle (Omnicrescent) Solver", "Highlights the correct solution for trivia puzzle",  "solver.trivia"));
-    public static final SimpleFeature SOLVER_BLAZE = register(new SimpleFeature("Solver", "Blaze Puzzle Solver", "Highlights the blaze that needs to be killed in an blaze room", "solver.blaze"));
+    public static final SimpleFeature SOLVER_BLAZE = register(new SimpleFeature("Solver", "Blaze Puzzle Solver", "Highlights the blaze that needs to be killed in an blaze room", "solver.blaze") {{
+        parameters.put("blazeborder", new FeatureParameter<AColor>("blazeborder", "Blaze Border Color", "Blaze border color", new AColor(255,255,255,0), "acolor"));
+    }});
     public static final SimpleFeature SOLVER_TICTACTOE = register(new SimpleFeature("Solver", "Tictactoe Solver", "Shows the best move that could be taken by player in the tictactoe room", "solver.tictactoe"));
     public static final SimpleFeature SOLVER_ICEPATH = register(new SimpleFeature("Solver", "Icepath Puzzle Solver (Advanced)", "Calculates solution for icepath puzzle and displays it to user",  "solver.icepath"));
     public static final SimpleFeature SOLVER_SILVERFISH = register(new SimpleFeature("Solver", "Silverfish Puzzle Solver (Advanced)", "Actively calculates solution for silverfish puzzle and displays it to user",  "solver.silverfish"));
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/RoomProcessorBlazeSolver.java b/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/RoomProcessorBlazeSolver.java
index ab25e451..d8401756 100755
--- a/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/RoomProcessorBlazeSolver.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/RoomProcessorBlazeSolver.java
@@ -2,6 +2,7 @@ package kr.syeyoung.dungeonsguide.roomprocessor;
 
 import com.google.common.base.Predicate;
 import kr.syeyoung.dungeonsguide.config.Config;
+import kr.syeyoung.dungeonsguide.config.types.AColor;
 import kr.syeyoung.dungeonsguide.dungeon.roomfinder.DungeonRoom;
 import kr.syeyoung.dungeonsguide.features.FeatureRegistry;
 import kr.syeyoung.dungeonsguide.utils.RenderUtils;
@@ -138,7 +139,7 @@ public class RoomProcessorBlazeSolver extends GeneralRoomProcessor {
 
 //            Gui.drawRect(-9999,-9999, 9999, 9999, 0xFFFFFFFF);
 
-            boolean border = false;
+            boolean border = true;
 
             if (entity != nextBlaze)
                 RenderUtils.highlightBox(entity, AxisAlignedBB.fromBounds(-0.8,0, -0.8, 0.8, 2, 0.8), new Color(255,255,255,255), partialTicks, false);
@@ -147,28 +148,26 @@ public class RoomProcessorBlazeSolver extends GeneralRoomProcessor {
             GlStateManager.color(1,1,1,1);
 
 
-            if (border) {
-                GL11.glStencilFunc(GL11.GL_NOTEQUAL, 3, 0x01);
-                GL11.glStencilOp(GL11.GL_KEEP, GL11.GL_REPLACE, GL11.GL_REPLACE);
-                GlStateManager.pushMatrix();
-                GlStateManager.pushAttrib();
-                GlStateManager.translate(-x_fix, -y_fix, -z_fix);
-                GlStateManager.translate(x, y + 0.7, z);
-                GlStateManager.scale(1.1f, 1.1f, 1.1f);
+            GL11.glStencilFunc(GL11.GL_NOTEQUAL, 3, 0x01);
+            GL11.glStencilOp(GL11.GL_KEEP, GL11.GL_REPLACE, GL11.GL_REPLACE);
+            GlStateManager.pushMatrix();
+            GlStateManager.pushAttrib();
+            GlStateManager.translate(-x_fix, -y_fix, -z_fix);
+            GlStateManager.translate(x, y + 0.7, z);
+            GlStateManager.scale(1.1f, 1.1f, 1.1f);
 
-                GlStateManager.colorMask(false, false, false, false);
-                Minecraft.getMinecraft().getRenderManager().doRenderEntity(entity, 0, -0.7, 0, f, partialTicks, true);
-                GlStateManager.colorMask(true, true, true, true);
+            GlStateManager.colorMask(false, false, false, false);
+            Minecraft.getMinecraft().getRenderManager().doRenderEntity(entity, 0, -0.7, 0, f, partialTicks, true);
+            GlStateManager.colorMask(true, true, true, true);
 
-                GlStateManager.popMatrix();
-                GlStateManager.popAttrib();
+            GlStateManager.popMatrix();
+            GlStateManager.popAttrib();
 
 
-                GL11.glStencilFunc(GL11.GL_EQUAL, 3, 0xFF);
-                GL11.glStencilOp(GL11.GL_KEEP, GL11.GL_KEEP, GL11.GL_KEEP);
+            GL11.glStencilFunc(GL11.GL_EQUAL, 3, 0xFF);
+            GL11.glStencilOp(GL11.GL_KEEP, GL11.GL_KEEP, GL11.GL_KEEP);
 
-                RenderUtils.highlightBox(entity, AxisAlignedBB.fromBounds(-1, 0, -1, 1, 2, 1), new Color(0, 255, 255, 255), partialTicks, false);
-            }
+            RenderUtils.highlightBox(entity, AxisAlignedBB.fromBounds(-1, 0, -1, 1, 2, 1), FeatureRegistry.SOLVER_BLAZE.<AColor>getParameter("blazeborder").getValue(), partialTicks, false);
 
 
             GL11.glDisable(GL11.GL_STENCIL_TEST);