Merge remote-tracking branch 'origin/ver/7.0.0' into dev/pure

# Conflicts:
#	common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/BiomePipelineAddon.java
#	common/addons/config-distributors/src/main/java/com/dfsek/terra/addons/feature/distributor/DistributorAddon.java
#	common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/LocatorAddon.java

platforms/bukkit/build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    id("xyz.jpenilla.run-paper") version "1.0.6"
+    alias(libs.plugins.bukkit.run.paper)
 }
 
 repositories {
@@ -9,15 +9,12 @@ repositories {
 dependencies {
     shaded(project(":platforms:bukkit:common"))
     shaded(project(":platforms:bukkit:nms:v1_19_R1", configuration = "reobf"))
-    shaded("xyz.jpenilla", "reflection-remapper", Versions.Bukkit.reflectionRemapper)
+    shaded(libs.bukkit.reflection.remapper)
 }
 
 tasks {
     shadowJar {
-        relocate("org.bstats.bukkit", "com.dfsek.terra.lib.bstats")
         relocate("io.papermc.lib", "com.dfsek.terra.lib.paperlib")
-        relocate("com.google.common", "com.dfsek.terra.lib.google.common")
-        relocate("org.apache.logging.slf4j", "com.dfsek.terra.lib.slf4j-over-log4j")
         exclude("org/slf4j/**")
         exclude("org/checkerframework/**")
         exclude("org/jetbrains/annotations/**")
@@ -28,7 +25,7 @@ tasks {
     }
     
     runServer {
-        minecraftVersion("1.19")
+        minecraftVersion(libs.versions.bukkit.minecraft.get())
         dependsOn(shadowJar)
         pluginJars(shadowJar.get().archiveFile)
     }

platforms/bukkit/common/build.gradle.kts

@@ -5,14 +5,9 @@ repositories {
 dependencies {
     shadedApi(project(":common:implementation:base"))
     
-    api("org.slf4j:slf4j-api:1.8.0-beta4") {
-        because("Minecraft 1.17+ includes slf4j 1.8.0-beta4, so we need to shade it for other versions.")
-    }
+    compileOnly(libs.bukkit.paper.api)
     
-    compileOnly("io.papermc.paper:paper-api:${Versions.Bukkit.paper}")
+    shadedApi(libs.bukkit.paper.lib)
     
-    shadedApi("io.papermc", "paperlib", Versions.Bukkit.paperLib)
-    shadedApi("com.google.guava:guava:30.0-jre")
-    
-    shadedApi("cloud.commandframework", "cloud-paper", Versions.Libraries.cloud)
+    shadedApi(libs.bukkit.cloud.paper)
 }

platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/generator/BukkitChunkGeneratorWrapper.java

@@ -28,7 +28,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.util.List;
-import java.util.Random;
+import java.util.random.RandomGenerator;
 import java.util.stream.Collectors;
 
 import com.dfsek.terra.api.block.state.BlockState;
@@ -62,7 +62,7 @@ public class BukkitChunkGeneratorWrapper extends org.bukkit.generator.ChunkGener
     }
     
     @Override
-    public void generateNoise(@NotNull WorldInfo worldInfo, @NotNull Random random, int x, int z, @NotNull ChunkData chunkData) {
+    public void generateNoise(@NotNull WorldInfo worldInfo, @NotNull RandomGenerator random, int x, int z, @NotNull ChunkData chunkData) {
         BukkitWorldProperties properties = new BukkitWorldProperties(worldInfo);
         delegate.generateChunkData(new BukkitProtoChunk(chunkData), properties, pack.getBiomeProvider(), x, z);
     }
@@ -73,7 +73,7 @@ public class BukkitChunkGeneratorWrapper extends org.bukkit.generator.ChunkGener
                    .stream()
                    .map(generationStage -> new BlockPopulator() {
                        @Override
-                       public void populate(@NotNull WorldInfo worldInfo, @NotNull Random random, int x, int z,
+                       public void populate(@NotNull WorldInfo worldInfo, @NotNull RandomGenerator random, int x, int z,
                                             @NotNull LimitedRegion limitedRegion) {
                            generationStage.populate(new BukkitProtoWorld(limitedRegion, air, pack.getBiomeProvider()));
                        }

platforms/bukkit/nms/v1_19_R1/build.gradle.kts

@@ -1,4 +1,6 @@
-apply(plugin = "io.papermc.paperweight.userdev")
+plugins {
+    alias(libs.plugins.bukkit.paperweight)
+}
 
 repositories {
     maven("https://s01.oss.sonatype.org/content/repositories/snapshots/")

platforms/bukkit/nms/v1_19_R1/src/main/java/com/dfsek/terra/bukkit/nms/v1_19_R1/config/FertilizableConfig.java

@@ -3,6 +3,9 @@ package com.dfsek.terra.bukkit.nms.v1_19_R1.config;
 import com.dfsek.tectonic.api.config.template.annotations.Default;
 import com.dfsek.tectonic.api.config.template.annotations.Value;
 import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
+
+import com.dfsek.terra.api.structure.Structure;
+
 import net.minecraft.resources.ResourceLocation;
 
 import java.util.Map;
@@ -14,7 +17,7 @@ import com.dfsek.terra.api.util.collection.ProbabilityCollection;
 public class FertilizableConfig implements ObjectTemplate<FertilizableConfig> {
     @Value("strucutres")
     @Default
-    private ProbabilityCollection<ConfiguredStructure> structures = null;
+    private ProbabilityCollection<Structure> structures = null;
     
     @Value("cooldowns")
     @Default
@@ -28,7 +31,7 @@ public class FertilizableConfig implements ObjectTemplate<FertilizableConfig> {
     @Default
     private Boolean villagerFertilizable = null;
     
-    public ProbabilityCollection<ConfiguredStructure> getStructures() {
+    public ProbabilityCollection<Structure> getStructures() {
         return structures;
     }