Update to 1.21 (#51)

Co-authored-by: LCLP <[email protected]>
NucleoidMC · Jun 16, 2024 · 6c22614 · 6c22614
1 parent c8dd252
commit 6c22614
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 22 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -3,14 +3,14 @@ org.gradle.jvmargs=-Xmx2G
 
 # Fabric Properties
 
-minecraft_version=1.20.6
-yarn_mappings=1.20.6+build.1
-loader_version=0.15.10
+minecraft_version=1.21
+yarn_mappings=1.21+build.1
+loader_version=0.15.11
 
 # Mod Properties
 mod_version=0.6.2
 maven_group=xyz.nucleoid
 archives_base_name=fantasy
 
 # Dependencies
-fabric_version=0.97.8+1.20.6
+fabric_version=0.100.1+1.21
diff --git a/src/main/java/xyz/nucleoid/fantasy/Fantasy.java b/src/main/java/xyz/nucleoid/fantasy/Fantasy.java
@@ -37,7 +37,7 @@
 public final class Fantasy {
     public static final Logger LOGGER = LogManager.getLogger(Fantasy.class);
     public static final String ID = "fantasy";
-    public static final RegistryKey<DimensionType> DEFAULT_DIM_TYPE = RegistryKey.of(RegistryKeys.DIMENSION_TYPE, new Identifier(Fantasy.ID, "default"));
+    public static final RegistryKey<DimensionType> DEFAULT_DIM_TYPE = RegistryKey.of(RegistryKeys.DIMENSION_TYPE, Identifier.of(Fantasy.ID, "default"));
 
     private static Fantasy instance;
 
@@ -249,6 +249,6 @@ private List<RuntimeWorld> collectTemporaryWorlds() {
 
     private static Identifier generateTemporaryWorldKey() {
         String key = RandomStringUtils.random(16, "abcdefghijklmnopqrstuvwxyz0123456789");
-        return new Identifier(Fantasy.ID, key);
+        return Identifier.of(Fantasy.ID, key);
     }
 }
diff --git a/src/main/java/xyz/nucleoid/fantasy/FantasyInitializer.java b/src/main/java/xyz/nucleoid/fantasy/FantasyInitializer.java
@@ -10,7 +10,7 @@
 public final class FantasyInitializer implements ModInitializer {
     @Override
     public void onInitialize() {
-        Registry.register(Registries.CHUNK_GENERATOR, new Identifier(Fantasy.ID, "void"), VoidChunkGenerator.CODEC);
-        Registry.register(Registries.CHUNK_GENERATOR, new Identifier(Fantasy.ID, "transient"), TransientChunkGenerator.CODEC);
+        Registry.register(Registries.CHUNK_GENERATOR, Identifier.of(Fantasy.ID, "void"), VoidChunkGenerator.CODEC);
+        Registry.register(Registries.CHUNK_GENERATOR, Identifier.of(Fantasy.ID, "transient"), TransientChunkGenerator.CODEC);
     }
 }
diff --git a/...mixin/ThreadedAnvilChunkStorageMixin.java → ...mixin/ServerChunkLoadingManagerMixin.java b/...mixin/ThreadedAnvilChunkStorageMixin.java → ...mixin/ServerChunkLoadingManagerMixin.java
@@ -2,22 +2,20 @@
 
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
-import net.minecraft.server.world.ThreadedAnvilChunkStorage;
+import com.llamalad7.mixinextras.sugar.Local;
+import net.minecraft.server.world.ServerChunkLoadingManager;
 import net.minecraft.world.gen.chunk.ChunkGenerator;
 import net.minecraft.world.gen.chunk.ChunkGeneratorSettings;
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 import xyz.nucleoid.fantasy.util.ChunkGeneratorSettingsProvider;
 
-@Mixin(ThreadedAnvilChunkStorage.class)
-public class ThreadedAnvilChunkStorageMixin {
-    @Shadow
-    private ChunkGenerator chunkGenerator;
+@Mixin(ServerChunkLoadingManager.class)
+public class ServerChunkLoadingManagerMixin {
 
     @WrapOperation(method = "<init>", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/gen/chunk/ChunkGeneratorSettings;createMissingSettings()Lnet/minecraft/world/gen/chunk/ChunkGeneratorSettings;"))
-    private ChunkGeneratorSettings fantasy$useProvidedChunkGeneratorSettings(Operation<ChunkGeneratorSettings> original) {
-        if (this.chunkGenerator instanceof ChunkGeneratorSettingsProvider provider) {
+    private ChunkGeneratorSettings fantasy$useProvidedChunkGeneratorSettings(Operation<ChunkGeneratorSettings> original, @Local(argsOnly = true) ChunkGenerator chunkGenerator) {
+    	if (chunkGenerator instanceof ChunkGeneratorSettingsProvider provider) {
             ChunkGeneratorSettings settings = provider.getSettings();
             if (settings != null) return settings;
         }

diff --git a/src/main/java/xyz/nucleoid/fantasy/util/VoidChunkGenerator.java b/src/main/java/xyz/nucleoid/fantasy/util/VoidChunkGenerator.java
@@ -140,7 +140,7 @@ public void addStructureReferences(StructureWorldAccess world, StructureAccessor
     }
 
     @Override
-    public CompletableFuture<Chunk> populateNoise(Executor executor, Blender blender, NoiseConfig noiseConfig, StructureAccessor structureAccessor, Chunk chunk) {
+    public CompletableFuture<Chunk> populateNoise(Blender blender, NoiseConfig noiseConfig, StructureAccessor structureAccessor, Chunk chunk) {
         return CompletableFuture.completedFuture(chunk);
     }
 

diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
@@ -20,7 +20,7 @@
   },
   "depends": {
     "fabricloader": ">=0.15.10",
-    "minecraft": "1.20.6",
+    "minecraft": ">=1.21-",
     "fabric-api": "*",
     "java": ">=21"
   }

diff --git a/src/main/resources/fantasy.accesswidener b/src/main/resources/fantasy.accesswidener
@@ -1,5 +1,5 @@
 accessWidener v1 named
 
-accessible class net/minecraft/server/world/ThreadedAnvilChunkStorage$EntityTracker
+accessible class net/minecraft/server/world/ServerChunkLoadingManager$EntityTracker
 
 accessible field net/minecraft/world/GameRules$IntRule value I
diff --git a/src/main/resources/fantasy.mixins.json b/src/main/resources/fantasy.mixins.json
@@ -8,7 +8,7 @@
     "MinecraftServerMixin",
     "ServerChunkManagerMixin",
     "ServerWorldMixin",
-    "ThreadedAnvilChunkStorageMixin",
+    "ServerChunkLoadingManagerMixin",
     "registry.DimensionOptionsMixin",
     "registry.SimpleRegistryMixin",
     "registry.WorldGenSettingsMixin"

diff --git a/src/testmod/java/xyz/nucleoid/fantasy/test/FantasyInitializer.java b/src/testmod/java/xyz/nucleoid/fantasy/test/FantasyInitializer.java
@@ -3,7 +3,6 @@
 import com.mojang.logging.LogUtils;
 import net.fabricmc.api.ModInitializer;
 import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback;
-import net.fabricmc.fabric.api.dimension.v1.FabricDimensions;
 import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents;
 import net.minecraft.command.argument.IdentifierArgumentType;
 import net.minecraft.registry.RegistryKeys;
@@ -68,7 +67,7 @@ public void onInitialize() {
 
                                     ref.t = System.currentTimeMillis();
                                     if (source.getEntity() != null) {
-                                        FabricDimensions.teleport(source.getEntity(), x.asWorld(), new TeleportTarget(new Vec3d(0, 100, 0), Vec3d.ZERO, 0, 0));
+                                        source.getEntity().teleportTo(new TeleportTarget(x.asWorld(), new Vec3d(0, 100, 0), Vec3d.ZERO, 0, 0, TeleportTarget.NO_OP));
                                     }
 
                                     source.sendFeedback(() -> Text.literal("Teleport: " + (System.currentTimeMillis() - ref.t)), false);