diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 47b630e2f..3bdfddef0 100644 --- a/buildSrc/build.gradle.kts +++ b/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") } \ No newline at end of file diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index 78249fec3..8dc1151f5 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/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" } // diff --git a/common/api/build.gradle.kts b/common/api/build.gradle.kts index 68a2f0d75..4f88c83e3 100644 --- a/common/api/build.gradle.kts +++ b/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) } \ No newline at end of file diff --git a/platforms/bukkit/build.gradle.kts b/platforms/bukkit/build.gradle.kts index 45621ad9a..6f75b0133 100644 --- a/platforms/bukkit/build.gradle.kts +++ b/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) } diff --git a/platforms/bukkit/common/src/main/resources/plugin.yml b/platforms/bukkit/common/src/main/resources/plugin.yml index 8e9b471fa..e965d7dee 100644 --- a/platforms/bukkit/common/src/main/resources/plugin.yml +++ b/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 diff --git a/platforms/bukkit/nms/v1_20_R4/build.gradle.kts b/platforms/bukkit/nms/v1_20_R3/build.gradle.kts similarity index 100% rename from platforms/bukkit/nms/v1_20_R4/build.gradle.kts rename to platforms/bukkit/nms/v1_20_R3/build.gradle.kts diff --git a/platforms/bukkit/nms/v1_20_R4/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R4/AwfulBukkitHacks.java b/platforms/bukkit/nms/v1_20_R3/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R3/AwfulBukkitHacks.java similarity index 99% rename from platforms/bukkit/nms/v1_20_R4/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R4/AwfulBukkitHacks.java rename to platforms/bukkit/nms/v1_20_R3/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R3/AwfulBukkitHacks.java index 04dc78db4..fa2cc9907 100644 --- a/platforms/bukkit/nms/v1_20_R4/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R4/AwfulBukkitHacks.java +++ b/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; diff --git a/platforms/bukkit/nms/v1_20_R4/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R4/NMSBiomeInfo.java b/platforms/bukkit/nms/v1_20_R3/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R3/NMSBiomeInfo.java similarity index 83% rename from platforms/bukkit/nms/v1_20_R4/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R4/NMSBiomeInfo.java rename to platforms/bukkit/nms/v1_20_R3/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R3/NMSBiomeInfo.java index 5f8854d77..f47d21c56 100644 --- a/platforms/bukkit/nms/v1_20_R4/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R4/NMSBiomeInfo.java +++ b/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; diff --git a/platforms/bukkit/nms/v1_20_R4/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R4/NMSBiomeInjector.java b/platforms/bukkit/nms/v1_20_R3/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R3/NMSBiomeInjector.java similarity index 98% rename from platforms/bukkit/nms/v1_20_R4/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R4/NMSBiomeInjector.java rename to platforms/bukkit/nms/v1_20_R3/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R3/NMSBiomeInjector.java index ed6f560ae..e75b6fc0a 100644 --- a/platforms/bukkit/nms/v1_20_R4/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R4/NMSBiomeInjector.java +++ b/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; diff --git a/platforms/bukkit/nms/v1_20_R4/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R4/NMSBiomeProvider.java b/platforms/bukkit/nms/v1_20_R3/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R3/NMSBiomeProvider.java similarity index 97% rename from platforms/bukkit/nms/v1_20_R4/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R4/NMSBiomeProvider.java rename to platforms/bukkit/nms/v1_20_R3/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R3/NMSBiomeProvider.java index 5faeab1cb..875a77fb5 100644 --- a/platforms/bukkit/nms/v1_20_R4/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R4/NMSBiomeProvider.java +++ b/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; diff --git a/platforms/bukkit/nms/v1_20_R4/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R4/NMSChunkGeneratorDelegate.java b/platforms/bukkit/nms/v1_20_R3/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R3/NMSChunkGeneratorDelegate.java similarity index 99% rename from platforms/bukkit/nms/v1_20_R4/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R4/NMSChunkGeneratorDelegate.java rename to platforms/bukkit/nms/v1_20_R3/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R3/NMSChunkGeneratorDelegate.java index f0c6e98e8..4338dc140 100644 --- a/platforms/bukkit/nms/v1_20_R4/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R4/NMSChunkGeneratorDelegate.java +++ b/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; diff --git a/platforms/bukkit/nms/v1_20_R4/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R4/NMSInitializer.java b/platforms/bukkit/nms/v1_20_R3/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R3/NMSInitializer.java similarity index 90% rename from platforms/bukkit/nms/v1_20_R4/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R4/NMSInitializer.java rename to platforms/bukkit/nms/v1_20_R3/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R3/NMSInitializer.java index 8ca4a59d0..084c5c30a 100644 --- a/platforms/bukkit/nms/v1_20_R4/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R4/NMSInitializer.java +++ b/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; diff --git a/platforms/bukkit/nms/v1_20_R4/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R4/NMSInjectListener.java b/platforms/bukkit/nms/v1_20_R3/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R3/NMSInjectListener.java similarity index 97% rename from platforms/bukkit/nms/v1_20_R4/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R4/NMSInjectListener.java rename to platforms/bukkit/nms/v1_20_R3/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R3/NMSInjectListener.java index 8fa489968..a81e93a3f 100644 --- a/platforms/bukkit/nms/v1_20_R4/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R4/NMSInjectListener.java +++ b/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; diff --git a/platforms/bukkit/nms/v1_20_R4/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R4/NMSWorldProperties.java b/platforms/bukkit/nms/v1_20_R3/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R3/NMSWorldProperties.java similarity index 94% rename from platforms/bukkit/nms/v1_20_R4/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R4/NMSWorldProperties.java rename to platforms/bukkit/nms/v1_20_R3/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R3/NMSWorldProperties.java index 03e84d7d4..60f6cee46 100644 --- a/platforms/bukkit/nms/v1_20_R4/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R4/NMSWorldProperties.java +++ b/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; diff --git a/platforms/bukkit/nms/v1_20_R4/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R4/Reflection.java b/platforms/bukkit/nms/v1_20_R3/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R3/Reflection.java similarity index 97% rename from platforms/bukkit/nms/v1_20_R4/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R4/Reflection.java rename to platforms/bukkit/nms/v1_20_R3/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R3/Reflection.java index 2889527e4..32243da54 100644 --- a/platforms/bukkit/nms/v1_20_R4/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R4/Reflection.java +++ b/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; diff --git a/platforms/bukkit/nms/v1_20_R4/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R4/RegistryFetcher.java b/platforms/bukkit/nms/v1_20_R3/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R3/RegistryFetcher.java similarity index 94% rename from platforms/bukkit/nms/v1_20_R4/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R4/RegistryFetcher.java rename to platforms/bukkit/nms/v1_20_R3/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R3/RegistryFetcher.java index 8f73a7db7..6dbbecbc7 100644 --- a/platforms/bukkit/nms/v1_20_R4/src/main/java/com/dfsek/terra/bukkit/nms/v1_20_R4/RegistryFetcher.java +++ b/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; diff --git a/platforms/fabric/src/main/resources/fabric.mod.json b/platforms/fabric/src/main/resources/fabric.mod.json index 46a2c12ac..8b67c7b54 100644 --- a/platforms/fabric/src/main/resources/fabric.mod.json +++ b/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": "*"