diff --git a/platforms/bukkit/compatibility/build.gradle.kts b/platforms/bukkit/compatibility/build.gradle.kts index 25fe446..cd0e2d9 100644 --- a/platforms/bukkit/compatibility/build.gradle.kts +++ b/platforms/bukkit/compatibility/build.gradle.kts @@ -19,6 +19,7 @@ repositories { dependencies { compileOnly(project(":api")) compileOnly(project(":backend")) + compileOnly("net.kyori:adventure-api:${rootProject.properties["adventure_bundle_version"]}") compileOnly("dev.dejvokep:boosted-yaml:${rootProject.properties["boosted_yaml_version"]}") // WorldGuard compileOnly("com.sk89q.worldguard:worldguard-bukkit:7.0.9") @@ -27,11 +28,11 @@ dependencies { // Chat compileOnly(files("libs/VentureChat-3.7.1.jar")) compileOnly(files("libs/TrChat-2.0.11.jar")) - compileOnly(files("libs/carbonchat-paper-3.0.0-beta.27.jar")) compileOnly(files("libs/AdvancedChat-1.3.7.jar")) compileOnly(files("libs/CMIAPI-9.7.4.1.jar")) compileOnly(files("libs/ChatControl-11.3.1.jar")) compileOnly(files("libs/Typewriter.jar")) + compileOnly("de.hexaoxi:carbonchat-api:3.0.0-beta.36") compileOnly("net.william278.huskchat:huskchat-bukkit:3.0.4") compileOnly("net.essentialsx:EssentialsX:2.20.1") compileOnly("net.essentialsx:EssentialsXChat:2.20.1") @@ -65,6 +66,6 @@ java { tasks.withType { options.encoding = "UTF-8" - options.release.set(17) + options.release.set(21) dependsOn(tasks.clean) } \ No newline at end of file diff --git a/platforms/bukkit/compatibility/libs/carbonchat-paper-3.0.0-beta.27.jar b/platforms/bukkit/compatibility/libs/carbonchat-paper-3.0.0-beta.27.jar deleted file mode 100644 index 599fbaa..0000000 Binary files a/platforms/bukkit/compatibility/libs/carbonchat-paper-3.0.0-beta.27.jar and /dev/null differ diff --git a/platforms/bukkit/compatibility/src/main/java/net/momirealms/customnameplates/bukkit/compatibility/chat/CarbonChatProvider.java b/platforms/bukkit/compatibility/src/main/java/net/momirealms/customnameplates/bukkit/compatibility/chat/CarbonChatProvider.java index 1ce9839..e3a96ec 100644 --- a/platforms/bukkit/compatibility/src/main/java/net/momirealms/customnameplates/bukkit/compatibility/chat/CarbonChatProvider.java +++ b/platforms/bukkit/compatibility/src/main/java/net/momirealms/customnameplates/bukkit/compatibility/chat/CarbonChatProvider.java @@ -49,7 +49,7 @@ public class CarbonChatProvider extends AbstractChatMessageProvider { public CarbonChatProvider(CustomNameplates plugin, ChatManager manager) { super(plugin, manager); - this.api = net.draycia.carbon.api.CarbonChatProvider.carbonChat(); + api = net.draycia.carbon.api.CarbonChatProvider.carbonChat(); try { this.originalMessageMethod = CarbonChatEvent.class.getMethod("originalMessage"); this.channelKeyMethod = ChatChannel.class.getMethod("key"); @@ -172,11 +172,8 @@ public class CarbonChatProvider extends AbstractChatMessageProvider { if (channel == null) { return false; } - String perm = channel.permission(); - if (perm == null) { - return true; - } - return player.hasPermission(perm); + CarbonPlayer carbonPlayer = this.api.userManager().user(player.uuid()).join(); + return channel.permissions().joinPermitted(carbonPlayer).permitted(); } @Override