Merge pull request #669 from SkyblockerMod/1.20.5

1.20.5 & 1.20.6

3 files changed, 8 insertions, 10 deletions

diff --git a/src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRuleAnnouncementScreen.java b/src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRuleAnnouncementScreen.java
index bafada27..d61a0b59 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRuleAnnouncementScreen.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRuleAnnouncementScreen.java
@@ -1,7 +1,7 @@
 package de.hysky.skyblocker.skyblock.chat;
 
 import de.hysky.skyblocker.config.SkyblockerConfigManager;
-import net.fabricmc.fabric.api.client.rendering.v1.HudRenderCallback;
+import de.hysky.skyblocker.events.HudRenderEvents;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.util.math.MatrixStack;
@@ -13,7 +13,7 @@ public class ChatRuleAnnouncementScreen {
     private static Text text = null;
 
     public static void init() {
-        HudRenderCallback.EVENT.register((context, tickDelta) -> {
+        HudRenderEvents.BEFORE_CHAT.register((context, tickDelta) -> {
             if (timer <= 0 || text == null) {
                 return;
             }
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRulesConfigListWidget.java b/src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRulesConfigListWidget.java
index a1b9317a..747e826b 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRulesConfigListWidget.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRulesConfigListWidget.java
@@ -39,8 +39,8 @@ public class ChatRulesConfigListWidget extends ElementListWidget<ChatRulesConfig
     }
 
     @Override
-    protected int getScrollbarPositionX() {
-        return super.getScrollbarPositionX() + 50;
+    protected int getScrollbarX() {
+        return super.getScrollbarX() + 50;
     }
 
     protected void addRuleAfterSelected() {
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRulesHandler.java b/src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRulesHandler.java
index 2a103d13..d1c7f4fd 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRulesHandler.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRulesHandler.java
@@ -6,7 +6,7 @@ import com.google.gson.JsonParser;
 import com.mojang.serialization.Codec;
 import com.mojang.serialization.JsonOps;
 import de.hysky.skyblocker.SkyblockerMod;
-import de.hysky.skyblocker.mixin.accessor.MessageHandlerAccessor;
+import de.hysky.skyblocker.mixins.accessors.MessageHandlerAccessor;
 import de.hysky.skyblocker.utils.Http;
 import de.hysky.skyblocker.utils.Utils;
 import net.fabricmc.fabric.api.client.message.v1.ClientReceiveMessageEvents;
@@ -52,7 +52,7 @@ public class ChatRulesHandler {
 
     private static void loadChatRules() {
         try (BufferedReader reader = Files.newBufferedReader(CHAT_RULE_FILE)) {
-            Map<String, List<ChatRule>> chatRules = MAP_CODEC.parse(JsonOps.INSTANCE, JsonParser.parseReader(reader)).result().orElseThrow();
+            Map<String, List<ChatRule>> chatRules = MAP_CODEC.parse(JsonOps.INSTANCE, JsonParser.parseReader(reader)).getOrThrow();
             LOGGER.info("[Skyblocker Chat Rules]: {}", chatRules);
 
             chatRuleList.addAll(chatRules.get("rules"));
@@ -98,7 +98,7 @@ public class ChatRulesHandler {
 
     protected static void saveChatRules() {
         JsonObject chatRuleJson = new JsonObject();
-        chatRuleJson.add("rules", ChatRule.LIST_CODEC.encodeStart(JsonOps.INSTANCE, chatRuleList).result().orElseThrow());
+        chatRuleJson.add("rules", ChatRule.LIST_CODEC.encodeStart(JsonOps.INSTANCE, chatRuleList).getOrThrow());
         try (BufferedWriter writer = Files.newBufferedWriter(CHAT_RULE_FILE)) {
             SkyblockerMod.GSON.toJson(chatRuleJson, writer);
             LOGGER.info("[Skyblocker Chat Rules] Saved chat rules file");
@@ -139,9 +139,7 @@ public class ChatRulesHandler {
                 //show replacement message in chat
                 //bypass MessageHandler#onGameMessage to avoid activating chat rules again
                 if (!rule.getHideMessage() && CLIENT.player != null) {
-                    CLIENT.inGameHud.getChatHud().addMessage(newMessage);
-                    ((MessageHandlerAccessor) CLIENT.getMessageHandler()).invokeAddToChatLog(newMessage, Instant.now());
-                    CLIENT.getNarratorManager().narrateSystemMessage(newMessage);
+                    Utils.sendMessageToBypassEvents(newMessage);
                 }
 
                 //play sound