From 1e124379b19d71d1d8af28832decd407f49d1a4b Mon Sep 17 00:00:00 2001 From: syeyoung Date: Sat, 27 Feb 2021 01:29:27 +0900 Subject: ok --- .../kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonRoomDoor.java | 2 +- .../features/impl/dungeon/FeatureDungeonCurrentRoomSecrets.java | 1 + .../dungeonsguide/features/impl/dungeon/FeatureDungeonMap.java | 3 +-- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/main/java/kr/syeyoung') diff --git a/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonRoomDoor.java b/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonRoomDoor.java index 83b5388a..d9e8cd2d 100644 --- a/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonRoomDoor.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonRoomDoor.java @@ -43,7 +43,7 @@ public class DungeonRoomDoor implements DungeonMechanic { @Override public String getCurrentState(DungeonRoom dungeonRoom) { - return doorfinder.isRequiresKey() ? doorfinder.isOpened() ? "key-open" : "key-closed" : "normal"; + return doorfinder.isRequiresKey() ?"key" : "normal"; } @Override diff --git a/src/main/java/kr/syeyoung/dungeonsguide/features/impl/dungeon/FeatureDungeonCurrentRoomSecrets.java b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/dungeon/FeatureDungeonCurrentRoomSecrets.java index e1484122..667ce16d 100644 --- a/src/main/java/kr/syeyoung/dungeonsguide/features/impl/dungeon/FeatureDungeonCurrentRoomSecrets.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/dungeon/FeatureDungeonCurrentRoomSecrets.java @@ -67,6 +67,7 @@ public class FeatureDungeonCurrentRoomSecrets extends TextHUDFeature implements @Override public List getText() { + if (skyblockStatus.getContext().getBossfightProcessor() != null) return new ArrayList(); List actualBit = new ArrayList(); actualBit.add(new StyledText("Secrets In Room","title")); actualBit.add(new StyledText(": ","separator")); diff --git a/src/main/java/kr/syeyoung/dungeonsguide/features/impl/dungeon/FeatureDungeonMap.java b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/dungeon/FeatureDungeonMap.java index e378fadd..2f958169 100644 --- a/src/main/java/kr/syeyoung/dungeonsguide/features/impl/dungeon/FeatureDungeonMap.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/dungeon/FeatureDungeonMap.java @@ -314,7 +314,7 @@ public class FeatureDungeonMap extends GuiFeature implements DungeonEndListener, GlStateManager.scale(1 / scale, 1 / scale, 0); GlStateManager.scale(1 / postScale, 1 / postScale, 0); float s = this.getParameter("playerheadscale").getValue(); - GlStateManager.scale(s,s,0); + GlStateManager.scale(s * 5,s * 5,0); GlStateManager.translate(-0.125F, 0.125F, 0.0F); byte b0 = vec4b.func_176110_a(); @@ -332,7 +332,6 @@ public class FeatureDungeonMap extends GuiFeature implements DungeonEndListener, GlStateManager.popMatrix(); ++k; } - GlStateManager.popMatrix(); } } -- cgit