1.21.10 support

build.gradle

@@ -1,4 +1,4 @@
 plugins {
     id "me.modmuss50.mod-publish-plugin" version "0.4.4" apply false
-    id 'fabric-loom' version '1.11-SNAPSHOT' apply false
+    id 'fabric-loom' version '1.14-SNAPSHOT' apply false
 }

fabric/gradle.properties

@@ -1,16 +1,16 @@
 # Fabric Properties
 # check these on https://fabricmc.net/develop
-yarn_mappings=1.21.7+build.8
-loader_version=0.16.14
+yarn_mappings=1.21.10+build.3
+loader_version=0.18.4
 
 # Mod Properties
 mod_version=1.0.6
 archives_base_name=headpats
 
 # Dependencies
-fabric_version=0.129.0+1.21.7
+fabric_version=0.138.4+1.21.10
 
-deps.cicada=0.13.1+1.21.5-and-above
-deps.cardinal-components-api=7.0.0-beta.1
-deps.modmenu=15.0.0-beta.3
-deps.yacl=3.7.1+1.21.6-fabric
+deps.cicada=0.14.3+1.21.9-1.21.10
+deps.cardinal-components-api=7.2.0
+deps.modmenu=16.0.0-rc.2
+deps.yacl=3.8.1+1.21.10-fabric

fabric/src/main/java/dev/enjarai/headpats/Headpats.java

