Update to 1.20.5

Patbox · Patbox · commit b6e2640654be · 2024-04-21T15:23:49.000+02:00
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -12,7 +12,7 @@ jobs:
       matrix:
         # Use these Java versions
         java: [
-          17    # Minimum supported by Minecraft
+          21    # Minimum supported by Minecraft
         ]
         # and run on both Linux and Windows
         os: [ubuntu-20.04, windows-latest]
@@ -32,7 +32,7 @@ jobs:
       - name: build
         run: ./gradlew build
       - name: capture build artifacts
-        if: ${{ runner.os == 'Linux' && matrix.java == '17' }} # Only upload artifacts built from latest java on one OS
+        if: ${{ runner.os == 'Linux' && matrix.java == '21' }} # Only upload artifacts built from latest java on one OS
         uses: actions/upload-artifact@v2
         with:
           name: Artifacts
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -24,7 +24,7 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v1
         with:
-          java-version: 17
+          java-version: 21
 
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
diff --git a/build.gradle b/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-	id 'fabric-loom' version '1.4.+'
+	id 'fabric-loom' version '1.6.+'
 	id 'maven-publish'
 	id "com.modrinth.minotaur" version "2.+"
 	id 'com.matthewprenger.cursegradle' version '1.4.0'
@@ -38,9 +38,10 @@ dependencies {
 	modCompileOnly("net.fabricmc.fabric-api:fabric-api:${project.fabric_version}")
 	modLocalRuntime("net.fabricmc.fabric-api:fabric-api:${project.fabric_version}")
 
-	modImplementation include("eu.pb4:placeholder-api:2.3.0+1.20.3")
+	//modImplementation include("eu.pb4:predicate-api:0.4.0+1.20.5")
+	modImplementation include("eu.pb4:placeholder-api:2.4.0-pre.1+1.20.5")
+	modImplementation include("me.lucko:fabric-permissions-api:0.3.1")
 	modImplementation include("eu.pb4:player-data-api:0.4.0+1.20.3")
-	modImplementation include("me.lucko:fabric-permissions-api:0.2-SNAPSHOT")
 
 	modCompileOnly("maven.modrinth:vanish:1.4.0+1.19.4")
 
diff --git a/gradle.properties b/gradle.properties
@@ -3,14 +3,14 @@ org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
 	# check these on https://fabricmc.net/use
-minecraft_version=1.20.3-rc1
-yarn_mappings=1.20.3-rc1+build.1
-loader_version=0.15.0
+minecraft_version=1.20.5-rc2
+yarn_mappings=1.20.5-rc2+build.1
+loader_version=0.15.10
 
 #Fabric api
-fabric_version=0.91.1+1.20.3
+fabric_version=0.97.3+1.20.5
 # Mod Properties
-	mod_version = 1.4.0+1.20.3
+	mod_version = 1.5.0+1.20.5
 	maven_group = eu.pb4
 	archives_base_name = styled-nicknames
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/src/main/java/eu/pb4/stylednicknames/NicknameHolder.java b/src/main/java/eu/pb4/stylednicknames/NicknameHolder.java
@@ -7,6 +7,7 @@
 import org.jetbrains.annotations.Nullable;
 
 import java.util.Map;
+import java.util.function.Function;
 
 public interface NicknameHolder {
     NicknameHolder EMPTY = new NicknameHolder() {
@@ -48,8 +49,8 @@ public interface NicknameHolder {
         }
 
         @Override
-        public Map<String, Text> styledNicknames$placeholdersCommand() {
-            return Map.of("nickname", Text.empty(), "name", Text.empty());
+        public Function<String, Text> styledNicknames$placeholdersCommand() {
+            return x -> Text.empty();
         }
     };
 
@@ -87,5 +88,5 @@ static NicknameHolder of(Object possiblePlayer) {
 
     boolean styledNicknames$shouldDisplay();
 
-    Map<String, Text> styledNicknames$placeholdersCommand();
+    Function<String, Text> styledNicknames$placeholdersCommand();
 }
diff --git a/src/main/java/eu/pb4/stylednicknames/ParserUtils.java b/src/main/java/eu/pb4/stylednicknames/ParserUtils.java
@@ -0,0 +1,50 @@
+package eu.pb4.stylednicknames;
+
+import eu.pb4.placeholders.api.parsers.NodeParser;
+import eu.pb4.placeholders.api.parsers.tag.TagRegistry;
+import eu.pb4.stylednicknames.config.ConfigManager;
+import me.lucko.fabric.api.permissions.v0.Permissions;
+import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.util.Formatting;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.ArrayList;
+
+public class ParserUtils {
+
+    public static NodeParser getParser(@Nullable ServerPlayerEntity player) {
+        var b = NodeParser.builder();
+        var config = ConfigManager.getConfig();
+
+        if (player != null) {
+            var registry = TagRegistry.create();
+            for (var entry : TagRegistry.SAFE.getTags()) {
+                if ((config.defaultFormattingCodes.getBoolean(entry.name())
+                        || Permissions.check(player, "stylednicknames.format." + entry.name(), 2))) {
+                    registry.register(entry);
+                }
+            }
+            b.simplifiedTextFormat().quickText()
+                    .customTagRegistry(registry);
+
+            if (config.configData.allowLegacyFormatting) {
+                var formats = new ArrayList<Formatting>();
+                for (Formatting formatting : Formatting.values()) {
+                    if (registry.getTag(formatting.getName()) != null) {
+                        formats.add(formatting);
+                    }
+                }
+                if (!formats.isEmpty() || registry.getTag("color") != null) {
+                    b.legacy(registry.getTag("color") != null, formats);
+                }
+            }
+        } else {
+            b.simplifiedTextFormat().quickText();
+            if (config.configData.allowLegacyFormatting) {
+                b.legacyAll();
+            }
+        }
+
+        return b.build();
+    }
+}
diff --git a/src/main/java/eu/pb4/stylednicknames/command/Commands.java b/src/main/java/eu/pb4/stylednicknames/command/Commands.java
@@ -5,11 +5,11 @@
 import com.mojang.brigadier.context.CommandContext;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import com.mojang.brigadier.suggestion.SuggestionProvider;
-import eu.pb4.placeholders.api.Placeholders;
-import eu.pb4.placeholders.api.TextParserUtils;
-import eu.pb4.placeholders.api.parsers.TextParserV1;
+import eu.pb4.placeholders.api.ParserContext;
 import eu.pb4.stylednicknames.NicknameHolder;
+import eu.pb4.stylednicknames.ParserUtils;
 import eu.pb4.stylednicknames.StyledNicknamesMod;
+import eu.pb4.stylednicknames.config.Config;
 import eu.pb4.stylednicknames.config.ConfigManager;
 import me.drex.vanish.api.VanishAPI;
 import me.lucko.fabric.api.permissions.v0.Permissions;
@@ -93,30 +93,8 @@ private static int change(CommandContext<ServerCommandSource> context) throws Co
         var config = ConfigManager.getConfig();
         var nickname = context.getArgument("nickname", String.class);
         if (config.configData.maxLength > 0) {
-            Map<String, TextParserV1.TagNodeBuilder> handlers = new HashMap<>();
-            for (var entry : TextParserV1.SAFE.getTags()) {
-                if ((config.defaultFormattingCodes.getBoolean(entry.name())
-                        || Permissions.check(context.getSource(), "stylednicknames.format." + entry.name(), 2))) {
-
-                    handlers.put(entry.name(), entry.parser());
-
-                    if (entry.aliases() != null) {
-                        for (var a : entry.aliases()) {
-                            handlers.put(a, entry.parser());
-                        }
-                    }
-                }
-            }
-
-            if (config.configData.allowLegacyFormatting) {
-                for (Formatting formatting : Formatting.values()) {
-                    if (handlers.get(formatting.getName()) != null) {
-                        nickname = nickname.replace(String.copyValueOf(new char[]{'&', formatting.getCode()}), "<" + formatting.getName() + ">");
-                    }
-                }
-            }
-
-            var output = TextParserUtils.formatText(nickname, handlers::get);
+            var parser = ParserUtils.getParser(context.getSource().getPlayerOrThrow());
+            var output = parser.parseText(nickname, ParserContext.of());
 
             if (output.getString().length() > config.configData.maxLength && !Permissions.check(context.getSource(), "stylednicknames.ignore_limit", 2)) {
                 context.getSource().sendFeedback(() -> ConfigManager.getConfig().tooLongText, false);
@@ -126,17 +104,15 @@ private static int change(CommandContext<ServerCommandSource> context) throws Co
 
         holder.styledNicknames$set(nickname, true);
         context.getSource().sendFeedback(() ->
-                        Placeholders.parseText(ConfigManager.getConfig().changeText, Placeholders.PREDEFINED_PLACEHOLDER_PATTERN, holder.styledNicknames$placeholdersCommand()),
+                        ConfigManager.getConfig().changeText.toText(ParserContext.of(Config.KEY, holder.styledNicknames$placeholdersCommand())),
                 false);
         return 0;
     }
 
     private static int reset(CommandContext<ServerCommandSource> context) throws CommandSyntaxException {
         NicknameHolder.of(context.getSource().getPlayerOrThrow()).styledNicknames$set(null, false);
         context.getSource().sendFeedback(() ->
-                        Placeholders.parseText(ConfigManager.getConfig().resetText, Placeholders.PREDEFINED_PLACEHOLDER_PATTERN, Map.of(
-                                "nickname", context.getSource().getPlayer().getName(),
-                                "name", context.getSource().getPlayer().getName()
+                        ConfigManager.getConfig().resetText.toText(ParserContext.of(Config.KEY, (x) -> context.getSource().getPlayer().getName()
                         )),
                 false);
         return 0;
@@ -168,7 +144,7 @@ private static int realname(CommandContext<ServerCommandSource> context) {
             }
         }
         if (foundPlayers.isEmpty()) {
-            context.getSource().sendError(Text.translatable("No player with that nickname is currently online."));
+            context.getSource().sendError(Text.literal("No player with that nickname is currently online."));
         } else {
             if (foundPlayers.size() > 1) {
                 context.getSource().sendFeedback(() -> Text.translatable("Found %s players with that nickname:", foundPlayers.size()), false);
diff --git a/src/main/java/eu/pb4/stylednicknames/config/Config.java b/src/main/java/eu/pb4/stylednicknames/config/Config.java
@@ -1,27 +1,45 @@
 package eu.pb4.stylednicknames.config;
 
 
+import eu.pb4.placeholders.api.ParserContext;
 import eu.pb4.placeholders.api.TextParserUtils;
+import eu.pb4.placeholders.api.node.DynamicTextNode;
 import eu.pb4.placeholders.api.node.TextNode;
+import eu.pb4.placeholders.api.parsers.NodeParser;
+import eu.pb4.placeholders.api.parsers.TagLikeParser;
+import eu.pb4.placeholders.api.parsers.TagParser;
 import eu.pb4.stylednicknames.config.data.ConfigData;
 import it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap;
 import net.minecraft.text.Text;
 
+import java.util.function.Function;
+
 
 public final class Config {
+    public static final ParserContext.Key<Function<String, Text>> KEY = DynamicTextNode.key("styled_nicknames");
+
+    public static final NodeParser PARSER = NodeParser.builder()
+            .simplifiedTextFormat()
+            .quickText()
+            .placeholders(TagLikeParser.PLACEHOLDER_USER, KEY)
+            .staticPreParsing()
+            .build();
+
     public final ConfigData configData;
     public final Object2BooleanArrayMap<String> defaultFormattingCodes;
     public final TextNode nicknameFormat;
+    public final TextNode nicknameFormatColor;
     public final TextNode changeText;
     public final TextNode resetText;
     public final Text tooLongText;
 
     public Config(ConfigData data) {
         this.configData = data;
-        this.nicknameFormat = TextParserUtils.formatNodes(data.nicknameFormat);
-        this.changeText = TextParserUtils.formatNodes(data.nicknameChangedMessage);
-        this.resetText = TextParserUtils.formatNodes(data.nicknameResetMessage);
-        this.tooLongText = TextParserUtils.formatText(data.tooLongMessage);
+        this.nicknameFormat = PARSER.parseNode(data.nicknameFormat);
+        this.nicknameFormatColor = PARSER.parseNode(data.nicknameFormatColor);
+        this.changeText = PARSER.parseNode(data.nicknameChangedMessage);
+        this.resetText = PARSER.parseNode(data.nicknameResetMessage);
+        this.tooLongText = PARSER.parseText(data.tooLongMessage, ParserContext.of());
         this.defaultFormattingCodes = new Object2BooleanArrayMap<>(this.configData.defaultEnabledFormatting);
     }
 
diff --git a/src/main/java/eu/pb4/stylednicknames/config/ConfigManager.java b/src/main/java/eu/pb4/stylednicknames/config/ConfigManager.java
@@ -11,7 +11,7 @@
 import java.io.*;
 
 public class ConfigManager {
-    public static final int VERSION = 1;
+    public static final int VERSION = 2;
     private static final Gson GSON = new GsonBuilder().setPrettyPrinting().disableHtmlEscaping().setLenient().create();
 
     private static Config CONFIG;
diff --git a/src/main/java/eu/pb4/stylednicknames/config/data/ConfigData.java b/src/main/java/eu/pb4/stylednicknames/config/data/ConfigData.java
@@ -1,6 +1,7 @@
 package eu.pb4.stylednicknames.config.data;
 
 import eu.pb4.placeholders.api.parsers.TextParserV1;
+import eu.pb4.placeholders.api.parsers.tag.TagRegistry;
 import eu.pb4.stylednicknames.config.ConfigManager;
 import net.minecraft.util.Formatting;
 
@@ -12,6 +13,7 @@ public class ConfigData {
     public String _comment = "Before changing anything, see https://github.com/Patbox/StyledNicknames#configuration";
     public boolean allowByDefault = true;
     public String nicknameFormat = "#${nickname}";
+    public String nicknameFormatColor = "${nickname}";
     public int maxLength = 48;
     public boolean changeDisplayName = true;
     public boolean changePlayerListName = false;
@@ -21,12 +23,9 @@ public class ConfigData {
     public HashMap<String, Boolean> defaultEnabledFormatting = getDefaultFormatting();
     public String tooLongMessage = "This nickname is too long!";
 
-    @Deprecated
-    public String defaultPrefix = null;
-
     private static HashMap<String, Boolean> getDefaultFormatting() {
         HashMap<String, Boolean> map = new HashMap<>();
-        for (var tag : TextParserV1.SAFE.getTags()) {
+        for (var tag : TagRegistry.SAFE.getTags()) {
             var color = Formatting.byName(tag.name());
             map.put(tag.name(), color != null && color != Formatting.BLACK);
         }
@@ -44,12 +43,6 @@ public static ConfigData transform(ConfigData configData) {
                 configData.defaultEnabledFormatting.remove(e);
             }
         }
-
-        if (configData.defaultPrefix != null) {
-            configData.nicknameFormat = configData.defaultPrefix + "<r>" + "${nickname}";
-            configData.defaultPrefix = null;
-        }
-
         return configData;
     }
 }
diff --git a/src/main/java/eu/pb4/stylednicknames/mixin/ServerPlayNetworkHandlerMixin.java b/src/main/java/eu/pb4/stylednicknames/mixin/ServerPlayNetworkHandlerMixin.java

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@`
`7`	`7`	`import org.jetbrains.annotations.Nullable;`
`8`	`8`
`9`	`9`	`import java.util.Map;`
	`10`	`+import java.util.function.Function;`
`10`	`11`
`11`	`12`	`public interface NicknameHolder {`
`12`	`13`	`NicknameHolder EMPTY = new NicknameHolder() {`
`@@ -48,8 +49,8 @@ public interface NicknameHolder {`
`48`	`49`	`}`
`49`	`50`
`50`	`51`	`@Override`
`51`		`- public Map<String, Text> styledNicknames$placeholdersCommand() {`
`52`		`- return Map.of("nickname", Text.empty(), "name", Text.empty());`
	`52`	`+ public Function<String, Text> styledNicknames$placeholdersCommand() {`
	`53`	`+ return x -> Text.empty();`
`53`	`54`	`}`
`54`	`55`	`};`
`55`	`56`
`@@ -87,5 +88,5 @@ static NicknameHolder of(Object possiblePlayer) {`
`87`	`88`
`88`	`89`	`boolean styledNicknames$shouldDisplay();`
`89`	`90`
`90`		`- Map<String, Text> styledNicknames$placeholdersCommand();`
	`91`	`+ Function<String, Text> styledNicknames$placeholdersCommand();`
`91`	`92`	`}`