aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/kr
diff options
context:
space:
mode:
authorsyeyoung <cyong06@naver.com>2021-01-12 22:58:35 +0900
committersyeyoung <cyong06@naver.com>2021-01-12 22:58:35 +0900
commit026a94fcbab2c761f4fc286f82e814adc8458d24 (patch)
tree22711adf151824e79ee89f398701b2b3687088e9 /src/main/java/kr
parent4abbd20dfa8b9331c645153d7c7ee1cde5e2c759 (diff)
downloadSkyblock-Dungeons-Guide-026a94fcbab2c761f4fc286f82e814adc8458d24.tar.gz
Skyblock-Dungeons-Guide-026a94fcbab2c761f4fc286f82e814adc8458d24.tar.bz2
Skyblock-Dungeons-Guide-026a94fcbab2c761f4fc286f82e814adc8458d24.zip
no player black out, please
Diffstat (limited to 'src/main/java/kr')
-rw-r--r--src/main/java/kr/syeyoung/dungeonsguide/features/impl/FeatureDungeonMap.java62
1 files changed, 32 insertions, 30 deletions
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/features/impl/FeatureDungeonMap.java b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/FeatureDungeonMap.java
index 92386b11..424169bf 100644
--- a/src/main/java/kr/syeyoung/dungeonsguide/features/impl/FeatureDungeonMap.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/FeatureDungeonMap.java
@@ -159,37 +159,7 @@ public class FeatureDungeonMap extends GuiFeature implements DungeonEndListener,
updateMapTexture(mapData.colors, mapProcessor, context.getDungeonRoomList());
render(mapData, false);
- FontRenderer fr = getFontRenderer();
- if (this.<Boolean>getParameter("showtotalsecrets").getValue()) {
- for (DungeonRoom dungeonRoom : context.getDungeonRoomList()) {
- GL11.glPushMatrix();
- GlStateManager.pushAttrib();
- Point mapPt = mapProcessor.roomPointToMapPoint(dungeonRoom.getUnitPoints().get(0));
- GL11.glTranslated(mapPt.x + mapProcessor.getUnitRoomDimension().width / 2, mapPt.y + mapProcessor.getUnitRoomDimension().height / 2, 0);
- if (this.<Boolean>getParameter("playerCenter").getValue() && this.<Boolean>getParameter("rotate").getValue()) {
- GL11.glRotated(yaw - 180, 0, 0, 1);
- }
- GL11.glScaled(1 / scale, 1 / scale, 0);
- GL11.glScaled(1 / postScale, 1 / postScale, 0);
- String str = "";
- str += dungeonRoom.getTotalSecrets() == -1 ? "?" : String.valueOf(dungeonRoom.getTotalSecrets());
- str += " ";
- if (dungeonRoom.getCurrentState() == DungeonRoom.RoomState.FINISHED) {
- str += "✔";
- } else if (dungeonRoom.getCurrentState() == DungeonRoom.RoomState.COMPLETE_WITHOUT_SECRETS) {
- str += "☑";
- } else if (dungeonRoom.getCurrentState() == DungeonRoom.RoomState.DISCOVERED) {
- str += "☐";
- } else if (dungeonRoom.getCurrentState() == DungeonRoom.RoomState.FAILED) {
- str += "❌";
- }
-
- fr.drawString(str, -(fr.getStringWidth(str) / 2), -(fr.FONT_HEIGHT / 2), dungeonRoom.getColor() == 74 ? 0xff000000 : 0xFFFFFFFF);
- GlStateManager.popAttrib();
- GL11.glPopMatrix();
- }
- }
GlStateManager.enableBlend();
GlStateManager.tryBlendFuncSeparate(1, 771, 0, 1);
@@ -243,6 +213,38 @@ public class FeatureDungeonMap extends GuiFeature implements DungeonEndListener,
GL11.glPopMatrix();
}
+ FontRenderer fr = getFontRenderer();
+ if (this.<Boolean>getParameter("showtotalsecrets").getValue()) {
+ for (DungeonRoom dungeonRoom : context.getDungeonRoomList()) {
+ GL11.glPushMatrix();
+ GlStateManager.pushAttrib();
+ Point mapPt = mapProcessor.roomPointToMapPoint(dungeonRoom.getUnitPoints().get(0));
+ GL11.glTranslated(mapPt.x + mapProcessor.getUnitRoomDimension().width / 2, mapPt.y + mapProcessor.getUnitRoomDimension().height / 2, 0);
+
+ if (this.<Boolean>getParameter("playerCenter").getValue() && this.<Boolean>getParameter("rotate").getValue()) {
+ GL11.glRotated(yaw - 180, 0, 0, 1);
+ }
+ GL11.glScaled(1 / scale, 1 / scale, 0);
+ GL11.glScaled(1 / postScale, 1 / postScale, 0);
+ String str = "";
+ str += dungeonRoom.getTotalSecrets() == -1 ? "?" : String.valueOf(dungeonRoom.getTotalSecrets());
+ str += " ";
+ if (dungeonRoom.getCurrentState() == DungeonRoom.RoomState.FINISHED) {
+ str += "✔";
+ } else if (dungeonRoom.getCurrentState() == DungeonRoom.RoomState.COMPLETE_WITHOUT_SECRETS) {
+ str += "☑";
+ } else if (dungeonRoom.getCurrentState() == DungeonRoom.RoomState.DISCOVERED) {
+ str += "☐";
+ } else if (dungeonRoom.getCurrentState() == DungeonRoom.RoomState.FAILED) {
+ str += "❌";
+ }
+
+ fr.drawString(str, -(fr.getStringWidth(str) / 2), -(fr.FONT_HEIGHT / 2), dungeonRoom.getColor() == 74 ? 0xff000000 : 0xFFFFFFFF);
+ GlStateManager.popAttrib();
+ GL11.glPopMatrix();
+ }
+ }
+
}