From 479514b7768c1e45446f45a2f118bc0f0aa4d502 Mon Sep 17 00:00:00 2001 From: Warrior <50800980+Warriorrrr@users.noreply.github.com> Date: Mon, 16 Sep 2024 13:56:55 +0200 Subject: [PATCH] Add support for new towny and minecraft versions --- build.gradle.kts | 2 +- gradle.properties | 6 +++--- gradle/libs.versions.toml | 4 ++-- .../java/io/github/townyadvanced/townymenus/TownyMenus.java | 2 +- .../io/github/townyadvanced/townymenus/menu/TownMenu.java | 2 +- src/main/resources/Changelog.txt | 3 +++ 6 files changed, 11 insertions(+), 8 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index aad5700..4547201 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -66,7 +66,7 @@ tasks { } runServer { - minecraftVersion("1.20.6") + minecraftVersion("1.21.1") downloadPlugins { libs.towny.get().version?.let { github("TownyAdvanced", "Towny", it, "towny-${it}.jar") } diff --git a/gradle.properties b/gradle.properties index 8bee85b..c12e4fa 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ group = io.github.townyadvanced -version = 0.0.11-SNAPSHOT +version = 0.0.11 -paperVersions = 1.16-1.20.6 -modrinthVersions = 1.16, 1.16.1, 1.16.2, 1.16.3, 1.16.4, 1.16.5, 1.17, 1.17.1, 1.18, 1.18.1, 1.18.2, 1.19, 1.19.1, 1.19.2, 1.19.3, 1.19.4, 1.20, 1.20.1, 1.20.2, 1.20.3, 1.20.4, 1.20.5, 1.20.6 +paperVersions = 1.16-1.21.1 +modrinthVersions = 1.16, 1.16.1, 1.16.2, 1.16.3, 1.16.4, 1.16.5, 1.17, 1.17.1, 1.18, 1.18.1, 1.18.2, 1.19, 1.19.1, 1.19.2, 1.19.3, 1.19.4, 1.20, 1.20.1, 1.20.2, 1.20.3, 1.20.4, 1.20.5, 1.20.6, 1.21, 1.21.1 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 1a20ae2..1dca7b6 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [libraries] spigot = { group = "org.spigotmc", name = "spigot-api", version = "1.19.4-R0.1-SNAPSHOT" } -towny = { group = "com.palmergames.bukkit.towny", name = "towny", version = "0.100.2.9" } +towny = { group = "com.palmergames.bukkit.towny", name = "towny", version = "0.100.4.2" } jetbrains-annotations = { group = "org.jetbrains", name = "annotations", version = "24.0.1" } -anvilgui = { group = "net.wesjd", name = "anvilgui", version = "1.9.5-SNAPSHOT" } +anvilgui = { group = "net.wesjd", name = "anvilgui", version = "1.10.2-SNAPSHOT" } jabel = { group = "com.github.bsideup.jabel", name = "jabel-javac-plugin", version = "1.0.0" } diff --git a/src/main/java/io/github/townyadvanced/townymenus/TownyMenus.java b/src/main/java/io/github/townyadvanced/townymenus/TownyMenus.java index 4bb87f5..99cadd3 100644 --- a/src/main/java/io/github/townyadvanced/townymenus/TownyMenus.java +++ b/src/main/java/io/github/townyadvanced/townymenus/TownyMenus.java @@ -29,7 +29,7 @@ public class TownyMenus extends JavaPlugin implements Listener { - private static final Version requiredTownyVersion = Version.fromString("0.100.2.0"); + private static final Version requiredTownyVersion = Version.fromString("0.100.4.0"); private static TownyMenus plugin; private final Object scheduler; diff --git a/src/main/java/io/github/townyadvanced/townymenus/menu/TownMenu.java b/src/main/java/io/github/townyadvanced/townymenus/menu/TownMenu.java index 66d9d7c..c0e0115 100644 --- a/src/main/java/io/github/townyadvanced/townymenus/menu/TownMenu.java +++ b/src/main/java/io/github/townyadvanced/townymenus/menu/TownMenu.java @@ -19,10 +19,10 @@ import com.palmergames.bukkit.towny.object.TownBlockTypeCache; import com.palmergames.bukkit.towny.object.TownBlockTypeCache.CacheType; import com.palmergames.bukkit.towny.object.TownBlockTypeHandler; -import com.palmergames.bukkit.towny.object.TransactionType; import com.palmergames.bukkit.towny.object.Translation; import com.palmergames.bukkit.towny.object.economy.Account; import com.palmergames.bukkit.towny.object.economy.BankTransaction; +import com.palmergames.bukkit.towny.object.economy.transaction.TransactionType; import com.palmergames.bukkit.towny.permissions.PermissionNodes; import com.palmergames.bukkit.towny.permissions.TownyPerms; import io.github.townyadvanced.townymenus.gui.MenuHelper; diff --git a/src/main/resources/Changelog.txt b/src/main/resources/Changelog.txt index 2304c91..f9b8410 100644 --- a/src/main/resources/Changelog.txt +++ b/src/main/resources/Changelog.txt @@ -52,3 +52,6 @@ 0.0.10: - Update AnvilGUI again for proper 1.20.6 support. - Fix rogue underscore in front of town name when changing name. +0.0.11: + - Add support for new Towny versions, now requires version 0.100.4.0 or up. + - Add support up to 1.21.1.