1.21.6 port

build.gradle

@@ -1,7 +1,7 @@
 //file:noinspection GroovyAssignabilityCheck
 plugins {
-    id "fabric-loom" version "1.7.+"
-    id "com.github.johnrengelman.shadow" version "7.1.+"
+    id "fabric-loom" version "1.10-SNAPSHOT"
+    id "com.gradleup.shadow" version "8.3.6"
     id "me.modmuss50.mod-publish-plugin" version "0.5.2"
 }
 
@@ -40,7 +40,7 @@ dependencies {
     ]
 
     apiModules.forEach {
-        include(modImplementation(fabricApi.module(it, project.fabric_api_version)))
+        modImplementation(fabricApi.module(it, project.fabric_api_version))
     }
 }
 

gradle.properties

@@ -2,21 +2,21 @@
 org.gradle.jvmargs = -Xmx1G
 
 # minecraft, mappings and loader dependencies
-# check these on https://modmuss50.me/fabric.html
-minecraft_version = 1.21.4
-quilt_mappings = 3
-loader_version = 0.16.10
-kaleido_config_version = 0.3.1+1.3.2
+# check these on https://fabricmc.net/develop/
+minecraft_version = 1.21.6
+quilt_mappings = 1
+loader_version = 0.16.14
+kaleido_config_version = 0.3.3+1.3.2
 
 # mod properties
-mod_version = 1.3.6+mc1.21.4
+mod_version = 1.3.8+mc1.21.6
 maven_group = rainglow
 archives_base_name = rainglow
 
 # other dependencies
 java_version = 21
-mod_menu_version = 13.0.0-beta.1
-fabric_api_version = 0.118.5+1.21.4
+mod_menu_version = 15.0.0-beta.3
+fabric_api_version = 0.127.1+1.21.6
 
 pub.should_publish = true
-pub.additional_versions = 1.21.4
+pub.additional_versions =

gradle/wrapper/gradle-wrapper.properties

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

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

@@ -92,6 +92,8 @@ public static RainglowColour generateRandomColour(World world, RandomGenerator r
     }
 
     public static boolean colourUnloaded(World world, RainglowEntity entityType, RainglowColour colour) {
+        if (colour == null) return true;
+
         var colours = MODE_CONFIG.getMode(world).getColours();
         return !colours.contains(colour) && colour != entityType.getDefaultColour();
     }

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

@@ -0,0 +1,6 @@
+package io.ix0rai.rainglow.data;
+
+public interface EntityVariantProvider {
+    RainglowColour rainglow$getVariant();
+    void rainglow$setVariant(RainglowColour colour);
+}

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

@@ -1,8 +1,8 @@
 package io.ix0rai.rainglow.data;
 
-import net.minecraft.entity.passive.PassiveEntity;
+import net.minecraft.entity.passive.AgingEntity;
 
-public class GlowSquidEntityData extends PassiveEntity.PassiveData {
+public class GlowSquidEntityData extends AgingEntity.Data {
 	private final RainglowColour colour;
 
 	public GlowSquidEntityData(RainglowColour colour) {

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

@@ -2,21 +2,21 @@
 
 import net.minecraft.client.particle.ItemBreakParticle;
 import net.minecraft.client.particle.Particle;
+import net.minecraft.client.render.item.ItemRenderState;
 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 CustomItemBreakParticle(ClientWorld world, double d, double e, double f, ItemRenderState itemRenderState) {
+            super(world, d, e, f, itemRenderState);
         }
     }
 
-    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);
+    public static Particle createItemBreakParticle(ClientWorld world, double d, double e, double f, ItemRenderState itemRenderState) {
+        return new CustomItemBreakParticle(world, d, e, f, itemRenderState);
     }
 }

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

@@ -7,11 +7,11 @@
 import net.minecraft.entity.passive.AllayEntity;
 import net.minecraft.entity.passive.GlowSquidEntity;
 import net.minecraft.item.Item;
-import net.minecraft.nbt.NbtCompound;
 import net.minecraft.network.PacketByteBuf;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.random.RandomGenerator;
 import net.minecraft.world.World;
+import net.minecraft.world.storage.DataReader;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.Arrays;
@@ -63,8 +63,8 @@ public Item getItem(int index) {
         return RainglowColour.values()[index].getItem();
     }
 
