maybe fixed

5 files changed, 29 insertions, 21 deletions

diff --git a/src/main/java/kr/syeyoung/dungeonsguide/e.java b/src/main/java/kr/syeyoung/dungeonsguide/e.java
index a06d2b29..223f8a70 100755
--- a/src/main/java/kr/syeyoung/dungeonsguide/e.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/e.java
@@ -158,7 +158,7 @@ public class e implements c, CloseListener {
         Minecraft.getMinecraft().getFramebuffer().enableStencil();
 
         try {
-            List<IResourcePack> resourcePackList = ReflectionHelper.getPrivateValue(Minecraft.class, Minecraft.getMinecraft(),"defaultResourcePacks");
+            List<IResourcePack> resourcePackList = ReflectionHelper.getPrivateValue(Minecraft.class, Minecraft.getMinecraft(),"defaultResourcePacks", "aA", "field_110449_ao");
             resourcePackList.add(new DGTexturePack(authenticator));
         } catch (Throwable t){
             t.printStackTrace();
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/features/impl/etc/FeaturePenguins.java b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/etc/FeaturePenguins.java
index f5ae6802..4e16781e 100644
--- a/src/main/java/kr/syeyoung/dungeonsguide/features/impl/etc/FeaturePenguins.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/etc/FeaturePenguins.java
@@ -30,7 +30,7 @@ public class FeaturePenguins extends SimpleFeature implements PlayerRenderListen
 
 
     private SkyblockStatus skyblockStatus = e.getDungeonsGuide().getSkyblockStatus();
-    private ResourceLocation penguin = new ResourceLocation("iamdg:penguin.png");
+    private ResourceLocation penguin = new ResourceLocation("dungeonsguide:penguin.png");
 
     @Override
     public void onEntityRenderPre(RenderPlayerEvent.Pre renderPlayerEvent) {
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/features/impl/secret/FeatureMechanicBrowse.java b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/secret/FeatureMechanicBrowse.java
index 898c7105..270fb4cb 100644
--- a/src/main/java/kr/syeyoung/dungeonsguide/features/impl/secret/FeatureMechanicBrowse.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/secret/FeatureMechanicBrowse.java
@@ -116,6 +116,9 @@ public class FeatureMechanicBrowse extends GuiFeature implements GuiPreRenderLis
         int mouseX = Mouse.getX() * width / Minecraft.getMinecraft().displayWidth;
         int mouseY = height - Mouse.getY() * height / Minecraft.getMinecraft().displayHeight - 1;
         GlStateManager.pushMatrix();
+        GlStateManager.enableTexture2D();
+        GlStateManager.disableLighting();
+        GlStateManager.color(1, 1, 1, 1);
 
         GeneralRoomProcessor grp = (GeneralRoomProcessor) dungeonRoom.getRoomProcessor();
 
@@ -183,6 +186,7 @@ public class FeatureMechanicBrowse extends GuiFeature implements GuiPreRenderLis
 
         GlStateManager.popMatrix();
         GlStateManager.enableBlend();
+        GlStateManager.enableTexture2D();
     }
 
     private void clip(ScaledResolution resolution, int x, int y, int width, int height) {
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/resources/DGTexturePack.java b/src/main/java/kr/syeyoung/dungeonsguide/resources/DGTexturePack.java
index a845757d..283af5c1 100644
--- a/src/main/java/kr/syeyoung/dungeonsguide/resources/DGTexturePack.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/resources/DGTexturePack.java
@@ -37,7 +37,7 @@ public class DGTexturePack implements IResourcePack {
 
     @Override
     public Set<String> getResourceDomains() {
-        return Collections.singleton("iamdg");
+        return Collections.singleton("dungeonsguide");
     }
 
     @Override
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/RoomProcessorBlazeSolver.java b/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/RoomProcessorBlazeSolver.java
index d8764d72..088a00b3 100755
--- a/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/RoomProcessorBlazeSolver.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/RoomProcessorBlazeSolver.java
@@ -63,7 +63,7 @@ public class RoomProcessorBlazeSolver extends GeneralRoomProcessor {
         blazeList = new ArrayList<EntityBlaze>(w.getEntities(EntityBlaze.class, input -> {
             BlockPos pos = input.getPosition();
             return low.getX() < pos.getX() && pos.getX() < high.getX()
-                    && low.getZ() < pos.getZ() && pos.getZ() < high.getZ() && input.getName().toLowerCase().contains("blaze");
+                    && low.getZ() < pos.getZ() && pos.getZ() < high.getZ();
         }));
 
         EntityArmorStand semi_target = null;
@@ -109,6 +109,7 @@ public class RoomProcessorBlazeSolver extends GeneralRoomProcessor {
 
 
         for (EntityBlaze entity : blazeList) {
+            GlStateManager.pushMatrix();
             float f = entity.prevRotationYaw + (entity.rotationYaw - entity.prevRotationYaw) * partialTicks;
             double x = entity.prevPosX + (entity.posX - entity.prevPosX) * partialTicks;
             double y = entity.prevPosY + (entity.posY - entity.prevPosY) * partialTicks;
@@ -149,30 +150,33 @@ public class RoomProcessorBlazeSolver extends GeneralRoomProcessor {
             GlStateManager.color(1,1,1,1);
 
 
-            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);
+            if (FeatureRegistry.SOLVER_BLAZE.<AColor>getParameter("blazeborder").getValue().getAlpha() > 0x10) {
+                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), FeatureRegistry.SOLVER_BLAZE.<AColor>getParameter("blazeborder").getValue(), 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);
-            GlStateManager.enableDepth();
+                GL11.glDisable(GL11.GL_STENCIL_TEST);
+                GlStateManager.enableDepth();
+                GlStateManager.popMatrix();
+            }
         }
     }