diff options
| author | Grayray75 <69988482+Grayray75@users.noreply.github.com> | 2023-09-16 22:15:07 +0200 |
|---|---|---|
| committer | Grayray75 <69988482+Grayray75@users.noreply.github.com> | 2023-09-16 22:15:07 +0200 |
| commit | 926502768c4691025e8416981be554c500746bf2 (patch) | |
| tree | 496edb7c293acabf989c5271b5f19f0a8b5d7e60 | |
| parent | 7ca3ad2eabafce7f07949f6ee9904c9741c2ca2e (diff) | |
| download | Skyblocker-926502768c4691025e8416981be554c500746bf2.tar.gz Skyblocker-926502768c4691025e8416981be554c500746bf2.tar.bz2 Skyblocker-926502768c4691025e8416981be554c500746bf2.zip | |
Revert some changes
| -rw-r--r-- | src/main/java/me/xmrvizzy/skyblocker/skyblock/FairySouls.java | 14 | ||||
| -rw-r--r-- | src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/Trivia.java | 3 |
2 files changed, 8 insertions, 9 deletions
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/FairySouls.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/FairySouls.java index be1c1dcd..5ad6eb83 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/FairySouls.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/FairySouls.java @@ -154,13 +154,6 @@ public class FairySouls { } } - private static void onChatMessage(Text text, boolean overlay) { - String message = text.getString(); - if (message.equals("You have already found that Fairy Soul!") || message.equals("§d§lSOUL! §fYou found a §dFairy Soul§f!")) { - markClosestFairyFound(); - } - } - private static boolean isFairySoulNotFound(BlockPos fairySoulPos) { Map<String, Set<BlockPos>> foundFairiesForProfile = foundFairies.get(Utils.getProfile()); if (foundFairiesForProfile == null) { @@ -173,6 +166,13 @@ public class FairySouls { return !foundFairiesForProfileAndLocation.contains(fairySoulPos); } + private static void onChatMessage(Text text, boolean overlay) { + String message = text.getString(); + if (message.equals("You have already found that Fairy Soul!") || message.equals("§d§lSOUL! §fYou found a §dFairy Soul§f!")) { + markClosestFairyFound(); + } + } + private static void markClosestFairyFound() { PlayerEntity player = MinecraftClient.getInstance().player; if (player == null) { diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/Trivia.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/Trivia.java index f4ea1ee9..8497041b 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/Trivia.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/Trivia.java @@ -1,9 +1,9 @@ package me.xmrvizzy.skyblocker.skyblock.dungeon; import me.xmrvizzy.skyblocker.config.SkyblockerConfig; -import me.xmrvizzy.skyblocker.skyblock.FairySouls; import me.xmrvizzy.skyblocker.utils.chat.ChatFilterResult; import me.xmrvizzy.skyblocker.utils.chat.ChatPatternListener; +import me.xmrvizzy.skyblocker.skyblock.FairySouls; import net.minecraft.client.MinecraftClient; import net.minecraft.client.network.ClientPlayerEntity; import net.minecraft.text.Text; @@ -77,7 +77,6 @@ public class Trivia extends ChatPatternListener { answers.put("Which of these enemies does not spawn in the Spider's Den?", new String[]{"Zombie Spider", "Cave Spider", "Wither Skeleton", "Dashing Spooder", "Broodfather", "Night Spider"}); answers.put("Which of these monsters only spawns at night?", new String[]{"Zombie Villager", "Ghast"}); answers.put("Which of these is not a dragon in The End?", new String[]{"Zoomer Dragon", "Weak Dragon", "Stonk Dragon", "Holy Dragon", "Boomer Dragon", "Booger Dragon", "Older Dragon", "Elder Dragon", "Stable Dragon", "Professor Dragon"}); - FairySouls.runAsyncAfterFairySoulsLoad(() -> { answers.put("How many total Fairy Souls are there?", getFairySoulsSizeString(null)); answers.put("How many Fairy Souls are there in Spider's Den?", getFairySoulsSizeString("combat_1")); |