Support minecraft version 1.21.10

- Add player model shivering when frozen
- Fix player models going dark

Author: HintSystem

build.gradle

@@ -1,10 +1,10 @@
 plugins {
 	id "fabric-loom" version "${loom_version}"
 	id "maven-publish"
-    id "me.modmuss50.mod-publish-plugin" version "1.0.0"
+    id "me.modmuss50.mod-publish-plugin" version "1.1.0"
 }
 
-version = project.mod_version
+version = "${project.mod_version}+${project.minecraft_version}"
 group = project.maven_group
 
 base {
@@ -36,7 +36,6 @@ repositories {
 
     maven { url "https://maven.terraformersmc.com/" } // Mod menu
     maven { url "https://maven.isxander.dev/releases" } // YACL
-    maven { url "https://maven.shedaniel.me/" } // Cloth Config
 
     mavenCentral()
 }
@@ -115,7 +114,7 @@ publishMods {
     modrinth {
         accessToken = project.findProperty("MODRINTH_API_KEY") ?: providers.environmentVariable("MODRINTH_API_KEY")
         projectId = "4vsSeMij"
-        minecraftVersions.addAll("1.21.6", "1.21.7", "1.21.8")
+        minecraftVersions.addAll("1.21.9", "1.21.10")
 
         requires("fabric-api")
         requires("yacl")

gradle.properties

@@ -4,20 +4,20 @@ org.gradle.parallel=true
 
 # Fabric Properties
 # check these on https://fabricmc.net/develop
-minecraft_version=1.21.8
-yarn_mappings=1.21.8+build.1
+minecraft_version=1.21.10
+yarn_mappings=1.21.10+build.2
 loader_version=0.17.3
 loom_version=1.11-SNAPSHOT
 
 # Mod Properties
-mod_version=1.4.0
+mod_version=1.4.1
 maven_group=dev.hintsystem.playerrelay
 archives_base_name=player-relay
 
 # Dependencies
-fabric_version=0.129.0+1.21.8
-modmenu_version=15.0.0
-yacl_version=3.7.1+1.21.6-fabric
-pingwheel_version=1.12.0-fabric,1.21.8
-xaerosminimap_version=25.2.16_Fabric_1.21.8
-xaerosworldmap_version=1.39.13_Fabric_1.21.8
+fabric_version=0.136.0+1.21.10
+modmenu_version=16.0.0-rc.1
+yacl_version=3.8.0+1.21.9-fabric
+pingwheel_version=1.12.0-fabric,1.21.10
+xaerosminimap_version=25.2.15_Fabric_1.21.9
+xaerosworldmap_version=1.39.17_Fabric_1.21.9

src/main/java/dev/hintsystem/playerrelay/ClientCore.java

@@ -115,10 +115,10 @@ private static boolean updateComponent(PlayerInfoPayload info, PlayerDataCompone
     public static int ticksToMs(int ticks) { return Math.round((ticks / tickRate) * 1000); }
 
     public static void sendClientMessage(Text message) {
-        ClientPlayerEntity clientPlayer = MinecraftClient.getInstance().player;
-        if (clientPlayer == null) { return; }
+        MinecraftClient client = MinecraftClient.getInstance();
+        if (client.player == null) { return; }
 
-        clientPlayer.sendMessage(message, false);
+        client.execute(() -> client.player.sendMessage(message, false));
     }
 
     @Nullable

src/main/java/dev/hintsystem/playerrelay/config/Config.java

@@ -146,7 +146,7 @@ public Screen createScreen(Screen parent) {
                         .name(Text.literal("Display Name Color"))
                         .binding(DEFAULTS.displayNameColor, () -> displayNameColor, val -> displayNameColor = val)
                         .controller(opt -> ColorControllerBuilder.create(opt)
-                            .allowAlpha(false))
+                            .allowAlpha(true)) // TODO: set allowAlpha to false when YACL fixes the crash caused by ColorPickerWidget
                         .build())
                     .option(Option.<Integer>createBuilder()
                         .name(Text.literal("AFK Timeout"))

src/main/java/dev/hintsystem/playerrelay/gui/PaperDollRenderer.java

@@ -6,7 +6,7 @@
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.render.RenderTickCounter;
-import net.minecraft.client.render.entity.EntityRenderDispatcher;
+import net.minecraft.client.render.entity.EntityRenderManager;
 import net.minecraft.client.render.entity.EntityRenderer;
 import net.minecraft.client.render.entity.state.EntityRenderState;
 import net.minecraft.entity.Entity;
@@ -88,7 +88,7 @@ public void applyHealth(LivingEntity livingEntity, float health) {
 
     public void setFakeVehicle(LivingEntity livingEntity) {
         if (fakeVehicle == null) {
-            fakeVehicle = new Entity(EntityType.ARMOR_STAND, livingEntity.getWorld()) {
+            fakeVehicle = new Entity(EntityType.ARMOR_STAND, livingEntity.getEntityWorld()) {
                 @Override
                 protected void initDataTracker(DataTracker.Builder builder) {}
                 @Override
@@ -126,7 +126,10 @@ public void tick(LivingEntity livingEntity) {
             headYawOffset = headYawOffsetO = centerYaw = 0.0f;
         }
 
-        if (livingEntity.isAlive()) livingEntity.tick();
+        if (livingEntity.isAlive()) {
+            livingEntity.tick();
+            livingEntity.age++;
+        }
     }
 
     public void renderPaperDoll(DrawContext context, int x1, int y1, int x2, int y2, int scale, LivingEntity livingEntity, RenderTickCounter tickCounter) {
@@ -172,11 +175,14 @@ public void renderPaperDoll(DrawContext context, int x1, int y1, int x2, int y2,
     /** @see net.minecraft.client.gui.screen.ingame.InventoryScreen#drawEntity(DrawContext, int, int, int, int, float, Vector3f, Quaternionf, Quaternionf, LivingEntity)  **/
     public static void drawEntity(DrawContext context, int x1, int y1, int x2, int y2, float scale, Vector3f translation,
                                   Quaternionf rotation, @Nullable Quaternionf overrideCameraAngle, LivingEntity livingEntity, RenderTickCounter tickCounter) {
-        EntityRenderDispatcher entityRenderDispatcher = MinecraftClient.getInstance().getEntityRenderDispatcher();
-        EntityRenderer<? super LivingEntity, ?> entityRenderer = entityRenderDispatcher.getRenderer(livingEntity);
+        EntityRenderManager entityRenderManager = MinecraftClient.getInstance().getEntityRenderDispatcher();
+        EntityRenderer<? super LivingEntity, ?> entityRenderer = entityRenderManager.getRenderer(livingEntity);
         EntityRenderState entityRenderState = entityRenderer.getAndUpdateRenderState(livingEntity, tickCounter.getTickProgress(false));
         entityRenderState.displayName = null;
         entityRenderState.hitbox = null;
+        entityRenderState.light = 15728880;
+        entityRenderState.shadowPieces.clear();
+        entityRenderState.outlineColor = 0;
         context.addEntity(entityRenderState, scale, translation, rotation, overrideCameraAngle, x1, y1, x2, y2);
     }
 

src/main/java/dev/hintsystem/playerrelay/gui/PlayerListEntry.java

@@ -11,7 +11,8 @@
 import net.minecraft.client.gui.hud.InGameHud;
 import net.minecraft.client.network.OtherClientPlayerEntity;
 import net.minecraft.client.render.RenderTickCounter;
-import net.minecraft.client.util.SkinTextures;
+import net.minecraft.component.type.ProfileComponent;
+import net.minecraft.entity.player.SkinTextures;
 import net.minecraft.client.world.ClientWorld;
 import net.minecraft.entity.effect.StatusEffects;
 import net.minecraft.entity.player.PlayerEntity;
@@ -122,7 +123,10 @@ private void applyInfoToPlayer(PlayerEntity player) {
         if (statsData != null) paperDollRenderer.applyHealth(player, statsData.health);
 
         PlayerStatusEffectsData statusEffectsData = playerInfo.getComponent(PlayerStatusEffectsData.class);
-        if (statusEffectsData != null) playerEntity.setOnFire(statusEffectsData.isOnFire());
+        if (statusEffectsData != null) {
+            playerEntity.setFrozenTicks(statusEffectsData.isFrozen() ? playerEntity.getMinFreezeDamageTicks() + 4 : 0);
+            playerEntity.setOnFire(statusEffectsData.isOnFire());
+        }
 
         PlayerEquipmentData equipmentData = playerInfo.getComponent(PlayerEquipmentData.class);
         if (equipmentData != null) equipmentData.applyToPlayer(player);
@@ -131,13 +135,19 @@ private void applyInfoToPlayer(PlayerEntity player) {
     @Nullable
     public OtherClientPlayerEntity getRenderPlayerEntity() {
         ClientWorld world = MinecraftClient.getInstance().world;
-        if ((this.playerEntity == null || this.playerEntity.clientWorld != world) && world != null) {
+        if ((this.playerEntity == null || this.playerEntity.getEntityWorld() != world) && world != null) {
             this.playerEntity = new OtherClientPlayerEntity(world, playerInfo.toGameProfile());
         }
 
         return this.playerEntity;
     }
 
+    public SkinTextures getPlayerSkinTextures() {
+        return MinecraftClient.getInstance().getPlayerSkinCache()
+            .get(ProfileComponent.ofStatic(playerInfo.toGameProfile()))
+            .getTextures();
+    }
+
     public void render(DrawContext context, int x, int y, RenderTickCounter tickCounter) {
         MinecraftClient client = MinecraftClient.getInstance();
 
@@ -156,8 +166,7 @@ public void render(DrawContext context, int x, int y, RenderTickCounter tickCoun
                 renderIconUnderlay(context, x, y, x2, y2, null);
                 paperDollRenderer.renderPaperDoll(context, x, y, x2, y2, 22, playerEntity, tickCounter);
             } else {
-                SkinTextures skin = client.getSkinProvider().getSkinTextures(playerInfo.toGameProfile());
-                PlayerSkinDrawer.draw(context, skin, x, y, config.iconWidth);
+                PlayerSkinDrawer.draw(context, getPlayerSkinTextures(), x, y, config.iconWidth);
             }
 
             renderIconOverlay(context, x, y, x2, y2, null);

src/main/java/dev/hintsystem/playerrelay/mixin/minecraft/KeyboardMixin.java

@@ -1,7 +1,10 @@
 package dev.hintsystem.playerrelay.mixin.minecraft;
 
 import dev.hintsystem.playerrelay.PlayerRelay;
+
 import net.minecraft.client.Keyboard;
+import net.minecraft.client.input.KeyInput;
+
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -10,7 +13,7 @@
 @Mixin(Keyboard.class)
 public class KeyboardMixin {
     @Inject(method = "onKey", at = @At("HEAD"))
-    private void onKey(long window, int key, int scancode, int action, int modifiers, CallbackInfo ci) {
+    private void onKey(long window, int action, KeyInput input, CallbackInfo ci) {
         // Only count press or repeat (not release)
         if (action != 0) PlayerRelay.updateInputActivity();
     }

src/main/java/dev/hintsystem/playerrelay/mixin/minecraft/MouseMixin.java

@@ -1,7 +1,10 @@
 package dev.hintsystem.playerrelay.mixin.minecraft;
 
 import dev.hintsystem.playerrelay.PlayerRelay;
+
 import net.minecraft.client.Mouse;
+import net.minecraft.client.input.MouseInput;
+
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -10,7 +13,7 @@
 @Mixin(Mouse.class)
 public class MouseMixin {
     @Inject(method = "onMouseButton", at = @At("HEAD"))
-    private void onMouseButton(long window, int button, int action, int mods, CallbackInfo ci) {
+    private void onMouseButton(long window, MouseInput input, int action, CallbackInfo ci) {
         if (action != 0) PlayerRelay.updateInputActivity();
     }
 

src/main/java/dev/hintsystem/playerrelay/payload/player/PlayerPositionData.java

@@ -15,7 +15,7 @@ public class PlayerPositionData implements PlayerDataComponent {
     public PlayerPositionData() {}
 
     public PlayerPositionData(ClientPlayerEntity player) {
-        this.coords = player.getPos();
+        this.coords = player.getEntityPos();
         this.yaw = player.getYaw();
         this.pitch = player.getPitch();
         this.pose = (player.getVehicle() != null) ? EntityPose.SITTING : player.getPose();

src/main/java/dev/hintsystem/playerrelay/payload/player/PlayerWorldData.java

@@ -33,10 +33,10 @@ public PlayerWorldData(@Nullable PlayerEntity player) {
         if (player == null) { return; }
 
         setFlag(FLAGS.IN_WORLD, true);
-        WorldProperties worldProperties = player.getWorld().getLevelProperties();
+        WorldProperties worldProperties = player.getEntityWorld().getLevelProperties();
 
         setFlag(FLAGS.HARDCORE, worldProperties.isHardcore());
-        this.dimension = player.getWorld().getRegistryKey();
+        this.dimension = player.getEntityWorld().getRegistryKey();
         this.difficulty = worldProperties.getDifficulty();
     }