diff options
| author | Aaron <51387595+AzureAaron@users.noreply.github.com> | 2024-10-19 16:01:45 -0400 |
|---|---|---|
| committer | Aaron <51387595+AzureAaron@users.noreply.github.com> | 2024-10-21 01:13:20 -0400 |
| commit | 865d5564138ef6092a46b032a2fd12bc7b383ebc (patch) | |
| tree | feea2903ca851d38f20b0f263c4e907fcd8ac8a7 | |
| parent | 58a167d36c9607b1c45cbf3aac2f8083581464d7 (diff) | |
| download | Skyblocker-865d5564138ef6092a46b032a2fd12bc7b383ebc.tar.gz Skyblocker-865d5564138ef6092a46b032a2fd12bc7b383ebc.tar.bz2 Skyblocker-865d5564138ef6092a46b032a2fd12bc7b383ebc.zip | |
Repackages and Refactors
| -rw-r--r-- | src/main/java/de/hysky/skyblocker/SkyblockerScreen.java | 2 | ||||
| -rw-r--r-- | src/main/java/de/hysky/skyblocker/mixins/MinecraftClientMixin.java | 4 | ||||
| -rw-r--r-- | src/main/java/de/hysky/skyblocker/skyblock/chat/filters/AbilityFilter.java (renamed from src/main/java/de/hysky/skyblocker/skyblock/filters/AbilityFilter.java) | 2 | ||||
| -rw-r--r-- | src/main/java/de/hysky/skyblocker/skyblock/chat/filters/AdFilter.java (renamed from src/main/java/de/hysky/skyblocker/skyblock/filters/AdFilter.java) | 2 | ||||
| -rw-r--r-- | src/main/java/de/hysky/skyblocker/skyblock/chat/filters/AoteFilter.java (renamed from src/main/java/de/hysky/skyblocker/skyblock/filters/AoteFilter.java) | 2 | ||||
| -rw-r--r-- | src/main/java/de/hysky/skyblocker/skyblock/chat/filters/AutopetFilter.java (renamed from src/main/java/de/hysky/skyblocker/skyblock/filters/AutopetFilter.java) | 2 | ||||
| -rw-r--r-- | src/main/java/de/hysky/skyblocker/skyblock/chat/filters/ComboFilter.java (renamed from src/main/java/de/hysky/skyblocker/skyblock/filters/ComboFilter.java) | 2 | ||||
| -rw-r--r-- | src/main/java/de/hysky/skyblocker/skyblock/chat/filters/DeathFilter.java (renamed from src/main/java/de/hysky/skyblocker/skyblock/filters/DeathFilter.java) | 2 | ||||
| -rw-r--r-- | src/main/java/de/hysky/skyblocker/skyblock/chat/filters/DicerFilter.java (renamed from src/main/java/de/hysky/skyblocker/skyblock/filters/DicerFilter.java) | 2 | ||||
| -rw-r--r-- | src/main/java/de/hysky/skyblocker/skyblock/chat/filters/HealFilter.java (renamed from src/main/java/de/hysky/skyblocker/skyblock/filters/HealFilter.java) | 2 | ||||
| -rw-r--r-- | src/main/java/de/hysky/skyblocker/skyblock/chat/filters/ImplosionFilter.java (renamed from src/main/java/de/hysky/skyblocker/skyblock/filters/ImplosionFilter.java) | 2 | ||||
| -rw-r--r-- | src/main/java/de/hysky/skyblocker/skyblock/chat/filters/MimicFilter.java (renamed from src/main/java/de/hysky/skyblocker/skyblock/filters/MimicFilter.java) | 2 | ||||
| -rw-r--r-- | src/main/java/de/hysky/skyblocker/skyblock/chat/filters/MoltenWaveFilter.java (renamed from src/main/java/de/hysky/skyblocker/skyblock/filters/MoltenWaveFilter.java) | 2 | ||||
| -rw-r--r-- | src/main/java/de/hysky/skyblocker/skyblock/chat/filters/ShowOffFilter.java (renamed from src/main/java/de/hysky/skyblocker/skyblock/filters/ShowOffFilter.java) | 2 | ||||
| -rw-r--r-- | src/main/java/de/hysky/skyblocker/skyblock/chat/filters/SimpleChatFilter.java (renamed from src/main/java/de/hysky/skyblocker/skyblock/filters/SimpleChatFilter.java) | 2 | ||||
| -rw-r--r-- | src/main/java/de/hysky/skyblocker/skyblock/chat/filters/TeleportPadFilter.java (renamed from src/main/java/de/hysky/skyblocker/skyblock/filters/TeleportPadFilter.java) | 2 | ||||
| -rw-r--r-- | src/main/java/de/hysky/skyblocker/skyblock/chat/filters/ToggleSkyMallFilter.java (renamed from src/main/java/de/hysky/skyblocker/skyblock/filters/ToggleSkyMallFilter.java) | 2 | ||||
| -rw-r--r-- | src/main/java/de/hysky/skyblocker/skyblock/crimson/kuudra/DangerWarning.java | 4 | ||||
| -rw-r--r-- | src/main/java/de/hysky/skyblocker/skyblock/crimson/kuudra/Kuudra.java | 3 | ||||
| -rw-r--r-- | src/main/java/de/hysky/skyblocker/skyblock/crimson/kuudra/KuudraWaypoints.java | 4 | ||||
| -rw-r--r-- | src/main/java/de/hysky/skyblocker/skyblock/events/JacobEventToast.java | 3 | ||||
| -rw-r--r-- | src/main/java/de/hysky/skyblocker/utils/chat/ChatMessageListener.java | 13 | ||||
| -rw-r--r-- | src/main/java/de/hysky/skyblocker/utils/render/RenderHelper.java | 9 | ||||
| -rw-r--r-- | src/main/java/de/hysky/skyblocker/utils/render/gui/BasePlaceholderScreen.java (renamed from src/main/java/de/hysky/skyblocker/utils/BasePlaceholderScreen.java) | 2 | ||||
| -rw-r--r-- | src/main/java/de/hysky/skyblocker/utils/render/gui/JoinWorldPlaceholderScreen.java (renamed from src/main/java/de/hysky/skyblocker/utils/JoinWorldPlaceholderScreen.java) | 2 | ||||
| -rw-r--r-- | src/main/java/de/hysky/skyblocker/utils/render/gui/ReconfiguringPlaceholderScreen.java (renamed from src/main/java/de/hysky/skyblocker/utils/ReconfiguringPlaceholderScreen.java) | 2 | ||||
| -rw-r--r-- | src/test/java/de/hysky/skyblocker/skyblock/chat/filters/AbilityFilterTest.java (renamed from src/test/java/de/hysky/skyblocker/skyblock/filters/AbilityFilterTest.java) | 2 | ||||
| -rw-r--r-- | src/test/java/de/hysky/skyblocker/skyblock/chat/filters/AdFilterTest.java (renamed from src/test/java/de/hysky/skyblocker/skyblock/filters/AdFilterTest.java) | 2 | ||||
| -rw-r--r-- | src/test/java/de/hysky/skyblocker/skyblock/chat/filters/AoteFilterTest.java (renamed from src/test/java/de/hysky/skyblocker/skyblock/filters/AoteFilterTest.java) | 2 | ||||
| -rw-r--r-- | src/test/java/de/hysky/skyblocker/skyblock/chat/filters/AutopetFilterTest.java (renamed from src/test/java/de/hysky/skyblocker/skyblock/filters/AutopetFilterTest.java) | 2 | ||||
| -rw-r--r-- | src/test/java/de/hysky/skyblocker/skyblock/chat/filters/ChatFilterTest.java (renamed from src/test/java/de/hysky/skyblocker/skyblock/filters/ChatFilterTest.java) | 2 | ||||
| -rw-r--r-- | src/test/java/de/hysky/skyblocker/skyblock/chat/filters/ComboFilterTest.java (renamed from src/test/java/de/hysky/skyblocker/skyblock/filters/ComboFilterTest.java) | 2 | ||||
| -rw-r--r-- | src/test/java/de/hysky/skyblocker/skyblock/chat/filters/HealFilterTest.java (renamed from src/test/java/de/hysky/skyblocker/skyblock/filters/HealFilterTest.java) | 2 | ||||
| -rw-r--r-- | src/test/java/de/hysky/skyblocker/skyblock/chat/filters/ImplosionFilterTest.java (renamed from src/test/java/de/hysky/skyblocker/skyblock/filters/ImplosionFilterTest.java) | 2 | ||||
| -rw-r--r-- | src/test/java/de/hysky/skyblocker/skyblock/chat/filters/ShowOffFilterTest.java (renamed from src/test/java/de/hysky/skyblocker/skyblock/filters/ShowOffFilterTest.java) | 2 | ||||
| -rw-r--r-- | src/test/java/de/hysky/skyblocker/skyblock/chat/filters/TeleportPadFilterTest.java (renamed from src/test/java/de/hysky/skyblocker/skyblock/filters/TeleportPadFilterTest.java) | 2 |
36 files changed, 52 insertions, 46 deletions
diff --git a/src/main/java/de/hysky/skyblocker/SkyblockerScreen.java b/src/main/java/de/hysky/skyblocker/SkyblockerScreen.java index cc90d747..98b9235a 100644 --- a/src/main/java/de/hysky/skyblocker/SkyblockerScreen.java +++ b/src/main/java/de/hysky/skyblocker/SkyblockerScreen.java @@ -3,7 +3,6 @@ package de.hysky.skyblocker; import de.hysky.skyblocker.annotations.Init; import de.hysky.skyblocker.config.SkyblockerConfigManager; import de.hysky.skyblocker.skyblock.Tips; -import de.hysky.skyblocker.utils.render.RenderHelper; import de.hysky.skyblocker.utils.scheduler.Scheduler; import net.fabricmc.fabric.api.client.command.v2.ClientCommandManager; import net.fabricmc.fabric.api.client.command.v2.ClientCommandRegistrationCallback; @@ -103,7 +102,6 @@ public class SkyblockerScreen extends Screen { @Override public void render(DrawContext context, int mouseX, int mouseY, float delta) { - this.renderBackground(context, mouseX, mouseY, delta); super.render(context, mouseX, mouseY, delta); } diff --git a/src/main/java/de/hysky/skyblocker/mixins/MinecraftClientMixin.java b/src/main/java/de/hysky/skyblocker/mixins/MinecraftClientMixin.java index ac737501..16d771d0 100644 --- a/src/main/java/de/hysky/skyblocker/mixins/MinecraftClientMixin.java +++ b/src/main/java/de/hysky/skyblocker/mixins/MinecraftClientMixin.java @@ -6,9 +6,9 @@ import de.hysky.skyblocker.config.SkyblockerConfigManager; import de.hysky.skyblocker.skyblock.item.HotbarSlotLock; import de.hysky.skyblocker.skyblock.item.ItemProtection; import de.hysky.skyblocker.skyblock.item.SkyblockInventoryScreen; -import de.hysky.skyblocker.utils.JoinWorldPlaceholderScreen; -import de.hysky.skyblocker.utils.ReconfiguringPlaceholderScreen; import de.hysky.skyblocker.utils.Utils; +import de.hysky.skyblocker.utils.render.gui.JoinWorldPlaceholderScreen; +import de.hysky.skyblocker.utils.render.gui.ReconfiguringPlaceholderScreen; import net.minecraft.client.MinecraftClient; import net.minecraft.client.gui.screen.DownloadingTerrainScreen; import net.minecraft.client.gui.screen.ReconfiguringScreen; diff --git a/src/main/java/de/hysky/skyblocker/skyblock/filters/AbilityFilter.java b/src/main/java/de/hysky/skyblocker/skyblock/chat/filters/AbilityFilter.java index 1675dd89..77e3aa08 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/filters/AbilityFilter.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/chat/filters/AbilityFilter.java @@ -1,4 +1,4 @@ -package de.hysky.skyblocker.skyblock.filters; +package de.hysky.skyblocker.skyblock.chat.filters; import de.hysky.skyblocker.config.SkyblockerConfigManager; import de.hysky.skyblocker.utils.chat.ChatFilterResult; diff --git a/src/main/java/de/hysky/skyblocker/skyblock/filters/AdFilter.java b/src/main/java/de/hysky/skyblocker/skyblock/chat/filters/AdFilter.java index 53f7066c..8f0192b7 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/filters/AdFilter.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/chat/filters/AdFilter.java @@ -1,4 +1,4 @@ -package de.hysky.skyblocker.skyblock.filters; +package de.hysky.skyblocker.skyblock.chat.filters; import de.hysky.skyblocker.config.SkyblockerConfigManager; import de.hysky.skyblocker.utils.Constants; diff --git a/src/main/java/de/hysky/skyblocker/skyblock/filters/AoteFilter.java b/src/main/java/de/hysky/skyblocker/skyblock/chat/filters/AoteFilter.java index 98e252f3..a6b61b54 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/filters/AoteFilter.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/chat/filters/AoteFilter.java @@ -1,4 +1,4 @@ -package de.hysky.skyblocker.skyblock.filters; +package de.hysky.skyblocker.skyblock.chat.filters; import de.hysky.skyblocker.config.SkyblockerConfigManager; import de.hysky.skyblocker.utils.chat.ChatFilterResult; diff --git a/src/main/java/de/hysky/skyblocker/skyblock/filters/AutopetFilter.java b/src/main/java/de/hysky/skyblocker/skyblock/chat/filters/AutopetFilter.java index 3e535ec9..0d29b565 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/filters/AutopetFilter.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/chat/filters/AutopetFilter.java @@ -1,4 +1,4 @@ -package de.hysky.skyblocker.skyblock.filters; +package de.hysky.skyblocker.skyblock.chat.filters; import de.hysky.skyblocker.config.SkyblockerConfigManager; import de.hysky.skyblocker.utils.chat.ChatFilterResult; diff --git a/src/main/java/de/hysky/skyblocker/skyblock/filters/ComboFilter.java b/src/main/java/de/hysky/skyblocker/skyblock/chat/filters/ComboFilter.java index e6103720..d71085db 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/filters/ComboFilter.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/chat/filters/ComboFilter.java @@ -1,4 +1,4 @@ -package de.hysky.skyblocker.skyblock.filters; +package de.hysky.skyblocker.skyblock.chat.filters; import de.hysky.skyblocker.config.SkyblockerConfigManager; import de.hysky.skyblocker.utils.chat.ChatFilterResult; diff --git a/src/main/java/de/hysky/skyblocker/skyblock/filters/DeathFilter.java b/src/main/java/de/hysky/skyblocker/skyblock/chat/filters/DeathFilter.java index b286c9b5..545eabfd 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/filters/DeathFilter.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/chat/filters/DeathFilter.java @@ -1,4 +1,4 @@ -package de.hysky.skyblocker.skyblock.filters; +package de.hysky.skyblocker.skyblock.chat.filters; import de.hysky.skyblocker.config.SkyblockerConfigManager; import de.hysky.skyblocker.utils.chat.ChatFilterResult; diff --git a/src/main/java/de/hysky/skyblocker/skyblock/filters/DicerFilter.java b/src/main/java/de/hysky/skyblocker/skyblock/chat/filters/DicerFilter.java index b2022f1f..10482bd1 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/filters/DicerFilter.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/chat/filters/DicerFilter.java @@ -1,4 +1,4 @@ -package de.hysky.skyblocker.skyblock.filters; +package de.hysky.skyblocker.skyblock.chat.filters; import de.hysky.skyblocker.config.SkyblockerConfigManager; import de.hysky.skyblocker.utils.chat.ChatFilterResult; diff --git a/src/main/java/de/hysky/skyblocker/skyblock/filters/HealFilter.java b/src/main/java/de/hysky/skyblocker/skyblock/chat/filters/HealFilter.java index 604a0f5c..1baaf74f 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/filters/HealFilter.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/chat/filters/HealFilter.java @@ -1,4 +1,4 @@ -package de.hysky.skyblocker.skyblock.filters; +package de.hysky.skyblocker.skyblock.chat.filters; import de.hysky.skyblocker.config.SkyblockerConfigManager; import de.hysky.skyblocker.utils.chat.ChatFilterResult; diff --git a/src/main/java/de/hysky/skyblocker/skyblock/filters/ImplosionFilter.java b/src/main/java/de/hysky/skyblocker/skyblock/chat/filters/ImplosionFilter.java index a120c0e5..58bd4820 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/filters/ImplosionFilter.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/chat/filters/ImplosionFilter.java @@ -1,4 +1,4 @@ -package de.hysky.skyblocker.skyblock.filters; +package de.hysky.skyblocker.skyblock.chat.filters; import de.hysky.skyblocker.config.SkyblockerConfigManager; import de.hysky.skyblocker.utils.chat.ChatFilterResult; diff --git a/src/main/java/de/hysky/skyblocker/skyblock/filters/MimicFilter.java b/src/main/java/de/hysky/skyblocker/skyblock/chat/filters/MimicFilter.java index 1659713c..dad2224e 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/filters/MimicFilter.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/chat/filters/MimicFilter.java @@ -1,4 +1,4 @@ -package de.hysky.skyblocker.skyblock.filters; +package de.hysky.skyblocker.skyblock.chat.filters; import de.hysky.skyblocker.config.SkyblockerConfigManager; import de.hysky.skyblocker.skyblock.dungeon.DungeonScore; diff --git a/src/main/java/de/hysky/skyblocker/skyblock/filters/MoltenWaveFilter.java b/src/main/java/de/hysky/skyblocker/skyblock/chat/filters/MoltenWaveFilter.java index d935138b..39365af7 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/filters/MoltenWaveFilter.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/chat/filters/MoltenWaveFilter.java @@ -1,4 +1,4 @@ -package de.hysky.skyblocker.skyblock.filters; +package de.hysky.skyblocker.skyblock.chat.filters; import de.hysky.skyblocker.config.SkyblockerConfigManager; import de.hysky.skyblocker.utils.chat.ChatFilterResult; diff --git a/src/main/java/de/hysky/skyblocker/skyblock/filters/ShowOffFilter.java b/src/main/java/de/hysky/skyblocker/skyblock/chat/filters/ShowOffFilter.java index 94c23504..0a0cbbe5 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/filters/ShowOffFilter.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/chat/filters/ShowOffFilter.java @@ -1,4 +1,4 @@ -package de.hysky.skyblocker.skyblock.filters; +package de.hysky.skyblocker.skyblock.chat.filters; import de.hysky.skyblocker.config.SkyblockerConfigManager; import de.hysky.skyblocker.utils.Constants; diff --git a/src/main/java/de/hysky/skyblocker/skyblock/filters/SimpleChatFilter.java b/src/main/java/de/hysky/skyblocker/skyblock/chat/filters/SimpleChatFilter.java index 2521b3a9..61e1fba1 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/filters/SimpleChatFilter.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/chat/filters/SimpleChatFilter.java @@ -1,4 +1,4 @@ -package de.hysky.skyblocker.skyblock.filters; +package de.hysky.skyblocker.skyblock.chat.filters; import de.hysky.skyblocker.utils.chat.ChatPatternListener; import net.minecraft.text.Text; diff --git a/src/main/java/de/hysky/skyblocker/skyblock/filters/TeleportPadFilter.java b/src/main/java/de/hysky/skyblocker/skyblock/chat/filters/TeleportPadFilter.java index 5c30b039..1308aa09 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/filters/TeleportPadFilter.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/chat/filters/TeleportPadFilter.java @@ -1,4 +1,4 @@ -package de.hysky.skyblocker.skyblock.filters; +package de.hysky.skyblocker.skyblock.chat.filters; import de.hysky.skyblocker.config.SkyblockerConfigManager; import de.hysky.skyblocker.utils.chat.ChatFilterResult; diff --git a/src/main/java/de/hysky/skyblocker/skyblock/filters/ToggleSkyMallFilter.java b/src/main/java/de/hysky/skyblocker/skyblock/chat/filters/ToggleSkyMallFilter.java index b1907391..4e7f953f 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/filters/ToggleSkyMallFilter.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/chat/filters/ToggleSkyMallFilter.java @@ -1,4 +1,4 @@ -package de.hysky.skyblocker.skyblock.filters; +package de.hysky.skyblocker.skyblock.chat.filters; import de.hysky.skyblocker.config.SkyblockerConfigManager; import de.hysky.skyblocker.utils.chat.ChatFilterResult; diff --git a/src/main/java/de/hysky/skyblocker/skyblock/crimson/kuudra/DangerWarning.java b/src/main/java/de/hysky/skyblocker/skyblock/crimson/kuudra/DangerWarning.java index feaa1a11..80028405 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/crimson/kuudra/DangerWarning.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/crimson/kuudra/DangerWarning.java @@ -2,6 +2,7 @@ package de.hysky.skyblocker.skyblock.crimson.kuudra; import java.util.function.Supplier; +import de.hysky.skyblocker.annotations.Init; import de.hysky.skyblocker.config.SkyblockerConfigManager; import de.hysky.skyblocker.utils.Utils; import de.hysky.skyblocker.utils.render.RenderHelper; @@ -23,7 +24,8 @@ public class DangerWarning { private static final Supplier<MutableText> DANGER_TEXT = () -> Text.translatable("skyblocker.crimson.kuudra.danger"); private static final Title TITLE = new Title(DANGER_TEXT.get()); - static void init() { + @Init + public static void init() { Scheduler.INSTANCE.scheduleCyclic(DangerWarning::updateIndicator, 5); ClientPlayConnectionEvents.JOIN.register((handler, sender, client) -> reset()); } diff --git a/src/main/java/de/hysky/skyblocker/skyblock/crimson/kuudra/Kuudra.java b/src/main/java/de/hysky/skyblocker/skyblock/crimson/kuudra/Kuudra.java index 7265a81a..9ba15495 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/crimson/kuudra/Kuudra.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/crimson/kuudra/Kuudra.java @@ -14,9 +14,6 @@ public class Kuudra { @Init public static void init() { - KuudraWaypoints.init(); - DangerWarning.init(); - ClientPlayConnectionEvents.JOIN.register((_handler, _sender, _client) -> reset()); ClientReceiveMessageEvents.GAME.register(Kuudra::onMessage); } diff --git a/src/main/java/de/hysky/skyblocker/skyblock/crimson/kuudra/KuudraWaypoints.java b/src/main/java/de/hysky/skyblocker/skyblock/crimson/kuudra/KuudraWaypoints.java index ba2e6695..80941e86 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/crimson/kuudra/KuudraWaypoints.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/crimson/kuudra/KuudraWaypoints.java @@ -17,6 +17,7 @@ import com.mojang.serialization.Codec; import com.mojang.serialization.JsonOps; import de.hysky.skyblocker.SkyblockerMod; +import de.hysky.skyblocker.annotations.Init; import de.hysky.skyblocker.config.SkyblockerConfigManager; import de.hysky.skyblocker.utils.PosUtils; import de.hysky.skyblocker.utils.Utils; @@ -54,7 +55,8 @@ public class KuudraWaypoints { private static ObjectArrayList<Waypoint> fuelWaypoints = ObjectArrayList.of(); private static boolean loaded; - static void init() { + @Init + public static void init() { WorldRenderEvents.AFTER_TRANSLUCENT.register(KuudraWaypoints::render); ClientLifecycleEvents.CLIENT_STARTED.register(KuudraWaypoints::load); Scheduler.INSTANCE.scheduleCyclic(KuudraWaypoints::tick, 20); diff --git a/src/main/java/de/hysky/skyblocker/skyblock/events/JacobEventToast.java b/src/main/java/de/hysky/skyblocker/skyblock/events/JacobEventToast.java index 39d5e4cf..67e761a5 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/events/JacobEventToast.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/events/JacobEventToast.java @@ -9,6 +9,7 @@ import net.minecraft.client.util.math.MatrixStack; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; import net.minecraft.util.Colors; +import net.minecraft.util.math.ColorHelper; import net.minecraft.util.math.MathHelper; public class JacobEventToast extends EventToast { @@ -44,7 +45,7 @@ public class JacobEventToast extends EventToast { // IDK how to make the items transparent, so I just redraw the texture on top matrices.push(); matrices.translate(0, 0, 400f); - RenderHelper.renderNineSliceColored(context, TEXTURE, 0, 0, getWidth(), getHeight(), 1f, 1f, 1f, (k >> 24) / 255f); + RenderHelper.renderNineSliceColored(context, TEXTURE, 0, 0, getWidth(), getHeight(), ColorHelper.fromFloats((k >> 24) / 255f, 1f, 1f, 1f)); matrices.pop(); y += textRenderer.fontHeight * message.size(); } diff --git a/src/main/java/de/hysky/skyblocker/utils/chat/ChatMessageListener.java b/src/main/java/de/hysky/skyblocker/utils/chat/ChatMessageListener.java index 38042a9a..3be8116d 100644 --- a/src/main/java/de/hysky/skyblocker/utils/chat/ChatMessageListener.java +++ b/src/main/java/de/hysky/skyblocker/utils/chat/ChatMessageListener.java @@ -3,11 +3,11 @@ package de.hysky.skyblocker.utils.chat; import de.hysky.skyblocker.annotations.Init; import de.hysky.skyblocker.skyblock.barn.HungryHiker; import de.hysky.skyblocker.skyblock.barn.TreasureHunter; +import de.hysky.skyblocker.skyblock.chat.filters.*; import de.hysky.skyblocker.skyblock.dungeon.Reparty; import de.hysky.skyblocker.skyblock.dungeon.puzzle.Trivia; import de.hysky.skyblocker.skyblock.dwarven.Fetchur; import de.hysky.skyblocker.skyblock.dwarven.Puzzler; -import de.hysky.skyblocker.skyblock.filters.*; import de.hysky.skyblocker.utils.Utils; import net.fabricmc.fabric.api.client.message.v1.ClientReceiveMessageEvents; import net.fabricmc.fabric.api.event.Event; @@ -34,7 +34,8 @@ public interface ChatMessageListener { /** * Registers {@link ChatMessageListener}s to {@link ChatMessageListener#EVENT} and registers {@link ChatMessageListener#EVENT} to {@link ClientReceiveMessageEvents#ALLOW_GAME} */ - @Init + @SuppressWarnings("incomplete-switch") + @Init static void init() { ChatMessageListener[] listeners = new ChatMessageListener[]{ // Features @@ -60,27 +61,35 @@ public interface ChatMessageListener { new DeathFilter(), new DicerFilter() }; + // Register all listeners to EVENT for (ChatMessageListener listener : listeners) { EVENT.register(listener); } + // Register EVENT to ClientReceiveMessageEvents.ALLOW_GAME from fabric api ClientReceiveMessageEvents.ALLOW_GAME.register((message, overlay) -> { if (!Utils.isOnSkyblock()) { return true; } + ChatFilterResult result = EVENT.invoker().onMessage(message, Formatting.strip(message.getString())); + switch (result) { case ACTION_BAR -> { if (overlay) { return true; } + ClientPlayerEntity player = MinecraftClient.getInstance().player; + if (player != null) { player.sendMessage(message, true); + return false; } } + case FILTER -> { return false; } diff --git a/src/main/java/de/hysky/skyblocker/utils/render/RenderHelper.java b/src/main/java/de/hysky/skyblocker/utils/render/RenderHelper.java index 6debc355..10c2fdf8 100644 --- a/src/main/java/de/hysky/skyblocker/utils/render/RenderHelper.java +++ b/src/main/java/de/hysky/skyblocker/utils/render/RenderHelper.java @@ -402,15 +402,12 @@ public class RenderHelper { return x >= x1 && x <= x2 && y >= y1 && y <= y2; } - public static void renderNineSliceColored(DrawContext context, Identifier texture, int x, int y, int width, int height, float red, float green, float blue, float alpha) { - context.drawGuiTexture(RenderLayer::getGuiTextured, texture, x, y, width, height, ColorHelper.fromFloats(alpha, red, green, blue)); + public static void renderNineSliceColored(DrawContext context, Identifier texture, int x, int y, int width, int height, int argb) { + context.drawGuiTexture(RenderLayer::getGuiTextured, texture, x, y, width, height, argb); } - private static final float[] colorBuffer = new float[4]; - public static void renderNineSliceColored(DrawContext context, Identifier texture, int x, int y, int width, int height, Color color) { - color.getComponents(colorBuffer); - renderNineSliceColored(context, texture, x, y, width, height, colorBuffer[0], colorBuffer[1], colorBuffer[2], colorBuffer[3]); + renderNineSliceColored(context, texture, x, y, width, height, ColorHelper.getArgb(color.getAlpha(), color.getRed(), color.getGreen(), color.getBlue())); } // TODO Get rid of reflection once the new Sodium is released diff --git a/src/main/java/de/hysky/skyblocker/utils/BasePlaceholderScreen.java b/src/main/java/de/hysky/skyblocker/utils/render/gui/BasePlaceholderScreen.java index b362dcb7..729fae42 100644 --- a/src/main/java/de/hysky/skyblocker/utils/BasePlaceholderScreen.java +++ b/src/main/java/de/hysky/skyblocker/utils/render/gui/BasePlaceholderScreen.java @@ -1,4 +1,4 @@ -package de.hysky.skyblocker.utils; +package de.hysky.skyblocker.utils.render.gui; import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.screen.Screen; diff --git a/src/main/java/de/hysky/skyblocker/utils/JoinWorldPlaceholderScreen.java b/src/main/java/de/hysky/skyblocker/utils/render/gui/JoinWorldPlaceholderScreen.java index f64bcf6c..f1dce2a8 100644 --- a/src/main/java/de/hysky/skyblocker/utils/JoinWorldPlaceholderScreen.java +++ b/src/main/java/de/hysky/skyblocker/utils/render/gui/JoinWorldPlaceholderScreen.java @@ -1,4 +1,4 @@ -package de.hysky.skyblocker.utils; +package de.hysky.skyblocker.utils.render.gui; import net.minecraft.text.Text; diff --git a/src/main/java/de/hysky/skyblocker/utils/ReconfiguringPlaceholderScreen.java b/src/main/java/de/hysky/skyblocker/utils/render/gui/ReconfiguringPlaceholderScreen.java index 4d415615..8780acbe 100644 --- a/src/main/java/de/hysky/skyblocker/utils/ReconfiguringPlaceholderScreen.java +++ b/src/main/java/de/hysky/skyblocker/utils/render/gui/ReconfiguringPlaceholderScreen.java @@ -1,4 +1,4 @@ -package de.hysky.skyblocker.utils; +package de.hysky.skyblocker.utils.render.gui; |
