Final dep update

confirmed working on paper and fabric

buildSrc/build.gradle.kts

@@ -17,10 +17,10 @@ repositories {
 dependencies {
     //TODO Allow pulling from Versions.kt
     implementation("com.github.johnrengelman", "shadow", "8.1.1")
-    implementation("io.papermc.paperweight.userdev", "io.papermc.paperweight.userdev.gradle.plugin", "1.5.10")
+    implementation("io.papermc.paperweight.userdev", "io.papermc.paperweight.userdev.gradle.plugin", "1.5.11")
 
     implementation("org.ow2.asm", "asm", "9.6")
     implementation("org.ow2.asm", "asm-tree", "9.6")
-    implementation("com.dfsek.tectonic", "common", "4.2.0")
+    implementation("com.dfsek.tectonic", "common", "4.2.1")
     implementation("org.yaml", "snakeyaml", "2.2")
 }

buildSrc/src/main/kotlin/Versions.kt

@@ -6,6 +6,8 @@ object Versions {
         
         const val cloud = "1.8.4"
         
+        const val caffeine = "3.1.8"
+        
         const val slf4j = "2.0.9"
         const val log4j_slf4j_impl = "2.20.0"
         
@@ -22,7 +24,7 @@ object Versions {
     }
     
     object Fabric {
-        const val fabricAPI = "0.91.1+${Mod.minecraft}"
+        const val fabricAPI = "0.91.2+${Mod.minecraft}"
     }
 //
 //    object Quilt {
@@ -35,9 +37,9 @@ object Versions {
         
         const val minecraft = "1.20.4"
         const val yarn = "$minecraft+build.1"
-        const val fabricLoader = "0.15.0"
+        const val fabricLoader = "0.15.1"
         
-        const val architecuryLoom = "1.4.367"
+        const val architecuryLoom = "1.4.369"
         const val architecturyPlugin = "3.4.151"
      }
 //
@@ -48,13 +50,13 @@ object Versions {
     
     object Bukkit {
         const val minecraft = "1.20.4"
-        const val paperBuild = "$minecraft-R0.1-20231207.202833-1"
+        const val paperBuild = "$minecraft-R0.1-20231209.173338-2"
         const val paper = paperBuild
         const val paperLib = "1.0.8"
         const val reflectionRemapper = "0.1.0"
         const val paperDevBundle = paperBuild
         const val runPaper = "2.2.2"
-        const val paperWeight = "1.5.10"
+        const val paperWeight = "1.5.11"
     }
     
     //

common/api/build.gradle.kts

@@ -6,6 +6,6 @@ dependencies {
 
     api("com.dfsek.tectonic", "common", Versions.Libraries.tectonic)
 
-    api("com.github.ben-manes.caffeine:caffeine:3.1.0")
+    api("com.github.ben-manes.caffeine", "caffeine", Versions.Libraries.caffeine)
 
 }

platforms/bukkit/build.gradle.kts

@@ -10,7 +10,7 @@ repositories {
 
 dependencies {
     shaded(project(":platforms:bukkit:common"))
-    shaded(project(":platforms:bukkit:nms:v1_20_R4", configuration = "reobf"))
+    shaded(project(":platforms:bukkit:nms:v1_20_R3", configuration = "reobf"))
     shaded("xyz.jpenilla", "reflection-remapper", Versions.Bukkit.reflectionRemapper)
 }
 

platforms/bukkit/common/src/main/resources/plugin.yml

@@ -4,6 +4,6 @@ version: "@VERSION@"
 load: "STARTUP"
 author: dfsek
 website: "@WIKI@"
-api-version: "1.20.4"
+api-version: "1.20"
 description: "@DESCRIPTION@"
 folia-supported: true

platforms/bukkit/nms/v1_20_R3/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R3/AwfulBukkitHacks.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.bukkit.nms.v1_20_R4;
+package com.dfsek.terra.bukkit.nms.v1_20_R3;
 
 import com.google.common.collect.ImmutableMap;
 import com.mojang.serialization.Lifecycle;

platforms/bukkit/nms/v1_20_R3/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R3/NMSBiomeInfo.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.bukkit.nms.v1_20_R4;
+package com.dfsek.terra.bukkit.nms.v1_20_R3;
 
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.world.level.biome.Biome;

platforms/bukkit/nms/v1_20_R3/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R3/NMSBiomeInjector.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.bukkit.nms.v1_20_R4;
+package com.dfsek.terra.bukkit.nms.v1_20_R3;
 
 import net.minecraft.core.Holder;
 import net.minecraft.core.Registry;

platforms/bukkit/nms/v1_20_R3/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R3/NMSBiomeProvider.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.bukkit.nms.v1_20_R4;
+package com.dfsek.terra.bukkit.nms.v1_20_R3;
 
 import com.mojang.serialization.Codec;
 import net.minecraft.core.Holder;

platforms/bukkit/nms/v1_20_R3/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R3/NMSChunkGeneratorDelegate.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.bukkit.nms.v1_20_R4;
+package com.dfsek.terra.bukkit.nms.v1_20_R3;
 
 import com.mojang.serialization.Codec;
 import net.minecraft.core.BlockPos;

platforms/bukkit/nms/v1_20_R3/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R3/NMSInitializer.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.bukkit.nms.v1_20_R4;
+package com.dfsek.terra.bukkit.nms.v1_20_R3;
 
 import org.bukkit.Bukkit;
 

platforms/bukkit/nms/v1_20_R3/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R3/NMSInjectListener.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.bukkit.nms.v1_20_R4;
+package com.dfsek.terra.bukkit.nms.v1_20_R3;
 
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.level.chunk.ChunkGenerator;

platforms/bukkit/nms/v1_20_R3/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R3/NMSWorldProperties.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.bukkit.nms.v1_20_R4;
+package com.dfsek.terra.bukkit.nms.v1_20_R3;
 
 import net.minecraft.world.level.LevelHeightAccessor;
 

platforms/bukkit/nms/v1_20_R3/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R3/Reflection.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.bukkit.nms.v1_20_R4;
+package com.dfsek.terra.bukkit.nms.v1_20_R3;
 
 import net.minecraft.core.Holder;
 import net.minecraft.core.Holder.Reference;

platforms/bukkit/nms/v1_20_R3/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R3/RegistryFetcher.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.bukkit.nms.v1_20_R4;
+package com.dfsek.terra.bukkit.nms.v1_20_R3;
 
 import net.minecraft.core.Registry;
 import net.minecraft.core.registries.Registries;

platforms/fabric/src/main/resources/fabric.mod.json

@@ -26,7 +26,7 @@
         "terra.common.mixins.json"
     ],
     "depends": {
-        "fabricloader": ">=0.15.0",
+        "fabricloader": ">=0.15.1",
         "java": ">=17",
         "minecraft": ">=1.20.4",
         "fabric": "*"