Port to 1.21.11

Author: PepperCode1

build.gradle.kts

@@ -1,14 +1,14 @@
 // versions
-val minecraftVersion = "1.21.1"
-val minecraftDep = "=1.21.1"
+val minecraftVersion = "1.21.11"
+val minecraftDep = "=1.21.11"
 // https://parchmentmc.org/docs/getting-started
-val parchmentVersion = "2024.11.17"
+val parchmentVersion = "2025.12.20"
 // https://fabricmc.net/develop
-val loaderVersion = "0.16.14"
+val loaderVersion = "0.18.4"
 
 // buildscript
 plugins {
-	id("fabric-loom") version "1.11.+"
+	id("net.fabricmc.fabric-loom-remap") version "1.15.+"
 	id("maven-publish")
 }
 

gradle.properties

@@ -1,4 +1,4 @@
 org.gradle.jvmargs=-Xmx2G
 org.gradle.parallel=true
 org.gradle.caching=true
-org.gradle.configuration-cache=true
+#org.gradle.configuration-cache=true

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.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

src/main/java/one/devos/nautical/sheared/ShearedClient.java

@@ -4,7 +4,7 @@
 import org.slf4j.LoggerFactory;
 
 import net.fabricmc.api.ClientModInitializer;
-import net.minecraft.resources.ResourceLocation;
+import net.minecraft.resources.Identifier;
 
 public class ShearedClient implements ClientModInitializer {
 	public static final String ID = "sheared";
@@ -14,7 +14,7 @@ public class ShearedClient implements ClientModInitializer {
 	public void onInitializeClient() {
 	}
 
-	public static ResourceLocation id(String path) {
-		return ResourceLocation.fromNamespaceAndPath(ID, path);
+	public static Identifier id(String path) {
+		return Identifier.fromNamespaceAndPath(ID, path);
 	}
 }

src/main/java/one/devos/nautical/sheared/mixin/LivingEntityMixin.java

@@ -7,7 +7,7 @@
 
 import net.minecraft.util.Mth;
 import net.minecraft.world.entity.LivingEntity;
-import net.minecraft.world.entity.animal.Sheep;
+import net.minecraft.world.entity.animal.sheep.Sheep;
 import one.devos.nautical.sheared.mixinterface.SheepExtension;
 
 @Mixin(LivingEntity.class)

src/main/java/one/devos/nautical/sheared/mixin/LivingEntityRendererMixin.java

@@ -1,6 +1,7 @@
 package one.devos.nautical.sheared.mixin;
 
 import java.util.Random;
+import java.util.UUID;
 
 import org.joml.Matrix4f;
 import org.spongepowered.asm.mixin.Mixin;
@@ -12,42 +13,45 @@
 import com.mojang.blaze3d.vertex.PoseStack;
 
 import net.minecraft.client.renderer.entity.LivingEntityRenderer;
+import net.minecraft.client.renderer.entity.state.LivingEntityRenderState;
 import net.minecraft.util.Mth;
-import net.minecraft.world.entity.LivingEntity;
-import net.minecraft.world.entity.animal.Sheep;
-import one.devos.nautical.sheared.mixinterface.SheepExtension;
+import one.devos.nautical.sheared.mixinterface.SheepRenderStateExtension;
 
 @Mixin(LivingEntityRenderer.class)
 abstract class LivingEntityRendererMixin {
 	@Unique
 	private static final Random RANDOM = new Random();
 
 	@Inject(method = "setupRotations", at = @At("RETURN"))
-	private void onReturnSetupRotations(LivingEntity entity, PoseStack poseStack, float bob, float yBodyRot, float partialTick, float scale, CallbackInfo ci) {
-		if (!(entity instanceof Sheep sheep)) {
+	private void onReturnSetupRotations(LivingEntityRenderState renderState, PoseStack poseStack, float bodyRot, float scale, CallbackInfo ci) {
+		if (!(renderState instanceof SheepRenderStateExtension sheepRenderStateExt)) {
 			return;
 		}
 
-		long seed = entity.getUUID().getMostSignificantBits() ^ entity.getUUID().getLeastSignificantBits();
+		UUID uuid = sheepRenderStateExt.sheared$getUuid();
+
+		if (uuid == null) {
+			return;
+		}
+
+		long seed = uuid.getMostSignificantBits() ^ uuid.getLeastSignificantBits();
 		RANDOM.setSeed(seed);
 
 		if (RANDOM.nextInt(5) != 0) {
 			return;
 		}
 
-		SheepExtension extension = ((SheepExtension) sheep);
-		float shearProgress = extension.sheared$getShearProgress();
-		float shearProgressO = extension.sheared$getShearProgressO();
+		float shearProgress = sheepRenderStateExt.sheared$getShearProgress();
 
-		if (shearProgress <= Mth.EPSILON && shearProgressO <= Mth.EPSILON) {
+		if (shearProgress <= Mth.EPSILON) {
 			return;
 		}
 
 		float shearDirAngle = RANDOM.nextFloat(Mth.TWO_PI);
 		float shearDirX = Mth.cos(shearDirAngle);
 		float shearDirZ = Mth.sin(shearDirAngle);
 		float shearAmount = RANDOM.nextFloat(0.25f, 1.0f);
-		shearAmount *= Mth.lerp(partialTick, shearProgressO, shearProgress);
+		shearAmount *= shearProgress;
 
 		Matrix4f matrix = new Matrix4f();
 		matrix.m10(shearDirX * shearAmount);

src/main/java/one/devos/nautical/sheared/mixin/SheepMixin.java

@@ -3,7 +3,7 @@
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Unique;
 
-import net.minecraft.world.entity.animal.Sheep;
+import net.minecraft.world.entity.animal.sheep.Sheep;
 import one.devos.nautical.sheared.mixinterface.SheepExtension;
 
 @Mixin(Sheep.class)

src/main/java/one/devos/nautical/sheared/mixin/SheepRenderStateMixin.java

@@ -0,0 +1,41 @@
+package one.devos.nautical.sheared.mixin;
+
+import java.util.UUID;
+
+import org.jspecify.annotations.Nullable;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Unique;
+
+import net.minecraft.client.renderer.entity.state.SheepRenderState;
+import one.devos.nautical.sheared.mixinterface.SheepRenderStateExtension;
+
+@Mixin(SheepRenderState.class)
+abstract class SheepRenderStateMixin implements SheepRenderStateExtension {
+	@Unique
+	@Nullable
+	private UUID uuid;
+
+	@Unique
+	private float shearProgress;
+
+	@Override
+	@Nullable
+	public UUID sheared$getUuid() {
+		return uuid;
+	}
+
+	@Override
+	public float sheared$getShearProgress() {
+		return shearProgress;
+	}
+
+	@Override
+	public void sheared$setUuid(@Nullable UUID uuid) {
+		this.uuid = uuid;
+	}
+
+	@Override
+	public void sheared$setShearProgress(float shearProgress) {
+		this.shearProgress = shearProgress;
+	}
+}

src/main/java/one/devos/nautical/sheared/mixin/SheepRendererMixin.java

@@ -0,0 +1,27 @@
+package one.devos.nautical.sheared.mixin;
+
+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.callback.CallbackInfo;
+
+import net.minecraft.client.renderer.entity.SheepRenderer;
+import net.minecraft.client.renderer.entity.state.SheepRenderState;
+import net.minecraft.util.Mth;
+import net.minecraft.world.entity.animal.sheep.Sheep;
+import one.devos.nautical.sheared.mixinterface.SheepExtension;
+import one.devos.nautical.sheared.mixinterface.SheepRenderStateExtension;
+
+@Mixin(SheepRenderer.class)
+abstract class SheepRendererMixin {
+	@Inject(method = "extractRenderState", at = @At("RETURN"))
+	private void onReturnExtractRenderState(Sheep sheep, SheepRenderState renderState, float partialTick, CallbackInfo ci) {
+		SheepExtension extension = ((SheepExtension) sheep);
+		float shearProgress = extension.sheared$getShearProgress();
+		float shearProgressO = extension.sheared$getShearProgressO();
+
+		((SheepRenderStateExtension) renderState).sheared$setUuid(sheep.getUUID());
+		float stateShearProgress = Mth.lerp(partialTick, shearProgressO, shearProgress);
+		((SheepRenderStateExtension) renderState).sheared$setShearProgress(stateShearProgress);
+	}
+}

src/main/java/one/devos/nautical/sheared/mixinterface/SheepRenderStateExtension.java

@@ -0,0 +1,16 @@
+package one.devos.nautical.sheared.mixinterface;
+
+import java.util.UUID;
+
+import org.jspecify.annotations.Nullable;
+
+public interface SheepRenderStateExtension {
+	@Nullable
+	UUID sheared$getUuid();
+
+	float sheared$getShearProgress();
+
+	void sheared$setUuid(@Nullable UUID uuid);
+
+	void sheared$setShearProgress(float shearProgress);
+}