Merge branch 'master' of https://github.com/SkyblockerMod/Skyblocker into beeper-creams

# Conflicts:
#	src/main/java/de/hysky/skyblocker/SkyblockerMod.java
#	src/main/java/de/hysky/skyblocker/skyblock/dungeon/CreeperBeams.java

Pull updates from upstream and NOT get a heart attack

23 files changed, 58 insertions, 58 deletions

diff --git a/src/test/java/me/xmrvizzy/skyblocker/skyblock/StatusBarTrackerTest.java b/src/test/java/de/hysky/skyblocker/skyblock/StatusBarTrackerTest.java
index da919699..c058da5d 100644
--- a/src/test/java/me/xmrvizzy/skyblocker/skyblock/StatusBarTrackerTest.java
+++ b/src/test/java/de/hysky/skyblocker/skyblock/StatusBarTrackerTest.java
@@ -1,4 +1,4 @@
-package me.xmrvizzy.skyblocker.skyblock;
+package de.hysky.skyblocker.skyblock;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
diff --git a/src/test/java/me/xmrvizzy/skyblocker/skyblock/dungeon/AcceptRepartyTest.java b/src/test/java/de/hysky/skyblocker/skyblock/dungeon/AcceptRepartyTest.java
index eb867a37..5dba3f96 100644
--- a/src/test/java/me/xmrvizzy/skyblocker/skyblock/dungeon/AcceptRepartyTest.java
+++ b/src/test/java/de/hysky/skyblocker/skyblock/dungeon/AcceptRepartyTest.java
@@ -1,6 +1,6 @@
-package me.xmrvizzy.skyblocker.skyblock.dungeon;
+package de.hysky.skyblocker.skyblock.dungeon;
 
-import me.xmrvizzy.skyblocker.utils.chat.ChatPatternListenerTest;
+import de.hysky.skyblocker.utils.chat.ChatPatternListenerTest;
 import org.junit.jupiter.api.Test;
 
 import java.util.regex.Matcher;
diff --git a/src/test/java/de/hysky/skyblocker/skyblock/dungeon/DungeonChestProfitTest.java b/src/test/java/de/hysky/skyblocker/skyblock/dungeon/DungeonChestProfitTest.java
new file mode 100644
index 00000000..3a55ce5b
--- /dev/null
+++ b/src/test/java/de/hysky/skyblocker/skyblock/dungeon/DungeonChestProfitTest.java
@@ -0,0 +1,22 @@
+package de.hysky.skyblocker.skyblock.dungeon;
+
+import de.hysky.skyblocker.config.SkyblockerConfig;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+public class DungeonChestProfitTest {
+    @Test
+    void testProfitText() {
+        SkyblockerConfig.DungeonChestProfit config = new SkyblockerConfig.DungeonChestProfit();
+        Assertions.assertEquals("literal{ 0}[style={color=dark_gray}]", DungeonChestProfit.getProfitText(0, false, config.neutralThreshold, config.neutralColor, config.profitColor, config.lossColor, config.incompleteColor).toString());
+        Assertions.assertEquals("literal{ 0}[style={color=blue}]", DungeonChestProfit.getProfitText(0, true, config.neutralThreshold, config.neutralColor, config.profitColor, config.lossColor, config.incompleteColor).toString());
+        Assertions.assertEquals("literal{ +10}[style={color=dark_gray}]", DungeonChestProfit.getProfitText(10, false, config.neutralThreshold, config.neutralColor, config.profitColor, config.lossColor, config.incompleteColor).toString());
+        Assertions.assertEquals("literal{ +10}[style={color=blue}]", DungeonChestProfit.getProfitText(10, true, config.neutralThreshold, config.neutralColor, config.profitColor, config.lossColor, config.incompleteColor).toString());
+        Assertions.assertEquals("literal{ -10}[style={color=dark_gray}]", DungeonChestProfit.getProfitText(-10, false, config.neutralThreshold, config.neutralColor, config.profitColor, config.lossColor, config.incompleteColor).toString());
+        Assertions.assertEquals("literal{ -10}[style={color=blue}]", DungeonChestProfit.getProfitText(-10, true, config.neutralThreshold, config.neutralColor, config.profitColor, config.lossColor, config.incompleteColor).toString());
+        Assertions.assertEquals("literal{ +10,000}[style={color=dark_green}]", DungeonChestProfit.getProfitText(10000, false, config.neutralThreshold, config.neutralColor, config.profitColor, config.lossColor, config.incompleteColor).toString());
+        Assertions.assertEquals("literal{ +10,000}[style={color=blue}]", DungeonChestProfit.getProfitText(10000, true, config.neutralThreshold, config.neutralColor, config.profitColor, config.lossColor, config.incompleteColor).toString());
+        Assertions.assertEquals("literal{ -10,000}[style={color=red}]", DungeonChestProfit.getProfitText(-10000, false, config.neutralThreshold, config.neutralColor, config.profitColor, config.lossColor, config.incompleteColor).toString());
+        Assertions.assertEquals("literal{ -10,000}[style={color=blue}]", DungeonChestProfit.getProfitText(-10000, true, config.neutralThreshold, config.neutralColor, config.profitColor, config.lossColor, config.incompleteColor).toString());
+    }
+}
diff --git a/src/test/java/me/xmrvizzy/skyblocker/skyblock/dungeon/ThreeWeirdosTest.java b/src/test/java/de/hysky/skyblocker/skyblock/dungeon/ThreeWeirdosTest.java
index 6a5dd2a7..3772fd75 100644
--- a/src/test/java/me/xmrvizzy/skyblocker/skyblock/dungeon/ThreeWeirdosTest.java
+++ b/src/test/java/de/hysky/skyblocker/skyblock/dungeon/ThreeWeirdosTest.java
@@ -1,6 +1,6 @@
-package me.xmrvizzy.skyblocker.skyblock.dungeon;
+package de.hysky.skyblocker.skyblock.dungeon;
 
