Merge pull request #63 from CyR1en/development

Version 2.13.0

Author: CyR1en

README.md

@@ -20,7 +20,7 @@ Features:
 CommandPrompter uses Gradle as a project manager. You can build CommandPrompter for yourself by following the instructions below:
 
 #### Requirements
-* JDK 16 or newer
+* JDK 17 or newer
 * Git
 
 #### Compiling from source
@@ -32,12 +32,6 @@ cd CommandPrompter/
 
 ## Special Thanks To:
 <div align="Left">
-  <a href="https://www.jetbrains.com">
-    <img width="130" src="https://resources.jetbrains.com/storage/products/company/brand/logos/jb_beam.svg" />
-  </a>
-
-  <p>This project was developed with the help of JetBrains' generous <a href="https://www.jetbrains.com/opensource/">Open Source License program</a>. Huge thanks to their continued support for open source development!</p>
-
   <a href="https://www.gitbook.com/">
     <img width="230" src="https://i.imgur.com/SIPKmzS.png">
   </a>

build.gradle

@@ -39,7 +39,7 @@ java {
 
 PluginManifest pluginManifest = [
         name       : 'CommandPrompter',
-        version    : new Version(major: 2, minor: 12, patch: 0, fix: 0, classifier: 'SNAPSHOT'),
+        version    : new Version(major: 2, minor: 13, patch: 0, fix: 0, classifier: 'SNAPSHOT'),
         author     : 'CyR1en',
         description: 'Making Commands More Interactive!',
         entry      : 'com.cyr1en.commandprompter.CommandPrompter'
@@ -58,25 +58,26 @@ repositories {
     maven { url 'https://repo.codemc.io/repository/maven-public/' }
     maven { url 'https://repo.extendedclip.com/content/repositories/placeholderapi/' }
     maven { url 'https://jitpack.io' }
-    maven { url 'https://repo.glaremasters.me/repository/towny/'}
+    maven { url 'https://repo.glaremasters.me/repository/towny/' }
     maven { url 'https://repo.william278.net/releases' }
     flatDir { dirs 'libs' }
 }
 
 dependencies {
     implementation 'com.cyr1en:kiso-utils:1.8-SNAPSHOT'
     implementation 'com.cyr1en:kiso-mc:1.8-SNAPSHOT'
-    implementation 'net.wesjd:anvilgui:1.10.4-SNAPSHOT'
+    implementation 'net.wesjd:anvilgui:1.10.5-SNAPSHOT'
     implementation 'org.bstats:bstats-bukkit:3.0.2'
     implementation group: 'org.fusesource.jansi', name: 'jansi', version: '2.4.0'
-    implementation 'com.github.stefvanschie.inventoryframework:IF:0.10.19'
-    implementation "net.kyori:adventure-text-minimessage:4.17.0"
-    implementation "dev.jorel:commandapi-bukkit-shade:9.7.0"
-    implementation 'de.rapha149.signgui:signgui:2.5.0'
-
+    implementation 'com.github.stefvanschie.inventoryframework:IF:0.11.0'
+    implementation "net.kyori:adventure-text-minimessage:4.21.0"
+    implementation "dev.jorel:commandapi-bukkit-shade:10.0.1"
+    implementation 'de.rapha149.signgui:signgui:2.5.1'
+    implementation 'org.openjdk.nashorn:nashorn-core:15.4'
+
+    compileOnly "net.kyori:adventure-text-serializer-legacy:4.21.0"
+    compileOnly "net.kyori:adventure-text-serializer-plain:4.21.0"
     compileOnly 'me.clip:placeholderapi:2.11.6'
-    compileOnly "net.kyori:adventure-text-serializer-legacy:4.17.0"
-    compileOnly "net.kyori:adventure-text-serializer-plain:4.17.0"
     compileOnly 'com.palmergames.bukkit.towny:towny:0.100.3.0'
     compileOnly "org.spigotmc:spigot-api:1.21.3-R0.1-SNAPSHOT"
     compileOnly 'com.github.LeonMangler:SuperVanish:6.2.18-3'
@@ -85,7 +86,7 @@ dependencies {
     compileOnly 'org.jetbrains:annotations:23.0.0'
     compileOnly 'net.luckperms:api:5.4'
     compileOnly 'net.william278.husktowns:husktowns-common:3.0.5'
-
+    compileOnly 'com.github.LeonMangler:PremiumVanishAPI:2.9.0-4'
     // Local
     implementation fileTree(dir: 'libs', include: '*.jar')
     compileOnly fileTree(dir: 'libs/compileonly', include: '*.jar')
@@ -96,7 +97,7 @@ configurations.implementation {
     exclude group: 'org.atteo.classindex', module: 'classindex'
 }
 
-tasks.named('jar').configure { enabled = false }
+tasks.named('jar').configure { enabled = true }
 
 shadowJar {
     dependencies {
@@ -107,11 +108,10 @@ shadowJar {
     archiveClassifier.set('')
     archiveVersion.set(pluginManifest.version.getFullVersion())
 
+    //relocate 'net.kyori.adventure', 'com.cyr1en.adventure'
     relocate 'com.github.stefvanschie.inventoryframework', 'com.cyr1en.inventoryframework'
     relocate 'net.wesjd.anvilgui', 'com.cyr1en.anvilgui'
     relocate 'de.rapha149.signgui', 'com.cyr1en.signgui'
-    relocate 'net.kyori.adventure', 'com.cyr1en.adventure'
-    relocate 'net.kyori.examination', 'com.cyr1en.examination'
     relocate 'dev.jorel.commandapi', 'com.cyr1en.commandapi'
     relocate 'org.fusesource.jansi', 'com.cyr1en.jansi'
     relocate 'org.bstats', 'com.cyr1en.bstats'

src/main/java/com/cyr1en/commandprompter/CommandPrompter.java

@@ -67,7 +67,6 @@ public class CommandPrompter extends JavaPlugin {
 
     @Override
     public void onEnable() {
-
         new Metrics(this, 5359);
         setupConfig();
         logger = new PluginLogger(this, "CommandPrompter");
@@ -105,10 +104,6 @@ public void onDisable() {
         if (promptManager != null)
             promptManager.clearPromptRegistry();
 
-        PluginLogger logger;
-        if ((logger = getPluginLogger()) != null)
-            logger.ansiUninstall();
-
         if (Objects.nonNull(updateChecker) && !updateChecker.isDisabled())
             HandlerList.unregisterAll(updateChecker);
     }

src/main/java/com/cyr1en/commandprompter/PluginLogger.java

@@ -2,10 +2,10 @@
 
 import org.bukkit.Bukkit;
 import org.fusesource.jansi.Ansi;
-import org.fusesource.jansi.AnsiConsole;
 
 import java.awt.*;
 import java.util.Objects;
+import java.util.UnknownFormatConversionException;
 import java.util.logging.Level;
 
 public class PluginLogger {
@@ -22,7 +22,6 @@ public class PluginLogger {
     public PluginLogger(CommandPrompter plugin, String prefix) {
         this.isFancy = plugin.getConfiguration().fancyLogger();
         this.debugMode = plugin.getConfiguration().debugMode();
-        AnsiConsole.systemInstall();
 
         // Spread love not war <3
         normalGrad = new ColorGradient(new Color(1, 88, 181), new Color(246, 206, 0));
@@ -32,11 +31,6 @@ public PluginLogger(CommandPrompter plugin, String prefix) {
         setPrefix(prefix);
     }
 
-    public void ansiUninstall() {
-        if (AnsiConsole.isInstalled())
-            AnsiConsole.systemUninstall();
-    }
-
     public void setPrefix(String prefix) {
         var sep = isFancy ? new Ansi().fgRgb(153, 214, 90).a(">>").reset().toString() : ">>";
         var normal = isFancy ? makeGradient(prefix, normalGrad) : prefix;
@@ -56,8 +50,11 @@ private String makeGradient(String prefix, ColorGradient grad) {
 
     public void log(String prefix, Level level, String msg, Object... args) {
         String pre = prefix == null ? getPrefix() : prefix;
-        if (msg.contains("%s"))
-            msg = String.format(msg, args);
+        try {
+            if (msg.matches("%s"))
+                msg = String.format(msg, args);
+        } catch (UnknownFormatConversionException ignore) {
+        }
         Bukkit.getLogger().log(level, pre + msg);
     }
 

src/main/java/com/cyr1en/commandprompter/api/prompt/CompoundableValidator.java

@@ -0,0 +1,30 @@
+package com.cyr1en.commandprompter.api.prompt;
+
+
+/**
+ * A class that represents a compoundable validator.
+ * <p>
+ * This class is used to represent a validator that can be combined with other validators.
+ */
+public interface CompoundableValidator {
+
+    /**
+     * Get the type of the compoundable validator.
+     *
+     * @return the type of the compoundable validator.
+     */
+    public Type getType();
+
+    /**
+     * Set the type of the compoundable validator.
+     *
+     * @param type the type of the compoundable validator.
+     */
+    public void setType(Type type);
+
+    public enum Type {
+        AND,
+        OR,
+        DEFAULT
+    }
+}

src/main/java/com/cyr1en/commandprompter/api/prompt/InputValidator.java

@@ -1,6 +1,8 @@
 package com.cyr1en.commandprompter.api.prompt;
 
 
+import org.bukkit.entity.Player;
+
 /**
  * A functional interface for validating input.
  *
@@ -33,4 +35,9 @@ public interface InputValidator {
      * @return the message to send when validation fails
      */
     String messageOnFail();
+
+    /**
+     * Get the player that entered the input.
+     */
+    Player inputPlayer();
 }

src/main/java/com/cyr1en/commandprompter/commands/CommandAPIWrapper.java

@@ -23,6 +23,7 @@ public CommandAPIWrapper(CommandPrompter plugin) {
 
     public void load() {
         var config = new CommandAPIBukkitConfig(plugin);
+        config.skipReloadDatapacks(true);
         config.useLatestNMSVersion(false);
         config = plugin.getConfiguration().debugMode() ? config.silentLogs(false).verboseOutput(true)
                 : config.silentLogs(true).verboseOutput(false);

src/main/java/com/cyr1en/commandprompter/config/CommandPrompterConfig.java

@@ -88,6 +88,16 @@ public record CommandPrompterConfig(
         })
         boolean showCompleted,
 
+        @ConfigNode
+        @NodeName("Show-Prompt-Cancelled")
+        @NodeDefault("true")
+        @NodeComment({
+                "Should CommandPrompter a",
+                "prompt cancellation message",
+                "to the player."
+        })
+        boolean showCancelled,
+
         @ConfigNode
         @NodeName("Fancy-Logger")
         @NodeDefault("true")

src/main/java/com/cyr1en/commandprompter/config/PromptConfig.java

@@ -6,11 +6,11 @@
 import com.cyr1en.commandprompter.config.annotations.type.ConfigPath;
 import com.cyr1en.commandprompter.config.annotations.type.Configuration;
 import com.cyr1en.commandprompter.prompt.ui.CacheFilter;
-import com.cyr1en.commandprompter.prompt.validators.NoopValidator;
-import com.cyr1en.commandprompter.prompt.validators.OnlinePlayerValidator;
-import com.cyr1en.commandprompter.prompt.validators.RegexValidator;
+import com.cyr1en.commandprompter.prompt.validators.*;
 import com.cyr1en.kiso.mc.configuration.base.Config;
+import org.bukkit.entity.Player;
 
+import java.util.ArrayList;
 import java.util.regex.Pattern;
 
 @Configuration
@@ -122,6 +122,46 @@ public record PromptConfig(
         @NodeDefault("&7Cancel ✘")
         String cancelText,
 
+        @ConfigNode
+        @NodeName("PlayerUI.Search.Item")
+        @NodeDefault("Name_Tag")
+        String searchItem,
+
+        @ConfigNode
+        @NodeName("PlayerUI.Search.Custom-Model-Data")
+        @NodeDefault("0")
+        int searchCustomModelData,
+
+        @ConfigNode
+        @NodeName("PlayerUI.Search.Column")
+        @NodeDefault("9")
+        int searchColumn,
+
+        @ConfigNode
+        @NodeName("PlayerUI.Search.Text")
+        @NodeDefault("&6Search ⌕")
+        String searchText,
+
+        @ConfigNode
+        @NodeName("PlayerUI.Search.AnvilItem.Title")
+        @NodeDefault("&6&lPlayer Search")
+        String searchAnvilItemTitle,
+
+        @ConfigNode
+        @NodeName("PlayerUI.Search.AnvilItem.Material")
+        @NodeDefault("PAPER")
+        String searchAnvilItem,
+
+        @ConfigNode
+        @NodeName("PlayerUI.Search.AnvilItem.CustomModelData")
+        @NodeDefault("0")
+        int searchAnvilItemCustomModelData,
+
+        @ConfigNode
+        @NodeName("PlayerUI.Search.AnvilItem.Text")
+        @NodeDefault("&6Enter Player Name")
+        String searchAnvilItemText,
+
         @ConfigNode
         @NodeName("PlayerUI.Sorted")
         @NodeDefault("false")
@@ -375,16 +415,36 @@ private String getIVValue(String key, String keyVal, String query) {
         return getInputValidationValue("Input-Validation", key, keyVal, query);
     }
 
-    public InputValidator getInputValidator(String alias) {
+    public InputValidator getInputValidator(String alias, Player player) {
         if (alias == null || alias.isBlank())
             return new NoopValidator();
+
+        var validators = findValidators(alias, player);
+        if (validators.length == 1)
+            return validators[0];
+        else if (validators.length > 1) {
+            return new CompoundedValidator(alias, getIVErrMessage(alias), player, validators);
+        }
+
+        return new NoopValidator();
+    }
+
+    private InputValidator[] findValidators(String alias, Player player) {
+        var validators = new ArrayList<InputValidator>();
+
+        var expr = getIVValue("Alias", alias, "JS-Expression");
+        if (expr != null && !expr.isBlank())
+            validators.add(new JSExprValidator(alias, expr, getIVErrMessage(alias), null));
+
         var isPlayer = Boolean.parseBoolean(getIVValue("Alias", alias, "Online-Player"));
         if (isPlayer)
-            return new OnlinePlayerValidator(alias, getIVErrMessage(alias));
+            validators.add(new OnlinePlayerValidator(alias, getIVErrMessage(alias), player));
+
         var regex = findIVRegexCheckInConfig(alias);
         if (regex != null && !regex.isBlank())
-            return new RegexValidator(alias, Pattern.compile(regex), getIVErrMessage(alias));
-        return new NoopValidator();
+            validators.add(new RegexValidator(alias, Pattern.compile(regex), getIVErrMessage(alias), player));
+
+        return validators.toArray(new InputValidator[0]);
     }
 
     /**

src/main/java/com/cyr1en/commandprompter/hook/HookContainer.java

@@ -21,6 +21,7 @@ public HookContainer(CommandPrompter plugin) {
     }
 
     public void initHooks() {
+        hook(PremiumVanishHook.class);
         hook(SuperVanishHook.class);
         hook(CarbonChatHook.class);
         hook(VanishNoPacketHook.class);