Update to 1.21.5

Author: Ampflower

gradle.properties

@@ -1,15 +1,15 @@
 # Project Specifics
-projectVersion=0.8.4
+projectVersion=0.8.5
 modrinthId=G9eJHDO2
 
 # Minecraft
-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
+minecraftVersion=1.21.5
+minecraftRequired=>=1.21.5-
+minecraftCompatible=1.21.5
+yarnMappings=1.21.5+build.1
 loaderVersion=0.16.10
-fabricApiVersion=0.106.1+1.21.2
-polymerVersion=0.10.0+1.21.2
+fabricApiVersion=0.119.6+1.21.5
+polymerVersion=0.12.1+1.21.5-rc2
 
 # Plugins
 systemProp.loomVersion=1.10.+

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

@@ -273,7 +273,8 @@ public static ActionResult sit(@NotNull final World world, @NotNull final BlockS
 
 				// Set the spawn point for the player as one would expect.
 				if (head != null) {
-					player.setSpawnPoint(world.getRegistryKey(), head, player.getYaw(), false, true);
+					player.setSpawnPoint(
+							new ServerPlayerEntity.Respawn(world.getRegistryKey(), head, player.getYaw(), false), true);
 				}
 			}
 

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

@@ -104,7 +104,7 @@ protected void initDataTracker(final DataTracker.Builder builder) {
 	@Override
 	protected void readCustomDataFromNbt(NbtCompound nbt) {
 		// Avoids setting position on entity init
-		final var version = nbt.getInt(Main.VERSION_TAG_NAME);
+		final var version = nbt.getInt(Main.VERSION_TAG_NAME, 0);
 		if (version != Main.RUNTIME_VERSION) {
 			this.setPos(this.getX(), this.getY() + Main.delta(version), this.getZ());
 			// Required to suppress the packet
@@ -127,20 +127,6 @@ public boolean shouldSave() {
 		return hasPassengers();
 	}
 
-	/** Discard self when passengers are dismounted. */
-	@Override
-	public void removeAllPassengers() {
-		super.removeAllPassengers();
-		discard();
-	}
-
-	/** Discard self when the passenger is dismounted. */
-	@Override
-	protected void removePassenger(Entity passenger) {
-		super.removePassenger(passenger);
-		discard();
-	}
-
 	/**
 	 * Automatic cleanup and syncing yaw with the passenger.
 	 */

src/main/java/gay/ampflower/polysit/internal/HackEntity.java

@@ -0,0 +1,23 @@
+/* Copyright 2025 Ampflower
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+package gay.ampflower.polysit.internal;
+
+import net.minecraft.util.math.Vec3d;
+import org.jetbrains.annotations.ApiStatus;
+
+/**
+ * The code equivalent of a bodge wire.
+ *
+ * @author Ampflower
+ * @since 0.8.5
+ **/
+@ApiStatus.Internal
+public interface HackEntity {
+	/** Delegates to player's handling. No-op */
+	default void polysit$requestTeleportOnDismount(Vec3d position, Vec3d velocity) {
+	}
+}

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

@@ -0,0 +1,31 @@
+/* Copyright 2025 Ampflower
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+package gay.ampflower.polysit.mixin;
+
+import gay.ampflower.polysit.internal.HackEntity;
+import net.minecraft.entity.Entity;
+import net.minecraft.util.math.Vec3d;
+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;
+
+/**
+ * @author Ampflower
+ * @since 0.8.5
+ **/
+@Mixin(Entity.class)
+class MixinEntity implements HackEntity {
+	@Shadow
+	public native Vec3d getVelocity();
+
+	@Inject(method = "requestTeleportAndDismount", at = @At("RETURN"))
+	private void onDismount(double x, double y, double z, CallbackInfo ci) {
+		this.polysit$requestTeleportOnDismount(new Vec3d(x, y, z), this.getVelocity());
+	}
+}

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

@@ -6,23 +6,15 @@
 
 package gay.ampflower.polysit.mixin;
 
-import com.mojang.authlib.GameProfile;
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.player.PlayerEntity;
+import gay.ampflower.polysit.internal.HackEntity;
 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.jetbrains.annotations.ApiStatus;
 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.
@@ -33,38 +25,19 @@
  * @since 0.3.1
  **/
 @Mixin(ServerPlayerEntity.class)
-public abstract class MixinServerPlayerEntity extends PlayerEntity {
+public abstract class MixinServerPlayerEntity implements HackEntity {
 	@Shadow
 	public ServerPlayNetworkHandler networkHandler;
 
-	@Shadow
-	public abstract void requestTeleport(final double destX, final double destY, final double destZ);
-
-	public MixinServerPlayerEntity(final World world, final BlockPos pos, final float yaw,
-			final GameProfile gameProfile) {
-		super(world, pos, yaw, gameProfile);
-	}
-
 	/**
-	 * Forces a teleport packet, which for some reason is not sent.
+	 * 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.
 	 *
-	 * Blame Mojang for this one's existence.
-	 */
-	@Inject(method = "requestTeleportAndDismount", at = @At("RETURN"))
-	private void onDismount(double x, double y, double z, CallbackInfo ci) {
-		// 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.
+	 * @since 0.8.5
 	 */
-	@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));
+	@Override
+	@ApiStatus.Internal
+	public void polysit$requestTeleportOnDismount(final Vec3d position, final Vec3d velocity) {
+		this.networkHandler.requestTeleport(new PlayerPosition(position, velocity, 0.F, 0.F), PositionFlag.ROT);
 	}
 }

src/main/resources/polysit.mixin.json

@@ -5,6 +5,7 @@
   "mixins": [
     "AccessorEntity",
     "AccessorLivingEntity",
+    "MixinEntity",
     "MixinEntityTypeBootstrap",
     "MixinLivingEntity",
     "MixinServerPlayerEntity"