Merge pull request #206 from KyoriPowered/dev/1.21.6

Minecraft 1.21.6

Author: jpenilla

fabric/src/main/java/net/kyori/adventure/platform/fabric/impl/ServerArgumentTypes.java

@@ -1,7 +1,7 @@
 /*
  * This file is part of adventure-platform-mod, licensed under the MIT License.
  *
- * Copyright (c) 2022-2024 KyoriPowered
+ * Copyright (c) 2022-2025 KyoriPowered
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -102,7 +102,7 @@ public static void knownArgumentTypes(final ServerPlayer player, final Set<Resou
     ((ServerPlayerBridge) player).bridge$knownArguments(ids);
     sendMappings(player, responder);
     if (!ids.isEmpty()) { // TODO: Avoid resending the whole command tree, find a way to receive the packet before sending?
-      player.server.getCommands().sendCommands(player);
+      player.getServer().getCommands().sendCommands(player);
     }
   }
 

fabric/src/mixin/java/net/kyori/adventure/platform/fabric/impl/mixin/minecraft/commands/CommandsMixin.java

@@ -1,7 +1,7 @@
 /*
  * This file is part of adventure-platform-mod, licensed under the MIT License.
  *
- * Copyright (c) 2022-2024 KyoriPowered
+ * Copyright (c) 2022-2025 KyoriPowered
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -24,14 +24,14 @@
 package net.kyori.adventure.platform.fabric.impl.mixin.minecraft.commands;
 
 import com.google.common.collect.Iterators;
+import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
+import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
+import com.llamalad7.mixinextras.sugar.Local;
 import com.mojang.brigadier.arguments.ArgumentType;
 import com.mojang.brigadier.builder.ArgumentBuilder;
 import com.mojang.brigadier.builder.RequiredArgumentBuilder;
-import com.mojang.brigadier.exceptions.CommandSyntaxException;
-import com.mojang.brigadier.suggestion.SuggestionProvider;
 import com.mojang.brigadier.tree.CommandNode;
 import java.util.Iterator;
-import java.util.Map;
 import java.util.Set;
 import net.kyori.adventure.platform.fabric.impl.ServerArgumentType;
 import net.kyori.adventure.platform.fabric.impl.ServerArgumentTypes;
@@ -40,36 +40,32 @@
 import net.minecraft.commands.CommandBuildContext;
 import net.minecraft.commands.CommandSourceStack;
 import net.minecraft.commands.Commands;
-import net.minecraft.commands.SharedSuggestionProvider;
 import net.minecraft.resources.ResourceLocation;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.ModifyVariable;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-import org.spongepowered.asm.mixin.injection.callback.LocalCapture;
 
 @Mixin(Commands.class)
 public abstract class CommandsMixin {
 
   @SuppressWarnings({"rawtypes", "unchecked"}) // argument type generics
-  @Inject(
+  @WrapOperation(
     method = "fillUsableCommands",
-    locals = LocalCapture.CAPTURE_FAILEXCEPTION,
-    at = @At(value = "INVOKE", target = "com.mojang.brigadier.builder.RequiredArgumentBuilder.getSuggestionsProvider()Lcom/mojang/brigadier/suggestion/SuggestionProvider;", remap = false, ordinal = 0)
-  /*slice = @Slice(from = @At(value = "INVOKE_ASSIGN", target = "RequiredArgumentBuilder.executes(Lcom/mojang/brigadier/Command;)Lcom/mojang/brigadier/builder/ArgumentBuilder;", remap = false), to = @At(value = "INVOKE", target = "RequiredArgumentBuilder.getRedirect()Lcom/mojang/brigadier/tree/CommandNode;", remap = false))*/
+    at = @At(
+      value = "INVOKE",
+      target = "Lcom/mojang/brigadier/builder/ArgumentBuilder;build()Lcom/mojang/brigadier/tree/CommandNode;",
+      remap = false
+    )
   )
