Update to 1.20.5-1.21.1

Author: Ampflower

.github/workflows/build.yml

@@ -18,7 +18,7 @@ jobs:
       - uses: actions/setup-java@v4
         with:
           distribution: temurin
-          java-version: 17
+          java-version: 21
       - name: Build with Gradle
         run: ./gradlew build
       - name: Upload build artifacts

.github/workflows/publish.yml

@@ -14,7 +14,7 @@ jobs:
       - uses: actions/setup-java@v4
         with:
           distribution: temurin
-          java-version: 17
+          java-version: 21
       - name: Build and publish with Gradle
         run: ./gradlew modrinth publish
         env:

gradle.properties

@@ -1,15 +1,15 @@
 # Project Specifics
-projectVersion=0.9.2
+projectVersion=0.9.3
 modrinthId=G9eJHDO2
 
 # Minecraft
-minecraftVersion=1.20.4
-minecraftRequired=>=1.20.2- <1.20.5
-minecraftCompatible=1.20.2,1.20.3,1.20.4
-yarnMappings=1.20.4+build.3
-loaderVersion=0.16.10
-fabricApiVersion=0.97.2+1.20.4
-polymerVersion=0.7.10+1.20.4
+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
 
 # Plugins
 systemProp.loomVersion=1.10.+

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

@@ -78,7 +78,7 @@ public static EntityDimensions smallest(EntityDimensions... dimensions) {
 
 		for (int i = 1; i < dimensions.length; i++) {
 			final var comparison = dimensions[i];
-			if (comparison.height < min.height && comparison.width <= min.width) {
+			if (comparison.height() < min.height() && comparison.width() <= min.width()) {
 				min = comparison;
 			}
 		}
@@ -96,7 +96,7 @@ private static EntityPose largest(final Entity entity, final double maxHeight, E
 		EntityPose fittingPose = null;
 
 		for (final var pose : poses) {
-			final var poseHeight = entity.getDimensions(pose).height;
+			final var poseHeight = entity.getDimensions(pose).height();
 			if (poseHeight < maxHeight && poseHeight > height) {
 				height = poseHeight;
 				fittingPose = pose;
@@ -137,7 +137,7 @@ private static double getEffectiveSittingHeight(final Entity entity, final Entit
 		// Pehkui workaround - requires a vehicle to get the correct offset.
 		// As the seat in question is the vehicle, it'll always be correct.
 		accessor.setVehicle(seat);
-		final double height = entity.getHeight() + entity.getRidingOffset(seat);
+		final double height = entity.getHeight() - entity.getVehicleAttachmentPos(seat).getY();
 		accessor.setVehicle(prevVehicle);
 		entity.setPose(prevPose);
 

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

@@ -109,7 +109,7 @@ private static double sum(double[] array, int from, int to) {
 
 	/** Seat entity type. Disallows manual summoning, makes fire immune. */
 	public static EntityType<SeatEntity> SEAT = registerEntity("polysit:seat",
-			EntityType.Builder.<SeatEntity>create(SeatEntity::new, SpawnGroup.MISC).setDimensions(0, 0)
+			EntityType.Builder.<SeatEntity>create(SeatEntity::new, SpawnGroup.MISC).dimensions(0, 0)
 					.maxTrackingRange(10).disableSummon().makeFireImmune());
 
 	/**

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

@@ -14,8 +14,6 @@
 import net.minecraft.entity.damage.DamageSource;
 import net.minecraft.entity.data.DataTracker;
 import net.minecraft.nbt.NbtCompound;
-import net.minecraft.network.listener.ClientPlayPacketListener;
-import net.minecraft.network.packet.Packet;
 import net.minecraft.network.packet.s2c.play.EntityAttributesS2CPacket;
 import net.minecraft.network.packet.s2c.play.EntitySpawnS2CPacket;
 import net.minecraft.server.network.ServerPlayerEntity;
@@ -97,7 +95,7 @@ public void modifyRawTrackedData(List<DataTracker.SerializedEntry<?>> data, Serv
 	}
 
 	@Override
-	protected void initDataTracker() {
+	protected void initDataTracker(final DataTracker.Builder builder) {
 	}
 
 	@Override
@@ -172,9 +170,4 @@ protected boolean isDiscardable() {
 	private BlockPos getAdjustedPos() {
 		return Main.blockPosOfFloored(getPos().add(0, Main.VERTICAL_CHECK_OFFSET, 0));
 	}
-
-	@Override
-	public Packet<ClientPlayPacketListener> createSpawnPacket() {
-		return new EntitySpawnS2CPacket(this);
-	}
 }