Update libs and use libs.versions.toml for dep management

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/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/cli/build.gradle.kts

@@ -7,14 +7,10 @@ val javaMainClass = "com.dfsek.terra.cli.TerraCLI"
 dependencies {
     shadedApi(project(":common:implementation:base"))
     
-    shadedApi("commons-io:commons-io:${Versions.CLI.commonsIO}")
-    shadedApi("com.github.Querz:NBT:${Versions.CLI.nbt}")
+    shadedApi(libs.libraries.internal.apache.io)
+    shadedApi(libs.cli.nbt)
     
-    shadedImplementation("com.google.guava:guava:${Versions.CLI.guava}")
-    
-    shadedImplementation("ch.qos.logback:logback-classic:${Versions.CLI.logback}")
-    
-    implementation("net.jafama", "jafama", Versions.Libraries.Internal.jafama)
+    shadedImplementation(libs.cli.logback)
 }
 
 tasks.withType<Jar> {

platforms/fabric/build.gradle.kts

@@ -1,7 +1,7 @@
 plugins {
-    id("dev.architectury.loom") version Versions.Mod.architecuryLoom
-    id("architectury-plugin") version Versions.Mod.architecturyPlugin
-    id("io.github.juuxel.loom-quiltflower") version Versions.Mod.loomQuiltflower
+    alias(libs.plugins.mod.architectury.loom)
+    alias(libs.plugins.mod.architectury.plugin)
+    alias(libs.plugins.mod.loom.quiltflower)
 }
 
 architectury {
@@ -12,9 +12,6 @@ architectury {
 dependencies {
     shadedApi(project(":common:implementation:base"))
     
-    annotationProcessor("net.fabricmc:sponge-mixin:${Versions.Mod.mixin}")
-    annotationProcessor("dev.architectury:architectury-loom:${Versions.Mod.architecuryLoom}")
-    
     implementation(project(path = ":platforms:mixin-common", configuration = "namedElements")) { isTransitive = false }
     "developmentFabric"(project(path = ":platforms:mixin-common", configuration = "namedElements")) { isTransitive = false }
     shaded(project(path = ":platforms:mixin-common", configuration = "transformProductionFabric")) { isTransitive = false }
@@ -22,28 +19,15 @@ dependencies {
     "developmentFabric"(project(path = ":platforms:mixin-lifecycle", configuration = "namedElements")) { isTransitive = false }
     shaded(project(path = ":platforms:mixin-lifecycle", configuration = "transformProductionFabric")) { isTransitive = false }
     
+    minecraft(libs.mod.minecraft)
+    mappings("net.fabricmc", "yarn", libs.versions.mod.yarn.get(), classifier = "v2")
     
-    minecraft("com.mojang:minecraft:${Versions.Mod.minecraft}")
-    mappings("net.fabricmc:yarn:${Versions.Mod.yarn}:v2")
+    modImplementation(libs.mod.fabric.fabric.loader)
     
-    modImplementation("net.fabricmc:fabric-loader:${Versions.Fabric.fabricLoader}")
+    modImplementation(libs.mod.cloud.fabric)
+    include(libs.mod.cloud.fabric)
     
-    setOf(
-        "fabric-lifecycle-events-v1",
-        "fabric-resource-loader-v0",
-        "fabric-api-base",
-        "fabric-command-api-v2",
-        "fabric-networking-api-v1"
-         ).forEach { apiModule ->
-        val module = fabricApi.module(apiModule, Versions.Fabric.fabricAPI)
-        modImplementation(module)
-        include(module)
-    }
-    
-    modImplementation("cloud.commandframework", "cloud-fabric", Versions.Libraries.cloud)
-    include("cloud.commandframework", "cloud-fabric", Versions.Libraries.cloud)
-    
-    modLocalRuntime("com.github.astei:lazydfu:${Versions.Mod.lazyDfu}")
+    modLocalRuntime(libs.mod.lazy.dfu)
 }
 
 loom {

platforms/forge/build.gradle.kts

@@ -1,7 +1,7 @@
 plugins {
-    id("dev.architectury.loom") version Versions.Mod.architecuryLoom
-    id("architectury-plugin") version Versions.Mod.architecturyPlugin
-    id("io.github.juuxel.loom-quiltflower") version Versions.Mod.loomQuiltflower
+    alias(libs.plugins.mod.architectury.loom)
+    alias(libs.plugins.mod.architectury.plugin)
+    alias(libs.plugins.mod.loom.quiltflower)
 }
 
 architectury {
@@ -10,9 +10,6 @@ architectury {
 }
 
 dependencies {
-    annotationProcessor("net.fabricmc:sponge-mixin:${Versions.Mod.mixin}")
-    annotationProcessor("dev.architectury:architectury-loom:${Versions.Mod.architecuryLoom}")
-    
     shadedApi(project(":common:implementation:base"))
     "forgeRuntimeLibrary"(project(":common:implementation:base"))
     
@@ -20,14 +17,14 @@ dependencies {
     "developmentForge"(project(path = ":platforms:mixin-common", configuration = "namedElements")) { isTransitive = false }
     shaded(project(path = ":platforms:mixin-common", configuration = "transformProductionForge")) { isTransitive = false }
     
-    forge(group = "net.minecraftforge", name = "forge", version = Versions.Forge.forge)
+    forge(libs.mod.forge.forge)
     
-    minecraft("com.mojang:minecraft:${Versions.Mod.minecraft}")
-    mappings("net.fabricmc:yarn:${Versions.Mod.yarn}:v2")
+    minecraft(libs.mod.minecraft)
+    mappings("net.fabricmc", "yarn", libs.versions.mod.yarn.get(), classifier = "v2")
     
     //forge is not ok.
-    compileOnly("org.burningwave:core:${Versions.Forge.burningwave}")
-    "forgeRuntimeLibrary"("org.burningwave:core:${Versions.Forge.burningwave}")
+    compileOnly(libs.mod.forge.burningwave)
+    "forgeRuntimeLibrary"(libs.mod.forge.burningwave)
 }
 
 loom {

platforms/mixin-common/build.gradle.kts

@@ -1,7 +1,7 @@
 plugins {
-    id("dev.architectury.loom") version Versions.Mod.architecuryLoom
-    id("architectury-plugin") version Versions.Mod.architecturyPlugin
-    id("io.github.juuxel.loom-quiltflower") version Versions.Mod.loomQuiltflower
+    alias(libs.plugins.mod.architectury.loom)
+    alias(libs.plugins.mod.architectury.plugin)
+    alias(libs.plugins.mod.loom.quiltflower)
 }
 
 loom {
@@ -15,16 +15,14 @@ loom {
 dependencies {
     shadedApi(project(":common:implementation:base"))
     
-    compileOnly("net.fabricmc:sponge-mixin:${Versions.Mod.mixin}")
-    annotationProcessor("net.fabricmc:sponge-mixin:${Versions.Mod.mixin}")
-    annotationProcessor("dev.architectury:architectury-loom:${Versions.Mod.architecuryLoom}")
+    modImplementation(libs.mod.fabric.fabric.loader)
     
-    minecraft("com.mojang:minecraft:${Versions.Mod.minecraft}")
-    mappings("net.fabricmc:yarn:${Versions.Mod.yarn}:v2")
+    minecraft(libs.mod.minecraft)
+    mappings("net.fabricmc", "yarn", libs.versions.mod.yarn.get(), classifier = "v2")
 }
 
 architectury {
     common("fabric", "forge", "quilt")
-    minecraft = Versions.Mod.minecraft
+    minecraft = libs.versions.mod.minecraft.get()
 }
 

platforms/mixin-common/src/main/java/com/dfsek/terra/mod/generation/MinecraftChunkGeneratorWrapper.java

@@ -147,7 +147,7 @@ public class MinecraftChunkGeneratorWrapper extends net.minecraft.world.gen.chun
     
     private void beard(StructureAccessor structureAccessor, Chunk chunk, WorldProperties world, BiomeProvider biomeProvider,
                        PreLoadCompatibilityOptions compatibilityOptions) {
-        StructureWeightSampler structureWeightSampler = StructureWeightSampler.method_42695(structureAccessor, chunk.getPos());
+        StructureWeightSampler structureWeightSampler = StructureWeightSampler.createStructureWeightSampler(structureAccessor, chunk.getPos());
         double threshold = compatibilityOptions.getBeardThreshold();
         double airThreshold = compatibilityOptions.getAirThreshold();
         int xi = chunk.getPos().x << 4;

platforms/mixin-common/src/main/java/com/dfsek/terra/mod/mixin/access/BiomeAccessor.java

@@ -1,12 +0,0 @@
-package com.dfsek.terra.mod.mixin.access;
-
-import net.minecraft.world.biome.Biome;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.gen.Accessor;
-
-
-@Mixin(Biome.class)
-public interface BiomeAccessor {
-    @Accessor("weather")
-    Biome.Weather getWeather();
-}

platforms/mixin-common/src/main/resources/terra.accesswidener

@@ -1,2 +1 @@
-accessWidener v1 named
-accessible class net/minecraft/world/biome/Biome$Weather
+accessWidener v1 named

platforms/mixin-lifecycle/build.gradle.kts

@@ -1,22 +1,22 @@
 plugins {
-    id("dev.architectury.loom") version Versions.Mod.architecuryLoom
-    id("architectury-plugin") version Versions.Mod.architecturyPlugin
-    id("io.github.juuxel.loom-quiltflower") version Versions.Mod.loomQuiltflower
+    alias(libs.plugins.mod.architectury.loom)
+    alias(libs.plugins.mod.architectury.plugin)
+    alias(libs.plugins.mod.loom.quiltflower)
 }
 
 dependencies {
     shadedApi(project(":common:implementation:base"))
     
-    compileOnly("net.fabricmc:sponge-mixin:${Versions.Mod.mixin}")
-    annotationProcessor("net.fabricmc:sponge-mixin:${Versions.Mod.mixin}")
-    annotationProcessor("dev.architectury:architectury-loom:${Versions.Mod.architecuryLoom}")
-    
     implementation(project(path = ":platforms:mixin-common", configuration = "namedElements")) { isTransitive = false }
     
-    minecraft("com.mojang:minecraft:${Versions.Mod.minecraft}")
-    mappings("net.fabricmc:yarn:${Versions.Mod.yarn}:v2")
+    shadedApi(project(":common:implementation:base"))
     
-    modImplementation("cloud.commandframework", "cloud-fabric", Versions.Libraries.cloud) {
+    modImplementation(libs.mod.fabric.fabric.loader)
+    
+    minecraft(libs.mod.minecraft)
+    mappings("net.fabricmc", "yarn", libs.versions.mod.yarn.get(), classifier = "v2")
+    
+    modImplementation(libs.mod.cloud.fabric) {
         exclude("net.fabricmc")
         exclude("net.fabricmc.fabric-api")
     }
@@ -42,5 +42,5 @@ tasks {
 
 architectury {
     common("fabric", "quilt")
-    minecraft = Versions.Mod.minecraft
+    minecraft = libs.versions.mod.minecraft.get()
 }

platforms/mixin-lifecycle/src/main/java/com/dfsek/terra/lifecycle/LifecycleEntryPoint.java

@@ -16,15 +16,19 @@ public class LifecycleEntryPoint {
     protected static void initialize(String modName, LifecyclePlatform platform) {
         logger.info("Initializing Terra {} mod...", modName);
         
-        FabricServerCommandManager<CommandSender> manager = new FabricServerCommandManager<>(
-                CommandExecutionCoordinator.simpleCoordinator(),
-                serverCommandSource -> (CommandSender) serverCommandSource,
-                commandSender -> (ServerCommandSource) commandSender
-        );
-        
-        
-        manager.brigadierManager().setNativeNumberSuggestions(false);
-        
-        platform.getEventManager().callEvent(new CommandRegistrationEvent(manager));
+        try {
+            FabricServerCommandManager<CommandSender> manager = new FabricServerCommandManager<>(
+                    CommandExecutionCoordinator.simpleCoordinator(),
+                    serverCommandSource -> (CommandSender) serverCommandSource,
+                    commandSender -> (ServerCommandSource) commandSender
+            );
+    
+    
+            manager.brigadierManager().setNativeNumberSuggestions(false);
+    
+            platform.getEventManager().callEvent(new CommandRegistrationEvent(manager));
+        } catch (Exception e) {
+            logger.warn("Fabric API not found, Terra commands will not work.");
+        }
     }
 }

platforms/quilt/build.gradle.kts

@@ -1,7 +1,7 @@
 plugins {
-    id("dev.architectury.loom") version Versions.Mod.architecuryLoom
-    id("architectury-plugin") version Versions.Mod.architecturyPlugin
-    id("io.github.juuxel.loom-quiltflower") version Versions.Mod.loomQuiltflower
+    alias(libs.plugins.mod.architectury.loom)
+    alias(libs.plugins.mod.architectury.plugin)
+    alias(libs.plugins.mod.loom.quiltflower)
 }
 
 architectury {
@@ -12,9 +12,6 @@ architectury {
 dependencies {
     shadedApi(project(":common:implementation:base"))
     
-    annotationProcessor("net.fabricmc:sponge-mixin:${Versions.Mod.mixin}")
-    annotationProcessor("dev.architectury:architectury-loom:${Versions.Mod.architecuryLoom}")
-    
     implementation(project(path = ":platforms:mixin-common", configuration = "namedElements")) { isTransitive = false }
     "developmentQuilt"(project(path = ":platforms:mixin-common", configuration = "namedElements")) { isTransitive = false }
     shaded(project(path = ":platforms:mixin-common", configuration = "transformProductionQuilt")) { isTransitive = false }
@@ -23,23 +20,22 @@ dependencies {
     "developmentQuilt"(project(path = ":platforms:mixin-lifecycle", configuration = "namedElements")) { isTransitive = false }
     shaded(project(path = ":platforms:mixin-lifecycle", configuration = "transformProductionQuilt")) { isTransitive = false }
     
-    minecraft("com.mojang:minecraft:${Versions.Mod.minecraft}")
-    mappings("net.fabricmc:yarn:${Versions.Mod.yarn}:v2")
+    minecraft(libs.mod.minecraft)
+    mappings("net.fabricmc", "yarn", libs.versions.mod.yarn.get(), classifier = "v2")
     
-    modImplementation("org.quiltmc:quilt-loader:${Versions.Quilt.quiltLoader}")
+    modImplementation(libs.mod.quilt.quilt.loader)
+    modImplementation(libs.mod.quilt.fabric.api)
     
-    modImplementation("org.quiltmc.quilted-fabric-api:quilted-fabric-api:${Versions.Quilt.fabricApi}")
-    
-    modImplementation("cloud.commandframework", "cloud-fabric", Versions.Libraries.cloud) {
+    modImplementation(libs.mod.cloud.fabric) {
         exclude("net.fabricmc")
         exclude("net.fabricmc.fabric-api")
     }
-    include("cloud.commandframework", "cloud-fabric", Versions.Libraries.cloud) {
+    include(libs.mod.cloud.fabric) {
         exclude("net.fabricmc")
         exclude("net.fabricmc.fabric-api")
     }
     
-    modLocalRuntime("com.github.astei:lazydfu:${Versions.Mod.lazyDfu}") {
+    modLocalRuntime(libs.mod.lazy.dfu) {
         exclude("net.fabricmc")
         exclude("net.fabricmc.fabric-api")
     }