-    public RainglowColour readNbt(World world, NbtCompound nbt, RandomGenerator random) {
-        RainglowColour colour = RainglowColour.get(nbt.getString(Rainglow.CUSTOM_NBT_KEY));
+    public RainglowColour readData(World world, DataReader reader, RandomGenerator random) {
+        RainglowColour colour = RainglowColour.get(reader.readStringOrDefault(Rainglow.CUSTOM_NBT_KEY, null));
 
         if (Rainglow.colourUnloaded(world, this, colour)) {
             colour = Rainglow.generateRandomColour(world, random);
@@ -86,7 +86,6 @@ public static RainglowEntity get(String id) {
         return BY_ID.get(id);
     }
 
-    @SuppressWarnings("all")
     public static RainglowEntity get(Entity entity) {
         if (entity instanceof GlowSquidEntity) {
             return GLOW_SQUID;

src/main/java/io/ix0rai/rainglow/mixin/AllayEntityMixin.java

@@ -1,56 +1,57 @@
 package io.ix0rai.rainglow.mixin;
 
 import io.ix0rai.rainglow.Rainglow;
-import io.ix0rai.rainglow.data.AllayVariantProvider;
+import io.ix0rai.rainglow.data.EntityVariantProvider;
 import io.ix0rai.rainglow.data.RainglowColour;
 import io.ix0rai.rainglow.data.RainglowEntity;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityType;
 import net.minecraft.entity.passive.AllayEntity;
-import net.minecraft.nbt.NbtCompound;
 import net.minecraft.world.World;
+import net.minecraft.world.storage.DataReader;
+import net.minecraft.world.storage.DataWriter;
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.Redirect;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(AllayEntity.class)
-public abstract class AllayEntityMixin extends Entity implements AllayVariantProvider {
-    @Shadow public abstract void writeCustomDataToNbt(NbtCompound nbt);
-
+public abstract class AllayEntityMixin extends Entity implements EntityVariantProvider {
     protected AllayEntityMixin(EntityType<? extends AllayEntity> entityType, World world) {
         super(entityType, world);
         throw new UnsupportedOperationException();
     }
 
-    @Inject(method = "writeCustomDataToNbt", at = @At("TAIL"))
-    public void writeCustomDataToNbt(NbtCompound nbt, CallbackInfo ci) {
+    @Inject(method = "writeCustomData", at = @At("TAIL"))
+    public void writeCustomData(DataWriter writer, CallbackInfo ci) {
         RainglowColour colour = Rainglow.getColour(this.getUuid(), this.getWorld(), RainglowEntity.ALLAY);
-        nbt.putString(Rainglow.CUSTOM_NBT_KEY, colour.getId());
+        writer.writeString(Rainglow.CUSTOM_NBT_KEY, colour.getId());
     }
 
-    @Inject(method = "readCustomDataFromNbt", at = @At("TAIL"))
-    public void readCustomDataFromNbt(NbtCompound nbt, CallbackInfo ci) {
-        this.setVariant(RainglowEntity.ALLAY.readNbt(this.getWorld(), nbt, this.random));
+    @Inject(method = "readCustomData", at = @At("TAIL"))
+    public void readCustomData(DataReader reader, CallbackInfo ci) {
+        this.rainglow$setVariant(RainglowEntity.ALLAY.readData(this.getWorld(), reader, this.random));
     }
 
     // triggered when an allay duplicates, to apply the same colour as parent
     @Redirect(method = "duplicate", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/World;spawnEntity(Lnet/minecraft/entity/Entity;)Z"))
     public boolean spawnWithColour(World instance, Entity entity) {
         RainglowColour colour = Rainglow.getColour(this.getUuid(), this.getWorld(), RainglowEntity.ALLAY);
-        ((AllayVariantProvider) entity).setVariant(colour);
+        ((EntityVariantProvider) entity).rainglow$setVariant(colour);
         return this.getWorld().spawnEntity(entity);
     }
 
     @Override
-    public RainglowColour getVariant() {
+    @Unique
+    public RainglowColour rainglow$getVariant() {
         return Rainglow.getColour(this.getUuid(), this.getWorld(), RainglowEntity.ALLAY);
     }
 
     @Override
-    public void setVariant(RainglowColour colour) {
+    @Unique
+    public void rainglow$setVariant(RainglowColour colour) {
         Rainglow.setColour(this, colour);
     }
 }

src/main/java/io/ix0rai/rainglow/mixin/DyeItemMixin.java

@@ -31,7 +31,7 @@ private void useOnEntity(ItemStack stack, PlayerEntity user, LivingEntity entity
                     && !Rainglow.colourUnloaded(user.getWorld(), entityType, colour)
                     && Rainglow.CONFIG.isEntityEnabled(entityType)
                     && Rainglow.getColour(entity.getUuid(), entity.getWorld(), entityType) != colour) {
-                entity.getWorld().playSoundFromEntity(user, entity, SoundEvents.BLOCK_AMETHYST_CLUSTER_BREAK, SoundCategory.PLAYERS, 5.0f, 1.0f);
+                entity.getWorld().playSoundFromEntity(entity, SoundEvents.BLOCK_AMETHYST_CLUSTER_BREAK, SoundCategory.PLAYERS, 5.0f, 1.0f);
                 if (!user.getWorld().isClient()) {
                     stack.decrement(1);
                 }

src/main/java/io/ix0rai/rainglow/mixin/GlowSquidEntityMixin.java

@@ -1,40 +1,42 @@
 package io.ix0rai.rainglow.mixin;
 
 import io.ix0rai.rainglow.Rainglow;
+import io.ix0rai.rainglow.data.EntityVariantProvider;
 import io.ix0rai.rainglow.data.RainglowColour;
 import io.ix0rai.rainglow.data.RainglowEntity;
-import io.ix0rai.rainglow.data.GlowSquidVariantProvider;
 import net.minecraft.entity.EntityType;
 import net.minecraft.entity.passive.WaterCreatureEntity;
 import net.minecraft.entity.passive.GlowSquidEntity;
 import net.minecraft.entity.passive.SquidEntity;
-import net.minecraft.nbt.NbtCompound;
 import net.minecraft.particle.ParticleEffect;
 import net.minecraft.particle.ParticleTypes;
 import net.minecraft.server.world.ServerWorld;
 import net.minecraft.world.World;
+import net.minecraft.world.storage.DataReader;
+import net.minecraft.world.storage.DataWriter;
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.Redirect;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(GlowSquidEntity.class)
-public abstract class GlowSquidEntityMixin extends SquidEntity implements GlowSquidVariantProvider {
+public abstract class GlowSquidEntityMixin extends SquidEntity implements EntityVariantProvider {
     protected GlowSquidEntityMixin(EntityType<? extends SquidEntity> entityType, World world) {
         super(entityType, world);
         throw new UnsupportedOperationException();
     }
 
-    @Inject(method = "writeCustomDataToNbt", at = @At("TAIL"))
-    public void writeCustomDataToNbt(NbtCompound nbt, CallbackInfo ci) {
+    @Inject(method = "writeCustomData", at = @At("TAIL"))
+    public void writeCustomData(DataWriter writer, CallbackInfo ci) {
         RainglowColour colour = Rainglow.getColour(this.getUuid(), this.getWorld(), RainglowEntity.GLOW_SQUID);
-        nbt.putString(Rainglow.CUSTOM_NBT_KEY, colour.getId());
+        writer.writeString(Rainglow.CUSTOM_NBT_KEY, colour.getId());
     }
 
-    @Inject(method = "readCustomDataFromNbt", at = @At("TAIL"))
-    public void readCustomDataFromNbt(NbtCompound nbt, CallbackInfo ci) {
-        this.setVariant(RainglowEntity.GLOW_SQUID.readNbt(this.getWorld(), nbt, this.random));
+    @Inject(method = "readCustomData", at = @At("TAIL"))
+    public void readCustomData(DataReader reader, CallbackInfo ci) {
+        this.rainglow$setVariant(RainglowEntity.GLOW_SQUID.readData(this.getWorld(), reader, this.random));
     }
 
     /**
@@ -53,12 +55,14 @@ public void tickMovement(CallbackInfo ci) {
     }
 
     @Override
-    public RainglowColour getVariant() {
+    @Unique
+    public RainglowColour rainglow$getVariant() {
         return Rainglow.getColour(this.getUuid(), this.getWorld(), RainglowEntity.GLOW_SQUID);
     }
 
     @Override
-    public void setVariant(RainglowColour colour) {
+    @Unique
+    public void rainglow$setVariant(RainglowColour colour) {
         Rainglow.setColour(this, colour);
     }