diff --git a/gradle.properties b/gradle.properties index 95ff9731..e1435648 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,10 +4,10 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check these on https://fabricmc.net/use # or better: https://modmuss50.me/fabric.html - minecraft_version=21w08a - yarn_mappings=21w08a+build.1 + minecraft_version=21w08b + yarn_mappings=21w08b+build.17 loader_version=0.11.2 - fabric_version=0.31.1+1.17 + fabric_version=0.31.2+1.17 # Mod Properties mod_version = 1.4.28 diff --git a/src/main/java/carpet/mixins/ServerChunkManagerMixin.java b/src/main/java/carpet/mixins/ServerChunkManagerMixin.java index c8bfcd21..3f2edb09 100644 --- a/src/main/java/carpet/mixins/ServerChunkManagerMixin.java +++ b/src/main/java/carpet/mixins/ServerChunkManagerMixin.java @@ -77,7 +77,7 @@ public abstract class ServerChunkManagerMixin implements ServerChunkManagerInter int spawnTries = SpawnReporter.spawn_tries.get(cat); if (!SpawnReporter.local_spawns.containsKey(cat)) { - if (!cat.isAnimal() || boolean_3) + if (!cat.isRare() || boolean_3) // isAnimal { // fill mobcaps for that category so spawn got cancelled SpawnReporter.spawn_ticks_full.put(key, diff --git a/src/main/java/carpet/mixins/SpawnHelperMixin.java b/src/main/java/carpet/mixins/SpawnHelperMixin.java index b4d5100d..61347721 100644 --- a/src/main/java/carpet/mixins/SpawnHelperMixin.java +++ b/src/main/java/carpet/mixins/SpawnHelperMixin.java @@ -279,7 +279,7 @@ public class SpawnHelperMixin for(int var8 = 0; var8 < var7; ++var8) { SpawnGroup entityCategory = var6[var8]; - if ((spawnAnimals || !entityCategory.isPeaceful()) && (spawnMonsters || entityCategory.isPeaceful()) && (shouldSpawnAnimals || !entityCategory.isAnimal()) ) + if ((spawnAnimals || !entityCategory.isPeaceful()) && (spawnMonsters || entityCategory.isPeaceful()) && (shouldSpawnAnimals || !entityCategory.isRare()) ) { RegistryKey dim = world.getRegistryKey(); // getDimensionType; int newCap = (int) ((double)entityCategory.getCapacity()*(Math.pow(2.0,(SpawnReporter.mobcap_exponent/4)))); diff --git a/src/main/java/carpet/patches/EntityPlayerMPFake.java b/src/main/java/carpet/patches/EntityPlayerMPFake.java index 895eca83..c682d437 100644 --- a/src/main/java/carpet/patches/EntityPlayerMPFake.java +++ b/src/main/java/carpet/patches/EntityPlayerMPFake.java @@ -75,7 +75,7 @@ public class EntityPlayerMPFake extends ServerPlayerEntity server.getPlayerManager().sendToDimension(new EntitySetHeadYawS2CPacket(playerShadow, (byte) (player.headYaw * 256 / 360)), playerShadow.world.getRegistryKey()); - server.getPlayerManager().sendToAll(new PlayerListS2CPacket(PlayerListS2CPacket.class_5893.field_29136, playerShadow)); + server.getPlayerManager().sendToAll(new PlayerListS2CPacket(PlayerListS2CPacket.class_5893.ADD_PLAYER, playerShadow)); player.getServerWorld().getChunkManager().updateCameraPosition(playerShadow); return playerShadow; } diff --git a/src/main/java/carpet/script/api/Auxiliary.java b/src/main/java/carpet/script/api/Auxiliary.java index fb2f5160..2fcfee47 100644 --- a/src/main/java/carpet/script/api/Auxiliary.java +++ b/src/main/java/carpet/script/api/Auxiliary.java @@ -36,11 +36,6 @@ import carpet.script.value.Value; import carpet.script.value.ValueConversions; import carpet.utils.Messenger; import net.minecraft.block.BlockState; -import net.minecraft.class_5888; -import net.minecraft.class_5894; -import net.minecraft.class_5903; -import net.minecraft.class_5904; -import net.minecraft.class_5905; import net.minecraft.command.DataCommandStorage; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityType; @@ -53,9 +48,14 @@ import net.minecraft.nbt.NbtHelper; import net.minecraft.nbt.StringTag; import net.minecraft.nbt.Tag; import net.minecraft.network.Packet; +import net.minecraft.network.packet.s2c.play.ClearTitleS2CPacket; +import net.minecraft.network.packet.s2c.play.OverlayMessageS2CPacket; import net.minecraft.network.packet.s2c.play.PlaySoundIdS2CPacket; //import net.minecraft.network.packet.s2c.play.TitleS2CPacket; //import net.minecraft.network.packet.s2c.play.TitleS2CPacket.Action; +import net.minecraft.network.packet.s2c.play.SubtitleS2CPacket; +import net.minecraft.network.packet.s2c.play.TitleFadeS2CPacket; +import net.minecraft.network.packet.s2c.play.TitleS2CPacket; import net.minecraft.particle.ParticleEffect; import net.minecraft.server.MinecraftServer; import net.minecraft.server.command.ServerCommandSource; @@ -520,28 +520,28 @@ public class Auxiliary { switch (lv.get(1).evalValue(c).getString().toLowerCase(Locale.ROOT)) { case "title": - packetGetter = (x) -> new class_5904(x); + packetGetter = TitleS2CPacket::new; //action = Action.TITLE; if (lv.size() < 3) throw new InternalExpressionException("Third argument of 'display_title' must be present except for 'clear' type"); break; case "subtitle": - packetGetter = (x) -> new class_5903(x); + packetGetter = SubtitleS2CPacket::new; if (lv.size() < 3) throw new InternalExpressionException("Third argument of 'display_title' must be present except for 'clear' type"); //action = Action.SUBTITLE; break; case "actionbar": - packetGetter = (x) -> new class_5894(x); + packetGetter = OverlayMessageS2CPacket::new; if (lv.size() < 3) throw new InternalExpressionException("Third argument of 'display_title' must be present except for 'clear' type"); //action = Action.ACTIONBAR; break; case "clear": - packetGetter = (x) -> new class_5888(true); // resetting default fade + packetGetter = (x) -> new ClearTitleS2CPacket(true); // resetting default fade //action = Action.CLEAR; break; default: @@ -558,13 +558,13 @@ public class Auxiliary { else title = new LiteralText(pVal.getString()); } - class_5905 timesPacket; // TimesPacket + TitleFadeS2CPacket timesPacket; // TimesPacket if (lv.size() > 3) { int in = NumericValue.asNumber(lv.get(3).evalValue(c),"fade in for display_title" ).getInt(); int stay = NumericValue.asNumber(lv.get(4).evalValue(c),"stay for display_title" ).getInt(); int out = NumericValue.asNumber(lv.get(5).evalValue(c),"fade out for display_title" ).getInt(); - timesPacket = new class_5905(in, stay, out); + timesPacket = new TitleFadeS2CPacket(in, stay, out); //timesPacket = new TitleS2CPacket(Action.TIMES, null, in, stay, out); } else timesPacket = null;