Skip to content

Commit 89f8e1e

Browse files
orifuorifu
committed
1.21.6 port
1 parent 79a1e8b commit 89f8e1e

File tree

7 files changed

+36
-36
lines changed

7 files changed

+36
-36
lines changed

‎gradle.properties‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,20 @@ org.gradle.jvmargs = -Xmx1G
33

44
# minecraft, mappings and loader dependencies
55
# check these on https://fabricmc.net/develop/
6-
minecraft_version = 1.21.5
7-
quilt_mappings = 7
6+
minecraft_version = 1.21.6
7+
quilt_mappings = 1
88
loader_version = 0.16.14
99
kaleido_config_version = 0.3.3+1.3.2
1010

1111
# mod properties
12-
mod_version = 1.3.7+mc1.21.5
12+
mod_version = 1.3.8+mc1.21.6
1313
maven_group = rainglow
1414
archives_base_name = rainglow
1515

1616
# other dependencies
1717
java_version = 21
18-
mod_menu_version = 14.0.0-rc.2
19-
fabric_api_version = 0.127.1+1.21.5
18+
mod_menu_version = 15.0.0-beta.3
19+
fabric_api_version = 0.127.1+1.21.6
2020

2121
pub.should_publish = true
2222
pub.additional_versions =

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package io.ix0rai.rainglow.data;
22

3-
import net.minecraft.entity.passive.PassiveEntity;
3+
import net.minecraft.entity.passive.AgingEntity;
44

