feat: finish port to 1.20.5

build.gradle.kts

@@ -1,18 +1,16 @@
-import io.gitlab.jfronny.scripts.*
-
 plugins {
-    id("jfmod") version "1.5-SNAPSHOT"
+    id("jfmod") version "1.6-SNAPSHOT"
 }
 
 allprojects { group = "io.gitlab.jfronny" }
 base.archivesName = "chat-transform"
 
-val fabricVersion = "0.89.1+1.20.2"
 jfMod {
-    minecraftVersion = "1.20.2"
+    minecraftVersion = "1.20.5"
     yarn("build.1")
-    loaderVersion = "0.14.22"
-    libJfVersion = "3.13.1"
+    loaderVersion = "0.15.10"
+    libJfVersion = "3.15.6"
+    fabricApiVersion = "0.97.6+1.20.5"
 
     modrinth {
         projectId = "chat-transform"
@@ -28,13 +26,17 @@ jfMod {
 }
 
 dependencies {
-    modImplementation("io.gitlab.jfronny.libjf:libjf-config-core-v2:${jfMod.libJfVersion.get()}")
-    include(modImplementation(fabricApi.module("fabric-message-api-v1", fabricVersion))!!)
-    include(modImplementation(fabricApi.module("fabric-command-api-v2", fabricVersion))!!)
-    modImplementation(fabricApi.module("fabric-networking-api-v1", fabricVersion))
+    modImplementation("io.gitlab.jfronny.libjf:libjf-config-core-v2")
+    include(modImplementation("net.fabricmc.fabric-api:fabric-message-api-v1")!!)
+    include(modImplementation("net.fabricmc.fabric-api:fabric-command-api-v2")!!)
+    modImplementation("net.fabricmc.fabric-api:fabric-networking-api-v1")
 
     // 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("io.gitlab.jfronny.libjf:libjf-config-ui-tiny")
+    modLocalRuntime("io.gitlab.jfronny.libjf:libjf-devutil")
+    modLocalRuntime("com.terraformersmc:modmenu:10.0.0-beta.1")
+    // for modmenu
+    modLocalRuntime("net.fabricmc.fabric-api:fabric-resource-loader-v0")
+    modLocalRuntime("net.fabricmc.fabric-api:fabric-screen-api-v1")
+    modLocalRuntime("net.fabricmc.fabric-api:fabric-key-binding-api-v1")
 }

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();

src/client/resources/assets/chat-transform/lang/en_us.json

@@ -17,5 +17,8 @@
   "chat-transform.jfconfig.server.playerConfigurable": "Player Configurable",
   "chat-transform.jfconfig.server.playerConfigurable.tooltip": "Whether players should be able to toggle chat transformation",
   "chat-transform.jfconfig.server.defaultEnable": "Default Enable",
-  "chat-transform.jfconfig.server.defaultEnable.tooltip": "Whether players' chat should be transformed by default"
+  "chat-transform.jfconfig.server.defaultEnable.tooltip": "Whether players' chat should be transformed by default",
+  "chat-transform.jfconfig.owo": "OwO",
+  "chat-transform.jfconfig.katakana": "Katakana",
+  "chat-transform.jfconfig.hiragana": "Hiragana"
 }

src/main/java/io/gitlab/jfronny/chattransform/Cfg.java

@@ -1,7 +1,7 @@
 package io.gitlab.jfronny.chattransform;
 
 import io.gitlab.jfronny.commons.data.String2ObjectMap;
-import io.gitlab.jfronny.commons.serialize.gson.api.v2.Ignore;
+import io.gitlab.jfronny.commons.serialize.annotations.Ignore;
 import io.gitlab.jfronny.libjf.config.api.v2.*;
 
 import java.util.HashMap;
@@ -42,6 +42,8 @@ public class Cfg {
         substitutions.put("you", "uu");
         substitutions.put("the ", "da ");
         substitutions.put("The ", "Da ");
+        substitutions.put("This", "Dis");
+        substitutions.put("this", "dis");
     }
 
     @Ignore private static final char[] consonants = "bcdfghjklmprstwz".toCharArray();

src/main/java/io/gitlab/jfronny/chattransform/ChatTransform.java

@@ -1,10 +1,10 @@
 package io.gitlab.jfronny.chattransform;
 
-import io.gitlab.jfronny.commons.logging.Logger;
+import io.gitlab.jfronny.commons.logger.SystemLoggerPlus;
 
 public class ChatTransform {
     public static final String MOD_ID = "chat-transform";
-    public static final Logger LOG = Logger.forName(MOD_ID);
+    public static final SystemLoggerPlus LOG = SystemLoggerPlus.forName(MOD_ID);
 
     public static String transform(String text) {
         return Cfg.substitutions.asSubstitution().apply(text);

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;
         }