diff options
Diffstat (limited to 'src/main')
4 files changed, 11 insertions, 13 deletions
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/dungeon/DungeonContext.java b/src/main/java/kr/syeyoung/dungeonsguide/dungeon/DungeonContext.java index b80813b4..ddbfa299 100755 --- a/src/main/java/kr/syeyoung/dungeonsguide/dungeon/DungeonContext.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/dungeon/DungeonContext.java @@ -67,7 +67,8 @@ public class DungeonContext { public void tick() { mapProcessor.tick(); - if (mapProcessor.isInitialized() && BossRoomEnterSeconds != -1 && !roomBoundary.contains(mapProcessor.worldPointToMapPoint(Minecraft.getMinecraft().thePlayer.getPositionVector()))) { + + if (mapProcessor.isInitialized() && BossRoomEnterSeconds == -1 && !roomBoundary.contains(mapProcessor.worldPointToMapPoint(Minecraft.getMinecraft().thePlayer.getPositionVector()))) { BossRoomEnterSeconds = FeatureRegistry.DUNGEON_SBTIME.getTimeElapsed() / 1000; MinecraftForge.EVENT_BUS.post(new BossroomEnterEvent()); } diff --git a/src/main/java/kr/syeyoung/dungeonsguide/features/impl/FeatureDungeonDeaths.java b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/FeatureDungeonDeaths.java index 697d42eb..a100496b 100644 --- a/src/main/java/kr/syeyoung/dungeonsguide/features/impl/FeatureDungeonDeaths.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/FeatureDungeonDeaths.java @@ -76,7 +76,6 @@ public class FeatureDungeonDeaths extends GuiFeature implements ChatListener { if (context == null) return; String txt = clientChatReceivedEvent.message.getFormattedText(); - System.out.println(txt); Matcher m = deathPattern.matcher(txt); if (m.matches()) { String nickname = TextUtils.stripColor(m.group(1)); 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 deb5bda5..00b46e07 100644 --- a/src/main/java/kr/syeyoung/dungeonsguide/features/impl/FeatureDungeonMap.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/FeatureDungeonMap.java @@ -154,6 +154,7 @@ public class FeatureDungeonMap extends GuiFeature implements DungeonEndListener, FontRenderer fr = getFontRenderer(); 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); @@ -168,18 +169,22 @@ public class FeatureDungeonMap extends GuiFeature implements DungeonEndListener, str += " "; } if (dungeonRoom.getCurrentState() == DungeonRoom.RoomState.FINISHED) { - str += "●"; + str += "✔"; } else if (dungeonRoom.getCurrentState() == DungeonRoom.RoomState.COMPLETE_WITHOUT_SECRETS) { - str += "◎"; + str += "☑"; } else if (dungeonRoom.getCurrentState() == DungeonRoom.RoomState.DISCOVERED) { - str += "○"; + 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); + GlStateManager.disableAlpha(); List<NetworkPlayerInfo> list = field_175252_a.sortedCopy(Minecraft.getMinecraft().thePlayer.sendQueue.getPlayerInfoMap()); if (list.size() < 40) return; @@ -199,7 +204,6 @@ public class FeatureDungeonMap extends GuiFeature implements DungeonEndListener, yaw2 = entityplayer.prevRotationYawHead + (entityplayer.rotationYaw - entityplayer.prevRotationYawHead) * partialTicks; } else { String iconName = mapProcessor.getMapIconToPlayerMap().get(actual); - System.out.println("Player is null "+actual+ " - connected with "+iconName); if (iconName == null) continue; Vec4b vec = mapData.mapDecorations.get(iconName); if (vec == null) { @@ -213,6 +217,7 @@ public class FeatureDungeonMap extends GuiFeature implements DungeonEndListener, GL11.glPushMatrix(); boolean flag1 = entityplayer != null && entityplayer.isWearing(EnumPlayerModelParts.CAPE); + GlStateManager.enableTexture2D(); Minecraft.getMinecraft().getTextureManager().bindTexture(networkPlayerInfo.getLocationSkin()); int l2 = 8 + (flag1 ? 8 : 0); int i3 = 8 * (flag1 ? -1 : 1); @@ -225,12 +230,6 @@ public class FeatureDungeonMap extends GuiFeature implements DungeonEndListener, float s = this.<Float>getParameter("playerheadscale").getValue(); GL11.glScaled(s,s,0); Gui.drawScaledCustomSizeModalRect(-4, -4, 8.0F, (float) l2, 8, i3, 8, 8, 64.0F, 64.0F); - - if (entityplayer != null && entityplayer.isWearing(EnumPlayerModelParts.HAT)) { - int j3 = 8 + (flag1 ? 8 : 0); - int k3 = 8 * (flag1 ? -1 : 1); - Gui.drawScaledCustomSizeModalRect(-4, -4, 40.0F, (float) j3, 8, k3, 8, 8, 64.0F, 64.0F); - } RenderUtils.drawUnfilledBox(-4,-4,4, 4, this.<AColor>getParameter("player_color").getValue().getRGB(), this.<Boolean>getParameter("player_chroma").getValue()); } GL11.glPopMatrix(); diff --git a/src/main/java/kr/syeyoung/dungeonsguide/features/impl/FeatureDungeonMilestone.java b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/FeatureDungeonMilestone.java index 9ccd5e18..c8cff194 100644 --- a/src/main/java/kr/syeyoung/dungeonsguide/features/impl/FeatureDungeonMilestone.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/FeatureDungeonMilestone.java @@ -62,7 +62,6 @@ public class FeatureDungeonMilestone extends GuiFeature implements ChatListener DungeonContext context = skyblockStatus.getContext(); if (context == null) return; String txt = clientChatReceivedEvent.message.getFormattedText(); - System.out.println(txt); if (milestone_pattern.matcher(txt).matches()) { context.getMilestoneReached().add(new String[] { TextUtils.formatTime(FeatureRegistry.DUNGEON_REALTIME.getTimeElapsed()), |