diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index 320387ef1..ab2ad60e9 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -28,7 +28,7 @@ object Versions { } object Fabric { - const val fabricAPI = "0.129.0+${Mod.minecraft}" + const val fabricAPI = "0.133.14+${Mod.minecraft}" const val cloud = "2.0.0-beta.11" } // @@ -41,12 +41,12 @@ object Versions { const val mixin = "0.15.5+mixin.0.8.7" const val mixinExtras = "0.4.1" - const val minecraft = "1.21.8" + const val minecraft = "1.21.9" const val yarn = "$minecraft+build.1" - const val fabricLoader = "0.16.14" + const val fabricLoader = "0.17.2" - const val architecuryLoom = "1.10.431" - const val architecturyPlugin = "3.4.161" + const val architecuryLoom = "1.11.440" + const val architecturyPlugin = "3.4.162" } // @@ -56,13 +56,14 @@ object Versions { // } object Bukkit { - const val minecraft = "1.21.8-R0.1" - const val paperBuild = "$minecraft-20250717.233435-4" + const val minecraft = "1.21.9-rc1-R0.1" + const val paperBuild = "$minecraft-20250930.133904-13" const val paper = paperBuild const val paperLib = "1.0.8" const val reflectionRemapper = "0.1.2" const val paperDevBundle = paperBuild const val runPaper = "2.3.1" + const val runPaperMinecraft = "1.21.9" const val paperWeight = "2.0.0-beta.17" const val cloud = "2.0.0-beta.11" const val multiverse = "5.0.2" diff --git a/platforms/bukkit/build.gradle.kts b/platforms/bukkit/build.gradle.kts index 7abb48183..bfbae612f 100644 --- a/platforms/bukkit/build.gradle.kts +++ b/platforms/bukkit/build.gradle.kts @@ -8,7 +8,7 @@ dependencies { paperweight.paperDevBundle(Versions.Bukkit.paperDevBundle) shaded(project(":platforms:bukkit:common")) - shaded(project(":platforms:bukkit:nms:v1_21_8")) + shaded(project(":platforms:bukkit:nms:v1_21_9")) shaded("xyz.jpenilla", "reflection-remapper", Versions.Bukkit.reflectionRemapper) } @@ -27,7 +27,7 @@ tasks { } runServer { - minecraftVersion(Versions.Bukkit.minecraft) + minecraftVersion(Versions.Bukkit.runPaperMinecraft) dependsOn(shadowJar) pluginJars(shadowJar.get().archiveFile) diff --git a/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/BukkitCommandSender.java b/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/BukkitCommandSender.java deleted file mode 100644 index 3f7cfd696..000000000 --- a/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/BukkitCommandSender.java +++ /dev/null @@ -1,62 +0,0 @@ -/* - * This file is part of Terra. - * - * Terra is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Terra is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Terra. If not, see . - */ - -package com.dfsek.terra.bukkit; - -import org.bukkit.ChatColor; - -import java.util.Optional; - -import com.dfsek.terra.api.command.CommandSender; -import com.dfsek.terra.api.entity.Entity; -import com.dfsek.terra.api.entity.Player; -import com.dfsek.terra.bukkit.world.BukkitAdapter; - - -public class BukkitCommandSender implements CommandSender { - private final org.bukkit.command.CommandSender delegate; - - public BukkitCommandSender(org.bukkit.command.CommandSender delegate) { - this.delegate = delegate; - } - - @Override - public void sendMessage(String message) { - delegate.sendMessage(ChatColor.translateAlternateColorCodes('&', message)); - } - - @Override - public Optional getEntity() { - if(delegate instanceof org.bukkit.entity.Entity entity) { - return Optional.of(BukkitAdapter.adapt(entity)); - } - return Optional.empty(); - } - - @Override - public Optional getPlayer() { - if(delegate instanceof org.bukkit.entity.Player player) { - return Optional.of(BukkitAdapter.adapt(player)); - } - return Optional.empty(); - } - - @Override - public org.bukkit.command.CommandSender getHandle() { - return delegate; - } -} diff --git a/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/CloudCommandSender.java b/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/CloudCommandSender.java new file mode 100644 index 000000000..4ace5e9b0 --- /dev/null +++ b/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/CloudCommandSender.java @@ -0,0 +1,46 @@ +package com.dfsek.terra.bukkit; + +import com.dfsek.terra.api.command.CommandSender; +import com.dfsek.terra.api.entity.Entity; +import com.dfsek.terra.api.entity.Player; +import com.dfsek.terra.bukkit.world.BukkitAdapter; + +import io.papermc.paper.command.brigadier.CommandSourceStack; +import org.bukkit.ChatColor; + +import java.util.Optional; + + +public class CloudCommandSender implements CommandSender { + private final CommandSourceStack delegate; + + public CloudCommandSender(CommandSourceStack delegate) { + this.delegate = delegate; + } + + @Override + public void sendMessage(String message) { + delegate.getSender().sendMessage(ChatColor.translateAlternateColorCodes('&', message)); + } + + @Override + public Optional getEntity() { + if(delegate instanceof org.bukkit.entity.Entity entity) { + return Optional.of(BukkitAdapter.adapt(entity)); + } + return Optional.empty(); + } + + @Override + public Optional getPlayer() { + if(delegate instanceof org.bukkit.entity.Player player) { + return Optional.of(BukkitAdapter.adapt(player)); + } + return Optional.empty(); + } + + @Override + public CommandSourceStack getHandle() { + return delegate; + } +} diff --git a/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/TerraBukkitPlugin.java b/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/TerraBukkitPlugin.java index 0a046651d..9085e19b5 100644 --- a/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/TerraBukkitPlugin.java +++ b/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/TerraBukkitPlugin.java @@ -23,10 +23,8 @@ import org.bukkit.Bukkit; import org.bukkit.generator.ChunkGenerator; import org.bukkit.plugin.java.JavaPlugin; import org.incendo.cloud.SenderMapper; -import org.incendo.cloud.brigadier.CloudBrigadierManager; -import org.incendo.cloud.bukkit.CloudBukkitCapabilities; import org.incendo.cloud.execution.ExecutionCoordinator; -import org.incendo.cloud.paper.LegacyPaperCommandManager; +import org.incendo.cloud.paper.PaperCommandManager; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; @@ -73,7 +71,7 @@ public class TerraBukkitPlugin extends JavaPlugin { platform.getEventManager().callEvent(new PlatformInitializationEvent()); try { - LegacyPaperCommandManager commandManager = getCommandSenderPaperCommandManager(); + PaperCommandManager commandManager = getCommandSenderPaperCommandManager(); platform.getEventManager().callEvent(new CommandRegistrationEvent(commandManager)); @@ -93,25 +91,15 @@ public class TerraBukkitPlugin extends JavaPlugin { } @NotNull - private LegacyPaperCommandManager getCommandSenderPaperCommandManager() throws Exception { - // TODO: Update to PaperCommandManager - LegacyPaperCommandManager commandManager = new LegacyPaperCommandManager<>( - this, - ExecutionCoordinator.simpleCoordinator(), - SenderMapper.create( + private PaperCommandManager getCommandSenderPaperCommandManager() throws Exception { + PaperCommandManager commandManager = PaperCommandManager.builder(SenderMapper.create( BukkitAdapter::adapt, BukkitAdapter::adapt - )); + )) + .executionCoordinator(ExecutionCoordinator.simpleCoordinator()) + .buildOnEnable(this); - if(commandManager.hasCapability(CloudBukkitCapabilities.NATIVE_BRIGADIER)) { - commandManager.registerBrigadier(); - final CloudBrigadierManager brigManager = commandManager.brigadierManager(); - if(brigManager != null) { - brigManager.setNativeNumberSuggestions(false); - } - } else if(commandManager.hasCapability(CloudBukkitCapabilities.ASYNCHRONOUS_COMPLETION)) { - commandManager.registerAsynchronousCompletions(); - } + commandManager.brigadierManager().setNativeNumberSuggestions(false); return commandManager; } diff --git a/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/nms/Initializer.java b/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/nms/Initializer.java index a6062a528..68a981676 100644 --- a/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/nms/Initializer.java +++ b/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/nms/Initializer.java @@ -46,12 +46,7 @@ public interface Initializer { private static PlatformImpl constructPlatform(TerraBukkitPlugin plugin) { try { - String packageVersion = NMS; - if (NMS.equals("v1_21_5") || NMS.equals("v1_21_6") || NMS.equals("v1_21_7")) { - packageVersion = "v1_21_8"; - } - - Class platformClass = Class.forName(TERRA_PACKAGE + "." + packageVersion + ".NMSPlatform"); + Class platformClass = Class.forName(TERRA_PACKAGE + "." + NMS + ".NMSPlatform"); try { return (PlatformImpl) platformClass .getConstructor(TerraBukkitPlugin.class) diff --git a/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/world/BukkitAdapter.java b/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/world/BukkitAdapter.java index 408265821..de44c45ae 100644 --- a/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/world/BukkitAdapter.java +++ b/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/world/BukkitAdapter.java @@ -18,6 +18,9 @@ package com.dfsek.terra.bukkit.world; +import com.dfsek.terra.bukkit.CloudCommandSender; + +import io.papermc.paper.command.brigadier.CommandSourceStack; import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.entity.Player; @@ -38,7 +41,6 @@ import com.dfsek.terra.api.util.vector.Vector3; import com.dfsek.terra.api.world.ServerWorld; import com.dfsek.terra.api.world.chunk.Chunk; import com.dfsek.terra.api.world.info.WorldProperties; -import com.dfsek.terra.bukkit.BukkitCommandSender; import com.dfsek.terra.bukkit.BukkitEntity; import com.dfsek.terra.bukkit.BukkitPlayer; import com.dfsek.terra.bukkit.world.block.BukkitBlockTypeAndItem; @@ -157,16 +159,16 @@ public final class BukkitAdapter { return Vector3.of(vector.getX(), vector.getY(), vector.getZ()); } - public static CommandSender adapt(org.bukkit.command.CommandSender sender) { - return new BukkitCommandSender(sender); + public static CommandSender adapt(CommandSourceStack sender) { + return new CloudCommandSender(sender); } public static Entity adapt(org.bukkit.entity.Entity entity) { return new BukkitEntity(entity); } - public static org.bukkit.command.CommandSender adapt(CommandSender sender) { - return ((BukkitCommandSender) sender).getHandle(); + public static CommandSourceStack adapt(CommandSender sender) { + return ((CloudCommandSender) sender).getHandle(); } public static ServerWorld adapt(org.bukkit.World world) { diff --git a/platforms/bukkit/nms/v1_21_8/build.gradle.kts b/platforms/bukkit/nms/v1_21_9/build.gradle.kts similarity index 100% rename from platforms/bukkit/nms/v1_21_8/build.gradle.kts rename to platforms/bukkit/nms/v1_21_9/build.gradle.kts diff --git a/platforms/bukkit/nms/v1_21_8/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_8/AwfulBukkitHacks.java b/platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_9/AwfulBukkitHacks.java similarity index 98% rename from platforms/bukkit/nms/v1_21_8/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_8/AwfulBukkitHacks.java rename to platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_9/AwfulBukkitHacks.java index ee206e34d..0148e25dd 100644 --- a/platforms/bukkit/nms/v1_21_8/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_8/AwfulBukkitHacks.java +++ b/platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_9/AwfulBukkitHacks.java @@ -1,6 +1,6 @@ -package com.dfsek.terra.bukkit.nms.v1_21_8; +package com.dfsek.terra.bukkit.nms.v1_21_9; -import com.dfsek.terra.bukkit.nms.v1_21_8.config.VanillaBiomeProperties; +import com.dfsek.terra.bukkit.nms.v1_21_9.config.VanillaBiomeProperties; import com.dfsek.terra.bukkit.world.BukkitBiomeInfo; diff --git a/platforms/bukkit/nms/v1_21_8/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_8/NMSAddon.java b/platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_9/NMSAddon.java similarity index 89% rename from platforms/bukkit/nms/v1_21_8/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_8/NMSAddon.java rename to platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_9/NMSAddon.java index 8d1a1ecf9..a0ad31948 100644 --- a/platforms/bukkit/nms/v1_21_8/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_8/NMSAddon.java +++ b/platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_9/NMSAddon.java @@ -1,11 +1,11 @@ -package com.dfsek.terra.bukkit.nms.v1_21_8; +package com.dfsek.terra.bukkit.nms.v1_21_9; import com.dfsek.terra.api.event.events.config.ConfigurationLoadEvent; import com.dfsek.terra.api.event.functional.FunctionalEventHandler; import com.dfsek.terra.api.world.biome.Biome; import com.dfsek.terra.bukkit.BukkitAddon; import com.dfsek.terra.bukkit.PlatformImpl; -import com.dfsek.terra.bukkit.nms.v1_21_8.config.VanillaBiomeProperties; +import com.dfsek.terra.bukkit.nms.v1_21_9.config.VanillaBiomeProperties; public class NMSAddon extends BukkitAddon { diff --git a/platforms/bukkit/nms/v1_21_8/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_8/NMSBiomeInfo.java b/platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_9/NMSBiomeInfo.java similarity index 83% rename from platforms/bukkit/nms/v1_21_8/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_8/NMSBiomeInfo.java rename to platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_9/NMSBiomeInfo.java index 8626f2cd4..d7d468cca 100644 --- a/platforms/bukkit/nms/v1_21_8/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_8/NMSBiomeInfo.java +++ b/platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_9/NMSBiomeInfo.java @@ -1,4 +1,4 @@ -package com.dfsek.terra.bukkit.nms.v1_21_8; +package com.dfsek.terra.bukkit.nms.v1_21_9; import net.minecraft.resources.ResourceKey; import net.minecraft.world.level.biome.Biome; diff --git a/platforms/bukkit/nms/v1_21_8/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_8/NMSBiomeInjector.java b/platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_9/NMSBiomeInjector.java similarity index 97% rename from platforms/bukkit/nms/v1_21_8/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_8/NMSBiomeInjector.java rename to platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_9/NMSBiomeInjector.java index 8f61ca024..458375012 100644 --- a/platforms/bukkit/nms/v1_21_8/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_8/NMSBiomeInjector.java +++ b/platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_9/NMSBiomeInjector.java @@ -1,4 +1,4 @@ -package com.dfsek.terra.bukkit.nms.v1_21_8; +package com.dfsek.terra.bukkit.nms.v1_21_9; import net.minecraft.core.Holder; import net.minecraft.core.Registry; @@ -12,7 +12,7 @@ import java.util.Objects; import java.util.Optional; import com.dfsek.terra.api.config.ConfigPack; -import com.dfsek.terra.bukkit.nms.v1_21_8.config.VanillaBiomeProperties; +import com.dfsek.terra.bukkit.nms.v1_21_9.config.VanillaBiomeProperties; public class NMSBiomeInjector { diff --git a/platforms/bukkit/nms/v1_21_8/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_8/NMSBiomeProvider.java b/platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_9/NMSBiomeProvider.java similarity index 97% rename from platforms/bukkit/nms/v1_21_8/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_8/NMSBiomeProvider.java rename to platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_9/NMSBiomeProvider.java index 2bf071eb0..ac70c0127 100644 --- a/platforms/bukkit/nms/v1_21_8/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_8/NMSBiomeProvider.java +++ b/platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_9/NMSBiomeProvider.java @@ -1,4 +1,4 @@ -package com.dfsek.terra.bukkit.nms.v1_21_8; +package com.dfsek.terra.bukkit.nms.v1_21_9; import com.mojang.serialization.MapCodec; import net.minecraft.core.Holder; diff --git a/platforms/bukkit/nms/v1_21_8/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_8/NMSChunkGeneratorDelegate.java b/platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_9/NMSChunkGeneratorDelegate.java similarity index 99% rename from platforms/bukkit/nms/v1_21_8/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_8/NMSChunkGeneratorDelegate.java rename to platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_9/NMSChunkGeneratorDelegate.java index ebc3797fd..4356b88bc 100644 --- a/platforms/bukkit/nms/v1_21_8/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_8/NMSChunkGeneratorDelegate.java +++ b/platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_9/NMSChunkGeneratorDelegate.java @@ -1,4 +1,4 @@ -package com.dfsek.terra.bukkit.nms.v1_21_8; +package com.dfsek.terra.bukkit.nms.v1_21_9; import com.mojang.serialization.MapCodec; import net.minecraft.core.BlockPos; diff --git a/platforms/bukkit/nms/v1_21_8/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_8/NMSInjectListener.java b/platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_9/NMSInjectListener.java similarity index 98% rename from platforms/bukkit/nms/v1_21_8/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_8/NMSInjectListener.java rename to platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_9/NMSInjectListener.java index 809435c8b..1c656c3cc 100644 --- a/platforms/bukkit/nms/v1_21_8/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_8/NMSInjectListener.java +++ b/platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_9/NMSInjectListener.java @@ -1,4 +1,4 @@ -package com.dfsek.terra.bukkit.nms.v1_21_8; +package com.dfsek.terra.bukkit.nms.v1_21_9; import net.minecraft.server.level.ChunkMap; import net.minecraft.server.level.ServerLevel; diff --git a/platforms/bukkit/nms/v1_21_8/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_8/NMSPlatform.java b/platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_9/NMSPlatform.java similarity index 84% rename from platforms/bukkit/nms/v1_21_8/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_8/NMSPlatform.java rename to platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_9/NMSPlatform.java index a94691844..ddaa8937e 100644 --- a/platforms/bukkit/nms/v1_21_8/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_8/NMSPlatform.java +++ b/platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_9/NMSPlatform.java @@ -1,4 +1,4 @@ -package com.dfsek.terra.bukkit.nms.v1_21_8; +package com.dfsek.terra.bukkit.nms.v1_21_9; import com.dfsek.tectonic.api.TypeRegistry; @@ -12,22 +12,22 @@ import com.dfsek.terra.api.world.biome.PlatformBiome; import com.dfsek.terra.bukkit.PlatformImpl; import com.dfsek.terra.bukkit.TerraBukkitPlugin; -import com.dfsek.terra.bukkit.nms.v1_21_8.config.BiomeAdditionsSoundTemplate; -import com.dfsek.terra.bukkit.nms.v1_21_8.config.BiomeMoodSoundTemplate; -import com.dfsek.terra.bukkit.nms.v1_21_8.config.BiomeParticleConfigTemplate; -import com.dfsek.terra.bukkit.nms.v1_21_8.config.EntityTypeTemplate; +import com.dfsek.terra.bukkit.nms.v1_21_9.config.BiomeAdditionsSoundTemplate; +import com.dfsek.terra.bukkit.nms.v1_21_9.config.BiomeMoodSoundTemplate; +import com.dfsek.terra.bukkit.nms.v1_21_9.config.BiomeParticleConfigTemplate; +import com.dfsek.terra.bukkit.nms.v1_21_9.config.EntityTypeTemplate; -import com.dfsek.terra.bukkit.nms.v1_21_8.config.MusicSoundTemplate; +import com.dfsek.terra.bukkit.nms.v1_21_9.config.MusicSoundTemplate; -import com.dfsek.terra.bukkit.nms.v1_21_8.config.SoundEventTemplate; +import com.dfsek.terra.bukkit.nms.v1_21_9.config.SoundEventTemplate; -import com.dfsek.terra.bukkit.nms.v1_21_8.config.SpawnCostConfig; +import com.dfsek.terra.bukkit.nms.v1_21_9.config.SpawnCostConfig; -import com.dfsek.terra.bukkit.nms.v1_21_8.config.SpawnEntryConfig; -import com.dfsek.terra.bukkit.nms.v1_21_8.config.SpawnSettingsTemplate; -import com.dfsek.terra.bukkit.nms.v1_21_8.config.SpawnTypeConfig; +import com.dfsek.terra.bukkit.nms.v1_21_9.config.SpawnEntryConfig; +import com.dfsek.terra.bukkit.nms.v1_21_9.config.SpawnSettingsTemplate; +import com.dfsek.terra.bukkit.nms.v1_21_9.config.SpawnTypeConfig; -import com.dfsek.terra.bukkit.nms.v1_21_8.config.VillagerTypeTemplate; +import com.dfsek.terra.bukkit.nms.v1_21_9.config.VillagerTypeTemplate; import net.minecraft.resources.ResourceLocation; import net.minecraft.sounds.Music; diff --git a/platforms/bukkit/nms/v1_21_8/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_8/NMSWorldProperties.java b/platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_9/NMSWorldProperties.java similarity index 94% rename from platforms/bukkit/nms/v1_21_8/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_8/NMSWorldProperties.java rename to platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_9/NMSWorldProperties.java index 1f8deecfa..da602a85a 100644 --- a/platforms/bukkit/nms/v1_21_8/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_8/NMSWorldProperties.java +++ b/platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_9/NMSWorldProperties.java @@ -1,4 +1,4 @@ -package com.dfsek.terra.bukkit.nms.v1_21_8; +package com.dfsek.terra.bukkit.nms.v1_21_9; import net.minecraft.world.level.LevelHeightAccessor; diff --git a/platforms/bukkit/nms/v1_21_8/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_8/Reflection.java b/platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_9/Reflection.java similarity index 99% rename from platforms/bukkit/nms/v1_21_8/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_8/Reflection.java rename to platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_9/Reflection.java index 728b635c6..f450cae11 100644 --- a/platforms/bukkit/nms/v1_21_8/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_8/Reflection.java +++ b/platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_9/Reflection.java @@ -1,4 +1,4 @@ -package com.dfsek.terra.bukkit.nms.v1_21_8; +package com.dfsek.terra.bukkit.nms.v1_21_9; import net.minecraft.core.Holder; import net.minecraft.core.Holder.Reference; diff --git a/platforms/bukkit/nms/v1_21_8/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_8/RegistryFetcher.java b/platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_9/RegistryFetcher.java similarity index 94% rename from platforms/bukkit/nms/v1_21_8/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_8/RegistryFetcher.java rename to platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_9/RegistryFetcher.java index bb24f315f..5541ee786 100644 --- a/platforms/bukkit/nms/v1_21_8/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_8/RegistryFetcher.java +++ b/platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_9/RegistryFetcher.java @@ -1,4 +1,4 @@ -package com.dfsek.terra.bukkit.nms.v1_21_8; +package com.dfsek.terra.bukkit.nms.v1_21_9; import net.minecraft.core.Registry; import net.minecraft.core.registries.Registries; diff --git a/platforms/bukkit/nms/v1_21_8/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_8/config/BiomeAdditionsSoundTemplate.java b/platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_9/config/BiomeAdditionsSoundTemplate.java similarity index 94% rename from platforms/bukkit/nms/v1_21_8/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_8/config/BiomeAdditionsSoundTemplate.java rename to platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_9/config/BiomeAdditionsSoundTemplate.java index a0f1d8e8b..e6ac43d9e 100644 --- a/platforms/bukkit/nms/v1_21_8/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_8/config/BiomeAdditionsSoundTemplate.java +++ b/platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_9/config/BiomeAdditionsSoundTemplate.java @@ -1,4 +1,4 @@ -package com.dfsek.terra.bukkit.nms.v1_21_8.config; +package com.dfsek.terra.bukkit.nms.v1_21_9.config; import com.dfsek.tectonic.api.config.template.annotations.Default; import com.dfsek.tectonic.api.config.template.annotations.Value; diff --git a/platforms/bukkit/nms/v1_21_8/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_8/config/BiomeMoodSoundTemplate.java b/platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_9/config/BiomeMoodSoundTemplate.java similarity index 95% rename from platforms/bukkit/nms/v1_21_8/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_8/config/BiomeMoodSoundTemplate.java rename to platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_9/config/BiomeMoodSoundTemplate.java index 8aa23867d..c18075e18 100644 --- a/platforms/bukkit/nms/v1_21_8/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_8/config/BiomeMoodSoundTemplate.java +++ b/platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_9/config/BiomeMoodSoundTemplate.java @@ -1,4 +1,4 @@ -package com.dfsek.terra.bukkit.nms.v1_21_8.config; +package com.dfsek.terra.bukkit.nms.v1_21_9.config; import com.dfsek.tectonic.api.config.template.annotations.Default; import com.dfsek.tectonic.api.config.template.annotations.Value; diff --git a/platforms/bukkit/nms/v1_21_8/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_8/config/BiomeParticleConfigTemplate.java b/platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_9/config/BiomeParticleConfigTemplate.java similarity index 96% rename from platforms/bukkit/nms/v1_21_8/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_8/config/BiomeParticleConfigTemplate.java rename to platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_9/config/BiomeParticleConfigTemplate.java index 162ee1a9d..8341e4a20 100644 --- a/platforms/bukkit/nms/v1_21_8/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_8/config/BiomeParticleConfigTemplate.java +++ b/platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_9/config/BiomeParticleConfigTemplate.java @@ -1,4 +1,4 @@ -package com.dfsek.terra.bukkit.nms.v1_21_8.config; +package com.dfsek.terra.bukkit.nms.v1_21_9.config; import com.dfsek.tectonic.api.config.template.annotations.Default; import com.dfsek.tectonic.api.config.template.annotations.Value; diff --git a/platforms/bukkit/nms/v1_21_8/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_8/config/EntityTypeTemplate.java b/platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_9/config/EntityTypeTemplate.java similarity index 92% rename from platforms/bukkit/nms/v1_21_8/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_8/config/EntityTypeTemplate.java rename to platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_9/config/EntityTypeTemplate.java index 095a6126c..4dcff2208 100644 --- a/platforms/bukkit/nms/v1_21_8/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_8/config/EntityTypeTemplate.java +++ b/platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_9/config/EntityTypeTemplate.java @@ -1,4 +1,4 @@ -package com.dfsek.terra.bukkit.nms.v1_21_8.config; +package com.dfsek.terra.bukkit.nms.v1_21_9.config; import com.dfsek.tectonic.api.config.template.annotations.Default; import com.dfsek.tectonic.api.config.template.annotations.Value; diff --git a/platforms/bukkit/nms/v1_21_8/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_8/config/MusicSoundTemplate.java b/platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_9/config/MusicSoundTemplate.java similarity index 95% rename from platforms/bukkit/nms/v1_21_8/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_8/config/MusicSoundTemplate.java rename to platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_9/config/MusicSoundTemplate.java index ae8663936..66faaefea 100644 --- a/platforms/bukkit/nms/v1_21_8/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_8/config/MusicSoundTemplate.java +++ b/platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_9/config/MusicSoundTemplate.java @@ -1,4 +1,4 @@ -package com.dfsek.terra.bukkit.nms.v1_21_8.config; +package com.dfsek.terra.bukkit.nms.v1_21_9.config; import com.dfsek.tectonic.api.config.template.annotations.Default; import com.dfsek.tectonic.api.config.template.annotations.Value; diff --git a/platforms/bukkit/nms/v1_21_8/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_8/config/SoundEventTemplate.java b/platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_9/config/SoundEventTemplate.java similarity index 94% rename from platforms/bukkit/nms/v1_21_8/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_8/config/SoundEventTemplate.java rename to platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_9/config/SoundEventTemplate.java index 7f79e22d1..e72e7dce5 100644 --- a/platforms/bukkit/nms/v1_21_8/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_8/config/SoundEventTemplate.java +++ b/platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_9/config/SoundEventTemplate.java @@ -1,4 +1,4 @@ -package com.dfsek.terra.bukkit.nms.v1_21_8.config; +package com.dfsek.terra.bukkit.nms.v1_21_9.config; import com.dfsek.tectonic.api.config.template.annotations.Default; import com.dfsek.tectonic.api.config.template.annotations.Value; diff --git a/platforms/bukkit/nms/v1_21_8/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_8/config/SpawnCostConfig.java b/platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_9/config/SpawnCostConfig.java similarity index 94% rename from platforms/bukkit/nms/v1_21_8/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_8/config/SpawnCostConfig.java rename to platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_9/config/SpawnCostConfig.java index a83e380ec..b89911454 100644 --- a/platforms/bukkit/nms/v1_21_8/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_8/config/SpawnCostConfig.java +++ b/platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_9/config/SpawnCostConfig.java @@ -1,4 +1,4 @@ -package com.dfsek.terra.bukkit.nms.v1_21_8.config; +package com.dfsek.terra.bukkit.nms.v1_21_9.config; import com.dfsek.tectonic.api.config.template.annotations.Default; import com.dfsek.tectonic.api.config.template.annotations.Value; diff --git a/platforms/bukkit/nms/v1_21_8/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_8/config/SpawnEntryConfig.java b/platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_9/config/SpawnEntryConfig.java similarity index 95% rename from platforms/bukkit/nms/v1_21_8/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_8/config/SpawnEntryConfig.java rename to platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_9/config/SpawnEntryConfig.java index b0902cd9a..3aa3f578b 100644 --- a/platforms/bukkit/nms/v1_21_8/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_8/config/SpawnEntryConfig.java +++ b/platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_9/config/SpawnEntryConfig.java @@ -1,4 +1,4 @@ -package com.dfsek.terra.bukkit.nms.v1_21_8.config; +package com.dfsek.terra.bukkit.nms.v1_21_9.config; import com.dfsek.tectonic.api.config.template.annotations.Default; import com.dfsek.tectonic.api.config.template.annotations.Value; diff --git a/platforms/bukkit/nms/v1_21_8/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_8/config/SpawnSettingsTemplate.java b/platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_9/config/SpawnSettingsTemplate.java similarity index 96% rename from platforms/bukkit/nms/v1_21_8/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_8/config/SpawnSettingsTemplate.java rename to platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_9/config/SpawnSettingsTemplate.java index 1ccf76a35..fcc798767 100644 --- a/platforms/bukkit/nms/v1_21_8/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_8/config/SpawnSettingsTemplate.java +++ b/platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_9/config/SpawnSettingsTemplate.java @@ -1,4 +1,4 @@ -package com.dfsek.terra.bukkit.nms.v1_21_8.config; +package com.dfsek.terra.bukkit.nms.v1_21_9.config; import com.dfsek.tectonic.api.config.template.annotations.Default; import com.dfsek.tectonic.api.config.template.annotations.Value; diff --git a/platforms/bukkit/nms/v1_21_8/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_8/config/SpawnTypeConfig.java b/platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_9/config/SpawnTypeConfig.java similarity index 93% rename from platforms/bukkit/nms/v1_21_8/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_8/config/SpawnTypeConfig.java rename to platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_9/config/SpawnTypeConfig.java index f7d2f4722..bd8680423 100644 --- a/platforms/bukkit/nms/v1_21_8/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_8/config/SpawnTypeConfig.java +++ b/platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_9/config/SpawnTypeConfig.java @@ -1,4 +1,4 @@ -package com.dfsek.terra.bukkit.nms.v1_21_8.config; +package com.dfsek.terra.bukkit.nms.v1_21_9.config; import com.dfsek.tectonic.api.config.template.annotations.Default; import com.dfsek.tectonic.api.config.template.annotations.Value; diff --git a/platforms/bukkit/nms/v1_21_8/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_8/config/VanillaBiomeProperties.java b/platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_9/config/VanillaBiomeProperties.java similarity index 98% rename from platforms/bukkit/nms/v1_21_8/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_8/config/VanillaBiomeProperties.java rename to platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_9/config/VanillaBiomeProperties.java index c227ae835..3882f4e4f 100644 --- a/platforms/bukkit/nms/v1_21_8/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_8/config/VanillaBiomeProperties.java +++ b/platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_9/config/VanillaBiomeProperties.java @@ -1,4 +1,4 @@ -package com.dfsek.terra.bukkit.nms.v1_21_8.config; +package com.dfsek.terra.bukkit.nms.v1_21_9.config; import com.dfsek.tectonic.api.config.template.ConfigTemplate; import com.dfsek.tectonic.api.config.template.annotations.Default; diff --git a/platforms/bukkit/nms/v1_21_8/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_8/config/VillagerTypeTemplate.java b/platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_9/config/VillagerTypeTemplate.java similarity index 93% rename from platforms/bukkit/nms/v1_21_8/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_8/config/VillagerTypeTemplate.java rename to platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_9/config/VillagerTypeTemplate.java index 7550f6f6f..13b2a9731 100644 --- a/platforms/bukkit/nms/v1_21_8/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_8/config/VillagerTypeTemplate.java +++ b/platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_9/config/VillagerTypeTemplate.java @@ -1,4 +1,4 @@ -package com.dfsek.terra.bukkit.nms.v1_21_8.config; +package com.dfsek.terra.bukkit.nms.v1_21_9.config; import com.dfsek.tectonic.api.config.template.annotations.Default; import com.dfsek.tectonic.api.config.template.annotations.Value; diff --git a/platforms/fabric/src/main/resources/fabric.mod.json b/platforms/fabric/src/main/resources/fabric.mod.json index 64a7f9111..98d352556 100644 --- a/platforms/fabric/src/main/resources/fabric.mod.json +++ b/platforms/fabric/src/main/resources/fabric.mod.json @@ -35,7 +35,7 @@ "depends": { "fabricloader": ">=0.16.10", "java": ">=21", - "minecraft": "1.21.8", + "minecraft": "1.21.9", "fabric": "*" } } \ No newline at end of file diff --git a/platforms/mixin-lifecycle/src/main/java/com/dfsek/terra/lifecycle/LifecyclePlatform.java b/platforms/mixin-lifecycle/src/main/java/com/dfsek/terra/lifecycle/LifecyclePlatform.java index d696ce180..cd1e9fc23 100644 --- a/platforms/mixin-lifecycle/src/main/java/com/dfsek/terra/lifecycle/LifecyclePlatform.java +++ b/platforms/mixin-lifecycle/src/main/java/com/dfsek/terra/lifecycle/LifecyclePlatform.java @@ -7,6 +7,7 @@ import ca.solostudios.strata.version.Version; import com.dfsek.terra.api.util.reflection.ReflectionUtil; import net.minecraft.MinecraftVersion; +import net.minecraft.SharedConstants; import net.minecraft.enchantment.Enchantment; import net.minecraft.registry.Registry; import net.minecraft.registry.RegistryKeys; @@ -107,7 +108,7 @@ public abstract class LifecyclePlatform extends ModPlatform { super.platformAddon().forEach(addons::add); - String mcVersion = MinecraftVersion.CURRENT.name(); + String mcVersion = SharedConstants.getGameVersion().name(); try { addons.add(new EphemeralAddon(Versions.parseVersion(mcVersion), "minecraft")); } catch(ParseException e) { diff --git a/platforms/mixin-lifecycle/src/main/java/com/dfsek/terra/lifecycle/mixin/lifecycle/MinecraftServerMixin.java b/platforms/mixin-lifecycle/src/main/java/com/dfsek/terra/lifecycle/mixin/lifecycle/MinecraftServerMixin.java index e52b0fdab..9cde600c3 100644 --- a/platforms/mixin-lifecycle/src/main/java/com/dfsek/terra/lifecycle/mixin/lifecycle/MinecraftServerMixin.java +++ b/platforms/mixin-lifecycle/src/main/java/com/dfsek/terra/lifecycle/mixin/lifecycle/MinecraftServerMixin.java @@ -1,14 +1,11 @@ package com.dfsek.terra.lifecycle.mixin.lifecycle; -import com.dfsek.terra.mod.CommonPlatform; -import com.dfsek.terra.mod.ModPlatform; - import com.mojang.datafixers.DataFixer; import net.minecraft.resource.ResourcePackManager; import net.minecraft.server.MinecraftServer; import net.minecraft.server.SaveLoader; -import net.minecraft.server.WorldGenerationProgressListenerFactory; import net.minecraft.util.ApiServices; +import net.minecraft.world.chunk.ChunkLoadProgress; import net.minecraft.world.level.storage.LevelStorage; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; @@ -25,11 +22,11 @@ public class MinecraftServerMixin { @Inject(method = "(Ljava/lang/Thread;Lnet/minecraft/world/level/storage/LevelStorage$Session;" + "Lnet/minecraft/resource/ResourcePackManager;Lnet/minecraft/server/SaveLoader;Ljava/net/Proxy;" + "Lcom/mojang/datafixers/DataFixer;Lnet/minecraft/util/ApiServices;" + - "Lnet/minecraft/server/WorldGenerationProgressListenerFactory;)V", + "Lnet/minecraft/world/chunk/ChunkLoadProgress;)V", at = @At("RETURN")) private void injectConstructor(Thread serverThread, LevelStorage.Session session, ResourcePackManager dataPackManager, SaveLoader saveLoader, Proxy proxy, DataFixer dataFixer, ApiServices apiServices, - WorldGenerationProgressListenerFactory worldGenerationProgressListenerFactory, CallbackInfo ci) { + ChunkLoadProgress chunkLoadProgress, CallbackInfo ci) { LifecyclePlatform.setServer((MinecraftServer) (Object) this); } }