From bfd812ddbce007667e158947ab210bcad0be071b Mon Sep 17 00:00:00 2001 From: JFronny Date: Thu, 7 Dec 2023 21:09:41 +0100 Subject: [PATCH] chore: update to 1.20.4 --- build.gradle.kts | 12 +++++------- .../client/mixin/TextFieldWidgetMixin.java | 2 +- .../chattransform/server/ChatTransformServer.java | 4 ++-- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 93cda07..4bcb96d 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,5 +1,3 @@ -import io.gitlab.jfronny.scripts.* - plugins { id("jfmod") version "1.5-SNAPSHOT" } @@ -7,12 +5,12 @@ plugins { allprojects { group = "io.gitlab.jfronny" } base.archivesName = "chat-transform" -val fabricVersion = "0.89.1+1.20.2" +val fabricVersion = "0.91.1+1.20.4" jfMod { - minecraftVersion = "1.20.2" + minecraftVersion = "1.20.4" yarn("build.1") - loaderVersion = "0.14.22" - libJfVersion = "3.13.1" + loaderVersion = "0.15.0" + libJfVersion = "3.14.1" modrinth { projectId = "chat-transform" @@ -36,5 +34,5 @@ dependencies { // Dev env modLocalRuntime("io.gitlab.jfronny.libjf:libjf-config-ui-tiny:${jfMod.libJfVersion.get()}") modLocalRuntime("io.gitlab.jfronny.libjf:libjf-devutil:${jfMod.libJfVersion.get()}") - modLocalRuntime("com.terraformersmc:modmenu:8.0.0-beta.2") + modLocalRuntime("com.terraformersmc:modmenu:9.0.0-pre.1") } diff --git a/src/client/java/io/gitlab/jfronny/chattransform/client/mixin/TextFieldWidgetMixin.java b/src/client/java/io/gitlab/jfronny/chattransform/client/mixin/TextFieldWidgetMixin.java index 8c1abf0..1fd38ef 100644 --- a/src/client/java/io/gitlab/jfronny/chattransform/client/mixin/TextFieldWidgetMixin.java +++ b/src/client/java/io/gitlab/jfronny/chattransform/client/mixin/TextFieldWidgetMixin.java @@ -133,7 +133,7 @@ public abstract class TextFieldWidgetMixin extends ClickableWidget implements IT } else return false; } - @Inject(method = "renderButton(Lnet/minecraft/client/gui/DrawContext;IIF)V", at = @At(value = "TAIL")) + @Inject(method = "renderWidget(Lnet/minecraft/client/gui/DrawContext;IIF)V", at = @At(value = "TAIL")) void renderTransformStart(DrawContext context, int mouseX, int mouseY, float delta, CallbackInfo ci) { if (isVisible() && Cfg.Client.visualize) { int y = this.drawsBackground ? this.getY() + (this.height - 8) / 2 : this.getY(); diff --git a/src/main/java/io/gitlab/jfronny/chattransform/server/ChatTransformServer.java b/src/main/java/io/gitlab/jfronny/chattransform/server/ChatTransformServer.java index 3960073..e89b6d2 100644 --- a/src/main/java/io/gitlab/jfronny/chattransform/server/ChatTransformServer.java +++ b/src/main/java/io/gitlab/jfronny/chattransform/server/ChatTransformServer.java @@ -129,8 +129,8 @@ public class ChatTransformServer implements DedicatedServerModInitializer { else args[i] = args[i]; } return new TranslatableTextContent(tx.getKey(), ChatTransform.transform(tx.getFallback()), args); - } else if (source instanceof LiteralTextContent tx) { - return new LiteralTextContent(ChatTransform.transform(tx.string())); + } else if (source instanceof PlainTextContent.Literal tx) { + return new PlainTextContent.Literal(ChatTransform.transform(tx.string())); } else { return source; }