1.21.4 port (#39)

* port work

* Full working update with 1.21.4 (and 3 maybe)

* Update build.yml

* fix crash when spawning new entity

* fix a cast exception on glow squids

* eliminate really unsafe getColour method

* bump version

---------

Co-authored-by: A5ho9999 <a5ho9999.gamer@gmail.com>
Co-authored-by: A5ho9999 <46066364+A5ho9999@users.noreply.github.com>

Author: eristhea

.github/workflows/build.yml

@@ -7,9 +7,9 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: set up JDK 21
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
           java-version: '21'
@@ -18,7 +18,7 @@ jobs:
       - name: build with gradle
         run: ./gradlew build
       - name: capture build artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: artifacts
           path: build/libs/

build.gradle

@@ -1,5 +1,6 @@
+//file:noinspection GroovyAssignabilityCheck
 plugins {
-    id "fabric-loom" version "1.6.+"
+    id "fabric-loom" version "1.7.+"
     id "com.github.johnrengelman.shadow" version "7.1.+"
     id "me.modmuss50.mod-publish-plugin" version "0.5.2"
 }

gradle.properties

@@ -1,22 +1,22 @@
 # increase gradle memory
-org.gradle.jvmargs=-Xmx1G
+org.gradle.jvmargs = -Xmx1G
 
 # minecraft, mappings and loader dependencies
 # check these on https://modmuss50.me/fabric.html
-minecraft_version=1.21.1
-quilt_mappings=2
-loader_version=0.15.11
-kaleido_config_version=0.3.1+1.3.2
+minecraft_version = 1.21.4
+quilt_mappings = 3
+loader_version = 0.16.10
+kaleido_config_version = 0.3.1+1.3.2
 
 # mod properties
-mod_version=1.3.5+mc1.21.1
-maven_group=rainglow
-archives_base_name=rainglow
+mod_version = 1.3.6+mc1.21.4
+maven_group = rainglow
+archives_base_name = rainglow
 
 # other dependencies
-java_version=21
-mod_menu_version=11.0.1
-fabric_api_version=0.102.0+1.21.1
+java_version = 21
+mod_menu_version = 13.0.0-beta.1
+fabric_api_version = 0.118.5+1.21.4
 
 pub.should_publish = true
-pub.additional_versions = 1.21
+pub.additional_versions = 1.21.4

gradle/wrapper/gradle-wrapper.properties

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

src/main/java/io/ix0rai/rainglow/Rainglow.java

@@ -8,6 +8,7 @@
 import io.ix0rai.rainglow.config.RainglowConfig;
 import io.ix0rai.rainglow.data.*;
 import net.fabricmc.api.ModInitializer;
+import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents;
 import net.fabricmc.fabric.api.networking.v1.PayloadTypeRegistry;
 import net.fabricmc.fabric.api.networking.v1.ServerPlayConnectionEvents;
 import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking;
@@ -71,8 +72,14 @@ public void onInitialize() {
         });
 
         ServerPlayConnectionEvents.DISCONNECT.register((handler, server) -> {
-            COLOURS.clear();
+            // Only clear colours on disconnect if server is NOT single-player to prevent NBT save failure (Unsure how this works with Lan-instances)
+            if (!server.isSingleplayer()) {
+                COLOURS.clear();
+            }
         });