-  public <T> void adventure$replaceArgumentType(
-    final CommandNode<CommandSourceStack> tree,
-    final CommandNode<SharedSuggestionProvider> result,
-    final CommandSourceStack source,
-    final Map<CommandNode<CommandSourceStack>, CommandNode<SharedSuggestionProvider>> nodes,
-    final CallbackInfo ci,
-    final Iterator<?> it,
-    final CommandNode<CommandSourceStack> current,
-    final ArgumentBuilder<?, ?> unused,
-    final RequiredArgumentBuilder<?, T> builder
-  ) throws CommandSyntaxException {
+  private static <T> CommandNode<T> adventure$replaceArgumentType(
+    final ArgumentBuilder<T, ?> instance,
+    final Operation<CommandNode<T>> original,
+    final @Local(argsOnly = true) T sourceRaw
+  ) {
+    if (!(instance instanceof RequiredArgumentBuilder builder)) {
+      return original.call(instance); // only replace argument types for required arguments
+    }
+    final CommandSourceStack source = (CommandSourceStack) sourceRaw;
     ServerArgumentType<ArgumentType<T>> type = ServerArgumentTypes.byClass((Class) builder.getType().getClass());
     final Set<ResourceLocation> knownExtraCommands = ServerArgumentTypes.knownArgumentTypes(source.getPlayer()); // throws an exception, we can ignore bc this is always a player
     // If we have a replacement and the arg type isn't known to the client, change the argument type
@@ -79,11 +75,11 @@ public abstract class CommandsMixin {
       final CommandBuildContext ctx = CommandBuildContext.simple(source.registryAccess(), source.enabledFeatures());
       ((RequiredArgumentBuilderAccess) builder).accessor$type(type.fallbackProvider().apply(builder.getType(), ctx));
       if (type.fallbackSuggestions() != null) {
-        builder.suggests((SuggestionProvider) type.fallbackSuggestions());
+        builder.suggests(type.fallbackSuggestions());
       }
       type = ServerArgumentTypes.byClass((Class) builder.getType().getClass());
     }
-
+    return original.call(instance);
   }
 
   /**
@@ -95,7 +91,7 @@ public abstract class CommandsMixin {
    * @return the filtered iterator
    */
   @ModifyVariable(method = "fillUsableCommands", at = @At("STORE"), ordinal = 0, require = 0)
-  private Iterator<CommandNode<CommandSourceStack>> adventure$filterHiddenCommands(final Iterator<CommandNode<CommandSourceStack>> itr) {
+  private static Iterator<CommandNode<CommandSourceStack>> adventure$filterHiddenCommands(final Iterator<CommandNode<CommandSourceStack>> itr) {
     return Iterators.filter(itr, node -> !(node.getRequirement() instanceof HiddenRequirement<CommandSourceStack>));
   }
 }

fabric/src/test/java/net/kyori/adventure/platform/fabric/ComponentConversionTest.java

@@ -1,7 +1,7 @@
 /*
  * This file is part of adventure-platform-mod, licensed under the MIT License.
  *
- * Copyright (c) 2023-2024 KyoriPowered
+ * Copyright (c) 2023-2025 KyoriPowered
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -25,6 +25,7 @@
 
 import com.google.gson.JsonElement;
 import com.google.gson.stream.JsonWriter;
+import com.mojang.serialization.JsonOps;
 import java.io.IOException;
 import java.io.StringWriter;
 import java.lang.annotation.ElementType;
@@ -48,6 +49,7 @@
 import net.kyori.adventure.translation.GlobalTranslator;
 import net.minecraft.core.component.DataComponentPatch;
 import net.minecraft.core.component.DataComponents;
+import net.minecraft.network.chat.ComponentSerialization;
 import net.minecraft.util.GsonHelper;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.Items;
@@ -91,7 +93,9 @@ void testComponentEqualSerializationWrapped(final Component input) {
   @TestOnComponents
   void testNonWrappingSerializerComponentsEqual(final Component input) {
     final JsonElement serialized = GsonComponentSerializer.gson().serializeToTree(input);
-    final JsonElement serializedNative = this.componentToJson(net.minecraft.network.chat.Component.Serializer.fromJson(serialized, lookup()));
+    final JsonElement serializedNative = this.componentToJson(
+      ComponentSerialization.CODEC.decode(lookup().createSerializationContext(JsonOps.INSTANCE), serialized).getOrThrow().getFirst()
+    );
 
     assertJsonTreesEqual(serializedNative, serialized);
   }

fabric/src/testmod/java/net/kyori/adventure/platform/test/fabric/AdventureFabricTester.java

@@ -198,7 +198,7 @@ public void onInitialize() {
           }));
           return 1;
         }))))
-        .then(literal("sound").then(argument(ARG_SOUND, key()).suggests(SuggestionProviders.AVAILABLE_SOUNDS).executes(ctx -> {
+        .then(literal("sound").then(argument(ARG_SOUND, key()).suggests(SuggestionProviders.cast(SuggestionProviders.AVAILABLE_SOUNDS)).executes(ctx -> {
           final Audience viewer = this.adventure().audience(ctx.getSource());
           final Key sound = key(ctx, ARG_SOUND);
           viewer.sendMessage(text(b -> b.content("Playing sound ").append(represent(sound)).color(COLOR_RESPONSE)));

gradle.properties

@@ -1,5 +1,5 @@
 group=net.kyori
-version=6.4.1-SNAPSHOT
+version=6.5.0-SNAPSHOT
 description=Integration between the adventure library and Minecraft: Java Edition, using the Fabric and NeoForge modding systems
 
 javadocPublishRoot=https://jd.advntr.dev/platform/

gradle/libs.versions.toml

@@ -2,22 +2,22 @@
 format = { version = "1.1" }
 
 [versions]
-adventure = "4.21.0"
+adventure = "4.23.0"
 adventurePlatform = "4.4.0"
 ansi = "1.1.1"
 autoService = "1.1.1"
 checkstyle = "10.25.0"
 examination = "1.3.0"
-fabricApi = "0.121.0+1.21.5"
+fabricApi = "0.127.0+1.21.6"
 fabricLoader = "0.16.14"
 indra = "3.1.3"
 junit = "5.13.1"
-minecraft = "1.21.5"
-parchment = "1.21.5:2025.04.19"
+minecraft = "1.21.6"
+parchment = "1.21.5:2025.06.15"
 vineflower = "1.11.1"
 spotless = "7.0.4"
-neoforge = "21.5.63-beta"
-neoform = "1.21.5-20250325.162830"
+neoforge = "21.6.4-beta"
+neoform = "1.21.6-20250617.151856"
 
 [libraries]
 adventure-api = { module = "net.kyori:adventure-api", version.ref = "adventure" }

mod-shared/src/client/java/net/kyori/adventure/platform/modcommon/impl/client/mixin/minecraft/player/LocalPlayerMixin.java

@@ -1,7 +1,7 @@
 /*
  * This file is part of adventure-platform-mod, licensed under the MIT License.
  *
- * Copyright (c) 2020-2024 KyoriPowered
+ * Copyright (c) 2020-2025 KyoriPowered
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -35,7 +35,6 @@
 import net.kyori.adventure.sound.Sound;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.player.LocalPlayer;
-import net.minecraft.core.BlockPos;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.level.Level;
 import org.jetbrains.annotations.NotNull;
@@ -53,8 +52,8 @@ public abstract class LocalPlayerMixin extends Player implements ForwardingAudie
 
   private final Audience adventure$default = MinecraftClientAudiences.of().audience();
 
-  private LocalPlayerMixin(final Level level, final BlockPos blockPos, final float f, final GameProfile gameProfile) {
-    super(level, blockPos, f, gameProfile);
+  private LocalPlayerMixin(final Level p_250508_, final GameProfile p_252153_) {
+    super(p_250508_, p_252153_);
   }
 
   @Override

mod-shared/src/main/java/net/kyori/adventure/platform/modcommon/impl/AdventureCommon.java

@@ -1,7 +1,7 @@
 /*
  * This file is part of adventure-platform-mod, licensed under the MIT License.
  *
- * Copyright (c) 2024 KyoriPowered
+ * Copyright (c) 2024-2025 KyoriPowered
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -46,7 +46,6 @@
 import net.kyori.adventure.text.TranslationArgument;
 import net.kyori.adventure.text.flattener.ComponentFlattener;
 import net.kyori.adventure.translation.GlobalTranslator;
-import net.kyori.adventure.translation.TranslationRegistry;
 import net.kyori.adventure.translation.Translator;
 import net.kyori.adventure.util.Services;
 import net.minecraft.core.Holder;
@@ -107,7 +106,7 @@ private static ComponentFlattener createFlattener(final SidedProxy proxy) {
     flattenerBuilder.complexMapper(TranslatableComponent.class, (translatable, consumer) -> {
       final String key = translatable.key();
       for (final Translator registry : GlobalTranslator.translator().sources()) {
-        if (registry instanceof TranslationRegistry tr && tr.contains(key)) {
+        if (registry.canTranslate(key, Locale.getDefault())) {
           consumer.accept(GlobalTranslator.render(translatable, Locale.getDefault()));
           return;
         }

mod-shared/src/main/java/net/kyori/adventure/platform/modcommon/impl/NonWrappingComponentSerializer.java

@@ -1,7 +1,7 @@
 /*
  * This file is part of adventure-platform-mod, licensed under the MIT License.
  *
- * Copyright (c) 2020-2024 KyoriPowered
+ * Copyright (c) 2020-2025 KyoriPowered
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -24,6 +24,7 @@
 package net.kyori.adventure.platform.modcommon.impl;
 
 import com.google.common.base.Suppliers;
+import com.google.gson.JsonElement;
 import com.google.gson.JsonParseException;
 import com.mojang.serialization.JsonOps;
 import java.util.function.Supplier;
@@ -34,7 +35,6 @@
 import net.minecraft.core.RegistryAccess;
 import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.network.chat.ComponentSerialization;
-import net.minecraft.network.chat.MutableComponent;
 import org.jetbrains.annotations.NotNull;
 
 public final class NonWrappingComponentSerializer implements ComponentSerializer<Component, Component, net.minecraft.network.chat.Component> {
@@ -68,11 +68,15 @@ public Component deserialize(final net.minecraft.network.chat.Component input) {
   }
 
   @Override
-  public MutableComponent serialize(final Component component) {
+  public net.minecraft.network.chat.Component serialize(final Component component) {
     BYPASS_IS_ALLOWED_FROM_SERVER.set(true);
-    final MutableComponent mutableComponent;
+    final net.minecraft.network.chat.Component mutableComponent;
     try {
-      mutableComponent = net.minecraft.network.chat.Component.Serializer.fromJson(GsonComponentSerializer.gson().serializeToTree(component), this.holderProvider.get());
+      final JsonElement jsonElement = GsonComponentSerializer.gson().serializeToTree(component);
+      mutableComponent = ComponentSerialization.CODEC
+        .decode(this.holderProvider.get().createSerializationContext(JsonOps.INSTANCE), jsonElement)
+        .getOrThrow(JsonParseException::new)
+        .getFirst();
     } finally {
       BYPASS_IS_ALLOWED_FROM_SERVER.set(false);
     }

mod-shared/src/main/java/net/kyori/adventure/platform/modcommon/impl/service/GsonComponentSerializerProviderImpl.java

@@ -55,6 +55,6 @@ public final class GsonComponentSerializerProviderImpl implements GsonComponentS
   public @NotNull Consumer<GsonComponentSerializer.Builder> builder() {
     return builder -> builder
       .legacyHoverEventSerializer(NBTLegacyHoverEventSerializer.INSTANCE)
-      .options(JSONOptions.byDataVersion().at(SharedConstants.getCurrentVersion().getDataVersion().getVersion()));
+      .options(JSONOptions.byDataVersion().at(SharedConstants.getCurrentVersion().dataVersion().version()));
   }
 }