Merge pull request #897 from viciscat/chat-rules-changes

Chat rules thingamabobs

3 files changed, 4 insertions, 57 deletions

diff --git a/src/main/java/de/hysky/skyblocker/SkyblockerMod.java b/src/main/java/de/hysky/skyblocker/SkyblockerMod.java
index 4d302ac5..860067ad 100644
--- a/src/main/java/de/hysky/skyblocker/SkyblockerMod.java
+++ b/src/main/java/de/hysky/skyblocker/SkyblockerMod.java
@@ -10,7 +10,6 @@ import de.hysky.skyblocker.debug.Debug;
 import de.hysky.skyblocker.skyblock.*;
 import de.hysky.skyblocker.skyblock.bazaar.BazaarHelper;
 import de.hysky.skyblocker.skyblock.calculators.CalculatorCommand;
-import de.hysky.skyblocker.skyblock.chat.ChatRuleAnnouncementScreen;
 import de.hysky.skyblocker.skyblock.chat.ChatRulesHandler;
 import de.hysky.skyblocker.skyblock.chat.SkyblockXpMessages;
 import de.hysky.skyblocker.skyblock.chocolatefactory.EggFinder;
@@ -146,7 +145,6 @@ public class SkyblockerMod implements ClientModInitializer {
         ChatMessageListener.init();
         Shortcuts.init();
         ChatRulesHandler.init();
-        ChatRuleAnnouncementScreen.init();
         SkyblockXpMessages.init();
         CalculatorCommand.init();
         DiscordRPCManager.init();
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRuleAnnouncementScreen.java b/src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRuleAnnouncementScreen.java
deleted file mode 100644
index 5fac426e..00000000
--- a/src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRuleAnnouncementScreen.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package de.hysky.skyblocker.skyblock.chat;
-
-import de.hysky.skyblocker.config.SkyblockerConfigManager;
-import de.hysky.skyblocker.events.HudRenderEvents;
-import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.gui.DrawContext;
-import net.minecraft.client.render.RenderTickCounter;
-import net.minecraft.client.util.math.MatrixStack;
-import net.minecraft.text.Text;
-
-public class ChatRuleAnnouncementScreen {
-    private static final MinecraftClient CLIENT = MinecraftClient.getInstance();
-    private static float timer;
-    private static Text text = null;
-
-    public static void init() {
-        HudRenderEvents.BEFORE_CHAT.register((context, tickCounter) -> {
-            if (timer <= 0 || text == null) {
-                return;
-            }
-            render(context, tickCounter);
-        });
-    }
-
-    /**
-     * renders {@link ChatRuleAnnouncementScreen#text} to the middle of the top of the screen.
-     * @param context render context
-     * @param tickDelta difference from last render to remove from timer
-     */
-    private static void render(DrawContext context, RenderTickCounter tickCounter) {
-        int scale = SkyblockerConfigManager.get().chat.chatRuleConfig.announcementScale;
-        //decrement timer
-        timer -= tickCounter.getTickDelta(true);
-        //scale text up and center
-        MatrixStack matrices = context.getMatrices();
-        matrices.push();
-        matrices.translate(context.getScaledWindowWidth() / 2f, context.getScaledWindowHeight() * 0.3, 0f);
-        matrices.scale(scale, scale, 0f);
-        //render text
-        context.drawCenteredTextWithShadow(CLIENT.textRenderer, text, 0, 0, 0xFFFFFFFF);
-
-        matrices.pop();
-    }
-
-    protected static void setText(Text newText) {
-        text = newText;
-        timer =  SkyblockerConfigManager.get().chat.chatRuleConfig.announcementLength;
-    }
-}
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 90a3b641..d4cd9ab8 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRulesHandler.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/chat/ChatRulesHandler.java
@@ -1,15 +1,14 @@
 package de.hysky.skyblocker.skyblock.chat;
 
-import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 import com.mojang.serialization.Codec;
 import com.mojang.serialization.JsonOps;
 import de.hysky.skyblocker.SkyblockerMod;
-import de.hysky.skyblocker.mixins.accessors.MessageHandlerAccessor;
-import de.hysky.skyblocker.utils.Http;
-import de.hysky.skyblocker.utils.Location;
+import de.hysky.skyblocker.config.SkyblockerConfigManager;
 import de.hysky.skyblocker.utils.Utils;
+import de.hysky.skyblocker.utils.render.title.Title;
+import de.hysky.skyblocker.utils.render.title.TitleContainer;
 import net.fabricmc.fabric.api.client.message.v1.ClientReceiveMessageEvents;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.sound.SoundEvents;
@@ -25,7 +24,6 @@ import java.io.BufferedWriter;
 import java.nio.file.Files;
 import java.nio.file.NoSuchFileException;
 import java.nio.file.Path;
-import java.time.Instant;
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
 
@@ -123,7 +121,7 @@ public class ChatRulesHandler {
                 }
 
                 if (rule.getShowAnnouncement()) {
-                    ChatRuleAnnouncementScreen.setText(newMessage);
+                    TitleContainer.addTitle(new Title(newMessage.copy()), SkyblockerConfigManager.get().chat.chatRuleConfig.announcementLength) ;
                 }
 
                 //show in action bar