custom chat width

Polyfrost · Mar 14, 2024 · 8e2abe0 · 8e2abe0
1 parent d62d36f
commit 8e2abe0
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 3 deletions.
diff --git a/src/main/java/org/polyfrost/chatting/mixin/GuiNewChatMixin.java b/src/main/java/org/polyfrost/chatting/mixin/GuiNewChatMixin.java
@@ -251,7 +251,7 @@ private void drawChatBox(Args args) {
 
     @ModifyVariable(method = "setChatLine", at = @At(value = "STORE"), ordinal = 2)
     private int wrap(int value) {
-        return calculateChatboxWidth(mc.gameSettings.chatWidth);
+        return ChattingConfig.INSTANCE.getChatWindow().getCustomChatWidth() ? Chatting.INSTANCE.getChatWidth() : calculateChatboxWidth(mc.gameSettings.chatWidth);
     }
 
     private boolean isHovered(int x, int y, int width, int height) {

diff --git a/src/main/java/org/polyfrost/chatting/mixin/GuiNewChatMixin_ChatHeight.java b/src/main/java/org/polyfrost/chatting/mixin/GuiNewChatMixin_ChatHeight.java
@@ -18,4 +18,10 @@ private void customHeight_getChatHeight(CallbackInfoReturnable<Integer> cir) {
         if (ChattingConfig.INSTANCE.getChatWindow().getCustomChatHeight())
             cir.setReturnValue(Chatting.INSTANCE.getChatHeight(getChatOpen()));
     }
+
+    @Inject(method = "getChatWidth", at = @At("HEAD"), cancellable = true)
+    private void customWidth_getChatWidth(CallbackInfoReturnable<Integer> cir) {
+        if (ChattingConfig.INSTANCE.getChatWindow().getCustomChatWidth())
+            cir.setReturnValue(Chatting.INSTANCE.getChatWidth());
+    }
 }
diff --git a/src/main/java/org/polyfrost/chatting/mixin/HUDUtilsMixin.java b/src/main/java/org/polyfrost/chatting/mixin/HUDUtilsMixin.java
@@ -6,6 +6,7 @@
 import cc.polyfrost.oneconfig.config.elements.*;
 import cc.polyfrost.oneconfig.hud.*;
 import cc.polyfrost.oneconfig.internal.hud.HudCore;
+import net.minecraft.client.Minecraft;
 import org.polyfrost.chatting.chat.*;
 import org.polyfrost.chatting.config.ChattingConfig;
 import org.spongepowered.asm.mixin.*;
@@ -54,6 +55,11 @@ public class HUDUtilsMixin {
             case "focusedHeight":
             case "unfocusedHeight":
                 option.addDependency("Custom Chat Height", () -> ChattingConfig.INSTANCE.getChatWindow().getCustomChatHeight());
+                option.addListener(() -> Minecraft.getMinecraft().ingameGUI.getChatGUI().refreshChat());
+                break;
+            case "customWidth":
+                option.addDependency("Custom Chat Width", () -> ChattingConfig.INSTANCE.getChatWindow().getCustomChatWidth());
+                option.addListener(() -> Minecraft.getMinecraft().ingameGUI.getChatGUI().refreshChat());
                 break;
         }
 

diff --git a/src/main/kotlin/org/polyfrost/chatting/Chatting.kt b/src/main/kotlin/org/polyfrost/chatting/Chatting.kt
@@ -212,10 +212,14 @@ object Chatting {
         return if (opened) ChattingConfig.chatWindow.focusedHeight else ChattingConfig.chatWindow.unfocusedHeight
     }
 
+    fun getChatWidth(): Int {
+        return ChattingConfig.chatWindow.customWidth
+    }
+
     fun screenshotLine(line: ChatLine): BufferedImage? {
         val hud = Minecraft.getMinecraft().ingameGUI
         val chat = hud.chatGUI
-        val i = MathHelper.floor_float(chat.chatWidth / chat.chatScale)
+        val i = MathHelper.floor_float(getChatWidth() / chat.chatScale)
         return screenshot(
             hashMapOf<ChatLine, String>().also {
                 GuiUtilRenderComponents.splitText(

diff --git a/src/main/kotlin/org/polyfrost/chatting/chat/ChatWindow.kt b/src/main/kotlin/org/polyfrost/chatting/chat/ChatWindow.kt
@@ -67,6 +67,19 @@ class ChatWindow : BasicHud(true, 2f, 1080 - 27f - 45f - 12f) {
     var unfocusedHeight = 90
         get() = field.coerceIn(20, 2160)
 
+    @Switch(
+        name = "Custom Chat Width",
+        description = "Set a custom width for the chat window. Allows for more customization than the vanilla chat width options."
+    )
+    var customChatWidth = false
+
+    @Slider(
+        min = 20F, max = 2160F, name = "Custom Width (px)",
+        description = "The width of the chat window when focused."
+    )
+    var customWidth = 320
+        get() = field.coerceIn(20, 2160)
+
     init {
         showInDebug = true
     }
@@ -138,7 +151,7 @@ class ChatWindow : BasicHud(true, 2f, 1080 - 27f - 45f - 12f) {
     }
 
     override fun getWidth(scale: Float, example: Boolean): Float {
-        return (GuiNewChat.calculateChatboxWidth(mc.gameSettings.chatWidth) + 4 + ModCompatHooks.chatHeadOffset) * scale
+        return (if (customChatWidth) Chatting.getChatWidth() else GuiNewChat.calculateChatboxWidth(mc.gameSettings.chatWidth) + 4 + ModCompatHooks.chatHeadOffset) * scale
     }
 
     override fun getHeight(scale: Float, example: Boolean): Float {