+
+        // Instead use SERVER_STOPPED for clearing colours from single-player worlds. (Doesn't affect others because mod would most likely be shutdown in non-single-player instances)
+        ServerLifecycleEvents.SERVER_STOPPED.register(server -> COLOURS.clear());
     }
 
     public static Identifier id(String id) {
@@ -102,15 +109,14 @@ public static Text translatableText(String key) {
         return Text.translatable(translatableTextKey(key));
     }
 
-    public static RainglowColour getColour(Entity entity) {
-        RainglowColour colour = COLOURS.get(entity.getUuid());
-        RainglowEntity entityType = RainglowEntity.get(entity);
+    public static RainglowColour getColour(UUID uuid, World world, RainglowEntity type) {
+        RainglowColour colour = COLOURS.get(uuid);
 
         // generate random colour if the squid's colour isn't currently loaded
-        if (colourUnloaded(entity.getWorld(), entityType, colour)) {
+        if (colourUnloaded(world, type, colour)) {
             // Use last generated colour if not null else generate a new colour
-            colour = generateRandomColour(entity.getWorld(), entity.getRandom());
-            COLOURS.put(entity.getUuid(), colour);
+            colour = generateRandomColour(world, world.getRandom());
+            COLOURS.put(uuid, colour);
         }
 
         return colour;

src/main/java/io/ix0rai/rainglow/config/CustomModeScreen.java

@@ -111,7 +111,7 @@ protected void repositionElements() {
 
 	private static void sendNoColoursToast() {
 		Toast toast = new SystemToast(SystemToast.Id.PACK_LOAD_FAILURE, Rainglow.translatableText("config.no_custom_colours"), Rainglow.translatableText("config.no_custom_colours_description"));
-		MinecraftClient.getInstance().getToastManager().add(toast);
+		MinecraftClient.getInstance().method_1566().method_1999(toast);
 	}
 
 	@Override

src/main/java/io/ix0rai/rainglow/data/EntityRenderStateTracker.java

@@ -0,0 +1,23 @@
+package io.ix0rai.rainglow.data;
+
+import net.minecraft.entity.Entity;
+
+import java.util.UUID;
+
+/**
+ * @author A5ho9999
+ * Interface to track entity data in render states
+ */
+public interface EntityRenderStateTracker {
+    /**
+     * Set the associated entity
+     * @param entity The entity to associate with this render state
+     */
+    void rainglow$setEntity(Entity entity);
+
+    /**
+     * Get the associated entity UUID
+     * @return The UUID of the associated entity, or null if not set
+     */
+    UUID rainglow$getEntityUuid();
+}

src/main/java/io/ix0rai/rainglow/data/GlowSquidEntityData.java

@@ -1,6 +1,17 @@
 package io.ix0rai.rainglow.data;
 
-import net.minecraft.entity.EntityData;
+import net.minecraft.entity.passive.PassiveEntity;
 
-public record GlowSquidEntityData(RainglowColour colour) implements EntityData {
+public class GlowSquidEntityData extends PassiveEntity.PassiveData {
+	private final RainglowColour colour;
+
+	public GlowSquidEntityData(RainglowColour colour) {
+		// copied from SquidEntity#initialize. as far as i can tell we have to duplicate this constant
+		super(0.05F);
+		this.colour = colour;
+	}
+
+	public  RainglowColour getColour() {
+		return colour;
+	}
 }

src/main/java/io/ix0rai/rainglow/data/ParticleHelper.java

@@ -0,0 +1,22 @@
+package io.ix0rai.rainglow.data;
+
+import net.minecraft.client.particle.ItemBreakParticle;
+import net.minecraft.client.particle.Particle;
+import net.minecraft.client.world.ClientWorld;
+import net.minecraft.unmapped.C_hvackyip;
+
+/**
+ * @author A5ho9999
+ * Helper for creating particles because Mojang likes to torture everyone
+ */
+public class ParticleHelper {
+    public static class CustomItemBreakParticle extends ItemBreakParticle {
+        public CustomItemBreakParticle(ClientWorld world, double d, double e, double f, C_hvackyip c_hvackyip) {
+            super(world, d, e, f, c_hvackyip);
+        }
+    }
+
+    public static Particle createItemBreakParticle(ClientWorld world, double d, double e, double f, C_hvackyip c_hvackyip) {
+        return new CustomItemBreakParticle(world, d, e, f, c_hvackyip);
+    }
+}

src/main/java/io/ix0rai/rainglow/data/RainglowEntity.java

@@ -13,10 +13,10 @@
 import net.minecraft.util.random.RandomGenerator;
 import net.minecraft.world.World;
 import org.jetbrains.annotations.Nullable;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 import java.util.Arrays;
 import java.util.HashMap;
+import java.util.UUID;
 import java.util.function.Function;
 
 public enum RainglowEntity {
@@ -99,14 +99,18 @@ public static RainglowEntity get(Entity entity) {
         return null;
     }
 
-    public void overrideTexture(Entity entity, CallbackInfoReturnable<Identifier> cir) {
-        RainglowColour colour = Rainglow.getColour(entity);
+    @Nullable
+    public Identifier overrideTexture(UUID uuid, World world) {
+        RainglowColour colour = Rainglow.getColour(uuid, world, this);
+
+        // Returning null will just use default texture, no need for extra checks
 
         // if the colour is default we don't need to override the method
         // this optimises a tiny bit
         if (Rainglow.CONFIG.isEntityEnabled(this) && colour != this.getDefaultColour()) {
-            Identifier texture = colour.getTexture(this);
-            cir.setReturnValue(texture != null ? texture : this.getDefaultTexture());
+            return colour.getTexture(this);
         }
+
+        return null;
     }
 }