-import me.xmrvizzy.skyblocker.utils.chat.ChatPatternListenerTest;
+import de.hysky.skyblocker.utils.chat.ChatPatternListenerTest;
 import org.junit.jupiter.api.Test;
 
 class ThreeWeirdosTest extends ChatPatternListenerTest<ThreeWeirdos> {
diff --git a/src/test/java/me/xmrvizzy/skyblocker/skyblock/dungeon/TriviaTest.java b/src/test/java/de/hysky/skyblocker/skyblock/dungeon/TriviaTest.java
index a787967d..1df5a8e1 100644
--- a/src/test/java/me/xmrvizzy/skyblocker/skyblock/dungeon/TriviaTest.java
+++ b/src/test/java/de/hysky/skyblocker/skyblock/dungeon/TriviaTest.java
@@ -1,6 +1,6 @@
-package me.xmrvizzy.skyblocker.skyblock.dungeon;
+package de.hysky.skyblocker.skyblock.dungeon;
 
-import me.xmrvizzy.skyblocker.utils.chat.ChatPatternListenerTest;
+import de.hysky.skyblocker.utils.chat.ChatPatternListenerTest;
 import org.junit.jupiter.api.Test;
 
 class TriviaTest extends ChatPatternListenerTest<Trivia> {
diff --git a/src/test/java/me/xmrvizzy/skyblocker/skyblock/dungeon/secrets/DungeonRoomsDFU.java b/src/test/java/de/hysky/skyblocker/skyblock/dungeon/secrets/DungeonRoomsDFU.java
index 5e4cdeef..3d2993cf 100644
--- a/src/test/java/me/xmrvizzy/skyblocker/skyblock/dungeon/secrets/DungeonRoomsDFU.java
+++ b/src/test/java/de/hysky/skyblocker/skyblock/dungeon/secrets/DungeonRoomsDFU.java
@@ -1,4 +1,4 @@
-package me.xmrvizzy.skyblocker.skyblock.dungeon.secrets;
+package de.hysky.skyblocker.skyblock.dungeon.secrets;
 
 import net.minecraft.datafixer.fix.ItemIdFix;
 import net.minecraft.datafixer.fix.ItemInstanceTheFlatteningFix;
diff --git a/src/test/java/me/xmrvizzy/skyblocker/skyblock/dungeon/secrets/RoomTest.java b/src/test/java/de/hysky/skyblocker/skyblock/dungeon/secrets/RoomTest.java
index b704037c..5309aae6 100644
--- a/src/test/java/me/xmrvizzy/skyblocker/skyblock/dungeon/secrets/RoomTest.java
+++ b/src/test/java/de/hysky/skyblocker/skyblock/dungeon/secrets/RoomTest.java
@@ -1,4 +1,4 @@
-package me.xmrvizzy.skyblocker.skyblock.dungeon.secrets;
+package de.hysky.skyblocker.skyblock.dungeon.secrets;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
diff --git a/src/test/java/me/xmrvizzy/skyblocker/skyblock/dwarven/FetchurTest.java b/src/test/java/de/hysky/skyblocker/skyblock/dwarven/FetchurTest.java
index 5d78beeb..08282972 100644
--- a/src/test/java/me/xmrvizzy/skyblocker/skyblock/dwarven/FetchurTest.java
+++ b/src/test/java/de/hysky/skyblocker/skyblock/dwarven/FetchurTest.java
@@ -1,6 +1,6 @@
-package me.xmrvizzy.skyblocker.skyblock.dwarven;
+package de.hysky.skyblocker.skyblock.dwarven;
 
-import me.xmrvizzy.skyblocker.utils.chat.ChatPatternListenerTest;
+import de.hysky.skyblocker.utils.chat.ChatPatternListenerTest;
 import org.junit.jupiter.api.Test;
 
 class FetchurTest extends ChatPatternListenerTest<Fetchur> {
diff --git a/src/test/java/me/xmrvizzy/skyblocker/skyblock/dwarven/PuzzlerTest.java b/src/test/java/de/hysky/skyblocker/skyblock/dwarven/PuzzlerTest.java
index 8b92e9f5..9437a5c9 100644
--- a/src/test/java/me/xmrvizzy/skyblocker/skyblock/dwarven/PuzzlerTest.java
+++ b/src/test/java/de/hysky/skyblocker/skyblock/dwarven/PuzzlerTest.java
@@ -1,6 +1,6 @@
-package me.xmrvizzy.skyblocker.skyblock.dwarven;
+package de.hysky.skyblocker.skyblock.dwarven;
 
-import me.xmrvizzy.skyblocker.utils.chat.ChatPatternListenerTest;
+import de.hysky.skyblocker.utils.chat.ChatPatternListenerTest;
 import org.junit.jupiter.api.Test;
 
 class PuzzlerTest extends ChatPatternListenerTest<Puzzler> {
diff --git a/src/test/java/me/xmrvizzy/skyblocker/skyblock/filters/AbilityFilterTest.java b/src/test/java/de/hysky/skyblocker/skyblock/filters/AbilityFilterTest.java
index de82039e..8e286d8f 100644
--- a/src/test/java/me/xmrvizzy/skyblocker/skyblock/filters/AbilityFilterTest.java
+++ b/src/test/java/de/hysky/skyblocker/skyblock/filters/AbilityFilterTest.java
@@ -1,4 +1,4 @@
-package me.xmrvizzy.skyblocker.skyblock.filters;
+package de.hysky.skyblocker.skyblock.filters;
 
 import org.junit.jupiter.api.Test;
 
diff --git a/src/test/java/me/xmrvizzy/skyblocker/skyblock/filters/AdFilterTest.java b/src/test/java/de/hysky/skyblocker/skyblock/filters/AdFilterTest.java
index 30315131..3eec1cd9 100644
--- a/src/test/java/me/xmrvizzy/skyblocker/skyblock/filters/AdFilterTest.java
+++ b/src/test/java/de/hysky/skyblocker/skyblock/filters/AdFilterTest.java
@@ -1,6 +1,6 @@
-package me.xmrvizzy.skyblocker.skyblock.filters;
+package de.hysky.skyblocker.skyblock.filters;
 
-import me.xmrvizzy.skyblocker.utils.chat.ChatPatternListenerTest;
+import de.hysky.skyblocker.utils.chat.ChatPatternListenerTest;
 import org.junit.jupiter.api.Test;
 
 import java.util.regex.Matcher;
diff --git a/src/test/java/me/xmrvizzy/skyblocker/skyblock/filters/AoteFilterTest.java b/src/test/java/de/hysky/skyblocker/skyblock/filters/AoteFilterTest.java
index 52903b1b..3115a48d 100644
--- a/src/test/java/me/xmrvizzy/skyblocker/skyblock/filters/AoteFilterTest.java
+++ b/src/test/java/de/hysky/skyblocker/skyblock/filters/AoteFilterTest.java
@@ -1,4 +1,4 @@
-package me.xmrvizzy.skyblocker.skyblock.filters;
+package de.hysky.skyblocker.skyblock.filters;
 
 import org.junit.jupiter.api.Test;
 
diff --git a/src/test/java/me/xmrvizzy/skyblocker/skyblock/filters/AutopetFilterTest.java b/src/test/java/de/hysky/skyblocker/skyblock/filters/AutopetFilterTest.java
index 2c8f1425..846acbb8 100644
--- a/src/test/java/me/xmrvizzy/skyblocker/skyblock/filters/AutopetFilterTest.java
+++ b/src/test/java/de/hysky/skyblocker/skyblock/filters/AutopetFilterTest.java
@@ -1,6 +1,6 @@
-package me.xmrvizzy.skyblocker.skyblock.filters;
+package de.hysky.skyblocker.skyblock.filters;
 
-import me.xmrvizzy.skyblocker.utils.chat.ChatPatternListenerTest;
+import de.hysky.skyblocker.utils.chat.ChatPatternListenerTest;
 import org.junit.jupiter.api.Test;
 
 class AutopetFilterTest extends ChatPatternListenerTest<AutopetFilter> {
diff --git a/src/test/java/de/hysky/skyblocker/skyblock/filters/ChatFilterTest.java b/src/test/java/de/hysky/skyblocker/skyblock/filters/ChatFilterTest.java
new file mode 100644
index 00000000..b8b08016
--- /dev/null
+++ b/src/test/java/de/hysky/skyblocker/skyblock/filters/ChatFilterTest.java
@@ -0,0 +1,10 @@
+package de.hysky.skyblocker.skyblock.filters;
+
+import de.hysky.skyblocker.utils.chat.ChatPatternListener;
+import de.hysky.skyblocker.utils.chat.ChatPatternListenerTest;
+
+public class ChatFilterTest<T extends ChatPatternListener> extends ChatPatternListenerTest<T> {
+    public ChatFilterTest(T listener) {
+        super(listener);
+    }
+}
diff --git a/src/test/java/me/xmrvizzy/skyblocker/skyblock/filters/ComboFilterTest.java b/src/test/java/de/hysky/skyblocker/skyblock/filters/ComboFilterTest.java
index 2914db39..85b01b4b 100644
--- a/src/test/java/me/xmrvizzy/skyblocker/skyblock/filters/ComboFilterTest.java
+++ b/src/test/java/de/hysky/skyblocker/skyblock/filters/ComboFilterTest.java
@@ -1,4 +1,4 @@
-package me.xmrvizzy.skyblocker.skyblock.filters;
+package de.hysky.skyblocker.skyblock.filters;
 
 import org.junit.jupiter.api.Test;
 
diff --git a/src/test/java/me/xmrvizzy/skyblocker/skyblock/filters/HealFilterTest.java b/src/test/java/de/hysky/skyblocker/skyblock/filters/HealFilterTest.java
index d720d4be..d57bf0dc 100644
--- a/src/test/java/me/xmrvizzy/skyblocker/skyblock/filters/HealFilterTest.java
+++ b/src/test/java/de/hysky/skyblocker/skyblock/filters/HealFilterTest.java
@@ -1,4 +1,4 @@
-package me.xmrvizzy.skyblocker.skyblock.filters;
+package de.hysky.skyblocker.skyblock.filters;
 
 import org.junit.jupiter.api.Test;
 
diff --git a/src/test/java/me/xmrvizzy/skyblocker/skyblock/filters/ImplosionFilterTest.java b/src/test/java/de/hysky/skyblocker/skyblock/filters/ImplosionFilterTest.java
index b9b872d9..327fcebb 100644
--- a/src/test/java/me/xmrvizzy/skyblocker/skyblock/filters/ImplosionFilterTest.java
+++ b/src/test/java/de/hysky/skyblocker/skyblock/filters/ImplosionFilterTest.java
@@ -1,4 +1,4 @@
-package me.xmrvizzy.skyblocker.skyblock.filters;
+package de.hysky.skyblocker.skyblock.filters;
 
 import org.junit.jupiter.api.Test;
 
diff --git a/src/test/java/me/xmrvizzy/skyblocker/skyblock/filters/TeleportPadFilterTest.java b/src/test/java/de/hysky/skyblocker/skyblock/filters/TeleportPadFilterTest.java
index b8a96703..681d64c0 100644
--- a/src/test/java/me/xmrvizzy/skyblocker/skyblock/filters/TeleportPadFilterTest.java
+++ b/src/test/java/de/hysky/skyblocker/skyblock/filters/TeleportPadFilterTest.java
@@ -1,4 +1,4 @@
-package me.xmrvizzy.skyblocker.skyblock.filters;
+package de.hysky.skyblocker.skyblock.filters;
 
 import org.junit.jupiter.api.Test;
 
diff --git a/src/test/java/me/xmrvizzy/skyblocker/skyblock/item/ArmorTrimIdSerializationTest.java b/src/test/java/de/hysky/skyblocker/skyblock/item/ArmorTrimIdSerializationTest.java
index a6ef79b0..36b65cae 100644
--- a/src/test/java/me/xmrvizzy/skyblocker/skyblock/item/ArmorTrimIdSerializationTest.java
+++ b/src/test/java/de/hysky/skyblocker/skyblock/item/ArmorTrimIdSerializationTest.java
@@ -1,4 +1,4 @@
-package me.xmrvizzy.skyblocker.skyblock.item;
+package de.hysky.skyblocker.skyblock.item;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
diff --git a/src/test/java/me/xmrvizzy/skyblocker/utils/chat/ChatPatternListenerTest.java b/src/test/java/de/hysky/skyblocker/utils/chat/ChatPatternListenerTest.java
index 5d6f5727..8b670cbb 100644
--- a/src/test/java/me/xmrvizzy/skyblocker/utils/chat/ChatPatternListenerTest.java
+++ b/src/test/java/de/hysky/skyblocker/utils/chat/ChatPatternListenerTest.java
@@ -1,4 +1,4 @@
-package me.xmrvizzy.skyblocker.utils.chat;
+package de.hysky.skyblocker.utils.chat;
 
 import java.util.regex.Matcher;
 
diff --git a/src/test/java/me/xmrvizzy/skyblocker/utils/scheduler/SchedulerTest.java b/src/test/java/de/hysky/skyblocker/utils/scheduler/SchedulerTest.java
index 5b3317ab..429273ac 100644
--- a/src/test/java/me/xmrvizzy/skyblocker/utils/scheduler/SchedulerTest.java
+++ b/src/test/java/de/hysky/skyblocker/utils/scheduler/SchedulerTest.java
@@ -1,4 +1,4 @@
-package me.xmrvizzy.skyblocker.utils.scheduler;
+package de.hysky.skyblocker.utils.scheduler;
 
 import org.apache.commons.lang3.mutable.MutableInt;
 import org.junit.jupiter.api.Assertions;
diff --git a/src/test/java/me/xmrvizzy/skyblocker/skyblock/dungeon/DungeonChestProfitTest.java b/src/test/java/me/xmrvizzy/skyblocker/skyblock/dungeon/DungeonChestProfitTest.java
deleted file mode 100644
index 7a130b5a..00000000
--- a/src/test/java/me/xmrvizzy/skyblocker/skyblock/dungeon/DungeonChestProfitTest.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package me.xmrvizzy.skyblocker.skyblock.dungeon;
-
-import me.xmrvizzy.skyblocker.config.SkyblockerConfig;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
-
-public class DungeonChestProfitTest {
-    @Test
-    void testProfitText() {
-        SkyblockerConfig.DungeonChestProfit config = new SkyblockerConfig.DungeonChestProfit();
-        Assertions.assertEquals("literal{ 0}[style={color=dark_gray}]", DungeonChestProfit.getProfitText(0, false, config.neutralThreshold, config.neutralColor.formatting, config.profitColor.formatting, config.lossColor.formatting, config.incompleteColor.formatting).toString());
-        Assertions.assertEquals("literal{ 0}[style={color=blue}]", DungeonChestProfit.getProfitText(0, true, config.neutralThreshold, config.neutralColor.formatting, config.profitColor.formatting, config.lossColor.formatting, config.incompleteColor.formatting).toString());
-        Assertions.assertEquals("literal{ +10}[style={color=dark_gray}]", DungeonChestProfit.getProfitText(10, false, config.neutralThreshold, config.neutralColor.formatting, config.profitColor.formatting, config.lossColor.formatting, config.incompleteColor.formatting).toString());
-        Assertions.assertEquals("literal{ +10}[style={color=blue}]", DungeonChestProfit.getProfitText(10, true, config.neutralThreshold, config.neutralColor.formatting, config.profitColor.formatting, config.lossColor.formatting, config.incompleteColor.formatting).toString());
-        Assertions.assertEquals("literal{ -10}[style={color=dark_gray}]", DungeonChestProfit.getProfitText(-10, false, config.neutralThreshold, config.neutralColor.formatting, config.profitColor.formatting, config.lossColor.formatting, config.incompleteColor.formatting).toString());
-        Assertions.assertEquals("literal{ -10}[style={color=blue}]", DungeonChestProfit.getProfitText(-10, true, config.neutralThreshold, config.neutralColor.formatting, config.profitColor.formatting, config.lossColor.formatting, config.incompleteColor.formatting).toString());
-        Assertions.assertEquals("literal{ +10,000}[style={color=dark_green}]", DungeonChestProfit.getProfitText(10000, false, config.neutralThreshold, config.neutralColor.formatting, config.profitColor.formatting, config.lossColor.formatting, config.incompleteColor.formatting).toString());
-        Assertions.assertEquals("literal{ +10,000}[style={color=blue}]", DungeonChestProfit.getProfitText(10000, true, config.neutralThreshold, config.neutralColor.formatting, config.profitColor.formatting, config.lossColor.formatting, config.incompleteColor.formatting).toString());
-        Assertions.assertEquals("literal{ -10,000}[style={color=red}]", DungeonChestProfit.getProfitText(-10000, false, config.neutralThreshold, config.neutralColor.formatting, config.profitColor.formatting, config.lossColor.formatting, config.incompleteColor.formatting).toString());
-        Assertions.assertEquals("literal{ -10,000}[style={color=blue}]", DungeonChestProfit.getProfitText(-10000, true, config.neutralThreshold, config.neutralColor.formatting, config.profitColor.formatting, config.lossColor.formatting, config.incompleteColor.formatting).toString());
-    }
-}
diff --git a/src/test/java/me/xmrvizzy/skyblocker/skyblock/filters/ChatFilterTest.java b/src/test/java/me/xmrvizzy/skyblocker/skyblock/filters/ChatFilterTest.java
deleted file mode 100644
index 5d397d16..00000000
--- a/src/test/java/me/xmrvizzy/skyblocker/skyblock/filters/ChatFilterTest.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package me.xmrvizzy.skyblocker.skyblock.filters;
-
-import me.xmrvizzy.skyblocker.utils.chat.ChatPatternListener;
-import me.xmrvizzy.skyblocker.utils.chat.ChatPatternListenerTest;
-
-public class ChatFilterTest<T extends ChatPatternListener> extends ChatPatternListenerTest<T> {
-    public ChatFilterTest(T listener) {
-        super(listener);
-    }
-}