5-
public class GlowSquidEntityData extends PassiveEntity.PassiveData {
5+
public class GlowSquidEntityData extends AgingEntity.Data {
66
private final RainglowColour colour;
77

88
public GlowSquidEntityData(RainglowColour colour) {

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
import net.minecraft.entity.passive.AllayEntity;
88
import net.minecraft.entity.passive.GlowSquidEntity;
99
import net.minecraft.item.Item;
10-
import net.minecraft.nbt.NbtCompound;
1110
import net.minecraft.network.PacketByteBuf;
1211
import net.minecraft.util.Identifier;
1312
import net.minecraft.util.random.RandomGenerator;
1413
import net.minecraft.world.World;
14+
import net.minecraft.world.storage.DataReader;
1515
import org.jetbrains.annotations.Nullable;
1616

1717
import java.util.Arrays;
@@ -63,8 +63,8 @@ public Item getItem(int index) {
6363
return RainglowColour.values()[index].getItem();
6464
}
6565

66-
public RainglowColour readNbt(World world, NbtCompound nbt, RandomGenerator random) {
67-
RainglowColour colour = RainglowColour.get(nbt.method_68564(Rainglow.CUSTOM_NBT_KEY, null));
66+
public RainglowColour readData(World world, DataReader reader, RandomGenerator random) {
67+
RainglowColour colour = RainglowColour.get(reader.readStringOrDefault(Rainglow.CUSTOM_NBT_KEY, null));
6868

6969
if (Rainglow.colourUnloaded(world, this, colour)) {
7070
colour = Rainglow.generateRandomColour(world, random);

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

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
import net.minecraft.entity.Entity;
88
import net.minecraft.entity.EntityType;
99
import net.minecraft.entity.passive.AllayEntity;
10-
import net.minecraft.nbt.NbtCompound;
1110
import net.minecraft.world.World;
11+
import net.minecraft.world.storage.DataReader;
12+
import net.minecraft.world.storage.DataWriter;
1213
import org.spongepowered.asm.mixin.Mixin;
13-
import org.spongepowered.asm.mixin.Shadow;
1414
import org.spongepowered.asm.mixin.Unique;
1515
import org.spongepowered.asm.mixin.injection.At;
1616
import org.spongepowered.asm.mixin.injection.Inject;
@@ -19,22 +19,20 @@
1919

2020
@Mixin(AllayEntity.class)
2121
public abstract class AllayEntityMixin extends Entity implements EntityVariantProvider {
22-
@Shadow public abstract void writeCustomDataToNbt(NbtCompound nbt);
23-
2422
protected AllayEntityMixin(EntityType<? extends AllayEntity> entityType, World world) {
2523
super(entityType, world);
2624
throw new UnsupportedOperationException();
2725
}
2826

29-
@Inject(method = "writeCustomDataToNbt", at = @At("TAIL"))
30-
public void writeCustomDataToNbt(NbtCompound nbt, CallbackInfo ci) {
27+
@Inject(method = "writeCustomData", at = @At("TAIL"))
28+
public void writeCustomData(DataWriter writer, CallbackInfo ci) {
3129
RainglowColour colour = Rainglow.getColour(this.getUuid(), this.getWorld(), RainglowEntity.ALLAY);
32-
nbt.putString(Rainglow.CUSTOM_NBT_KEY, colour.getId());
30+
writer.writeString(Rainglow.CUSTOM_NBT_KEY, colour.getId());
3331
}
3432

35-
@Inject(method = "readCustomDataFromNbt", at = @At("TAIL"))
36-
public void readCustomDataFromNbt(NbtCompound nbt, CallbackInfo ci) {
37-
this.rainglow$setVariant(RainglowEntity.ALLAY.readNbt(this.getWorld(), nbt, this.random));
33+
@Inject(method = "readCustomData", at = @At("TAIL"))
34+
public void readCustomData(DataReader reader, CallbackInfo ci) {
35+
this.rainglow$setVariant(RainglowEntity.ALLAY.readData(this.getWorld(), reader, this.random));
3836
}
3937

4038
// triggered when an allay duplicates, to apply the same colour as parent

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

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,12 @@
88
import net.minecraft.entity.passive.WaterCreatureEntity;
99
import net.minecraft.entity.passive.GlowSquidEntity;
1010
import net.minecraft.entity.passive.SquidEntity;
11-
import net.minecraft.nbt.NbtCompound;
1211
import net.minecraft.particle.ParticleEffect;
1312
import net.minecraft.particle.ParticleTypes;
1413
import net.minecraft.server.world.ServerWorld;
1514
import net.minecraft.world.World;
15+
import net.minecraft.world.storage.DataReader;
16+
import net.minecraft.world.storage.DataWriter;
1617
import org.spongepowered.asm.mixin.Mixin;
1718
import org.spongepowered.asm.mixin.Unique;
1819
import org.spongepowered.asm.mixin.injection.At;
@@ -27,15 +28,15 @@ protected GlowSquidEntityMixin(EntityType<? extends SquidEntity> entityType, Wor
2728
throw new UnsupportedOperationException();
2829
}
2930

30-
@Inject(method = "writeCustomDataToNbt", at = @At("TAIL"))
31-
public void writeCustomDataToNbt(NbtCompound nbt, CallbackInfo ci) {
31+
@Inject(method = "writeCustomData", at = @At("TAIL"))
32+
public void writeCustomData(DataWriter writer, CallbackInfo ci) {
3233
RainglowColour colour = Rainglow.getColour(this.getUuid(), this.getWorld(), RainglowEntity.GLOW_SQUID);
33-
nbt.putString(Rainglow.CUSTOM_NBT_KEY, colour.getId());
34+
writer.writeString(Rainglow.CUSTOM_NBT_KEY, colour.getId());
3435
}
3536

36-
@Inject(method = "readCustomDataFromNbt", at = @At("TAIL"))
37-
public void readCustomDataFromNbt(NbtCompound nbt, CallbackInfo ci) {
38-
this.rainglow$setVariant(RainglowEntity.GLOW_SQUID.readNbt(this.getWorld(), nbt, this.random));
37+
@Inject(method = "readCustomData", at = @At("TAIL"))
38+
public void readCustomData(DataReader reader, CallbackInfo ci) {
39+
this.rainglow$setVariant(RainglowEntity.GLOW_SQUID.readData(this.getWorld(), reader, this.random));
3940
}
4041

4142
/**

‎src/main/java/io/ix0rai/rainglow/mixin/SlimeEntityMixin.java‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,12 @@
66
import io.ix0rai.rainglow.data.RainglowEntity;
77
import net.minecraft.entity.*;
88
import net.minecraft.entity.mob.SlimeEntity;
9-
import net.minecraft.nbt.NbtCompound;
109
import net.minecraft.particle.ParticleEffect;
1110
import net.minecraft.scoreboard.Team;
1211
import net.minecraft.util.math.MathHelper;
1312
import net.minecraft.world.World;
13+
import net.minecraft.world.storage.DataReader;
14+
import net.minecraft.world.storage.DataWriter;
1415
import org.spongepowered.asm.mixin.Mixin;
1516
import org.spongepowered.asm.mixin.Shadow;
1617
import org.spongepowered.asm.mixin.Unique;
@@ -29,15 +30,15 @@ protected SlimeEntityMixin(EntityType<? extends SlimeEntity> entityType, World w
2930
throw new UnsupportedOperationException();
3031
}
3132

32-
@Inject(method = "writeCustomDataToNbt", at = @At("TAIL"))
33-
public void writeCustomDataToNbt(NbtCompound nbt, CallbackInfo ci) {
33+
@Inject(method = "writeCustomData", at = @At("TAIL"))
34+
public void writeCustomData(DataWriter writer, CallbackInfo ci) {
3435
RainglowColour colour = Rainglow.getColour(this.getUuid(), this.getWorld(), RainglowEntity.SLIME);
35-
nbt.putString(Rainglow.CUSTOM_NBT_KEY, colour.getId());
36+
writer.writeString(Rainglow.CUSTOM_NBT_KEY, colour.getId());
3637
}
3738

38-
@Inject(method = "readCustomDataFromNbt", at = @At("TAIL"))
39-
public void readCustomDataFromNbt(NbtCompound nbt, CallbackInfo ci) {
40-
this.rainglow$setVariant(RainglowEntity.SLIME.readNbt(this.getWorld(), nbt, this.random));
39+
@Inject(method = "readCustomData", at = @At("TAIL"))
40+
public void readCustomData(DataReader reader, CallbackInfo ci) {
41+
this.rainglow$setVariant(RainglowEntity.SLIME.readData(this.getWorld(), reader, this.random));
4142
}
4243

4344
/**
@@ -66,7 +67,7 @@ private void preserveColorOnSplit(Entity.RemovalReason reason, CallbackInfo ci)
6667
//noinspection unchecked
6768
thisSlime.convert((EntityType<SlimeEntity>) thisSlime.getType(), new EntityConversionParameters(EntityConversionType.SPLIT_ON_DEATH, false, false, team), SpawnReason.TRIGGERED, (newSlime) -> {
6869
newSlime.setSize(newSize, true);
69-
newSlime.setPosAndAngles(thisSlime.getX() + offsetX, thisSlime.getY() + 0.5, thisSlime.getZ() + offsetZ, thisSlime.getRandom().nextFloat() * 360.0F, 0.0F);
70+
newSlime.refreshPositionAndAngles(thisSlime.getX() + offsetX, thisSlime.getY() + 0.5, thisSlime.getZ() + offsetZ, thisSlime.getRandom().nextFloat() * 360.0F, 0.0F);
7071

7172
// Now that headache is done, finally set the child slime color to match the parent
7273
((EntityVariantProvider) newSlime).rainglow$setVariant(parentColor);

‎src/main/resources/fabric.mod.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
"fabricloader": ">=0.16.7",
4141
"fabric-resource-loader-v0": "*",
4242
"fabric-networking-api-v1": "*",
43-
"minecraft": "1.21.5"
43+
"minecraft": "1.21.6"
4444
},
4545

4646
"suggests": {

0 commit comments

Comments
 (0)