From 5327a7a935e8c959149474bc589b8e542c2778f8 Mon Sep 17 00:00:00 2001 From: BlockyTheDev <86119630+BlockyTheDev@users.noreply.github.com> Date: Thu, 9 Apr 2026 20:31:52 +0200 Subject: [PATCH 1/2] Update to Minecraft 26.1.2 --- gradle/libs.versions.toml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 1d43fe0..378cf58 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,12 +1,12 @@ [versions] # Plugins -fabricLoom = "1.15-SNAPSHOT" +fabricLoom = "1.16-SNAPSHOT" spotless = "8.1.0" # Libraries -minecraft = "26.1" -fabricLoader = "0.18.4" # on change - check if fabric.mod.json needs to be increased -fabricApi = "0.144.0+26.1" +minecraft = "26.1.2" +fabricLoader = "0.18.6" # on change - check if fabric.mod.json needs to be increased +fabricApi = "0.145.4+26.1.2" [libraries] minecraft = { group = "com.mojang", name = "minecraft", version.ref = "minecraft" } From d0a28c096a163c84be91859eea38863b76812517 Mon Sep 17 00:00:00 2001 From: BlockyTheDev <86119630+BlockyTheDev@users.noreply.github.com> Date: Thu, 9 Apr 2026 20:33:32 +0200 Subject: [PATCH 2/2] Rename Mixin method arguments to match the source class names and add recommended Mixin annotation name attributes --- .../fabric/mixin/AvatarRendererMixin.java | 10 +++++----- .../fabric/mixin/ChatComponentMixin.java | 14 +++++++------- .../fabric/mixin/PlayerTabOverlayMixin.java | 6 +++--- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/main/java/io/github/communityradargg/fabric/mixin/AvatarRendererMixin.java b/src/main/java/io/github/communityradargg/fabric/mixin/AvatarRendererMixin.java index afa0359..e48db30 100644 --- a/src/main/java/io/github/communityradargg/fabric/mixin/AvatarRendererMixin.java +++ b/src/main/java/io/github/communityradargg/fabric/mixin/AvatarRendererMixin.java @@ -32,13 +32,13 @@ public abstract class AvatarRendererMixin { /** * Modifies the player entity render state to set the self added uuid field. * - * @param avatar The avatar as the source for the uuid. - * @param avatarRenderState The avatar render state to set the uuid. - * @param f The float f. + * @param entity The avatar as the entity source for the uuid. + * @param state The avatar render state to set the uuid. + * @param partialTicks The partial ticks. * @param ci The callback info. */ @Inject(method = "extractRenderState(Lnet/minecraft/world/entity/Avatar;Lnet/minecraft/client/renderer/entity/state/AvatarRenderState;F)V", at = @At(value = "TAIL")) - private void modifyExtractRenderState(final Avatar avatar, final AvatarRenderState avatarRenderState, final float f, final CallbackInfo ci) { - ((AvatarRenderStateAccessor) avatarRenderState).communityradar_fabric$setPlayerUuid(avatar.getUUID()); + private void modifyExtractRenderState(final Avatar entity, final AvatarRenderState state, final float partialTicks, final CallbackInfo ci) { + ((AvatarRenderStateAccessor) state).communityradar_fabric$setPlayerUuid(entity.getUUID()); } } diff --git a/src/main/java/io/github/communityradargg/fabric/mixin/ChatComponentMixin.java b/src/main/java/io/github/communityradargg/fabric/mixin/ChatComponentMixin.java index ffbc6fe..048155b 100644 --- a/src/main/java/io/github/communityradargg/fabric/mixin/ChatComponentMixin.java +++ b/src/main/java/io/github/communityradargg/fabric/mixin/ChatComponentMixin.java @@ -40,25 +40,25 @@ public abstract class ChatComponentMixin { /** * Modifies the player chat messages. This gets called when a message should be added to the player chat. * - * @param component The original chat message component to modify. + * @param contents The original chat message content component to modify. * @return Returns the modified local variable. */ - @ModifyVariable(method = "addMessage(Lnet/minecraft/network/chat/Component;Lnet/minecraft/network/chat/MessageSignature;Lnet/minecraft/client/multiplayer/chat/GuiMessageSource;Lnet/minecraft/client/multiplayer/chat/GuiMessageTag;)V", at = @At(value = "HEAD"), index = 1, argsOnly = true) - private Component modifyAddMessage(final Component component) { + @ModifyVariable(method = "addMessage(Lnet/minecraft/network/chat/Component;Lnet/minecraft/network/chat/MessageSignature;Lnet/minecraft/client/multiplayer/chat/GuiMessageSource;Lnet/minecraft/client/multiplayer/chat/GuiMessageTag;)V", at = @At(value = "HEAD"), argsOnly = true, name = "contents") + private Component modifyAddMessage(final Component contents) { if (!Utils.isOnGrieferGames()) { - return component; + return contents; } // On a chat message there should be never be the need to call to the Mojang API. try { - final Optional playerUuid = Utils.getChatMessagePlayer(component.getString()).get(); + final Optional playerUuid = Utils.getChatMessagePlayer(contents.getString()).get(); if (playerUuid.isPresent() && CommunityRadarMod.getListManager().isInList(playerUuid.get())) { - return Utils.includePrefixComponent(playerUuid.get(), component); + return Utils.includePrefixComponent(playerUuid.get(), contents); } } catch (final ExecutionException | InterruptedException e) { logger.error("Could not get the player uuid in the message edit process", e); } - return component; + return contents; } } diff --git a/src/main/java/io/github/communityradargg/fabric/mixin/PlayerTabOverlayMixin.java b/src/main/java/io/github/communityradargg/fabric/mixin/PlayerTabOverlayMixin.java index cb53345..e05706e 100644 --- a/src/main/java/io/github/communityradargg/fabric/mixin/PlayerTabOverlayMixin.java +++ b/src/main/java/io/github/communityradargg/fabric/mixin/PlayerTabOverlayMixin.java @@ -33,14 +33,14 @@ public abstract class PlayerTabOverlayMixin { * Modifies the player info component. This gets called when the player info gets updated. * * @param component The original chat message component to modify. - * @param playerInfo The needed local variable of the player info. + * @param info The needed local variable of the player info. * @return Returns the modified local variable. */ @ModifyReturnValue(method = "getNameForDisplay", at = @At("RETURN")) - private Component modifyGetNameForDisplay(final Component component, final @Local(argsOnly = true) PlayerInfo playerInfo) { + private Component modifyGetNameForDisplay(final Component component, final @Local(argsOnly = true, name = "info") PlayerInfo info) { if (!Utils.isOnGrieferGames()) { return component; } - return Utils.includePrefixComponent(playerInfo.getProfile().id(), component); + return Utils.includePrefixComponent(info.getProfile().id(), component); } }