From 9b14b0ee960259d59836da817f56a6cd9ecdffa8 Mon Sep 17 00:00:00 2001 From: OakLoaf Date: Mon, 30 Jun 2025 16:47:29 +0100 Subject: [PATCH 1/6] Updated Bukkit to 1.21.7 --- buildSrc/src/main/kotlin/Versions.kt | 4 ++-- platforms/bukkit/build.gradle.kts | 2 +- .../src/main/java/com/dfsek/terra/bukkit/nms/Initializer.java | 4 ++-- platforms/bukkit/nms/{v1_21_6 => v1_21_7}/build.gradle.kts | 0 .../com/dfsek/terra/bukkit/nms/v1_21_7}/AwfulBukkitHacks.java | 4 ++-- .../java/com/dfsek/terra/bukkit/nms/v1_21_7}/NMSAddon.java | 4 ++-- .../com/dfsek/terra/bukkit/nms/v1_21_7}/NMSBiomeInfo.java | 2 +- .../com/dfsek/terra/bukkit/nms/v1_21_7}/NMSBiomeInjector.java | 4 ++-- .../com/dfsek/terra/bukkit/nms/v1_21_7}/NMSBiomeProvider.java | 2 +- .../terra/bukkit/nms/v1_21_7}/NMSChunkGeneratorDelegate.java | 2 +- .../com/dfsek/terra/bukkit/nms/v1_21_7}/NMSInitializer.java | 2 +- .../dfsek/terra/bukkit/nms/v1_21_7}/NMSInjectListener.java | 2 +- .../dfsek/terra/bukkit/nms/v1_21_7}/NMSWorldProperties.java | 2 +- .../java/com/dfsek/terra/bukkit/nms/v1_21_7}/Reflection.java | 2 +- .../com/dfsek/terra/bukkit/nms/v1_21_7}/RegistryFetcher.java | 2 +- .../nms/v1_21_7}/config/BiomeAdditionsSoundTemplate.java | 2 +- .../bukkit/nms/v1_21_7}/config/BiomeMoodSoundTemplate.java | 2 +- .../nms/v1_21_7}/config/BiomeParticleConfigTemplate.java | 2 +- .../terra/bukkit/nms/v1_21_7}/config/EntityTypeTemplate.java | 2 +- .../terra/bukkit/nms/v1_21_7}/config/MusicSoundTemplate.java | 2 +- .../terra/bukkit/nms/v1_21_7}/config/SoundEventTemplate.java | 2 +- .../terra/bukkit/nms/v1_21_7}/config/SpawnCostConfig.java | 2 +- .../terra/bukkit/nms/v1_21_7}/config/SpawnEntryConfig.java | 2 +- .../bukkit/nms/v1_21_7}/config/SpawnSettingsTemplate.java | 2 +- .../terra/bukkit/nms/v1_21_7}/config/SpawnTypeConfig.java | 2 +- .../bukkit/nms/v1_21_7}/config/VanillaBiomeProperties.java | 2 +- .../bukkit/nms/v1_21_7}/config/VillagerTypeTemplate.java | 2 +- 27 files changed, 31 insertions(+), 31 deletions(-) rename platforms/bukkit/nms/{v1_21_6 => v1_21_7}/build.gradle.kts (100%) rename platforms/bukkit/nms/{v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6 => v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7}/AwfulBukkitHacks.java (98%) rename platforms/bukkit/nms/{v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6 => v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7}/NMSAddon.java (89%) rename platforms/bukkit/nms/{v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6 => v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7}/NMSBiomeInfo.java (83%) rename platforms/bukkit/nms/{v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6 => v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7}/NMSBiomeInjector.java (97%) rename platforms/bukkit/nms/{v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6 => v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7}/NMSBiomeProvider.java (97%) rename platforms/bukkit/nms/{v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6 => v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7}/NMSChunkGeneratorDelegate.java (99%) rename platforms/bukkit/nms/{v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6 => v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7}/NMSInitializer.java (92%) rename platforms/bukkit/nms/{v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6 => v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7}/NMSInjectListener.java (98%) rename platforms/bukkit/nms/{v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6 => v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7}/NMSWorldProperties.java (94%) rename platforms/bukkit/nms/{v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6 => v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7}/Reflection.java (99%) rename platforms/bukkit/nms/{v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6 => v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7}/RegistryFetcher.java (94%) rename platforms/bukkit/nms/{v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6 => v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7}/config/BiomeAdditionsSoundTemplate.java (94%) rename platforms/bukkit/nms/{v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6 => v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7}/config/BiomeMoodSoundTemplate.java (95%) rename platforms/bukkit/nms/{v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6 => v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7}/config/BiomeParticleConfigTemplate.java (96%) rename platforms/bukkit/nms/{v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6 => v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7}/config/EntityTypeTemplate.java (92%) rename platforms/bukkit/nms/{v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6 => v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7}/config/MusicSoundTemplate.java (95%) rename platforms/bukkit/nms/{v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6 => v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7}/config/SoundEventTemplate.java (94%) rename platforms/bukkit/nms/{v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6 => v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7}/config/SpawnCostConfig.java (94%) rename platforms/bukkit/nms/{v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6 => v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7}/config/SpawnEntryConfig.java (95%) rename platforms/bukkit/nms/{v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6 => v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7}/config/SpawnSettingsTemplate.java (96%) rename platforms/bukkit/nms/{v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6 => v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7}/config/SpawnTypeConfig.java (93%) rename platforms/bukkit/nms/{v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6 => v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7}/config/VanillaBiomeProperties.java (98%) rename platforms/bukkit/nms/{v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6 => v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7}/config/VillagerTypeTemplate.java (92%) diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index 4a8c0faf9..b640709b9 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -56,8 +56,8 @@ object Versions { // } object Bukkit { - const val minecraft = "1.21.6-R0.1" - const val paperBuild = "$minecraft-20250617.170821-8" + const val minecraft = "1.21.7-R0.1" + const val paperBuild = "$minecraft-20250630.144242-1" const val paper = paperBuild const val paperLib = "1.0.8" const val reflectionRemapper = "0.1.2" diff --git a/platforms/bukkit/build.gradle.kts b/platforms/bukkit/build.gradle.kts index 26fb7b033..1246465cf 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_6")) + shaded(project(":platforms:bukkit:nms:v1_21_7")) shaded("xyz.jpenilla", "reflection-remapper", Versions.Bukkit.reflectionRemapper) } 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 923c73df0..e7d9d5cb8 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 @@ -54,8 +54,8 @@ public interface Initializer { private static Initializer constructInitializer() { try { String packageVersion = NMS; - if (NMS.equals("v1_21_5")) { - packageVersion = "v1_21_6"; + if (NMS.equals("v1_21_5") || NMS.equals("v1_21_6")) { + packageVersion = "v1_21_7"; } Class initializerClass = Class.forName(TERRA_PACKAGE + "." + packageVersion + ".NMSInitializer"); diff --git a/platforms/bukkit/nms/v1_21_6/build.gradle.kts b/platforms/bukkit/nms/v1_21_7/build.gradle.kts similarity index 100% rename from platforms/bukkit/nms/v1_21_6/build.gradle.kts rename to platforms/bukkit/nms/v1_21_7/build.gradle.kts diff --git a/platforms/bukkit/nms/v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6/AwfulBukkitHacks.java b/platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/AwfulBukkitHacks.java similarity index 98% rename from platforms/bukkit/nms/v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6/AwfulBukkitHacks.java rename to platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/AwfulBukkitHacks.java index 5411fdcac..42cb293eb 100644 --- a/platforms/bukkit/nms/v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6/AwfulBukkitHacks.java +++ b/platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/AwfulBukkitHacks.java @@ -1,6 +1,6 @@ -package com.dfsek.terra.bukkit.nms.v1_21_6; +package com.dfsek.terra.bukkit.nms.v1_21_7; -import com.dfsek.terra.bukkit.nms.v1_21_6.config.VanillaBiomeProperties; +import com.dfsek.terra.bukkit.nms.v1_21_7.config.VanillaBiomeProperties; import com.dfsek.terra.bukkit.world.BukkitBiomeInfo; diff --git a/platforms/bukkit/nms/v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6/NMSAddon.java b/platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/NMSAddon.java similarity index 89% rename from platforms/bukkit/nms/v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6/NMSAddon.java rename to platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/NMSAddon.java index 7093d0afe..ba07758d7 100644 --- a/platforms/bukkit/nms/v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6/NMSAddon.java +++ b/platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/NMSAddon.java @@ -1,11 +1,11 @@ -package com.dfsek.terra.bukkit.nms.v1_21_6; +package com.dfsek.terra.bukkit.nms.v1_21_7; 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_6.config.VanillaBiomeProperties; +import com.dfsek.terra.bukkit.nms.v1_21_7.config.VanillaBiomeProperties; public class NMSAddon extends BukkitAddon { diff --git a/platforms/bukkit/nms/v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6/NMSBiomeInfo.java b/platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/NMSBiomeInfo.java similarity index 83% rename from platforms/bukkit/nms/v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6/NMSBiomeInfo.java rename to platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/NMSBiomeInfo.java index 5eb28c122..65f1a3cd4 100644 --- a/platforms/bukkit/nms/v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6/NMSBiomeInfo.java +++ b/platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/NMSBiomeInfo.java @@ -1,4 +1,4 @@ -package com.dfsek.terra.bukkit.nms.v1_21_6; +package com.dfsek.terra.bukkit.nms.v1_21_7; import net.minecraft.resources.ResourceKey; import net.minecraft.world.level.biome.Biome; diff --git a/platforms/bukkit/nms/v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6/NMSBiomeInjector.java b/platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/NMSBiomeInjector.java similarity index 97% rename from platforms/bukkit/nms/v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6/NMSBiomeInjector.java rename to platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/NMSBiomeInjector.java index dd2f2790b..659aa1b55 100644 --- a/platforms/bukkit/nms/v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6/NMSBiomeInjector.java +++ b/platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/NMSBiomeInjector.java @@ -1,4 +1,4 @@ -package com.dfsek.terra.bukkit.nms.v1_21_6; +package com.dfsek.terra.bukkit.nms.v1_21_7; 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_6.config.VanillaBiomeProperties; +import com.dfsek.terra.bukkit.nms.v1_21_7.config.VanillaBiomeProperties; public class NMSBiomeInjector { diff --git a/platforms/bukkit/nms/v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6/NMSBiomeProvider.java b/platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/NMSBiomeProvider.java similarity index 97% rename from platforms/bukkit/nms/v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6/NMSBiomeProvider.java rename to platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/NMSBiomeProvider.java index f9aaaf73d..690d8449e 100644 --- a/platforms/bukkit/nms/v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6/NMSBiomeProvider.java +++ b/platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/NMSBiomeProvider.java @@ -1,4 +1,4 @@ -package com.dfsek.terra.bukkit.nms.v1_21_6; +package com.dfsek.terra.bukkit.nms.v1_21_7; import com.mojang.serialization.MapCodec; import net.minecraft.core.Holder; diff --git a/platforms/bukkit/nms/v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6/NMSChunkGeneratorDelegate.java b/platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/NMSChunkGeneratorDelegate.java similarity index 99% rename from platforms/bukkit/nms/v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6/NMSChunkGeneratorDelegate.java rename to platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/NMSChunkGeneratorDelegate.java index 6779e31eb..8dc42a259 100644 --- a/platforms/bukkit/nms/v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6/NMSChunkGeneratorDelegate.java +++ b/platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/NMSChunkGeneratorDelegate.java @@ -1,4 +1,4 @@ -package com.dfsek.terra.bukkit.nms.v1_21_6; +package com.dfsek.terra.bukkit.nms.v1_21_7; import com.mojang.serialization.MapCodec; import net.minecraft.core.BlockPos; diff --git a/platforms/bukkit/nms/v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6/NMSInitializer.java b/platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/NMSInitializer.java similarity index 92% rename from platforms/bukkit/nms/v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6/NMSInitializer.java rename to platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/NMSInitializer.java index cdf8a0902..18fac9845 100644 --- a/platforms/bukkit/nms/v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6/NMSInitializer.java +++ b/platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/NMSInitializer.java @@ -1,4 +1,4 @@ -package com.dfsek.terra.bukkit.nms.v1_21_6; +package com.dfsek.terra.bukkit.nms.v1_21_7; import com.dfsek.terra.bukkit.BukkitAddon; diff --git a/platforms/bukkit/nms/v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6/NMSInjectListener.java b/platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/NMSInjectListener.java similarity index 98% rename from platforms/bukkit/nms/v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6/NMSInjectListener.java rename to platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/NMSInjectListener.java index de651582e..76d3a1f26 100644 --- a/platforms/bukkit/nms/v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6/NMSInjectListener.java +++ b/platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/NMSInjectListener.java @@ -1,4 +1,4 @@ -package com.dfsek.terra.bukkit.nms.v1_21_6; +package com.dfsek.terra.bukkit.nms.v1_21_7; import net.minecraft.server.level.ChunkMap; import net.minecraft.server.level.ServerLevel; diff --git a/platforms/bukkit/nms/v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6/NMSWorldProperties.java b/platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/NMSWorldProperties.java similarity index 94% rename from platforms/bukkit/nms/v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6/NMSWorldProperties.java rename to platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/NMSWorldProperties.java index f60ace995..2b0f71fe2 100644 --- a/platforms/bukkit/nms/v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6/NMSWorldProperties.java +++ b/platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/NMSWorldProperties.java @@ -1,4 +1,4 @@ -package com.dfsek.terra.bukkit.nms.v1_21_6; +package com.dfsek.terra.bukkit.nms.v1_21_7; import net.minecraft.world.level.LevelHeightAccessor; diff --git a/platforms/bukkit/nms/v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6/Reflection.java b/platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/Reflection.java similarity index 99% rename from platforms/bukkit/nms/v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6/Reflection.java rename to platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/Reflection.java index e7a93da04..cea3ca98d 100644 --- a/platforms/bukkit/nms/v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6/Reflection.java +++ b/platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/Reflection.java @@ -1,4 +1,4 @@ -package com.dfsek.terra.bukkit.nms.v1_21_6; +package com.dfsek.terra.bukkit.nms.v1_21_7; import net.minecraft.core.Holder; import net.minecraft.core.Holder.Reference; diff --git a/platforms/bukkit/nms/v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6/RegistryFetcher.java b/platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/RegistryFetcher.java similarity index 94% rename from platforms/bukkit/nms/v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6/RegistryFetcher.java rename to platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/RegistryFetcher.java index 6b231a458..ce6bfe88d 100644 --- a/platforms/bukkit/nms/v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6/RegistryFetcher.java +++ b/platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/RegistryFetcher.java @@ -1,4 +1,4 @@ -package com.dfsek.terra.bukkit.nms.v1_21_6; +package com.dfsek.terra.bukkit.nms.v1_21_7; import net.minecraft.core.Registry; import net.minecraft.core.registries.Registries; diff --git a/platforms/bukkit/nms/v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6/config/BiomeAdditionsSoundTemplate.java b/platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/config/BiomeAdditionsSoundTemplate.java similarity index 94% rename from platforms/bukkit/nms/v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6/config/BiomeAdditionsSoundTemplate.java rename to platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/config/BiomeAdditionsSoundTemplate.java index e328bf9b0..16502bbe4 100644 --- a/platforms/bukkit/nms/v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6/config/BiomeAdditionsSoundTemplate.java +++ b/platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/config/BiomeAdditionsSoundTemplate.java @@ -1,4 +1,4 @@ -package com.dfsek.terra.bukkit.nms.v1_21_6.config; +package com.dfsek.terra.bukkit.nms.v1_21_7.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_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6/config/BiomeMoodSoundTemplate.java b/platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/config/BiomeMoodSoundTemplate.java similarity index 95% rename from platforms/bukkit/nms/v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6/config/BiomeMoodSoundTemplate.java rename to platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/config/BiomeMoodSoundTemplate.java index 5b872b9f1..cb2da663c 100644 --- a/platforms/bukkit/nms/v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6/config/BiomeMoodSoundTemplate.java +++ b/platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/config/BiomeMoodSoundTemplate.java @@ -1,4 +1,4 @@ -package com.dfsek.terra.bukkit.nms.v1_21_6.config; +package com.dfsek.terra.bukkit.nms.v1_21_7.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_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6/config/BiomeParticleConfigTemplate.java b/platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/config/BiomeParticleConfigTemplate.java similarity index 96% rename from platforms/bukkit/nms/v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6/config/BiomeParticleConfigTemplate.java rename to platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/config/BiomeParticleConfigTemplate.java index ab8facd81..fdd410cb2 100644 --- a/platforms/bukkit/nms/v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6/config/BiomeParticleConfigTemplate.java +++ b/platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/config/BiomeParticleConfigTemplate.java @@ -1,4 +1,4 @@ -package com.dfsek.terra.bukkit.nms.v1_21_6.config; +package com.dfsek.terra.bukkit.nms.v1_21_7.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_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6/config/EntityTypeTemplate.java b/platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/config/EntityTypeTemplate.java similarity index 92% rename from platforms/bukkit/nms/v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6/config/EntityTypeTemplate.java rename to platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/config/EntityTypeTemplate.java index 8f6b3d2d4..7269c70f7 100644 --- a/platforms/bukkit/nms/v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6/config/EntityTypeTemplate.java +++ b/platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/config/EntityTypeTemplate.java @@ -1,4 +1,4 @@ -package com.dfsek.terra.bukkit.nms.v1_21_6.config; +package com.dfsek.terra.bukkit.nms.v1_21_7.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_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6/config/MusicSoundTemplate.java b/platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/config/MusicSoundTemplate.java similarity index 95% rename from platforms/bukkit/nms/v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6/config/MusicSoundTemplate.java rename to platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/config/MusicSoundTemplate.java index e55b47783..753972b81 100644 --- a/platforms/bukkit/nms/v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6/config/MusicSoundTemplate.java +++ b/platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/config/MusicSoundTemplate.java @@ -1,4 +1,4 @@ -package com.dfsek.terra.bukkit.nms.v1_21_6.config; +package com.dfsek.terra.bukkit.nms.v1_21_7.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_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6/config/SoundEventTemplate.java b/platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/config/SoundEventTemplate.java similarity index 94% rename from platforms/bukkit/nms/v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6/config/SoundEventTemplate.java rename to platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/config/SoundEventTemplate.java index 9598d5913..50c532333 100644 --- a/platforms/bukkit/nms/v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6/config/SoundEventTemplate.java +++ b/platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/config/SoundEventTemplate.java @@ -1,4 +1,4 @@ -package com.dfsek.terra.bukkit.nms.v1_21_6.config; +package com.dfsek.terra.bukkit.nms.v1_21_7.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_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6/config/SpawnCostConfig.java b/platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/config/SpawnCostConfig.java similarity index 94% rename from platforms/bukkit/nms/v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6/config/SpawnCostConfig.java rename to platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/config/SpawnCostConfig.java index 0f98b1529..dac7baa38 100644 --- a/platforms/bukkit/nms/v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6/config/SpawnCostConfig.java +++ b/platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/config/SpawnCostConfig.java @@ -1,4 +1,4 @@ -package com.dfsek.terra.bukkit.nms.v1_21_6.config; +package com.dfsek.terra.bukkit.nms.v1_21_7.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_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6/config/SpawnEntryConfig.java b/platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/config/SpawnEntryConfig.java similarity index 95% rename from platforms/bukkit/nms/v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6/config/SpawnEntryConfig.java rename to platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/config/SpawnEntryConfig.java index a78b809d2..e7e61d1c1 100644 --- a/platforms/bukkit/nms/v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6/config/SpawnEntryConfig.java +++ b/platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/config/SpawnEntryConfig.java @@ -1,4 +1,4 @@ -package com.dfsek.terra.bukkit.nms.v1_21_6.config; +package com.dfsek.terra.bukkit.nms.v1_21_7.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_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6/config/SpawnSettingsTemplate.java b/platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/config/SpawnSettingsTemplate.java similarity index 96% rename from platforms/bukkit/nms/v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6/config/SpawnSettingsTemplate.java rename to platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/config/SpawnSettingsTemplate.java index 850f80075..1e155074a 100644 --- a/platforms/bukkit/nms/v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6/config/SpawnSettingsTemplate.java +++ b/platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/config/SpawnSettingsTemplate.java @@ -1,4 +1,4 @@ -package com.dfsek.terra.bukkit.nms.v1_21_6.config; +package com.dfsek.terra.bukkit.nms.v1_21_7.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_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6/config/SpawnTypeConfig.java b/platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/config/SpawnTypeConfig.java similarity index 93% rename from platforms/bukkit/nms/v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6/config/SpawnTypeConfig.java rename to platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/config/SpawnTypeConfig.java index ce865d1d6..014816c99 100644 --- a/platforms/bukkit/nms/v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6/config/SpawnTypeConfig.java +++ b/platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/config/SpawnTypeConfig.java @@ -1,4 +1,4 @@ -package com.dfsek.terra.bukkit.nms.v1_21_6.config; +package com.dfsek.terra.bukkit.nms.v1_21_7.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_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6/config/VanillaBiomeProperties.java b/platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/config/VanillaBiomeProperties.java similarity index 98% rename from platforms/bukkit/nms/v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6/config/VanillaBiomeProperties.java rename to platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/config/VanillaBiomeProperties.java index 8eec35bf1..c5a2dba66 100644 --- a/platforms/bukkit/nms/v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6/config/VanillaBiomeProperties.java +++ b/platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/config/VanillaBiomeProperties.java @@ -1,4 +1,4 @@ -package com.dfsek.terra.bukkit.nms.v1_21_6.config; +package com.dfsek.terra.bukkit.nms.v1_21_7.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_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6/config/VillagerTypeTemplate.java b/platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/config/VillagerTypeTemplate.java similarity index 92% rename from platforms/bukkit/nms/v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6/config/VillagerTypeTemplate.java rename to platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/config/VillagerTypeTemplate.java index e38aebb5c..d9cad79ce 100644 --- a/platforms/bukkit/nms/v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6/config/VillagerTypeTemplate.java +++ b/platforms/bukkit/nms/v1_21_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/config/VillagerTypeTemplate.java @@ -1,4 +1,4 @@ -package com.dfsek.terra.bukkit.nms.v1_21_6.config; +package com.dfsek.terra.bukkit.nms.v1_21_7.config; import com.dfsek.tectonic.api.config.template.annotations.Default; import com.dfsek.tectonic.api.config.template.annotations.Value; From da20e282ce8104204adb2139a2407d9e7d090112 Mon Sep 17 00:00:00 2001 From: OakLoaf Date: Mon, 30 Jun 2025 17:53:50 +0100 Subject: [PATCH 2/6] Updated Fabric to 1.21.7 --- buildSrc/src/main/kotlin/Versions.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index b640709b9..31efb49aa 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.127.0+${Mod.minecraft}" + const val fabricAPI = "0.128.1+${Mod.minecraft}" const val cloud = "2.0.0-beta.10" } // @@ -41,7 +41,7 @@ object Versions { const val mixin = "0.15.5+mixin.0.8.7" const val mixinExtras = "0.4.1" - const val minecraft = "1.21.6" + const val minecraft = "1.21.7" const val yarn = "$minecraft+build.1" const val fabricLoader = "0.16.14" From 1a1f46155081df51b0d7c7dac5ad59606706b84b Mon Sep 17 00:00:00 2001 From: OakLoaf Date: Mon, 30 Jun 2025 17:57:19 +0100 Subject: [PATCH 3/6] Corrected version in fabric.mod.json --- platforms/fabric/src/main/resources/fabric.mod.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platforms/fabric/src/main/resources/fabric.mod.json b/platforms/fabric/src/main/resources/fabric.mod.json index 0af8e7bd4..971c46122 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.6", + "minecraft": "1.21.7", "fabric": "*" } } \ No newline at end of file From 060bda2ec12a9b84f1b6342e56628c7b66cf1f7d Mon Sep 17 00:00:00 2001 From: OakLoaf Date: Thu, 3 Jul 2025 18:21:41 +0100 Subject: [PATCH 4/6] Bumped cloud-fabric version --- buildSrc/src/main/kotlin/Versions.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index 31efb49aa..dbc57c8e6 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 cloud = "2.0.0-beta.10" + const val cloud = "2.0.0-beta.11" } // // object Quilt { From 70c448dd0d29b45a74c3b02deceb5bf90f3768e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zo=C3=AB=20Gidiere?= Date: Wed, 9 Jul 2025 15:06:40 -0600 Subject: [PATCH 5/6] Fix particles --- .../mod/config/BiomeParticleConfigTemplate.java | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/config/BiomeParticleConfigTemplate.java b/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/config/BiomeParticleConfigTemplate.java index 8962f585f..81824003d 100644 --- a/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/config/BiomeParticleConfigTemplate.java +++ b/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/config/BiomeParticleConfigTemplate.java @@ -5,16 +5,20 @@ import com.dfsek.tectonic.api.config.template.annotations.Value; import com.dfsek.tectonic.api.config.template.object.ObjectTemplate; import com.mojang.brigadier.StringReader; import com.mojang.brigadier.exceptions.CommandSyntaxException; +import net.minecraft.client.particle.Particle; import net.minecraft.command.argument.ParticleEffectArgumentType; +import net.minecraft.particle.ParticleEffect; import net.minecraft.registry.Registries; import net.minecraft.registry.RegistryWrapper; +import net.minecraft.util.Identifier; +import net.minecraft.world.biome.Biome; import net.minecraft.world.biome.BiomeParticleConfig; public class BiomeParticleConfigTemplate implements ObjectTemplate { @Value("particle") @Default - private String particle = null; + private Identifier particle = null; @Value("probability") @Default @@ -26,13 +30,7 @@ public class BiomeParticleConfigTemplate implements ObjectTemplate Date: Wed, 9 Jul 2025 16:41:53 -0600 Subject: [PATCH 6/6] Some fixes to biome config --- .../bukkit/nms/v1_21_7/config/SpawnEntryConfig.java | 2 +- .../nms/v1_21_7/config/SpawnSettingsTemplate.java | 2 +- .../src/main/java/com/dfsek/terra/mod/ModPlatform.java | 2 +- .../com/dfsek/terra/mod/config/SpawnEntryConfig.java | 10 +++++++--- .../dfsek/terra/mod/config/SpawnSettingsTemplate.java | 4 ++-- .../com/dfsek/terra/mod/config/SpawnTypeConfig.java | 6 +++--- .../dfsek/terra/mod/config/VillagerTypeTemplate.java | 4 ++-- 7 files changed, 17 insertions(+), 13 deletions(-) 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_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/config/SpawnEntryConfig.java index e7e61d1c1..674fa0795 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_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/config/SpawnEntryConfig.java @@ -28,7 +28,7 @@ public class SpawnEntryConfig implements ObjectTemplate { return weight; } - public SpawnerData getSpawnerData() { + public SpawnerData getSpawnEntry() { return new SpawnerData(type, minGroupSize, maxGroupSize); } 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_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/config/SpawnSettingsTemplate.java index 1e155074a..5b0420f1f 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_7/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_7/config/SpawnSettingsTemplate.java @@ -33,7 +33,7 @@ public class SpawnSettingsTemplate implements ObjectTemplate { for(SpawnTypeConfig spawn : spawns) { MobCategory group = spawn.getGroup(); for(SpawnEntryConfig entry : spawn.getEntries()) { - builder.addSpawn(group, entry.getWeight(), entry.getSpawnerData()); + builder.addSpawn(group, entry.getWeight(), entry.getSpawnEntry()); } } for(SpawnCostConfig cost : costs) { diff --git a/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/ModPlatform.java b/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/ModPlatform.java index 2054d864b..3f3296f10 100644 --- a/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/ModPlatform.java +++ b/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/ModPlatform.java @@ -90,7 +90,7 @@ public abstract class ModPlatform extends AbstractPlatform { .registerLoader(MusicSound.class, MusicSoundTemplate::new) .registerLoader(EntityType.class, EntityTypeTemplate::new) .registerLoader(SpawnCostConfig.class, SpawnCostConfig::new) - .registerLoader(SpawnEntry.class, SpawnEntryConfig::new) + .registerLoader(SpawnEntryConfig.class, SpawnEntryConfig::new) .registerLoader(SpawnTypeConfig.class, SpawnTypeConfig::new) .registerLoader(SpawnSettings.class, SpawnSettingsTemplate::new) .registerLoader(VillagerType.class, VillagerTypeTemplate::new); diff --git a/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/config/SpawnEntryConfig.java b/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/config/SpawnEntryConfig.java index dd33bc163..058437303 100644 --- a/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/config/SpawnEntryConfig.java +++ b/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/config/SpawnEntryConfig.java @@ -7,7 +7,7 @@ import net.minecraft.entity.EntityType; import net.minecraft.world.biome.SpawnSettings.SpawnEntry; -public class SpawnEntryConfig implements ObjectTemplate { +public class SpawnEntryConfig implements ObjectTemplate { @Value("type") @Default private EntityType type = null; @@ -28,8 +28,12 @@ public class SpawnEntryConfig implements ObjectTemplate { return weight; } - @Override - public SpawnEntry get() { + public SpawnEntry getSpawnEntry() { return new SpawnEntry(type, minGroupSize, maxGroupSize); } + + @Override + public SpawnEntryConfig get() { + return this; + } } diff --git a/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/config/SpawnSettingsTemplate.java b/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/config/SpawnSettingsTemplate.java index 7c42342ab..b4be04e03 100644 --- a/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/config/SpawnSettingsTemplate.java +++ b/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/config/SpawnSettingsTemplate.java @@ -27,8 +27,8 @@ public class SpawnSettingsTemplate implements ObjectTemplate { SpawnSettings.Builder builder = new SpawnSettings.Builder(); for(SpawnTypeConfig spawn : spawns) { SpawnGroup group = spawn.getGroup(); - for(SpawnEntryConfig entry : spawn.getEntry()) { - builder.spawn(group, entry.getWeight(), entry.get()); + for(SpawnEntryConfig entry : spawn.getEntries()) { + builder.spawn(group, entry.getWeight(), entry.getSpawnEntry()); } } for(SpawnCostConfig cost : costs) { diff --git a/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/config/SpawnTypeConfig.java b/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/config/SpawnTypeConfig.java index 8fc5d8656..9d518c5c0 100644 --- a/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/config/SpawnTypeConfig.java +++ b/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/config/SpawnTypeConfig.java @@ -15,14 +15,14 @@ public class SpawnTypeConfig implements ObjectTemplate { @Value("entries") @Default - private List entry = null; + private List entries = null; public SpawnGroup getGroup() { return group; } - public List getEntry() { - return entry; + public List getEntries() { + return entries; } @Override diff --git a/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/config/VillagerTypeTemplate.java b/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/config/VillagerTypeTemplate.java index 66a8951f2..bca0a30b1 100644 --- a/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/config/VillagerTypeTemplate.java +++ b/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/config/VillagerTypeTemplate.java @@ -13,10 +13,10 @@ import net.minecraft.village.VillagerType; public class VillagerTypeTemplate implements ObjectTemplate> { @Value("id") @Default - private String id = null; + private Identifier id = null; @Override public RegistryKey get() { - return RegistryKey.of(RegistryKeys.VILLAGER_TYPE, Identifier.ofVanilla(id)); + return RegistryKey.of(RegistryKeys.VILLAGER_TYPE, id); } }