@@ -48,7 +48,7 @@ public void onInitializeClient() {
 				var pettingComponent = PETTING_COMPONENT.get(client.player);
 				if (pettingComponent.isPetting()) {
 					if (client.crosshairTarget != null && client.targetedEntity instanceof PlayerEntity otherEntity) {
-						var hitPos = client.crosshairTarget.getPos().subtract(otherEntity.getPos());
+						var hitPos = client.crosshairTarget.getPos().subtract(otherEntity.getSyncedPos());
 						double y = hitPos.y / (otherEntity.getScale() * otherEntity.getScaleFactor());
 						double height = otherEntity.getHeight() / (otherEntity.getScale() * otherEntity.getScaleFactor());
 						if (y > height - 0.5 && client.options.useKey.isPressed() && pettingComponent.isPetting(otherEntity)

fabric/src/main/java/dev/enjarai/headpats/PettingComponent.java

@@ -5,6 +5,7 @@
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.network.RegistryByteBuf;
 import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.server.world.ServerWorld;
 import net.minecraft.sound.SoundCategory;
 import net.minecraft.sound.SoundEvents;
 import net.minecraft.storage.ReadView;
@@ -74,7 +75,7 @@ public boolean isRequiredOnClient() {
 
     @Override
     public void serverTick() {
-        if (petting != null && player.getWorld().getPlayerByUuid(petting) == null) {
+        if (petting != null && player.getEntityWorld().getPlayerByUuid(petting) == null) {
             stopPetting();
         }
     }
@@ -99,7 +100,7 @@ public void clientTick() {
         prevPettedMultiplier = pettedMultiplier;
         if (isBeingPet()) {
             if (pettedTicks % 40 == 0 && ModConfig.INSTANCE.pettedPlayersPurr) {
-                player.getWorld().playSoundFromEntityClient(player, SoundEvents.ENTITY_CAT_PURR,
+                player.getEntityWorld().playSoundFromEntityClient(player, SoundEvents.ENTITY_CAT_PURR,
                         SoundCategory.PLAYERS, 1f, player.getSoundPitch());
             }
 
@@ -125,13 +126,13 @@ public void startPetting(PlayerEntity other) {
 
     public void stopPetting() {
         if (petting != null) {
-            var server = player.getServer();
+            var world = player.getEntityWorld();
 
             PlayerEntity other;
-            if (server != null) {
-                other = server.getPlayerManager().getPlayer(petting);
+            if (world instanceof ServerWorld serverWorld) {
+                other = serverWorld.getServer().getPlayerManager().getPlayer(petting);
             } else {
-                other = player.getWorld().getPlayerByUuid(petting);
+                other = world.getPlayerByUuid(petting);
             }
 
             if (other != null) {

fabric/src/main/java/dev/enjarai/headpats/mixin/HeldItemRendererMixin.java

@@ -2,7 +2,7 @@
 
 import dev.enjarai.headpats.PetRendering;
 import net.minecraft.client.network.AbstractClientPlayerEntity;
-import net.minecraft.client.render.VertexConsumerProvider;
+import net.minecraft.client.render.command.OrderedRenderCommandQueue;
 import net.minecraft.client.render.item.HeldItemRenderer;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.item.ItemStack;
@@ -21,7 +21,7 @@ public class HeldItemRendererMixin {
                     target = "Lnet/minecraft/item/ItemStack;isEmpty()Z"
             )
     )
-    private void pettingHand(AbstractClientPlayerEntity player, float tickDelta, float pitch, Hand hand, float swingProgress, ItemStack item, float equipProgress, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, CallbackInfo ci) {
+    private void pettingHand(AbstractClientPlayerEntity player, float tickDelta, float pitch, Hand hand, float swingProgress, ItemStack item, float equipProgress, MatrixStack matrices, OrderedRenderCommandQueue queue, int light, CallbackInfo ci) {
         if (hand == Hand.MAIN_HAND) {
             PetRendering.modifyHandMatrix(player, tickDelta, matrices);
         }

fabric/src/main/java/dev/enjarai/headpats/mixin/PlayerEntityRendererMixin.java

@@ -4,8 +4,8 @@
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.model.ModelPart;
 import net.minecraft.client.network.AbstractClientPlayerEntity;
-import net.minecraft.client.render.VertexConsumerProvider;
 import net.minecraft.client.render.entity.PlayerEntityRenderer;
+import net.minecraft.client.render.command.OrderedRenderCommandQueue;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.util.Identifier;
 import org.spongepowered.asm.mixin.Mixin;
@@ -22,7 +22,7 @@ public class PlayerEntityRendererMixin {
 //                    target = "Lnet/minecraft/client/network/AbstractClientPlayerEntity;getSkinTextures()Lnet/minecraft/client/util/SkinTextures;"
             )
     )
-    private void fixFunnyAnimation(MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, Identifier skinTexture, ModelPart arm, boolean sleeveVisible, CallbackInfo ci) {
+    private void fixFunnyAnimation(MatrixStack matrices, OrderedRenderCommandQueue queue, int light, Identifier skinTexture, ModelPart arm, boolean sleeveVisible, CallbackInfo ci) {
         PetRendering.fixFirstPersonAngles(MinecraftClient.getInstance().player, MinecraftClient.getInstance().getRenderTickCounter().getDynamicDeltaTicks(), arm);
     }
 }

fabric/src/main/java/dev/enjarai/headpats/net/PettingC2SPacket.java

@@ -17,7 +17,7 @@ public record PettingC2SPacket(int entityId) implements CustomPayload {
 
     public void handle(ServerPlayNetworking.Context context) {
         if (entityId != -1) {
-            var target = context.player().getWorld().getEntityById(entityId);
+            var target = context.player().getEntityWorld().getEntityById(entityId);
             if (target instanceof PlayerEntity player) {
                 Headpats.PETTING_COMPONENT.get(context.player()).startPetting(player);
             }

gradle.properties

@@ -2,12 +2,12 @@
 org.gradle.jvmargs=-Xmx1G
 org.gradle.parallel=true
 
-minecraft_version=1.21.7
+minecraft_version=1.21.10
 
 maven_group=dev.enjarai
 
-publish_target_min=1.21.6
-publish_target_max=1.21.8
+publish_target_min=1.21.10
+publish_target_max=1.21.11
 mod_modrinth=vETxChiy
 mod_github=enjarai/headpats
 git_branch=master

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME