misc: Depend on the Adventure API instead of the Velocity API in the …

…API module
4drian3d · Sep 15, 2023 · 5e4c41c · 5e4c41c
1 parent a07844a
commit 5e4c41c
Show file tree

Hide file tree

Showing 14 changed files with 33 additions and 26 deletions.
diff --git a/api/build.gradle.kts b/api/build.gradle.kts
@@ -13,7 +13,8 @@ java {
 }
 
 dependencies {
-    compileOnlyApi(libs.velocity)
+    compileOnlyApi(libs.adventure)
+    compileOnly(libs.caffeine)
 }
 
 tasks {
@@ -25,10 +26,8 @@ tasks {
     javadoc {
         options.encoding = Charsets.UTF_8.name()
         (options as StandardJavadocDocletOptions).links(
-            "https://jd.advntr.dev/api/4.13.1/",
-            "https://jd.advntr.dev/text-minimessage/4.13.1/",
-            "https://jd.papermc.io/velocity/3.0.0/",
-            "https://checkerframework.org/api/",
+            "https://jd.advntr.dev/api/${libs.versions.adventure.get()}/",
+            "https://jd.advntr.dev/text-minimessage/${libs.versions.adventure.get()}/",
             "https://javadoc.io/doc/org.jetbrains/annotations/24.0.1/index.html",
         )
     }

diff --git a/api/src/main/java/io/github/_4drian3d/chatregulator/api/checks/FloodCheck.java b/api/src/main/java/io/github/_4drian3d/chatregulator/api/checks/FloodCheck.java
@@ -23,7 +23,7 @@ public final class FloodCheck implements Check {
             .maximumSize(3)
             .initialCapacity(1)
             .build(length -> Pattern.compile(
-                    "(\\w)\\1{"+length+",}", //(\w{28,})|([^\wñ]{20,})|(^.{220,}$)
+                    "(\\w)\\1{"+length+",}",
                     Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE)
             );
     private final Pattern pattern;

diff --git a/api/src/main/java/io/github/_4drian3d/chatregulator/api/enums/DetectionMode.java b/api/src/main/java/io/github/_4drian3d/chatregulator/api/enums/DetectionMode.java
@@ -1,7 +1,7 @@
 package io.github._4drian3d.chatregulator.api.enums;
 
 /**
- * UnicodeChek's Detection Mode
+ * UnicodeCheck's Detection Mode
  */
 public enum DetectionMode {
     WHITELIST,

diff --git a/api/src/main/java/io/github/_4drian3d/chatregulator/api/enums/Permission.java b/api/src/main/java/io/github/_4drian3d/chatregulator/api/enums/Permission.java
@@ -1,13 +1,14 @@
 package io.github._4drian3d.chatregulator.api.enums;
 
-import com.velocitypowered.api.command.CommandSource;
+import net.kyori.adventure.audience.Audience;
+import net.kyori.adventure.permission.PermissionChecker;
 
 import java.util.function.Predicate;
 
 /**
  * ChatRegulator Permissions
  */
-public enum Permission implements Predicate<CommandSource> {
+public enum Permission implements Predicate<Audience> {
     /**General Command */
     COMMAND("chatregulator.command"),
 
@@ -83,7 +84,9 @@ public String toString() {
     }
 
     @Override
-    public boolean test(final CommandSource source) {
-        return source.hasPermission(permission);
+    public boolean test(final Audience source) {
+        return source.get(PermissionChecker.POINTER)
+                .filter(checker -> checker.test(this.permission))
+                .isPresent();
     }
 }
diff --git a/api/src/main/java/module-info.java b/api/src/main/java/module-info.java
@@ -6,7 +6,6 @@
     requires static org.checkerframework.checker.qual;
     requires net.kyori.adventure;
     requires net.kyori.examination.api;
-    requires com.velocitypowered.api;
     requires com.github.benmanes.caffeine;
 
     exports io.github._4drian3d.chatregulator.api;

diff --git a/build.gradle.kts b/build.gradle.kts
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -2,6 +2,7 @@ metadata.format.version = "1.1"
 
 [versions]
 
+adventure = "4.14.0"
 velocity = "3.2.0-SNAPSHOT"
 futures = "0.3.5"
 
@@ -10,6 +11,7 @@ assertj = "3.24.2"
 miniplaceholders = "2.2.1"
 hexlogger = "1.0.2"
 bstats = "3.0.2"
+caffeine = "3.1.8"
 
 blossom = "2.0.1"
 shadow = "8.1.1"
@@ -21,6 +23,7 @@ mockito = "5.5.0"
 
 [libraries]
 
+adventure = { group = "net.kyori", name = "adventure-api", version.ref = "adventure" }
 velocity = { group = "com.velocitypowered", name = "velocity-api", version.ref = "velocity" }
 bstats = { module = "org.bstats:bstats-velocity", version.ref = "bstats" }
 configurate = { module = "org.spongepowered:configurate-hocon", version.ref = "configurate" }
@@ -31,6 +34,7 @@ junit-bom = { group = "org.junit", name = "junit-bom", version.ref = "junit" }
 mockito = { group = "org.mockito", name = "mockito-core", version.ref = "mockito" }
 hexlogger = { group = "io.github.4drian3d", name = "velocityhexlogger", version.ref = "hexlogger" }
 futures = { group = "com.spotify", name = "completable-futures", version.ref = "futures" }
+caffeine = { group = "com.github.ben-manes.caffeine", name = "caffeine", version.ref = "caffeine" }
 
 [plugins]
 

diff --git a/plugin/src/main/java/io/github/_4drian3d/chatregulator/plugin/commands/ClearArgument.java b/plugin/src/main/java/io/github/_4drian3d/chatregulator/plugin/commands/ClearArgument.java
@@ -28,7 +28,7 @@ public class ClearArgument implements Argument {
     @Override
     public CommandNode<CommandSource> node() {
         return literal("clear")
-                .requires(Permission.COMMAND_CLEAR)
+                .requires(Permission.COMMAND_CLEAR::test)
                 .executes(cmd -> {
                     proxyServer.sendMessage(Components.SPACES_COMPONENT);
                     cmd.getSource().sendMessage(
@@ -39,7 +39,7 @@ public CommandNode<CommandSource> node() {
                     return Command.SINGLE_SUCCESS;
                 })
                 .then(literal("server")
-                        .requires(Permission.COMMAND_CLEAR_SERVER)
+                        .requires(Permission.COMMAND_CLEAR_SERVER::test)
                         .executes(cmd -> {
                             if (cmd.getSource() instanceof final Player player) {
                                 player.getCurrentServer().ifPresent(playerServer -> {
@@ -90,7 +90,7 @@ public CommandNode<CommandSource> node() {
                         )
                 )
                 .then(literal("player")
-                        .requires(Permission.COMMAND_CLEAR_PLAYER)
+                        .requires(Permission.COMMAND_CLEAR_PLAYER::test)
                         .executes(cmd -> {
                             cmd.getSource().sendMessage(
                                     formatter.parse(

diff --git a/plugin/src/main/java/io/github/_4drian3d/chatregulator/plugin/commands/PlayerArgument.java b/plugin/src/main/java/io/github/_4drian3d/chatregulator/plugin/commands/PlayerArgument.java
@@ -32,7 +32,7 @@ public class PlayerArgument implements Argument {
     @Override
     public CommandNode<CommandSource> node() {
         return literal("player")
-                .requires(Permission.COMMAND_PLAYER)
+                .requires(Permission.COMMAND_PLAYER::test)
                 .executes(ctx -> {
                     ctx.getSource().sendMessage(
                             formatter.parse(

diff --git a/plugin/src/main/java/io/github/_4drian3d/chatregulator/plugin/commands/RegulatorCommand.java b/plugin/src/main/java/io/github/_4drian3d/chatregulator/plugin/commands/RegulatorCommand.java
@@ -30,7 +30,7 @@ public final class RegulatorCommand {
     public void register() {
         final LiteralCommandNode<CommandSource> node = LiteralArgumentBuilder
                 .<CommandSource>literal("chatregulator")
-                .requires(Permission.COMMAND)
+                .requires(Permission.COMMAND::test)
                 .executes(cmd -> {
                     cmd.getSource().sendMessage(
                             formatter.parse(

diff --git a/plugin/src/main/java/io/github/_4drian3d/chatregulator/plugin/commands/ReloadArgument.java b/plugin/src/main/java/io/github/_4drian3d/chatregulator/plugin/commands/ReloadArgument.java
@@ -30,7 +30,7 @@ public class ReloadArgument implements Argument {
     public CommandNode<CommandSource> node() {
         return LiteralArgumentBuilder
                 .<CommandSource>literal("reload")
-                .requires(Permission.COMMAND_RELOAD)
+                .requires(Permission.COMMAND_RELOAD::test)
                 .executes(cmd -> {
                     CompletableFutures.combine(
                             messagesContainer.reload(),

diff --git a/plugin/src/main/java/io/github/_4drian3d/chatregulator/plugin/commands/ResetArgument.java b/plugin/src/main/java/io/github/_4drian3d/chatregulator/plugin/commands/ResetArgument.java
@@ -30,7 +30,7 @@ public class ResetArgument implements Argument {
     @Override
     public CommandNode<CommandSource> node() {
         return literal("reset")
-                .requires(Permission.COMMAND_RESET)
+                .requires(Permission.COMMAND_RESET::test)
                 .executes(cmd -> {
                     cmd.getSource().sendMessage(
                             formatter.parse(
@@ -77,7 +77,7 @@ public CommandNode<CommandSource> node() {
 
     private LiteralCommandNode<CommandSource> subReset(String subcommand, InfractionType type, Permission resetPermission) {
         return literal(subcommand)
-                .requires(resetPermission)
+                .requires(resetPermission::test)
                 .executes(cmd -> {
                     String arg = cmd.getArgument("player", String.class);
                     Player player = proxyServer.getPlayer(arg).orElse(null);

diff --git a/plugin/src/main/java/io/github/_4drian3d/chatregulator/plugin/commands/StatsArgument.java b/plugin/src/main/java/io/github/_4drian3d/chatregulator/plugin/commands/StatsArgument.java
@@ -27,7 +27,7 @@ public class StatsArgument implements Argument {
     @Override
     public CommandNode<CommandSource> node() {
         return literal("stats")
-                .requires(Permission.COMMAND_STATS)
+                .requires(Permission.COMMAND_STATS::test)
                 .executes(cmd -> {
                     final TagResolver resolver;
                     if (cmd.getSource() instanceof Player player) {

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -1,6 +1,13 @@
+@file:Suppress("UnstableApiUsage")
 enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
 rootProject.name = "ChatRegulator"
 
+dependencyResolutionManagement {
+    repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
+    repositories {
+        maven("https://papermc.io/repo/repository/maven-public/")
+    }
+}
 
 plugins {
     id("org.gradle.toolchains.foojay-resolver-convention") version "0.7.0"