Skip to content

Commit 8152442

Browse files
BlockyTheDevBlockyTheDev
committed
Rename Mixin classes and methods after Mojang mapping migration
1 parent 47ec531 commit 8152442

6 files changed

Lines changed: 25 additions & 25 deletions

File tree

src/main/java/io/github/communityradargg/fabric/accessors/PlayerEntityRenderStateAccessor.java renamed to src/main/java/io/github/communityradargg/fabric/accessors/AvatarRenderStateAccessor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
/**
2121
* Serves as accessor for the self added field in the {@link net.minecraft.client.renderer.entity.player.AvatarRenderer} class.
2222
*/
23-
public interface PlayerEntityRenderStateAccessor {
23+
public interface AvatarRenderStateAccessor {
2424
/**
2525
* Gets the player uuid field value.
2626
*

src/main/java/io/github/communityradargg/fabric/mixin/PlayerEntityRenderStateMixin.java renamed to src/main/java/io/github/communityradargg/fabric/mixin/AvatarRenderStateMixin.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616
package io.github.communityradargg.fabric.mixin;
1717

18-
import io.github.communityradargg.fabric.accessors.PlayerEntityRenderStateAccessor;
18+
import io.github.communityradargg.fabric.accessors.AvatarRenderStateAccessor;
1919
import net.minecraft.client.renderer.entity.state.AvatarRenderState;
2020
import org.spongepowered.asm.mixin.Mixin;
2121
import org.spongepowered.asm.mixin.Unique;
@@ -25,7 +25,7 @@
2525
* Mixin for the class {@link AvatarRenderState}.
2626
*/
2727
@Mixin(AvatarRenderState.class)
28-
public class PlayerEntityRenderStateMixin implements PlayerEntityRenderStateAccessor {
28+
public class AvatarRenderStateMixin implements AvatarRenderStateAccessor {
2929
@Unique
3030
private UUID communityradar_fabric$playerUuid;
3131

src/main/java/io/github/communityradargg/fabric/mixin/PlayerEntityRendererMixin.java renamed to src/main/java/io/github/communityradargg/fabric/mixin/AvatarRendererMixin.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
package io.github.communityradargg.fabric.mixin;
1717

1818
import com.llamalad7.mixinextras.sugar.Local;
19-
import io.github.communityradargg.fabric.accessors.PlayerEntityRenderStateAccessor;
19+
import io.github.communityradargg.fabric.accessors.AvatarRenderStateAccessor;
2020
import io.github.communityradargg.fabric.utils.Utils;
2121
import net.minecraft.client.renderer.entity.player.AvatarRenderer;
2222
import net.minecraft.client.renderer.entity.state.AvatarRenderState;
@@ -33,7 +33,7 @@
3333
* An abstract Mixin class for {@link AvatarRenderer}.
3434
*/
3535
@Mixin(AvatarRenderer.class)
36-
public abstract class PlayerEntityRendererMixin {
36+
public abstract class AvatarRendererMixin {
3737
/**
3838
* Modifies the player name tag. This gets called once every tick with the original non-modified prefix.
3939
*
@@ -50,8 +50,8 @@ public abstract class PlayerEntityRendererMixin {
5050
),
5151
index = 3
5252
)
53-
private Component modifyPlayerNameTag(final Component component, final @Local(index = 1, argsOnly = true) AvatarRenderState avatarRenderState) {
54-
final UUID uuid = ((PlayerEntityRenderStateAccessor) avatarRenderState).communityradar_fabric$getPlayerUuid();
53+
private Component modifySubmitNameTag(final Component component, final @Local(index = 1, argsOnly = true) AvatarRenderState avatarRenderState) {
54+
final UUID uuid = ((AvatarRenderStateAccessor) avatarRenderState).communityradar_fabric$getPlayerUuid();
5555

5656
if (uuid == null || !Utils.isOnGrieferGames()) {
5757
return component;
@@ -68,7 +68,7 @@ private Component modifyPlayerNameTag(final Component component, final @Local(in
6868
* @param ci The callback info.
6969
*/
7070
@Inject(method = "extractRenderState(Lnet/minecraft/world/entity/Avatar;Lnet/minecraft/client/renderer/entity/state/AvatarRenderState;F)V", at = @At(value = "TAIL"))
71-
private void modifyUpdateRenderState(final Avatar avatar, final AvatarRenderState avatarRenderState, final float f, final CallbackInfo ci) {
72-
((PlayerEntityRenderStateAccessor) avatarRenderState).communityradar_fabric$setPlayerUuid(avatar.getUUID());
71+
private void modifyExtractRenderState(final Avatar avatar, final AvatarRenderState avatarRenderState, final float f, final CallbackInfo ci) {
72+
((AvatarRenderStateAccessor) avatarRenderState).communityradar_fabric$setPlayerUuid(avatar.getUUID());
7373
}
7474
}

src/main/java/io/github/communityradargg/fabric/mixin/ChatHudMixin.java renamed to src/main/java/io/github/communityradargg/fabric/mixin/ChatComponentMixin.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@
3333
* An abstract Mixin class for {@link ChatComponent}.
3434
*/
3535
@Mixin(ChatComponent.class)
36-
public abstract class ChatHudMixin {
36+
public abstract class ChatComponentMixin {
3737
@Unique
38-
private static final Logger logger = LoggerFactory.getLogger(ChatHudMixin.class);
38+
private static final Logger logger = LoggerFactory.getLogger(ChatComponentMixin.class);
3939

4040
/**
4141
* Modifies the player chat messages. This gets called when a message should be added to the player chat.
@@ -44,7 +44,7 @@ public abstract class ChatHudMixin {
4444
* @return Returns the modified local variable.
4545
*/
4646
@ModifyVariable(method = "addMessage(Lnet/minecraft/network/chat/Component;Lnet/minecraft/network/chat/MessageSignature;Lnet/minecraft/client/GuiMessageTag;)V", at = @At(value = "HEAD"), index = 1, argsOnly = true)
47-
private Component modifyChatMessages(final Component component) {
47+
private Component modifyAddMessage(final Component component) {
4848
if (!Utils.isOnGrieferGames()) {
4949
return component;
5050
}

src/main/java/io/github/communityradargg/fabric/mixin/PlayerListHudMixin.java renamed to src/main/java/io/github/communityradargg/fabric/mixin/PlayerTabOverlayMixin.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
* An abstract Mixin class for {@link PlayerTabOverlay}.
2929
*/
3030
@Mixin(PlayerTabOverlay.class)
31-
public abstract class PlayerListHudMixin {
31+
public abstract class PlayerTabOverlayMixin {
3232
/**
3333
* Modifies the player info component. This gets called when the player info gets updated.
3434
*
@@ -37,7 +37,7 @@ public abstract class PlayerListHudMixin {
3737
* @return Returns the modified local variable.
3838
*/
3939
@ModifyReturnValue(method = "getNameForDisplay", at = @At("RETURN"))
40-
private Component modifyGetPlayerName(final Component component, final @Local(argsOnly = true) PlayerInfo playerInfo) {
40+
private Component modifyGetNameForDisplay(final Component component, final @Local(argsOnly = true) PlayerInfo playerInfo) {
4141
if (!Utils.isOnGrieferGames()) {
4242
return component;
4343
}

‎src/main/resources/communityradar.mixins.json‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
{
2-
"required": true,
3-
"package": "io.github.communityradargg.fabric.mixin",
4-
"compatibilityLevel": "JAVA_21",
5-
"injectors": {
6-
"defaultRequire": 1
7-
},
2+
"required": true,
3+
"package": "io.github.communityradargg.fabric.mixin",
4+
"compatibilityLevel": "JAVA_21",
5+
"injectors": {
6+
"defaultRequire": 1
7+
},
88
"overwrites": {
99
"requireAnnotations": true
1010
},
1111
"client": [
12-
"ChatHudMixin",
13-
"PlayerEntityRendererMixin",
14-
"PlayerEntityRenderStateMixin",
15-
"PlayerListHudMixin"
16-
]
12+
"AvatarRendererMixin",
13+
"AvatarRenderStateMixin",
14+
"ChatComponentMixin",
15+
"PlayerTabOverlayMixin"
16+
]
1717
}

0 commit comments

Comments
 (0)