From f06fc5d504aaee8933c1ef112f7b6f6fe7a7f6c1 Mon Sep 17 00:00:00 2001 From: MagicTeaMC Date: Thu, 5 Dec 2024 22:36:13 +0800 Subject: [PATCH 1/4] support for 1.21.4 --- build.gradle.kts | 22 +++++++++++-------- .../com/github/nutt1101/event/HitEvent.java | 6 +---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 7bd3388..a94db77 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -3,14 +3,14 @@ plugins { `java-library` `maven-publish` kotlin("jvm") version "1.8.0" - id("com.github.johnrengelman.shadow") version "8.1.1" + id("com.gradleup.shadow") version "8.3.5" id("xyz.jpenilla.run-paper") version "2.2.4" } group = "com.github.nutt1101" -version = "2.0.1" +version = "2.0.2" description = "CatchBall" -java.sourceCompatibility = JavaVersion.VERSION_16 +java.sourceCompatibility = JavaVersion.VERSION_21 repositories { mavenLocal() @@ -55,23 +55,27 @@ repositories { } dependencies { - api("org.bstats:bstats-bukkit:3.0.3") + api("org.bstats:bstats-bukkit:3.1.0") api("com.github.Paulem79:Spigot-UpdateChecker:3cfb265fb8") - api("de.tr7zw:item-nbt-api:2.13.3-SNAPSHOT") + api("de.tr7zw:item-nbt-api:2.14.1-SNAPSHOT") api("cn.handyplus.lib.adapter:FoliaLib:1.1.5") compileOnly("org.spigotmc:spigot-api:1.20.5-R0.1-SNAPSHOT") compileOnly("io.lumine:Mythic-Dist:5.7.1") - compileOnly("com.sk89q.worldguard:worldguard-bukkit:7.0.10") + compileOnly("com.sk89q.worldguard:worldguard-bukkit:7.0.12") compileOnly("com.github.TechFortress:GriefPrevention:17.0.0") compileOnly("com.github.angeschossen:LandsAPI:7.8.5") - compileOnly("com.github.Xyness:SimpleClaimSystem:1.10.0.4") + implementation("com.github.Xyness:SimpleClaimSystem:1.11") { + attributes { + attribute(TargetJvmVersion.TARGET_JVM_VERSION_ATTRIBUTE, 22) + } + } compileOnly("me.clip:placeholderapi:2.11.6") compileOnly ("io.github.fabiozumbi12.RedProtect:RedProtect-Core:8.1.2"){ exclude(group = "*")} // Core is not needed but allow access to all region methods compileOnly ("io.github.fabiozumbi12.RedProtect:RedProtect-Spigot:8.1.2"){ exclude(group = "*")} - compileOnly(files("./libs/Residence5.1.4.3.jar")) + compileOnly(files("./libs/Residence5.1.6.4.jar")) } -val targetJavaVersion = 16 +val targetJavaVersion = 21 tasks.withType().configureEach { if (targetJavaVersion >= 10 || JavaVersion.current().isJava10Compatible) { diff --git a/src/main/java/com/github/nutt1101/event/HitEvent.java b/src/main/java/com/github/nutt1101/event/HitEvent.java index fabe685..c46fa57 100644 --- a/src/main/java/com/github/nutt1101/event/HitEvent.java +++ b/src/main/java/com/github/nutt1101/event/HitEvent.java @@ -333,11 +333,7 @@ public boolean scsCheck(Player player, Location location) { if (plugin.getServer().getPluginManager().getPlugin("SimpleClaimSystem") == null) { return true; } fr.xyness.SCS.Claim claim = scs.getClaimAtChunk(getChunkFromLocation(location)); if (claim != null) { - if (claim.getPermission(player.getName())) { - return true; - } else { - return false; - } + return claim.getPermission(player.getName(), null); } return true; } From 31831f157e619af80ae976663c9e5d7c9714e13b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 5 Dec 2024 14:39:36 +0000 Subject: [PATCH 2/4] Bump xyz.jpenilla.run-paper from 2.2.4 to 2.3.1 Bumps xyz.jpenilla.run-paper from 2.2.4 to 2.3.1. --- updated-dependencies: - dependency-name: xyz.jpenilla.run-paper dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 8959cb7..10b2173 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -4,7 +4,7 @@ plugins { `maven-publish` kotlin("jvm") version "1.8.0" id("com.gradleup.shadow") version "8.3.5" - id("xyz.jpenilla.run-paper") version "2.2.4" + id("xyz.jpenilla.run-paper") version "2.3.1" } group = "com.github.nutt1101" From e5f1c8eaca2b73ea74bc415b88554e0ad401f663 Mon Sep 17 00:00:00 2001 From: MagicTeaMC Date: Wed, 18 Dec 2024 10:27:15 +0800 Subject: [PATCH 3/4] update NBTAPI ro avoid some issues around 1.21.4 --- build.gradle.kts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 8959cb7..0a4a09c 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -8,7 +8,7 @@ plugins { } group = "com.github.nutt1101" -version = "2.0.2" +version = "2.0.3" description = "CatchBall" java.sourceCompatibility = JavaVersion.VERSION_21 @@ -57,7 +57,7 @@ repositories { dependencies { api("org.bstats:bstats-bukkit:3.1.0") api("com.github.Paulem79:Spigot-UpdateChecker:3cfb265fb8") - api("de.tr7zw:item-nbt-api:2.14.1-SNAPSHOT") + api("de.tr7zw:item-nbt-api:2.14.1") api("cn.handyplus.lib.adapter:FoliaLib:1.1.5") compileOnly("org.spigotmc:spigot-api:1.20.5-R0.1-SNAPSHOT") compileOnly("io.lumine:Mythic-Dist:5.7.1") From e7a8900ad3351f9e4be1468706d0033c87cc9886 Mon Sep 17 00:00:00 2001 From: MagicTeaMC Date: Wed, 18 Dec 2024 19:06:36 +0800 Subject: [PATCH 4/4] add CREAKING --- src/main/resources/entity/en.yml | 3 +++ src/main/resources/entity/zh_tw.yml | 3 +++ 2 files changed, 6 insertions(+) diff --git a/src/main/resources/entity/en.yml b/src/main/resources/entity/en.yml index 2fbaaa0..50e8271 100644 --- a/src/main/resources/entity/en.yml +++ b/src/main/resources/entity/en.yml @@ -32,6 +32,9 @@ EntityList: CAVE_SPIDER: DisplayName: "CAVE_SPIDER" Skull: "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNDE2NDVkZmQ3N2QwOTkyMzEwN2IzNDk2ZTk0ZWViNWMzMDMyOWY5N2VmYzk2ZWQ3NmUyMjZlOTgyMjQifX19" + CREAKING: + DisplayName: "CREAKING" + Skull: "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNmI0OWUxOTY3ZmEyMzMyNzA5M2FjMDc0MmJjNDU3YjhhZTEyNTlhNDY4Yzk4MmMzZDM2OGNiNjNmODEyNGZhOSJ9fX0=" MINECART_CHEST: DisplayName: "MINECART_CHEST" Skull: "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNGNlZDM0MjExZmVkNDAxMGE4Yzg1NzI0YTI3ZmE1ZmIyMDVkNjc2ODRiM2RhNTE3YjY4MjEyNzljNmI2NWQzZiJ9fX0=" diff --git a/src/main/resources/entity/zh_tw.yml b/src/main/resources/entity/zh_tw.yml index 1ce496b..00a9b0a 100644 --- a/src/main/resources/entity/zh_tw.yml +++ b/src/main/resources/entity/zh_tw.yml @@ -32,6 +32,9 @@ EntityList: CAVE_SPIDER: DisplayName: "洞穴蜘蛛" Skull: "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNDE2NDVkZmQ3N2QwOTkyMzEwN2IzNDk2ZTk0ZWViNWMzMDMyOWY5N2VmYzk2ZWQ3NmUyMjZlOTgyMjQifX19" + CREAKING: + DisplayName: "嘎枝" + Skull: "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNmI0OWUxOTY3ZmEyMzMyNzA5M2FjMDc0MmJjNDU3YjhhZTEyNTlhNDY4Yzk4MmMzZDM2OGNiNjNmODEyNGZhOSJ9fX0=" MINECART_CHEST: DisplayName: "箱子礦車" Skull: "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNGNlZDM0MjExZmVkNDAxMGE4Yzg1NzI0YTI3ZmE1ZmIyMDVkNjc2ODRiM2RhNTE3YjY4MjEyNzljNmI2NWQzZiJ9fX0="