diff --git a/build.gradle.kts b/build.gradle.kts index 0bfaa85..3fe71b6 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("xyz.jpenilla.run-paper") version "2.2.4" + id("com.gradleup.shadow") version "8.3.5" + id("xyz.jpenilla.run-paper") version "2.3.1" } group = "com.github.nutt1101" -version = "2.0.2" +version = "2.0.3" description = "CatchBall" -java.sourceCompatibility = JavaVersion.VERSION_16 +java.sourceCompatibility = JavaVersion.VERSION_21 repositories { mavenLocal() @@ -57,21 +57,25 @@ 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.0") + 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") - 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; } 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="