Update to 1.21.9-pre1

Author: BlockyTheDev

gradle.properties

@@ -3,7 +3,7 @@ org.gradle.parallel=true
 org.gradle.configuration-cache=true
 
 # Mod Properties
-mod_version=1.0.1-SNAPSHOT+1.21.8
+mod_version=0.1.0-SNAPSHOT+1.21.9-pre1
 maven_group=io.github.communityradargg.fabric
 archives_base_name=communityradar-fabric
 

gradle/libs.versions.toml

@@ -4,10 +4,10 @@ fabricLoom = "1.11-SNAPSHOT"
 spotless = "7.2.1"
 
 # Libraries
-minecraft = "1.21.8"
-fabricYarn = "1.21.8+build.1"
+minecraft = "1.21.9-pre1"
+fabricYarn = "1.21.9-pre1+build.7"
 fabricLoader = "0.17.2"
-fabricApi = "0.131.0+1.21.8"
+fabricApi = "0.133.7+1.21.9"
 
 [libraries]
 minecraft = { group = "com.mojang", name = "minecraft", version.ref = "minecraft" }

src/main/java/io/github/communityradargg/fabric/commands/RadarCommand.java

@@ -270,12 +270,12 @@ private static void handleCheckAllSubcommand(final @NotNull FabricClientCommandS
 
         boolean anyPlayerFound = false;
         for (final PlayerListEntry player : networkHandler.getPlayerList()) {
-            if (player.getProfile().getId() == null) {
+            if (player.getProfile().id() == null) {
                 continue;
             }
 
             final Optional<RadarListEntry> listEntryOptional = CommunityRadarMod.getListManager()
-                    .getRadarListEntry(player.getProfile().getId());
+                    .getRadarListEntry(player.getProfile().id());
             if (listEntryOptional.isEmpty()) {
                 // player uuid is on no list
                 continue;

src/main/java/io/github/communityradargg/fabric/mixin/PlayerEntityRendererMixin.java

@@ -18,14 +18,14 @@
 import com.llamalad7.mixinextras.sugar.Local;
 import io.github.communityradargg.fabric.accessors.PlayerEntityRenderStateAccessor;
 import io.github.communityradargg.fabric.utils.Utils;
-import net.minecraft.client.network.AbstractClientPlayerEntity;
 import net.minecraft.client.render.entity.PlayerEntityRenderer;
 import net.minecraft.client.render.entity.state.PlayerEntityRenderState;
+import net.minecraft.entity.PlayerLikeEntity;
 import net.minecraft.text.Text;
 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.ModifyArg;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import java.util.UUID;
 
@@ -41,7 +41,15 @@ public abstract class PlayerEntityRendererMixin {
      * @param playerEntityRenderState The needed local variable of the player entity render state.
      * @return Returns the modified local variable.
      */
-    @ModifyVariable(method = "renderLabelIfPresent(Lnet/minecraft/client/render/entity/state/PlayerEntityRenderState;Lnet/minecraft/text/Text;Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;I)V", at = @At(value = "HEAD"), index = 2, argsOnly = true)
+    @ModifyArg(
+            method = "renderLabelIfPresent(Lnet/minecraft/client/render/entity/state/PlayerEntityRenderState;Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/command/OrderedRenderCommandQueue;Lnet/minecraft/client/render/state/CameraRenderState;)V",
+            at = @At(
+                    value = "INVOKE",
+                    target = "Lnet/minecraft/client/render/command/OrderedRenderCommandQueue;submitLabel(Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/util/math/Vec3d;Lnet/minecraft/text/Text;ZIDLnet/minecraft/client/render/state/CameraRenderState;)V",
+                    ordinal = 1
+            ),
+            index = 2
+    )
     private Text modifyPlayerNameTag(final Text text, final @Local(index = 1, argsOnly = true) PlayerEntityRenderState playerEntityRenderState) {
         final UUID uuid = ((PlayerEntityRenderStateAccessor) playerEntityRenderState).communityradar_fabric$getPlayerUuid();
 
@@ -54,13 +62,13 @@ private Text modifyPlayerNameTag(final Text text, final @Local(index = 1, argsOn
     /**
      * Modifies the player entity render state to set the self added uuid field.
      *
-     * @param abstractClientPlayerEntity The abstract client player entity as the uuid source.
+     * @param playerLikeEntity The player like entity as the source for the uuid.
      * @param playerEntityRenderState The player entity render state to set the uuid.
      * @param f The float f.
      * @param ci The callback info.
      */
-    @Inject(method = "updateRenderState(Lnet/minecraft/client/network/AbstractClientPlayerEntity;Lnet/minecraft/client/render/entity/state/PlayerEntityRenderState;F)V", at = @At(value = "TAIL"))
-    private void modifyUpdateRenderState(final AbstractClientPlayerEntity abstractClientPlayerEntity, final PlayerEntityRenderState playerEntityRenderState, final float f, final CallbackInfo ci) {
-        ((PlayerEntityRenderStateAccessor) playerEntityRenderState).communityradar_fabric$setPlayerUuid(abstractClientPlayerEntity.getUuid());
+    @Inject(method = "updateRenderState(Lnet/minecraft/entity/PlayerLikeEntity;Lnet/minecraft/client/render/entity/state/PlayerEntityRenderState;F)V", at = @At(value = "TAIL"))
+    private void modifyUpdateRenderState(final PlayerLikeEntity playerLikeEntity, final PlayerEntityRenderState playerEntityRenderState, final float f, final CallbackInfo ci) {
+        ((PlayerEntityRenderStateAccessor) playerEntityRenderState).communityradar_fabric$setPlayerUuid(playerLikeEntity.getUuid());
     }
 }

src/main/java/io/github/communityradargg/fabric/mixin/PlayerListHudMixin.java

@@ -41,6 +41,6 @@ private Text modifyGetPlayerName(final Text text, final @Local(argsOnly = true)
         if (!Utils.isOnGrieferGames()) {
             return text;
         }
-        return Utils.includePrefixText(entry.getProfile().getId(), text);
+        return Utils.includePrefixText(entry.getProfile().id(), text);
     }
 }

src/main/java/io/github/communityradargg/fabric/utils/Utils.java

@@ -77,9 +77,9 @@ public class Utils {
 
         // checking if there is a player with same name in the loaded world. If so, returning the uuid from the profile
         for (final PlayerListEntry playerListEntry : networkHandler.getPlayerList()) {
-            if (playerListEntry.getProfile().getName().equalsIgnoreCase(playerName)) {
-                uuidNameCache.put(playerName, playerListEntry.getProfile().getId());
-                return CompletableFuture.completedFuture(Optional.of(playerListEntry.getProfile().getId()));
+            if (playerListEntry.getProfile().name().equalsIgnoreCase(playerName)) {
+                uuidNameCache.put(playerName, playerListEntry.getProfile().id());
+                return CompletableFuture.completedFuture(Optional.of(playerListEntry.getProfile().id()));
             }
         }