Update to 1.21.11

Author: 56738

.github/workflows/build.yml

@@ -21,7 +21,7 @@ jobs:
           name: Package
           path: build/libs/*.jar
       - name: Update description
-        if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }}
+        if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
         run: ./gradlew modrinthSyncBody
         env:
           MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }}

CHANGELOG.md

@@ -0,0 +1 @@
+* Updated to 1.21.11

build.gradle.kts

@@ -9,7 +9,7 @@ plugins {
 }
 
 group = "me.m56738"
-version = "1.21.10-v2-SNAPSHOT"
+version = "1.21.11-v1-SNAPSHOT"
 
 dependencies {
     minecraft(libs.minecraft)

gradle/libs.versions.toml

@@ -1,10 +1,10 @@
 [versions]
 curseforgegradle = "1.1.28"
-minecraft = "1.21.10"
+minecraft = "1.21.11"
 minotaur = "2.8.10"
-fabric-loader = "0.17.3"
-fabric-api = "0.136.0+1.21.10"
-fabric-loom = "1.12-SNAPSHOT"
+fabric-loader = "0.18.1"
+fabric-api = "0.139.4+1.21.11"
+fabric-loom = "1.14-SNAPSHOT"
 
 [libraries]
 minecraft = { module = "com.mojang:minecraft", version.ref = "minecraft" }

gradle/wrapper/gradle-wrapper.jar

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

gradle/wrapper/gradle-wrapper.properties

@@ -28,6 +28,10 @@ public boolean isActive() {
         return isNotIdentity(previous) || isNotIdentity(lerp) || isNotIdentity(target);
     }
 
+    public void set(Rotations angle) {
+        set(angle, 3);
+    }
+
     public void set(Rotations angle, int ticks) {
         targetEuler = angle;
         target.rotationZYX(

src/main/java/me/m56738/smoothcoasters/AnimatedPose.java

@@ -3,7 +3,5 @@
 import net.minecraft.client.renderer.entity.state.ArmorStandRenderState;
 
 public interface ArmorStandMixinInterface {
-    void smoothcoasters$setTicks(int ticks);
-
     void smoothcoasters$animate(ArmorStandRenderState renderState, float time);
 }

src/main/java/me/m56738/smoothcoasters/ArmorStandMixinInterface.java

@@ -1,5 +1,6 @@
 package me.m56738.smoothcoasters;
 
+import com.mojang.blaze3d.platform.InputConstants;
 import me.m56738.smoothcoasters.implementation.Implementation;
 import me.m56738.smoothcoasters.network.EntityPropertiesPayload;
 import me.m56738.smoothcoasters.network.EntityRotationPayload;
@@ -18,27 +19,29 @@
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.components.debug.DebugScreenEntries;
 import net.minecraft.network.chat.Component;
-import net.minecraft.resources.ResourceLocation;
+import net.minecraft.resources.Identifier;
 import org.joml.Quaternionf;
 import org.joml.Quaternionfc;
+import org.jspecify.annotations.Nullable;
 import org.lwjgl.glfw.GLFW;
-import com.mojang.blaze3d.platform.InputConstants;
+
 import java.util.NoSuchElementException;
+import java.util.Objects;
 
 public class SmoothCoasters implements ClientModInitializer {
-    private static final ResourceLocation HANDSHAKE = ResourceLocation.fromNamespaceAndPath("smoothcoasters", "hs");
-    private static final KeyMapping.Category CAMERA = KeyMapping.Category.register(ResourceLocation.fromNamespaceAndPath("smoothcoasters", "camera"));
+    private static final Identifier HANDSHAKE = Identifier.fromNamespaceAndPath("smoothcoasters", "hs");
+    private static final KeyMapping.Category CAMERA = KeyMapping.Category.register(Identifier.fromNamespaceAndPath("smoothcoasters", "camera"));
     private static final Quaternionf IDENTITY = new Quaternionf();
-    private static SmoothCoasters instance;
-    private Implementation currentImplementation;
-    private String version;
-    private KeyMapping toggleBinding;
+    private static @Nullable SmoothCoasters instance;
+    private @Nullable Implementation currentImplementation;
+    private @Nullable String version;
+    private @Nullable KeyMapping toggleBinding;
 
     public static SmoothCoasters getInstance() {
-        return instance;
+        return Objects.requireNonNull(instance);
     }
 
-    public String getVersion() {
+    public @Nullable String getVersion() {
         return version;
     }
 
@@ -88,27 +91,27 @@ public void onInitializeClient() {
             }
         });
 
-        DebugScreenEntries.register(ResourceLocation.fromNamespaceAndPath("smoothcoasters", "version"), new SmoothCoastersDebugHudEntry());
+        DebugScreenEntries.register(Identifier.fromNamespaceAndPath("smoothcoasters", "version"), new SmoothCoastersDebugHudEntry());
     }
 
     private void handleHandshake(HandshakePayload payload, ClientPlayNetworking.Context context) {
         context.client().execute(() -> performHandshake(payload.versions()));
     }
 
-    private void setCurrentImplementation(Implementation implementation) {
+    private void setCurrentImplementation(@Nullable Implementation implementation) {
         if (currentImplementation != null) {
             currentImplementation.unregister();
         }
 
         currentImplementation = implementation;
 
-        if (currentImplementation != null) {
+        if (currentImplementation != null && version != null) {
             ClientPlayNetworking.send(new HandshakeResponsePayload(currentImplementation.getVersion(), version));
             currentImplementation.register();
         }
     }
 
-    private Implementation findImplementation(byte[] offeredVersions) {
+    private @Nullable Implementation findImplementation(byte[] offeredVersions) {
         for (Implementation implementation : Implementation.IMPLEMENTATIONS) {
             byte version = implementation.getVersion();
             for (byte offeredVersion : offeredVersions) {

src/main/java/me/m56738/smoothcoasters/SmoothCoasters.java

@@ -0,0 +1,4 @@
+@NullMarked
+package me.m56738.smoothcoasters.implementation;
+
+import org.jspecify.annotations.NullMarked;