From 9c2057e53549b28f3e5ea38001a8ddf443154aa8 Mon Sep 17 00:00:00 2001 From: syeyoung Date: Wed, 27 Jan 2021 14:14:41 +0900 Subject: no dash check --- src/main/java/kr/syeyoung/dungeonsguide/SkyblockStatus.java | 6 +----- .../syeyoung/dungeonsguide/roomprocessor/GeneralRoomProcessor.java | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) (limited to 'src/main/java/kr/syeyoung/dungeonsguide') diff --git a/src/main/java/kr/syeyoung/dungeonsguide/SkyblockStatus.java b/src/main/java/kr/syeyoung/dungeonsguide/SkyblockStatus.java index c4de63e7..d2635c89 100755 --- a/src/main/java/kr/syeyoung/dungeonsguide/SkyblockStatus.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/SkyblockStatus.java @@ -42,15 +42,11 @@ public class SkyblockStatus { @Getter private String dungeonName; - private final Pattern SERVER_BRAND_PATTERN = Pattern.compile("Hypixel BungeeCord \\(\\d\\.\\d\\.\\d\\)"); - - public boolean isOnHypixel() { Minecraft mc = Minecraft.getMinecraft(); if (mc == null || mc.thePlayer == null) return false; if (!mc.isSingleplayer() && mc.thePlayer.getClientBrand() != null) { - Matcher matcher = SERVER_BRAND_PATTERN.matcher(mc.thePlayer.getClientBrand()); - if (matcher.matches()) return true; + if (mc.thePlayer.getClientBrand().startsWith("Hypixel BungeeCord")) return true; } return false; } diff --git a/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/GeneralRoomProcessor.java b/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/GeneralRoomProcessor.java index 2700b1d9..8bd43fc9 100755 --- a/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/GeneralRoomProcessor.java +++ b/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/GeneralRoomProcessor.java @@ -60,7 +60,6 @@ public class GeneralRoomProcessor implements RoomProcessor { @Override public void actionbarReceived(IChatComponent chat) { if (!e.getDungeonsGuide().getSkyblockStatus().isOnDungeon()) return; - if (chat.getFormattedText().contains("-")) return; if (dungeonRoom.getTotalSecrets() == -1) { e.sendDebugChat(new ChatComponentText(chat.getFormattedText().replace('ยง', '&') + " - received")); } @@ -86,6 +85,7 @@ public class GeneralRoomProcessor implements RoomProcessor { } } String it = text.substring(theindex + 2, secretsIndex - 1); + secrets = Integer.parseInt(it.split("/")[1]); } -- cgit