Update to 1.21.11 and mojmapping

Author: Patbox

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-	id 'fabric-loom' version '1.11.+'
+	id 'fabric-loom' version '1.13.+'
 	id 'maven-publish'
 	id "com.modrinth.minotaur" version "2.+"
 	id 'com.matthewprenger.cursegradle' version '1.4.0'
@@ -32,7 +32,7 @@ repositories {
 dependencies {
 	// To change the versions see the gradle.properties file
 	minecraft "com.mojang:minecraft:${project.minecraft_version}"
-	mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
+	mappings loom.officialMojangMappings()
 	modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
 
 	modCompileOnly "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
@@ -41,9 +41,9 @@ dependencies {
 	//modCompileOnly fabricApi.module("fabric-api-base", project.fabric_version)
 	//modLocalRuntime fabricApi.module("fabric-api-base", project.fabric_version)
 
-	modImplementation include("eu.pb4:predicate-api:0.6.1+1.21.9")
-	modImplementation include("eu.pb4:placeholder-api:2.8.0+1.21.9")
-	modImplementation include("me.lucko:fabric-permissions-api:0.4.2-patbox.1")
+	modImplementation include("eu.pb4:predicate-api:0.7.0+1.21.11")
+	modImplementation include("eu.pb4:placeholder-api:2.8.1+1.21.10")
+	modImplementation include("me.lucko:fabric-permissions-api:0.6.0-patbox")
 	modImplementation include("eu.pb4:player-data-api:0.9.0+1.21.9")
 
 	modCompileOnly("maven.modrinth:vanish:1.5.2+1.20.4")

gradle.properties

@@ -3,16 +3,16 @@ org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
 	# check these on https://fabricmc.net/use
-minecraft_version=1.21.9-rc1
-yarn_mappings=1.21.9-rc1+build.1
-loader_version=0.17.2
-loom_version=1.11-SNAPSHOT
+minecraft_version=1.21.11-rc2
+yarn_mappings=1.21.11-rc2+build.1
+loader_version=0.18.1
+loom_version=1.13-SNAPSHOT
 
 # Fabric API
-fabric_version=0.133.14+1.21.9
+fabric_version=0.139.4+1.21.11
 
 # Mod Properties
-mod_version = 2.10.0+1.21.9
+mod_version = 2.11.0+1.21.11
 maven_group = eu.pb4
 archives_base_name = styled-chat
 

src/main/java/eu/pb4/styledchat/StyledChatEvents.java

@@ -5,7 +5,7 @@
 import eu.pb4.placeholders.api.parsers.TextParserV1;
 import net.fabricmc.fabric.api.event.Event;
 import net.fabricmc.fabric.api.event.EventFactory;
-import net.minecraft.server.command.ServerCommandSource;
+import net.minecraft.commands.CommandSourceStack;
 
 public class StyledChatEvents {
     /**
@@ -42,7 +42,7 @@ public class StyledChatEvents {
 
     @Deprecated(forRemoval = true)
     public interface FormattingCreationEvent {
-        void onFormattingBuild(ServerCommandSource player, TextParserV1 builder);
+        void onFormattingBuild(CommandSourceStack player, TextParserV1 builder);
     }
 
     public interface PreMessageEvent {

src/main/java/eu/pb4/styledchat/StyledChatMod.java

@@ -7,12 +7,11 @@
 import net.fabricmc.api.ModInitializer;
 import net.fabricmc.loader.api.FabricLoader;
 import net.fabricmc.loader.api.ModContainer;
-import net.minecraft.network.message.MessageType;
-import net.minecraft.registry.RegistryKey;
-import net.minecraft.registry.RegistryKeys;
+import net.minecraft.core.registries.Registries;
+import net.minecraft.network.chat.ChatType;
+import net.minecraft.resources.Identifier;
+import net.minecraft.resources.ResourceKey;
 import net.minecraft.server.MinecraftServer;
-import net.minecraft.util.Identifier;
-
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
@@ -24,7 +23,7 @@ public class StyledChatMod implements ModInitializer {
 
 	public static boolean USE_FABRIC_API = true;
 
-	public static RegistryKey<MessageType> MESSAGE_TYPE_ID = RegistryKey.of(RegistryKeys.MESSAGE_TYPE, Identifier.of("styled_chat", "generic_hack"));
+	public static ResourceKey<ChatType> MESSAGE_TYPE_ID = ResourceKey.create(Registries.CHAT_TYPE, Identifier.fromNamespaceAndPath("styled_chat", "generic_hack"));
 
 	@Override
 	public void onInitialize() {
@@ -37,7 +36,7 @@ public void onInitialize() {
 
 	public static void serverStarting(MinecraftServer s) {
 		crabboardDetection();
-		ConfigManager.loadConfig(s.getRegistryManager());
+		ConfigManager.loadConfig(s.registryAccess());
 		server = s;
 	}
 

src/main/java/eu/pb4/styledchat/StyledChatStyles.java

@@ -3,19 +3,19 @@
 import eu.pb4.placeholders.api.PlaceholderContext;
 import eu.pb4.placeholders.api.node.TextNode;
 import eu.pb4.styledchat.config.ConfigManager;
-import net.minecraft.entity.passive.TameableEntity;
-import net.minecraft.network.message.MessageType;
-import net.minecraft.registry.RegistryKeys;
-import net.minecraft.server.command.ServerCommandSource;
-import net.minecraft.server.network.ServerPlayerEntity;
-import net.minecraft.text.Text;
-import net.minecraft.util.Identifier;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.Map;
+import net.minecraft.commands.CommandSourceStack;
+import net.minecraft.core.registries.Registries;
+import net.minecraft.network.chat.ChatType;
+import net.minecraft.network.chat.Component;
+import net.minecraft.resources.Identifier;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.world.entity.TamableAnimal;
 
 public final class StyledChatStyles {
-    public static Text getDisplayName(ServerPlayerEntity player, Text vanillaDisplayName) {
+    public static Component getDisplayName(ServerPlayer player, Component vanillaDisplayName) {
         var style = StyledChatUtils.getPersonalStyle(player).getDisplayName(player, vanillaDisplayName);
         if (style != null) {
             return style;
@@ -24,7 +24,7 @@ public static Text getDisplayName(ServerPlayerEntity player, Text vanillaDisplay
         return ConfigManager.getConfig().getDisplayName(player, vanillaDisplayName);
     }
 
-    public static Text getChat(ServerPlayerEntity player, Text message) {
+    public static Component getChat(ServerPlayer player, Component message) {
         var style = StyledChatUtils.getPersonalStyle(player).getChat(player, message);
         if (style != null) {
             return style;
@@ -33,7 +33,7 @@ public static Text getChat(ServerPlayerEntity player, Text message) {
         return ConfigManager.getConfig().getChat(player, message);
     }
 
-    public static Text getJoin(ServerPlayerEntity player) {
+    public static Component getJoin(ServerPlayer player) {
         var style = StyledChatUtils.getPersonalStyle(player).getJoin(player);
         if (style != null) {
             return style;
@@ -42,7 +42,7 @@ public static Text getJoin(ServerPlayerEntity player) {
         return ConfigManager.getConfig().getJoin(player);
     }
 
-    public static Text getJoinFirstTime(ServerPlayerEntity player) {
+    public static Component getJoinFirstTime(ServerPlayer player) {
         var style = StyledChatUtils.getPersonalStyle(player).getJoinFirstTime(player);
         if (style != null) {
             return style;
@@ -51,7 +51,7 @@ public static Text getJoinFirstTime(ServerPlayerEntity player) {
         return ConfigManager.getConfig().getJoinFirstTime(player);
     }
 
-    public static Text getJoinRenamed(ServerPlayerEntity player, String oldName) {
+    public static Component getJoinRenamed(ServerPlayer player, String oldName) {
         var style = StyledChatUtils.getPersonalStyle(player).getJoinRenamed(player, oldName);
         if (style != null) {
             return style;
@@ -60,7 +60,7 @@ public static Text getJoinRenamed(ServerPlayerEntity player, String oldName) {
         return ConfigManager.getConfig().getJoinRenamed(player, oldName);
     }
 
-    public static Text getLeft(ServerPlayerEntity player) {
+    public static Component getLeft(ServerPlayer player) {
         var style = StyledChatUtils.getPersonalStyle(player).getLeft(player);
         if (style != null) {
             return style;
@@ -69,7 +69,7 @@ public static Text getLeft(ServerPlayerEntity player) {
         return ConfigManager.getConfig().getLeft(player);
     }
 
-    public static Text getDeath(ServerPlayerEntity player, Text vanillaMessage) {
+    public static Component getDeath(ServerPlayer player, Component vanillaMessage) {
         var style = StyledChatUtils.getPersonalStyle(player).getDeath(player, vanillaMessage);
         if (style != null) {
             return style;
@@ -78,7 +78,7 @@ public static Text getDeath(ServerPlayerEntity player, Text vanillaMessage) {
         return ConfigManager.getConfig().getDeath(player, vanillaMessage);
     }
 
-    public static Text getAdvancementTask(ServerPlayerEntity player, Text advancement) {
+    public static Component getAdvancementTask(ServerPlayer player, Component advancement) {
         var style = StyledChatUtils.getPersonalStyle(player).getAdvancementTask(player, advancement);
         if (style != null) {
             return style;
@@ -87,7 +87,7 @@ public static Text getAdvancementTask(ServerPlayerEntity player, Text advancemen
         return ConfigManager.getConfig().getAdvancementTask(player, advancement);
     }
 
-    public static Text getAdvancementGoal(ServerPlayerEntity player, Text advancement) {
+    public static Component getAdvancementGoal(ServerPlayer player, Component advancement) {
         var style = StyledChatUtils.getPersonalStyle(player).getAdvancementGoal(player, advancement);
         if (style != null) {
             return style;
@@ -96,7 +96,7 @@ public static Text getAdvancementGoal(ServerPlayerEntity player, Text advancemen
         return ConfigManager.getConfig().getAdvancementGoal(player, advancement);
     }
 
-    public static Text getAdvancementChallenge(ServerPlayerEntity player, Text advancement) {
+    public static Component getAdvancementChallenge(ServerPlayer player, Component advancement) {
         var style = StyledChatUtils.getPersonalStyle(player).getAdvancementChallenge(player, advancement);
         if (style != null) {
             return style;
@@ -105,8 +105,8 @@ public static Text getAdvancementChallenge(ServerPlayerEntity player, Text advan
         return ConfigManager.getConfig().getAdvancementChallenge(player, advancement);
     }
 
-    public static Text getSayCommand(ServerCommandSource source, Text message) {
-        if (source.isExecutedByPlayer()) {
+    public static Component getSayCommand(CommandSourceStack source, Component message) {
+        if (source.isPlayer()) {
             var style = StyledChatUtils.getPersonalStyle(source.getPlayer()).getSayCommand(source, message);
             if (style != null) {
                 return style;
@@ -116,8 +116,8 @@ public static Text getSayCommand(ServerCommandSource source, Text message) {
         return ConfigManager.getConfig().getSayCommand(source, message);
     }
 
-    public static Text getMeCommand(ServerCommandSource source, Text message) {
-        if (source.isExecutedByPlayer()) {
+    public static Component getMeCommand(CommandSourceStack source, Component message) {
+        if (source.isPlayer()) {
             var style = StyledChatUtils.getPersonalStyle(source.getPlayer()).getMeCommand(source, message);
             if (style != null) {
                 return style;
@@ -127,8 +127,8 @@ public static Text getMeCommand(ServerCommandSource source, Text message) {
         return ConfigManager.getConfig().getMeCommand(source, message);
     }
 
-    public static Text getPrivateMessageSent(Text sender, Text receiver, Text message, ServerCommandSource source) {
-        if (source.isExecutedByPlayer()) {
+    public static Component getPrivateMessageSent(Component sender, Component receiver, Component message, CommandSourceStack source) {
+        if (source.isPlayer()) {
             var style = StyledChatUtils.getPersonalStyle(source.getPlayer()).getPrivateMessageSent(sender, receiver, message, PlaceholderContext.of(source));
             if (style != null) {
                 return style;
@@ -138,8 +138,8 @@ public static Text getPrivateMessageSent(Text sender, Text receiver, Text messag
         return ConfigManager.getConfig().getPrivateMessageSent(sender, receiver, message, source);
     }
 
-    public static Text getPrivateMessageReceived(Text sender, Text receiver, Text message, ServerCommandSource source) {
-        if (source.isExecutedByPlayer()) {
+    public static Component getPrivateMessageReceived(Component sender, Component receiver, Component message, CommandSourceStack source) {
+        if (source.isPlayer()) {
             var style = StyledChatUtils.getPersonalStyle(source.getPlayer()).getPrivateMessageReceived(sender, receiver, message, PlaceholderContext.of(source));
             if (style != null) {
                 return style;
@@ -148,8 +148,8 @@ public static Text getPrivateMessageReceived(Text sender, Text receiver, Text me
         return ConfigManager.getConfig().getPrivateMessageReceived(sender, receiver, message, source);
     }
 
-    public static Text getTeamChatSent(Text team, Text displayName, Text message, ServerCommandSource source) {
-        if (source.isExecutedByPlayer()) {
+    public static Component getTeamChatSent(Component team, Component displayName, Component message, CommandSourceStack source) {
+        if (source.isPlayer()) {
             var style = StyledChatUtils.getPersonalStyle(source.getPlayer()).getTeamChatSent(team, displayName, message, source);
             if (style != null) {
                 return style;
@@ -159,8 +159,8 @@ public static Text getTeamChatSent(Text team, Text displayName, Text message, Se
         return ConfigManager.getConfig().getTeamChatSent(team, displayName, message, source);
     }
 
-    public static Text getTeamChatReceived(Text team, Text displayName, Text message, ServerCommandSource source) {
-        if (source.isExecutedByPlayer()) {
+    public static Component getTeamChatReceived(Component team, Component displayName, Component message, CommandSourceStack source) {
+        if (source.isPlayer()) {
             var style = StyledChatUtils.getPersonalStyle(source.getPlayer()).getTeamChatReceived(team, displayName, message, source);
             if (style != null) {
                 return style;
@@ -170,17 +170,17 @@ public static Text getTeamChatReceived(Text team, Text displayName, Text message
         return ConfigManager.getConfig().getTeamChatReceived(team, displayName, message, source);
     }
 
-    public static Text getPetDeath(TameableEntity entity, Text vanillaMessage) {
+    public static Component getPetDeath(TamableAnimal entity, Component vanillaMessage) {
         return ConfigManager.getConfig().getPetDeath(entity, vanillaMessage);
     }
 
-    public static Map<String, TextNode> getEmotes(ServerCommandSource source) {
+    public static Map<String, TextNode> getEmotes(CommandSourceStack source) {
         return ConfigManager.getConfig().getEmotes(source);
 
     }
 
-    public static Text getCustom(Identifier identifier, Text displayName, Text message, Text receiver, ServerCommandSource source) {
-        if (source.isExecutedByPlayer()) {
+    public static Component getCustom(Identifier identifier, Component displayName, Component message, Component receiver, CommandSourceStack source) {
+        if (source.isPlayer()) {
             var style = StyledChatUtils.getPersonalStyle(source.getPlayer()).getCustom(identifier, displayName, message, receiver, source);
             if (style != null) {
                 return style;
@@ -193,24 +193,24 @@ public static Text getCustom(Identifier identifier, Text displayName, Text messa
             return out;
         }
 
-        var type = source.getRegistryManager().getOrThrow(RegistryKeys.MESSAGE_TYPE).get(identifier);
+        var type = source.registryAccess().lookupOrThrow(Registries.CHAT_TYPE).getValue(identifier);
 
         if (type == null) {
-            return Text.empty();
+            return Component.empty();
         }
 
-        var optional = source.getRegistryManager().getOrThrow(RegistryKeys.MESSAGE_TYPE).getKey(type);
+        var optional = source.registryAccess().lookupOrThrow(Registries.CHAT_TYPE).getResourceKey(type);
 
         if (optional.isEmpty()) {
-            return Text.empty();
+            return Component.empty();
         }
-        var params = MessageType.params(optional.get(), source.getRegistryManager(), displayName);
+        var params = ChatType.bind(optional.get(), source.registryAccess(), displayName);
 
         if (receiver != null) {
             params = params.withTargetName(receiver);
         }
 
 
-        return type.chat().apply(message, params);
+        return type.chat().decorate(message, params);
     }
 }