chore: update to 1.20.2

build.gradle.kts

@@ -1,18 +1,40 @@
 import io.gitlab.jfronny.scripts.*
 
 plugins {
-    id("jfmod") version "1.3-SNAPSHOT"
-    id("io.github.juuxel.loom-quiltflower") version "1.8.0"
+    id("jfmod") version "1.5-SNAPSHOT"
+}
+
+allprojects { group = "io.gitlab.jfronny" }
+base.archivesName = "chat-transform"
+
+val fabricVersion = "0.89.1+1.20.2"
+jfMod {
+    minecraftVersion = "1.20.2"
+    yarn("build.1")
+    loaderVersion = "0.14.22"
+    libJfVersion = "3.13.1"
+
+    modrinth {
+        projectId = "chat-transform"
+        requiredDependencies.add("libjf")
+        optionalDependencies.add("modmenu")
+    }
+
+    curseforge {
+        projectId = "839175"
+        requiredDependencies.add("libjf")
+        optionalDependencies.add("modmenu")
+    }
 }
 
 dependencies {
-    modImplementation("io.gitlab.jfronny.libjf:libjf-config-core-v1:${prop("libjf_version")}")
-    include(modImplementation(fabricApi.module("fabric-message-api-v1", prop("fabric_version")))!!)
-    include(modImplementation(fabricApi.module("fabric-command-api-v2", prop("fabric_version")))!!)
-    modImplementation(fabricApi.module("fabric-networking-api-v1", prop("fabric_version")))
+    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))
 
     // Dev env
-    modLocalRuntime("io.gitlab.jfronny.libjf:libjf-config-ui-tiny-v1:${prop("libjf_version")}")
-    modLocalRuntime("io.gitlab.jfronny.libjf:libjf-devutil:${prop("libjf_version")}")
-    modLocalRuntime("com.terraformersmc:modmenu:7.0.1")
+    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")
 }

gradle.properties

@@ -1,17 +0,0 @@
-# https://fabricmc.net/develop/
-minecraft_version=1.20
-yarn_mappings=build.1
-loader_version=0.14.21
-
-maven_group=io.gitlab.jfronny
-archives_base_name=chat-transform
-
-modrinth_id=chat-transform
-modrinth_required_dependencies=libjf
-modrinth_optional_dependencies=modmenu
-curseforge_id=839175
-curseforge_required_dependencies=libjf
-curseforge_optional_dependencies=modmenu
-
-libjf_version=3.8.0
-fabric_version=0.83.0+1.20

src/client/java/io/gitlab/jfronny/chattransform/client/mixin/ChatScreenMixin.java

@@ -1,6 +1,7 @@
 package io.gitlab.jfronny.chattransform.client.mixin;
 
-import io.gitlab.jfronny.chattransform.*;
+import io.gitlab.jfronny.chattransform.Cfg;
+import io.gitlab.jfronny.chattransform.ChatTransform;
 import io.gitlab.jfronny.chattransform.client.ITextFieldWidget;
 import net.minecraft.client.gui.screen.ChatScreen;
 import net.minecraft.client.gui.widget.TextFieldWidget;

src/client/java/io/gitlab/jfronny/chattransform/client/mixin/TextFieldWidgetMixin.java

@@ -31,7 +31,7 @@ public abstract class TextFieldWidgetMixin extends ClickableWidget implements IT
     @Shadow private boolean drawsBackground;
     @Shadow public abstract int getCharacterX(int index);
     @Shadow public abstract boolean isVisible();
-    @Shadow public abstract void setCursor(int cursor);
+    @Shadow public abstract void setCursor(int cursor, boolean shiftKeyPressed);
 
     @Shadow private Predicate<String> textPredicate;
     @Shadow @Final private TextRenderer textRenderer;
@@ -63,8 +63,8 @@ public abstract class TextFieldWidgetMixin extends ClickableWidget implements IT
         }
     }
 
-    @Inject(method = "setCursor(I)V", at = @At("TAIL"))
-    void updateStartOnSetCursor(int cursor, CallbackInfo ci) {
+    @Inject(method = "setCursor(IZ)V", at = @At("TAIL"))
+    void updateStartOnSetCursor(int cursor, boolean shiftKeyPressed, CallbackInfo ci) {
         transformStart.clear();
         lastSubstitution = null;
     }
@@ -96,7 +96,7 @@ public abstract class TextFieldWidgetMixin extends ClickableWidget implements IT
             if (substitution != null
                     // ...and matched -> replace
                     && substitute(transformStart.get(), selectionStart - 1, substitution)) {
-                setCursor(selectionStart + 1);
+                setCursor(selectionStart + 1, false);
             } else {
                 // ...and didn't match -> move transform start and call transform again (substring might have matched)
                 transformStart.increment();

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

@@ -1,10 +1,11 @@
 package io.gitlab.jfronny.chattransform;
 
 import io.gitlab.jfronny.commons.data.String2ObjectMap;
-import io.gitlab.jfronny.commons.serialize.gson.api.v1.Ignore;
-import io.gitlab.jfronny.libjf.config.api.v1.*;
+import io.gitlab.jfronny.commons.serialize.gson.api.v2.Ignore;
+import io.gitlab.jfronny.libjf.config.api.v2.*;
 
-import java.util.*;
+import java.util.HashMap;
+import java.util.Map;
 
 @JfConfig
 public class Cfg {

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

@@ -1,6 +1,6 @@
 package io.gitlab.jfronny.chattransform;
 
-import io.gitlab.jfronny.commons.log.Logger;
+import io.gitlab.jfronny.commons.logging.Logger;
 
 public class ChatTransform {
     public static final String MOD_ID = "chat-transform";

src/main/java/io/gitlab/jfronny/chattransform/server/ChatTransformServer.java

@@ -3,23 +3,18 @@ package io.gitlab.jfronny.chattransform.server;
 import com.mojang.brigadier.Command;
 import io.gitlab.jfronny.chattransform.Cfg;
 import io.gitlab.jfronny.chattransform.ChatTransform;
-import io.gitlab.jfronny.libjf.config.api.v1.ConfigInstance;
+import io.gitlab.jfronny.libjf.config.api.v2.ConfigInstance;
 import net.fabricmc.api.DedicatedServerModInitializer;
 import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback;
 import net.fabricmc.fabric.api.message.v1.ServerMessageDecoratorEvent;
-import net.fabricmc.fabric.api.networking.v1.ServerLoginConnectionEvents;
 import net.fabricmc.fabric.api.networking.v1.ServerPlayConnectionEvents;
-import net.minecraft.network.packet.s2c.play.ChatMessageS2CPacket;
-import net.minecraft.network.packet.s2c.play.GameMessageS2CPacket;
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.text.*;
-import org.spongepowered.asm.mixin.Mutable;
 
 import java.util.Arrays;
 import java.util.Objects;
-import java.util.concurrent.CompletableFuture;
 
-import static net.minecraft.server.command.CommandManager.*;
+import static net.minecraft.server.command.CommandManager.literal;
 
 public class ChatTransformServer implements DedicatedServerModInitializer {
     public static final ConfigInstance CONFIG_INSTANCE = Objects.requireNonNull(ConfigInstance.get(ChatTransform.MOD_ID));
@@ -92,7 +87,7 @@ public class ChatTransformServer implements DedicatedServerModInitializer {
         });
 
         ServerMessageDecoratorEvent.EVENT.register(ServerMessageDecoratorEvent.CONTENT_PHASE, (sender, message) -> {
-            return CompletableFuture.completedFuture(sender != null && get(sender) ? transform(message) : message);
+            return sender != null && get(sender) ? transform(message) : message;
         });
     }