From 7b22f2e40be3b545f17f4c158f1c7847fb99c0bc Mon Sep 17 00:00:00 2001 From: Andrew Wong <42793301+md5sha256@users.noreply.github.com> Date: Sat, 22 Jun 2024 01:27:28 +1000 Subject: [PATCH 1/3] Compile against 1.21, bump version to 2.9.1-SNAPSHOT --- AreaShop/build.gradle.kts | 2 +- build.gradle.kts | 2 +- gradle/libs.versions.toml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/AreaShop/build.gradle.kts b/AreaShop/build.gradle.kts index 8e2ff2d1..6a030b07 100644 --- a/AreaShop/build.gradle.kts +++ b/AreaShop/build.gradle.kts @@ -130,7 +130,7 @@ tasks { // Configure the Minecraft version for our task. // This is the only required configuration besides applying the plugin. // Your plugin's jar (or shadowJar if present) will be used automatically. - minecraftVersion("1.20.6") + minecraftVersion("1.21") downloadPlugins { github("EssentialsX", "essentials", "2.20.1", "EssentialsX-2.20.1.jar") diff --git a/build.gradle.kts b/build.gradle.kts index e54ab33e..915c43ee 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -11,7 +11,7 @@ plugins { } group = "me.wiefferink" -version = "2.9.0" +version = "2.9.1-SNAPSHOT" val targetJavaVersion = 21 val encoding = Charsets.UTF_8 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index f5b1d59f..1450f10f 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] # Platforms -minecraft = "1.20.6-R0.1-SNAPSHOT" +minecraft = "1.21-R0.1-SNAPSHOT" # Minecraft Plugins worldedit = "7.3.3" From 5dd42e42adb518e1f343353d0ad4289074db7b64 Mon Sep 17 00:00:00 2001 From: Andrew Wong <42793301+md5sha256@users.noreply.github.com> Date: Sat, 22 Jun 2024 01:30:06 +1000 Subject: [PATCH 2/3] Enforce min version to 1.21 --- AreaShop/src/main/java/me/wiefferink/areashop/AreaShop.java | 4 ++-- .../me/wiefferink/areashop/tools/version/VersionUtil.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/AreaShop/src/main/java/me/wiefferink/areashop/AreaShop.java b/AreaShop/src/main/java/me/wiefferink/areashop/AreaShop.java index 0eb83bd1..505a5be4 100644 --- a/AreaShop/src/main/java/me/wiefferink/areashop/AreaShop.java +++ b/AreaShop/src/main/java/me/wiefferink/areashop/AreaShop.java @@ -181,8 +181,8 @@ public void onEnable() { // Setup NMS Impl Version currentServerVersion = VersionUtil.parseMinecraftVersion(Bukkit.getBukkitVersion()); - if (currentServerVersion.versionData().isOlderThan(VersionUtil.MC_1_20_6)) { - error("Unsupported minecraft version: " + currentServerVersion + "! Minimum is 1.20.6"); + if (currentServerVersion.versionData().isOlderThan(VersionUtil.MC_1_21)) { + error("Unsupported minecraft version: " + currentServerVersion + "! Minimum is 1.21"); shutdownOnError(); return; } diff --git a/AreaShop/src/main/java/me/wiefferink/areashop/tools/version/VersionUtil.java b/AreaShop/src/main/java/me/wiefferink/areashop/tools/version/VersionUtil.java index 6ed266fc..25f4ebe9 100644 --- a/AreaShop/src/main/java/me/wiefferink/areashop/tools/version/VersionUtil.java +++ b/AreaShop/src/main/java/me/wiefferink/areashop/tools/version/VersionUtil.java @@ -5,7 +5,7 @@ public class VersionUtil { - public static final VersionData MC_1_20_6 = new VersionData(1, 20, 6); + public static final VersionData MC_1_21 = new VersionData(1, 21); @Nonnull public static String padTrailingZero(@Nonnull String minecraftVersion) { From a6190504b81f493f5711eae4b580667659e07cfe Mon Sep 17 00:00:00 2001 From: Andrew Wong <42793301+md5sha256@users.noreply.github.com> Date: Wed, 24 Jul 2024 14:43:05 +1000 Subject: [PATCH 3/3] Update cloud to beta.9 --- AreaShop/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AreaShop/build.gradle.kts b/AreaShop/build.gradle.kts index 6a030b07..7d59ffd8 100644 --- a/AreaShop/build.gradle.kts +++ b/AreaShop/build.gradle.kts @@ -31,7 +31,7 @@ dependencies { api("com.google.inject.extensions:guice-assistedinject:7.0.0") { exclude("com.google.guava") } - implementation("org.incendo:cloud-paper:2.0.0-beta.8") { + implementation("org.incendo:cloud-paper:2.0.0-beta.9") { exclude("com.google.guava") } implementation("org.incendo:cloud-processors-confirmation:1.0.0-beta.3") {