diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index bb5ee447e..010befbf3 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -29,7 +29,7 @@ object Versions { } object Fabric { - const val fabricAPI = "0.128.1+${Mod.minecraft}" + const val fabricAPI = "0.133.14+${Mod.minecraft}" const val cloud = "2.0.0-beta.11" } // @@ -42,12 +42,12 @@ object Versions { const val mixin = "0.15.5+mixin.0.8.7" const val mixinExtras = "0.4.1" - const val minecraft = "1.21.7" + 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" } // @@ -57,15 +57,16 @@ object Versions { // } object Bukkit { - const val minecraft = "1.21.7-R0.1" - const val paperBuild = "$minecraft-20250630.144242-1" + 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.10" + const val cloud = "2.0.0-beta.11" const val multiverse = "5.0.2" } diff --git a/platforms/allay/build.gradle.kts b/platforms/allay/build.gradle.kts.disabled similarity index 100% rename from platforms/allay/build.gradle.kts rename to platforms/allay/build.gradle.kts.disabled diff --git a/platforms/bukkit/build.gradle.kts b/platforms/bukkit/build.gradle.kts index 1246465cf..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_7")) + 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 90bd3a075..7caa71cda 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; @@ -71,7 +69,7 @@ public class TerraBukkitPlugin extends JavaPlugin { platform.getEventManager().callEvent(new PlatformInitializationEvent()); try { - LegacyPaperCommandManager commandManager = getCommandSenderPaperCommandManager(); + PaperCommandManager commandManager = getCommandSenderPaperCommandManager(); platform.getEventManager().callEvent(new CommandRegistrationEvent(commandManager)); @@ -91,25 +89,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/listeners/CommonListener.java b/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/listeners/CommonListener.java index 22e55d9d2..c513c6bdf 100644 --- a/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/listeners/CommonListener.java +++ b/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/listeners/CommonListener.java @@ -19,6 +19,7 @@ package com.dfsek.terra.bukkit.listeners; import org.bukkit.NamespacedKey; import org.bukkit.World; +import org.bukkit.entity.Entity; import org.bukkit.entity.Wolf; import org.bukkit.entity.Wolf.Variant; import org.bukkit.event.EventHandler; @@ -26,6 +27,7 @@ import org.bukkit.event.Listener; import org.bukkit.event.entity.CreatureSpawnEvent; import org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason; import org.bukkit.event.server.PluginEnableEvent; +import org.bukkit.event.world.ChunkLoadEvent; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -45,7 +47,7 @@ import com.dfsek.terra.bukkit.world.BukkitPlatformBiome; public class CommonListener implements Listener { private static final Logger logger = LoggerFactory.getLogger(CommonListener.class); private static final List WOLF_VARIANT_SPAWN_REASONS = List.of( - SpawnReason.SPAWNER, SpawnReason.TRIAL_SPAWNER, SpawnReason.SPAWNER_EGG, SpawnReason.DEFAULT + SpawnReason.SPAWNER, SpawnReason.TRIAL_SPAWNER, SpawnReason.SPAWNER_EGG, SpawnReason.NATURAL ); private final Platform platform; @@ -67,21 +69,12 @@ public class CommonListener implements Listener { } } - @EventHandler - public void onWolfSpawn(CreatureSpawnEvent event) { - if(!(event.getEntity() instanceof Wolf wolf)) { - return; - } - + private void applyWolfVariant(Wolf wolf) { // Doesn't apply if variant has already been applied if(wolf.getVariant() != Variant.PALE) { return; } - if(!WOLF_VARIANT_SPAWN_REASONS.contains(event.getSpawnReason())) { - return; - } - World world = wolf.getWorld(); if(!(world.getGenerator() instanceof BukkitChunkGeneratorWrapper wrapper)) { return; @@ -112,4 +105,31 @@ public class CommonListener implements Listener { } }); } + + @EventHandler + public void onWolfSpawn(CreatureSpawnEvent event) { + if (!(event.getEntity() instanceof Wolf wolf)) { + return; + } + + if (!WOLF_VARIANT_SPAWN_REASONS.contains(event.getSpawnReason())) { + logger.debug("Ignoring wolf spawned with reason: " + event.getSpawnReason()); + return; + } + + applyWolfVariant(wolf); + } + + @EventHandler + public void onChunkGenerate(ChunkLoadEvent event) { + if (!event.isNewChunk()) { + return; + } + + for (Entity entity : event.getChunk().getEntities()) { + if (entity instanceof Wolf wolf) { + applyWolfVariant(wolf); + } + } + } } 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 132df6006..66cd42543 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 @@ -45,12 +45,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")) { - packageVersion = "v1_21_7"; - } - - 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 ef7d2c535..799e33577 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 @@ -19,6 +19,9 @@ package com.dfsek.terra.bukkit.world; import com.dfsek.seismic.type.vector.Vector3; +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.inventory.item.Enchantment; 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_7/build.gradle.kts b/platforms/bukkit/nms/v1_21_9/build.gradle.kts similarity index 100% rename from platforms/bukkit/nms/v1_21_7/build.gradle.kts rename to platforms/bukkit/nms/v1_21_9/build.gradle.kts diff --git a/platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/AwfulBukkitHacks.java b/platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_9/AwfulBukkitHacks.java similarity index 97% rename from platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/AwfulBukkitHacks.java rename to platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_9/AwfulBukkitHacks.java index 5558f489a..77e441d40 100644 --- a/platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/AwfulBukkitHacks.java +++ b/platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_9/AwfulBukkitHacks.java @@ -1,4 +1,8 @@ -package com.dfsek.terra.bukkit.nms.v1_21_7; +package com.dfsek.terra.bukkit.nms.v1_21_9; + +import com.dfsek.terra.bukkit.nms.v1_21_9.config.VanillaBiomeProperties; + +import com.dfsek.terra.bukkit.world.BukkitBiomeInfo; import net.minecraft.core.Holder; import net.minecraft.core.Holder.Reference; diff --git a/platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/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_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/NMSAddon.java rename to platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_9/NMSAddon.java index ba07758d7..a0ad31948 100644 --- a/platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/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_7; +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_7.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_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/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_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/NMSBiomeInfo.java rename to platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_9/NMSBiomeInfo.java index 65f1a3cd4..d7d468cca 100644 --- a/platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/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_7; +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_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/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_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/NMSBiomeInjector.java rename to platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_9/NMSBiomeInjector.java index bc41a3555..a8ca54c39 100644 --- a/platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/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_7; +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_7.config.VanillaBiomeProperties; +import com.dfsek.terra.bukkit.nms.v1_21_9.config.VanillaBiomeProperties; public class NMSBiomeInjector { diff --git a/platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/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_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/NMSBiomeProvider.java rename to platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_9/NMSBiomeProvider.java index 690d8449e..ac70c0127 100644 --- a/platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/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_7; +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_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/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_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/NMSChunkGeneratorDelegate.java rename to platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_9/NMSChunkGeneratorDelegate.java index 8dc42a259..4356b88bc 100644 --- a/platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/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_7; +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_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/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_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/NMSInjectListener.java rename to platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_9/NMSInjectListener.java index 76d3a1f26..1c656c3cc 100644 --- a/platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/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_7; +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_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/NMSPlatform.java b/platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_9/NMSPlatform.java similarity index 80% rename from platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/NMSPlatform.java rename to platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_9/NMSPlatform.java index 5a7961259..803f36ed8 100644 --- a/platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/NMSPlatform.java +++ b/platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_9/NMSPlatform.java @@ -1,9 +1,33 @@ -package com.dfsek.terra.bukkit.nms.v1_21_7; +package com.dfsek.terra.bukkit.nms.v1_21_9; import com.dfsek.tectonic.api.TypeRegistry; import com.dfsek.tectonic.api.exception.LoadException; import com.dfsek.terra.addon.InternalAddon; +import com.dfsek.terra.api.addon.BaseAddon; +import com.dfsek.terra.api.event.events.platform.PlatformInitializationEvent; +import com.dfsek.terra.api.event.functional.FunctionalEventHandler; +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_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_9.config.MusicSoundTemplate; + +import com.dfsek.terra.bukkit.nms.v1_21_9.config.SoundEventTemplate; + +import com.dfsek.terra.bukkit.nms.v1_21_9.config.SpawnCostConfig; + +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_9.config.VillagerTypeTemplate; + import net.minecraft.resources.ResourceLocation; import net.minecraft.sounds.Music; import net.minecraft.sounds.SoundEvent; diff --git a/platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/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_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/NMSWorldProperties.java rename to platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_9/NMSWorldProperties.java index 2b0f71fe2..da602a85a 100644 --- a/platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/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_7; +package com.dfsek.terra.bukkit.nms.v1_21_9; import net.minecraft.world.level.LevelHeightAccessor; diff --git a/platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/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_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/Reflection.java rename to platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_9/Reflection.java index 7f0748570..69f6b8a3d 100644 --- a/platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/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_7; +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_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/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_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/RegistryFetcher.java rename to platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_9/RegistryFetcher.java index ce6bfe88d..5541ee786 100644 --- a/platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/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_7; +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_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/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_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/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 b2fedbf83..197fda792 100644 --- a/platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/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_7.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_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/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_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/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 0102380f7..e8280bf54 100644 --- a/platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/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_7.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_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/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_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/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 c564a190f..aeaa9042f 100644 --- a/platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/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_7.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_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/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_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/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 652934a03..0b78b97fb 100644 --- a/platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/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_7.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_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/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_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/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 9d2d33182..2adfbb393 100644 --- a/platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/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_7.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_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/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_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/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 a9e2e8a33..213da76cf 100644 --- a/platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/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_7.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_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/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 93% rename from platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/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 58be14ca1..9023c339d 100644 --- a/platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/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_7.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_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/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 94% rename from platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/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 57cc13fec..03c4a3643 100644 --- a/platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/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_7.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_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/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_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/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 ef34b149d..ddc140afa 100644 --- a/platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/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_7.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_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/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_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/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 241cedbbe..9a6d0f854 100644 --- a/platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/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_7.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_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/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_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/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 4d6d7b10b..d690f79e3 100644 --- a/platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/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_7.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_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/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_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/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 7655573e0..c754c17f5 100644 --- a/platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/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_7.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 971c46122..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.7", + "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 9fc1ab71d..4d1f1cdde 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 @@ -4,6 +4,7 @@ import ca.solostudios.strata.Versions; import ca.solostudios.strata.parser.tokenizer.ParseException; import ca.solostudios.strata.version.Version; import net.minecraft.MinecraftVersion; +import net.minecraft.SharedConstants; import net.minecraft.enchantment.Enchantment; import net.minecraft.registry.DynamicRegistryManager; import net.minecraft.registry.Registry; @@ -108,7 +109,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 25ac340d0..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 @@ -4,8 +4,8 @@ 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; @@ -22,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); } }