From 7d60f9d33a02412c9a8df11c7a1c673175b1e20c Mon Sep 17 00:00:00 2001
From: Patbox <patbox4@outlook.com>
Date: Sun, 3 Dec 2023 20:17:40 +0100
Subject: [PATCH] Update to 1.20.3-rc1

---
 build.gradle                                         |  6 +++---
 gradle.properties                                    | 12 ++++++------
 gradle/wrapper/gradle-wrapper.properties             |  2 +-
 .../java/eu/pb4/styledchat/parser/MentionParser.java |  4 ++--
 src/main/resources/fabric.mod.json                   |  3 ++-
 5 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/build.gradle b/build.gradle
index 440e19b..0472b45 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-	id 'fabric-loom' version '1.1.+'
+	id 'fabric-loom' version '1.4.+'
 	id 'maven-publish'
 	id "com.modrinth.minotaur" version "2.+"
 	id 'com.matthewprenger.cursegradle' version '1.4.0'
@@ -42,9 +42,9 @@ dependencies {
 	//modLocalRuntime fabricApi.module("fabric-api-base", project.fabric_version)
 
 	modImplementation include("eu.pb4:predicate-api:0.3.0+1.20.2")
-	modImplementation include("eu.pb4:placeholder-api:2.1.3+1.20.1")
+	modImplementation include("eu.pb4:placeholder-api:2.3.0+1.20.3")
 	modImplementation include("me.lucko:fabric-permissions-api:0.2-SNAPSHOT")
-	modImplementation include("eu.pb4:player-data-api:0.3.0+1.20.2")
+	modImplementation include("eu.pb4:player-data-api:0.4.0+1.20.3")
 
 	modCompileOnly("maven.modrinth:vanish:1.1.0")
 	//modLocalRuntime("fr.catcore:server-translations-api:1.4.17+1.19.2")
diff --git a/gradle.properties b/gradle.properties
index b06a0db..dd3a7ec 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,18 +3,18 @@ org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
 	# check these on https://fabricmc.net/use
-minecraft_version=23w43a
-yarn_mappings=23w43a+build.1
-loader_version=0.14.24
+minecraft_version=1.20.3-rc1
+yarn_mappings=1.20.3-rc1+build.1
+loader_version=0.15.0
 
 #Fabric api
-fabric_version=0.90.5+1.20.3
+fabric_version=0.91.1+1.20.3
 
 # Mod Properties
 
-	mod_version = 2.3.1+1.20.3
+	mod_version = 2.4.0+1.20.3
 	maven_group = eu.pb4
 	archives_base_name = styled-chat
 
 # Dependencies
-is_stable = false
+is_stable = true
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index e750102..e411586 100644
--- 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-7.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/src/main/java/eu/pb4/styledchat/parser/MentionParser.java b/src/main/java/eu/pb4/styledchat/parser/MentionParser.java
index 0857f4e..d7667b3 100644
--- a/src/main/java/eu/pb4/styledchat/parser/MentionParser.java
+++ b/src/main/java/eu/pb4/styledchat/parser/MentionParser.java
@@ -40,9 +40,9 @@ public TextNode[] parseInput(String input) {
         if (input.isEmpty()) return new TextNode[]{};
         for (ServerPlayerEntity player : context.server().getPlayerManager().getPlayerList()) {
             if (VANISH && VanishAPI.isVanished(player)) continue;
-            int startPos = input.indexOf(player.getEntityName());
+            int startPos = input.indexOf(player.getNameForScoreboard());
             if (startPos != -1) {
-                int endPos = startPos + player.getEntityName().length();
+                int endPos = startPos + player.getNameForScoreboard().length();
                 TextNode[] before = parseInput(input.substring(0, startPos));
                 TextNode mention = new DirectTextNode(style.toText(PlaceholderContext.of(player)));
                 TextNode[] after = parseInput(input.substring(Math.min(endPos, input.length())));
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
index 255af97..ee4a686 100644
--- a/src/main/resources/fabric.mod.json
+++ b/src/main/resources/fabric.mod.json
@@ -29,7 +29,8 @@
   ],
 
   "depends": {
-    "minecraft": ">=1.20-"
+    "minecraft": ">=1.20.3-",
+    "fabricloader": ">=0.15.0"
   },
   "custom": {
     "modmenu": {