From f10d3c14b5cc2fe0a5ac4b48570e2009dd5df31e Mon Sep 17 00:00:00 2001 From: William278 Date: Sat, 7 Dec 2024 21:28:26 +0000 Subject: [PATCH] build: general dependency bump (cherry picked from commit e04c19acf5bc32fff43ff9e8ceadd22760ef2ef7) --- bukkit/build.gradle | 4 ++-- .../main/java/net/william278/husksync/BukkitHuskSync.java | 1 - common/build.gradle | 2 +- fabric/build.gradle | 8 ++++---- .../main/java/net/william278/husksync/FabricHuskSync.java | 6 ++---- gradle.properties | 8 ++++---- 6 files changed, 13 insertions(+), 16 deletions(-) diff --git a/bukkit/build.gradle b/bukkit/build.gradle index f69f260d..f44e6981 100644 --- a/bukkit/build.gradle +++ b/bukkit/build.gradle @@ -1,7 +1,7 @@ dependencies { implementation project(path: ':common') - implementation 'net.william278.uniform:uniform-bukkit:1.2.2' + implementation 'net.william278.uniform:uniform-bukkit:1.2.3' implementation 'net.william278:mpdbdataconverter:1.0.1' implementation 'net.william278:hsldataconverter:1.0' implementation 'net.william278:mapdataapi:2.0' @@ -13,7 +13,7 @@ dependencies { compileOnly "org.spigotmc:spigot-api:${bukkit_spigot_api}" compileOnly 'com.github.retrooper.packetevents:spigot:2.3.0' - compileOnly 'com.comphenix.protocol:ProtocolLib:5.1.0' + compileOnly 'com.comphenix.protocol:ProtocolLib:5.3.0' compileOnly 'org.projectlombok:lombok:1.18.36' compileOnly 'commons-io:commons-io:2.18.0' compileOnly 'org.json:json:20240303' diff --git a/bukkit/src/main/java/net/william278/husksync/BukkitHuskSync.java b/bukkit/src/main/java/net/william278/husksync/BukkitHuskSync.java index 2beaed0d..719a2ab9 100644 --- a/bukkit/src/main/java/net/william278/husksync/BukkitHuskSync.java +++ b/bukkit/src/main/java/net/william278/husksync/BukkitHuskSync.java @@ -343,7 +343,6 @@ public int getDataVersion(@NotNull Version mcVersion) { case "1.20.3", "1.20.4" -> DataFixerUtil.VERSION1_20_4; case "1.20.5", "1.20.6" -> DataFixerUtil.VERSION1_20_5; case "1.21", "1.21.1" -> DataFixerUtil.VERSION1_21; - case "1.21.2", "1.21.3" -> DataFixerUtil.VERSION1_21_2; default -> DataFixerUtil.getCurrentVersion(); }; } diff --git a/common/build.gradle b/common/build.gradle index 2d298d1c..ce810291 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -16,7 +16,7 @@ dependencies { exclude module: 'slf4j-api' } - compileOnly 'net.william278.uniform:uniform-common:1.2.2' + compileOnly 'net.william278.uniform:uniform-common:1.2.3' compileOnly 'com.mojang:brigadier:1.1.8' compileOnly 'org.projectlombok:lombok:1.18.36' compileOnly 'org.jetbrains:annotations:26.0.1' diff --git a/fabric/build.gradle b/fabric/build.gradle index 6325e053..e38f5e6c 100644 --- a/fabric/build.gradle +++ b/fabric/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'fabric-loom' version '1.7-SNAPSHOT' + id 'fabric-loom' version "$fabric_loom_version" } apply plugin: 'fabric-loom' @@ -18,7 +18,7 @@ dependencies { modImplementation include("net.kyori:adventure-platform-fabric:${fabric_adventure_platform_version}") modImplementation include("me.lucko:fabric-permissions-api:${fabric_permissions_api_version}") modImplementation include("eu.pb4:sgui:${fabric_sgui_version}") - modImplementation include('net.william278.uniform:uniform-fabric:1.2.1+1.21') + modImplementation include("net.william278.uniform:uniform-fabric:1.2.3+${minecraft_version}") modCompileOnly "net.fabricmc.fabric-api:fabric-api:${fabric_api_version}" implementation include('org.apache.commons:commons-pool2:2.12.0') @@ -30,9 +30,9 @@ dependencies { compileOnly 'org.jetbrains:annotations:26.0.1' compileOnly 'net.william278:DesertWell:2.0.4' - compileOnly 'org.projectlombok:lombok:1.18.34' + compileOnly 'org.projectlombok:lombok:1.18.36' - annotationProcessor 'org.projectlombok:lombok:1.18.34' + annotationProcessor 'org.projectlombok:lombok:1.18.36' shadow project(path: ":common") } diff --git a/fabric/src/main/java/net/william278/husksync/FabricHuskSync.java b/fabric/src/main/java/net/william278/husksync/FabricHuskSync.java index 91787c50..11356e86 100644 --- a/fabric/src/main/java/net/william278/husksync/FabricHuskSync.java +++ b/fabric/src/main/java/net/william278/husksync/FabricHuskSync.java @@ -93,8 +93,7 @@ public class FabricHuskSync implements DedicatedServerModInitializer, HuskSync, private static final int VERSION1_20_2 = 3578; private static final int VERSION1_20_4 = 3700; private static final int VERSION1_20_5 = 3837; - private static final int VERSION1_21_1 = 3955; - private static final int VERSION1_21_3 = 4082; // Current + private static final int VERSION1_21_1 = 3955; // Current private final TreeMap> serializers = Maps.newTreeMap( SerializerRegistry.DEPENDENCY_ORDER_COMPARATOR @@ -372,8 +371,7 @@ public int getDataVersion(@NotNull Version mcVersion) { case "1.20.4" -> VERSION1_20_4; case "1.20.5", "1.20.6" -> VERSION1_20_5; case "1.21", "1.21.1" -> VERSION1_21_1; - case "1.21.2", "1.21.3" -> VERSION1_21_3; - default -> VERSION1_21_3; // Current supported ver + default -> VERSION1_21_1; // Current supported ver }; } diff --git a/gradle.properties b/gradle.properties index 46bdf38e..6eae6077 100644 --- a/gradle.properties +++ b/gradle.properties @@ -12,10 +12,10 @@ plugin_description=A modern, cross-server player data synchronization system # Drivers jedis_version=5.2.0 mysql_driver_version=9.1.0 -mariadb_driver_version=3.5.0 -postgres_driver_version=42.7.3 -mongodb_driver_version=5.1.2 -snappy_version=1.1.10.6 +mariadb_driver_version=3.5.1 +postgres_driver_version=42.7.4 +mongodb_driver_version=5.2.1 +snappy_version=1.1.10.7 # Spigot/Paper build settings bukkit_spigot_api=1.21.1-R0.1-SNAPSHOT