Update to 1.21.9 (#71)

Author: DrexHD

build.gradle

@@ -1,15 +1,14 @@
 plugins {
-  id 'fabric-loom' version '1.10.+'
+  id 'fabric-loom' version '1.11.+'
   id 'maven-publish'
 }
 
-sourceCompatibility = JavaVersion.VERSION_21
-targetCompatibility = JavaVersion.VERSION_21
-
-archivesBaseName = project.archives_base_name
 version = project.mod_version + "+" + project.minecraft_version
 group = project.maven_group
 
+base {
+  archivesName = project.archives_base_name
+}
 
 sourceSets {
   testmod {
@@ -65,6 +64,9 @@ tasks.withType(JavaCompile).configureEach {
 
 java {
   withSourcesJar()
+
+  sourceCompatibility = JavaVersion.VERSION_21
+  targetCompatibility = JavaVersion.VERSION_21
 }
 
 jar {

gradle.properties

@@ -3,14 +3,14 @@ org.gradle.jvmargs=-Xmx2G
 
 # Fabric Properties
 
-minecraft_version=1.21.5
-yarn_mappings=1.21.5+build.1
-loader_version=0.16.13
+minecraft_version=1.21.9
+yarn_mappings=1.21.9+build.1
+loader_version=0.17.2
 
 # Mod Properties
 mod_version=0.6.7
 maven_group=xyz.nucleoid
 archives_base_name=fantasy
 
 # Dependencies
-fabric_version=0.119.2+1.21.5
+fabric_version=0.133.14+1.21.9

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

settings.gradle

@@ -1,6 +1,5 @@
 pluginManagement {
   repositories {
-    jcenter()
     maven {
       name = 'Fabric'
       url = 'https://maven.fabricmc.net/'

src/main/java/xyz/nucleoid/fantasy/Fantasy.java

@@ -14,6 +14,7 @@
 import net.minecraft.util.math.Vec3d;
 import net.minecraft.world.TeleportTarget;
 import net.minecraft.world.World;
+import net.minecraft.world.WorldProperties;
 import net.minecraft.world.dimension.DimensionType;
 import net.minecraft.world.level.storage.LevelStorage;
 import org.apache.commons.io.FileUtils;
@@ -223,16 +224,15 @@ private void kickPlayers(ServerWorld world) {
             return;
         }
 
-        ServerWorld overworld = this.server.getOverworld();
-        BlockPos spawnPos = overworld.getSpawnPos();
-        float spawnAngle = overworld.getSpawnAngle();
+        ServerWorld spawnWorld = this.server.getSpawnWorld();
+        WorldProperties.SpawnPoint spawnPoint = this.server.getSpawnPoint();
 
         List<ServerPlayerEntity> players = new ArrayList<>(world.getPlayers());
 
-        Vec3d pos = new Vec3d(spawnPos.getX() + 0.5, spawnPos.getY(), spawnPos.getZ() + 0.5);
-        TeleportTarget target = new TeleportTarget(overworld, pos, Vec3d.ZERO, spawnAngle, 0.0F, TeleportTarget.NO_OP);
-
         for (ServerPlayerEntity player : players) {
+            Vec3d pos = player.getWorldSpawnPos(spawnWorld, spawnPoint.getPos()).toBottomCenterPos();
+            TeleportTarget target = new TeleportTarget(spawnWorld, pos, Vec3d.ZERO, spawnPoint.yaw(), spawnPoint.pitch(), TeleportTarget.NO_OP);
+
             player.teleportTo(target);
         }
     }

src/main/java/xyz/nucleoid/fantasy/RuntimeWorld.java

@@ -3,7 +3,6 @@
 import com.google.common.collect.ImmutableList;
 import net.minecraft.registry.RegistryKey;
 import net.minecraft.server.MinecraftServer;
-import net.minecraft.server.WorldGenerationProgressListener;
 import net.minecraft.server.world.ServerWorld;
 import net.minecraft.util.ProgressListener;
 import net.minecraft.util.Util;
@@ -17,7 +16,6 @@
 import net.minecraft.world.spawner.SpecialSpawner;
 import org.jetbrains.annotations.Nullable;
 import xyz.nucleoid.fantasy.mixin.MinecraftServerAccess;
-import xyz.nucleoid.fantasy.util.VoidWorldProgressListener;
 
 import java.util.List;
 import java.util.concurrent.Executor;
@@ -32,7 +30,6 @@ protected RuntimeWorld(MinecraftServer server, RegistryKey<World> registryKey, R
                 new RuntimeWorldProperties(server.getSaveProperties(), config),
                 registryKey,
                 config.createDimensionOptions(server),
-                config.getWorldGenerationProgressListener(),
                 false,
                 BiomeAccess.hashSeed(config.getSeed()),
                 ImmutableList.of(),
@@ -43,8 +40,8 @@ protected RuntimeWorld(MinecraftServer server, RegistryKey<World> registryKey, R
         this.flat = config.isFlat().orElse(super.isFlat());
     }
 
-    protected RuntimeWorld(MinecraftServer server, Executor workerExecutor, LevelStorage.Session session, ServerWorldProperties properties, RegistryKey<World> worldKey, DimensionOptions dimensionOptions, WorldGenerationProgressListener worldGenerationProgressListener, boolean debugWorld, long seed, List<SpecialSpawner> spawners, boolean shouldTickTime, @Nullable RandomSequencesState randomSequencesState, Style style) {
-        super(server, workerExecutor, session, properties, worldKey, dimensionOptions, worldGenerationProgressListener, debugWorld, seed, spawners, shouldTickTime, randomSequencesState);
+    protected RuntimeWorld(MinecraftServer server, Executor workerExecutor, LevelStorage.Session session, ServerWorldProperties properties, RegistryKey<World> worldKey, DimensionOptions dimensionOptions, boolean debugWorld, long seed, List<SpecialSpawner> spawners, boolean shouldTickTime, @Nullable RandomSequencesState randomSequencesState, Style style) {
+        super(server, workerExecutor, session, properties, worldKey, dimensionOptions, debugWorld, seed, spawners, shouldTickTime, randomSequencesState);
         this.style = style;
     }
 

src/main/java/xyz/nucleoid/fantasy/RuntimeWorldConfig.java

@@ -6,15 +6,13 @@
 import net.minecraft.registry.RegistryKeys;
 import net.minecraft.registry.entry.RegistryEntry;
 import net.minecraft.server.MinecraftServer;
-import net.minecraft.server.WorldGenerationProgressListener;
 import net.minecraft.world.Difficulty;
 import net.minecraft.world.GameRules;
 import net.minecraft.world.dimension.DimensionOptions;
 import net.minecraft.world.dimension.DimensionType;
 import net.minecraft.world.gen.chunk.ChunkGenerator;
 import org.jetbrains.annotations.Nullable;
 import xyz.nucleoid.fantasy.util.GameRuleStore;
-import xyz.nucleoid.fantasy.util.VoidWorldProgressListener;
 
 /**
  * A configuration describing how a runtime world should be constructed. This includes properties such as the dimension
@@ -34,7 +32,6 @@ public final class RuntimeWorldConfig {
     private boolean mirrorOverworldGameRules = false;
     private boolean mirrorOverworldDifficulty = false;
     private RuntimeWorld.Constructor worldConstructor = RuntimeWorld::new;
-    private WorldGenerationProgressListener worldGenerationProgressListener = VoidWorldProgressListener.INSTANCE;
 
     private int sunnyTime = Integer.MAX_VALUE;
     private boolean raining;
@@ -405,12 +402,4 @@ public boolean isThundering() {
     public TriState isFlat() {
         return this.flat;
     }
-
-    public WorldGenerationProgressListener getWorldGenerationProgressListener() {
-        return this.worldGenerationProgressListener;
-    }
-
-    public void setWorldGenerationProgressListener(WorldGenerationProgressListener listener) {
-        this.worldGenerationProgressListener = listener;
-    }
 }