Update to 1.21.2-1.21.4

Author: Ampflower

gradle.properties

@@ -1,15 +1,15 @@
 # Project Specifics
-projectVersion=0.9.3
+projectVersion=0.9.4
 modrinthId=G9eJHDO2
 
 # Minecraft
-minecraftVersion=1.21.1
-minecraftRequired=>=1.20.5- <1.21.2
-minecraftCompatible=1.20.5,1.20.6,1.21,1.21.1
-yarnMappings=1.21.1+build.1
-loaderVersion=0.15.11
-fabricApiVersion=0.115.4+1.21.1
-polymerVersion=0.9.4+1.21
+minecraftVersion=1.21.2
+minecraftRequired=>=1.21.2- <1.21.5
+minecraftCompatible=1.21.2,1.21.3,1.21.4
+yarnMappings=1.21.2+build.1
+loaderVersion=0.16.10
+fabricApiVersion=0.106.1+1.21.2
+polymerVersion=0.10.0+1.21.2
 
 # Plugins
 systemProp.loomVersion=1.10.+

src/main/java/gay/ampflower/polysit/Main.java

@@ -28,10 +28,13 @@
 import net.minecraft.entity.SpawnGroup;
 import net.minecraft.registry.Registries;
 import net.minecraft.registry.Registry;
+import net.minecraft.registry.RegistryKey;
+import net.minecraft.registry.RegistryKeys;
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.text.Text;
 import net.minecraft.util.ActionResult;
 import net.minecraft.util.Hand;
+import net.minecraft.util.Identifier;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Direction;
 import net.minecraft.util.math.MathHelper;
@@ -325,8 +328,9 @@ public static ActionResult sit(World world, Entity entity, double seatX, double
 	}
 
 	public static <T extends Entity> EntityType<T> registerEntity(String id, EntityType.Builder<T> type) {
-		var built = type.build(id);
-		Registry.register(Registries.ENTITY_TYPE, id, built);
+		final var identifier = Identifier.of(id);
+		final var built = type.build(RegistryKey.of(RegistryKeys.ENTITY_TYPE, identifier));
+		Registry.register(Registries.ENTITY_TYPE, identifier, built);
 		PolymerEntityUtils.registerType(built);
 		return built;
 	}

src/main/java/gay/ampflower/polysit/SeatEntity.java

@@ -15,10 +15,13 @@
 import net.minecraft.entity.data.DataTracker;
 import net.minecraft.nbt.NbtCompound;
 import net.minecraft.network.packet.s2c.play.EntityAttributesS2CPacket;
-import net.minecraft.network.packet.s2c.play.EntitySpawnS2CPacket;
+import net.minecraft.registry.tag.DamageTypeTags;
 import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.server.world.ServerWorld;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
+import org.jetbrains.annotations.Nullable;
+import xyz.nucleoid.packettweaker.PacketContext;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -45,7 +48,7 @@
  **/
 public class SeatEntity extends Entity implements PolymerEntity {
 	private static final EntityAttributeInstance MAX_HEALTH_NULL = new EntityAttributeInstance(
-			EntityAttributes.GENERIC_MAX_HEALTH, discard -> {
+			EntityAttributes.MAX_HEALTH, discard -> {
 			});
 	private static final Collection<EntityAttributeInstance> MAX_HEALTH_NULL_SINGLE = Collections
 			.singleton(MAX_HEALTH_NULL);
@@ -72,7 +75,7 @@ public SeatEntity(World world, double x, double y, double z) {
 	 * at a block.
 	 */
 	@Override
-	public EntityType<?> getPolymerEntityType(ServerPlayerEntity player) {
+	public EntityType<?> getPolymerEntityType(final PacketContext context) {
 		return EntityType.ARMOR_STAND;
 	}
 
@@ -154,15 +157,21 @@ public void tick() {
 	}
 
 	@Override
-	public boolean damage(final DamageSource source, final float amount) {
-		if (isInvulnerableTo(source)) {
+	public boolean damage(final ServerWorld world, final DamageSource source, final float amount) {
+		if (!source.isSourceCreativePlayer() && !source.isIn(DamageTypeTags.BYPASSES_INVULNERABILITY)) {
 			return false;
 		}
 
 		this.remove(RemovalReason.KILLED);
 		return true;
 	}
 
+	@Override
+	public void onExplodedBy(@Nullable final Entity entity) {
+		// Allows the seat to be destroyed by TNT.
+		this.remove(RemovalReason.KILLED);
+	}
+
 	protected boolean isDiscardable() {
 		return this.getWorld().getBlockState(getAdjustedPos()).isAir();
 	}

src/main/java/gay/ampflower/polysit/mixin/MixinServerPlayerEntity.java

@@ -7,15 +7,22 @@
 package gay.ampflower.polysit.mixin;
 
 import com.mojang.authlib.GameProfile;
+import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.entity.player.PlayerPosition;
+import net.minecraft.network.packet.s2c.play.EntityPassengersSetS2CPacket;
+import net.minecraft.network.packet.s2c.play.PositionFlag;
+import net.minecraft.server.network.ServerPlayNetworkHandler;
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Vec3d;
 import net.minecraft.world.World;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 /**
  * Forcefully teleports the player on dismount.
@@ -27,6 +34,9 @@
  **/
 @Mixin(ServerPlayerEntity.class)
 public abstract class MixinServerPlayerEntity extends PlayerEntity {
+	@Shadow
+	public ServerPlayNetworkHandler networkHandler;
+
 	@Shadow
 	public abstract void requestTeleport(final double destX, final double destY, final double destZ);
 
@@ -42,6 +52,19 @@ public MixinServerPlayerEntity(final World world, final BlockPos pos, final floa
 	 */
 	@Inject(method = "requestTeleportAndDismount", at = @At("RETURN"))
 	private void onDismount(double x, double y, double z, CallbackInfo ci) {
-		this.requestTeleport(x, y, z);
+		// Modified requestTeleport for also sending the current velocity.
+		// Enforces that the client can't just shove the player because there's a block
+		// edge to go to.
+		this.networkHandler.requestTeleport(new PlayerPosition(new Vec3d(x, y, z), this.getVelocity(), 0.F, 0.F),
+				PositionFlag.ROT);
+	}
+
+	/**
+	 * Forces a passenger update packet to the player, removing the chance for the
+	 * client to assert movement.
+	 */
+	@Inject(method = "startRiding", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/network/ServerPlayNetworkHandler;requestTeleport(Lnet/minecraft/entity/player/PlayerPosition;Ljava/util/Set;)V"))
+	private void onMount(Entity vehicle, boolean force, CallbackInfoReturnable<Boolean> ci) {
+		this.networkHandler.sendPacket(new EntityPassengersSetS2CPacket(vehicle));
 	}
 }