Merge pull request #34 from CyR1en/development

Sync to main

Author: CyR1en

.idea/icon.png

@@ -39,7 +39,7 @@ java {
 
 PluginManifest pluginManifest = [
         name       : 'CommandPrompter',
-        version    : new Version(major: 2, minor: 6, patch: 0, fix: 0, classifier: 'RELEASE'),
+        version    : new Version(major: 2, minor: 7, patch: 0, fix: 0, classifier: 'SNAPSHOT'),
         author     : 'CyR1en',
         description: 'Perfect companion plugin for inventory UI menu.',
         entry      : 'com.cyr1en.commandprompter.CommandPrompter'
@@ -63,10 +63,10 @@ repositories {
 dependencies {
     implementation 'com.cyr1en:kiso-utils:1.8-SNAPSHOT'
     implementation 'com.cyr1en:kiso-mc:1.8-SNAPSHOT'
-    implementation 'net.wesjd:anvilgui:1.9.0-SNAPSHOT'
-    implementation 'io.github.rapha149.signgui:signgui:2.2.1'
+    implementation 'net.wesjd:anvilgui:1.9.2-SNAPSHOT'
+    implementation 'io.github.rapha149.signgui:signgui:2.2.2'
     implementation 'org.bstats:bstats-bukkit:3.0.0'
-    implementation "dev.jorel:commandapi-bukkit-shade:9.2.0"
+    implementation "dev.jorel:commandapi-bukkit-shade:9.3.0"
     implementation group: 'org.fusesource.jansi', name: 'jansi', version: '2.4.0'
 
     // Exclude these
@@ -97,7 +97,7 @@ shadowJar {
     }
 
     archiveBaseName.set("$project.name")
-    archiveClassifier.set(pluginManifest.version.classifier + "-Bundled")
+    archiveClassifier.set('bundled')
     archiveVersion.set(pluginManifest.version.getFullVersion())
 
     relocate 'com.github.stefvanschie.inventoryframework', 'com.cyr1en.inventoryframework'
@@ -115,11 +115,9 @@ shadowJar {
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 
 tasks.register("lightJar", ShadowJar) {
-    archiveClassifier.set(pluginManifest.version.classifier)
     from sourceSets.main.output
     configurations = [project.configurations.runtimeClasspath]
 
-
     dependencies {
         exclude(dependency('com.mojang:brigadier'))
         exclude(dependency('com.github.stefvanschie.inventoryframework:IF'))

build.gradle

@@ -45,7 +45,6 @@
 import com.cyr1en.kiso.mc.I18N;
 import com.cyr1en.kiso.mc.UpdateChecker;
 import com.cyr1en.kiso.utils.SRegex;
-
 import org.bstats.bukkit.Metrics;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
@@ -122,9 +121,9 @@ public void onDisable() {
     }
 
     private void initPromptSystem() {
+        Bukkit.getPluginManager().registerEvents(headCache = new HeadCache(this), this);
         promptManager = new PromptManager(this);
         initCommandListener();
-        Bukkit.getPluginManager().registerEvents(headCache = new HeadCache(this), this);
     }
 
     private boolean loadDeps() {
@@ -137,7 +136,7 @@ private boolean loadDeps() {
 
         var depLoader = new DependencyLoader(this);
         if (!depLoader.isClassLoaderAccessSupported())
-            return depErrAndDisable("No access to URLClassloader, cannot load depedencies!", depLoader);
+            return depErrAndDisable("No access to URLClassloader, cannot load dependencies!", depLoader);
 
         if (!depLoader.loadCoreDeps())
             return depErrAndDisable("Unable to load dependencies!", depLoader);
@@ -190,7 +189,7 @@ private void hackMap() {
             logger.warn("sHash: " + sHash + " | pHash: " + pHash);
             Bukkit.getPluginManager().registerEvents(commandListener, this);
         } catch (NoSuchFieldException | IllegalAccessException e) {
-            e.printStackTrace();
+            logger.err("Unable to hack command map!");
         }
     }
 
@@ -248,6 +247,7 @@ public void reload(boolean clean) {
         messenger.setPrefix(config.promptPrefix());
         logger = new PluginLogger(this, "CommandPrompter");
         i18n = new I18N(this, "CommandPrompter");
+        headCache.reBuildCache();
         promptManager.getParser().initRegex();
         ChatPrompt.DefaultListener.setPriority(this);
         setupUpdater();

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

@@ -1,7 +1,6 @@
 package com.cyr1en.commandprompter;
 
 import org.bukkit.Bukkit;
-import org.bukkit.ChatColor;
 import org.fusesource.jansi.Ansi;
 import org.fusesource.jansi.AnsiConsole;
 
@@ -17,8 +16,8 @@ public class PluginLogger {
     private final ColorGradient normalGrad;
     private final ColorGradient debugGrad;
 
-    private boolean debugMode = false;
-    private boolean isFancy = true;
+    private final boolean debugMode;
+    private final boolean isFancy;
 
     public PluginLogger(CommandPrompter plugin, String prefix) {
         this.isFancy = plugin.getConfiguration().fancyLogger();
@@ -91,20 +90,12 @@ public void debug(String msg, Object... args) {
         if (debugMode) {
             msg = callerAvailable ? String.format("[%s] - %s", caller.getSimpleName(), msg)
                     : Objects.isNull(lastDebugClass) ? msg
-                            : String.format("[%s?] - %s", lastDebugClass.getSimpleName(), msg);
+                    : String.format("[%s?] - %s", lastDebugClass.getSimpleName(), msg);
             var str = new Ansi().fgRgb(255, 195, 113).a(msg).reset().toString();
             log(debugPrefix, Level.INFO, str, args);
         }
     }
 
-    public void setDebugMode(boolean b) {
-        debugMode = b;
-    }
-
-    public void bukkitWarn(String msg) {
-        Bukkit.getConsoleSender().sendMessage(ChatColor.GOLD + getPrefix() + msg);
-    }
-
     private String getPrefix() {
         return prefix;
     }

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

@@ -90,16 +90,22 @@ public static void dispatchWithAttachment(Plugin plugin, Player sender, String c
         var logger = commandPrompter.getPluginLogger();
 
         logger.debug("Dispatching command with permission attachment");
+
         var attachment = sender.addAttachment(plugin, ticks);
         if (attachment == null) {
             logger.err("Unable to create PermissionAttachment for " + sender.getName());
             return;
         }
-        logger.debug("Added PermissionAttachment");
-        for (String perm : perms)
+
+        for (String perm : perms) {
+            logger.debug("Attached Perm: " + perm);
             attachment.setPermission(perm, true);
+        }
         attachment.getPermissible().recalculatePermissions();
-        dispatchCommand(plugin, (Player) attachment.getPermissible(), command);
+        final String checked = command.codePointAt(0) == 0x2F ? command.substring(1) : command;
+        Bukkit.dispatchCommand(sender, checked);
+        //dispatchCommand(plugin, sender, command);
+        sender.removeAttachment(attachment);
     }
 
 }

src/main/java/com/cyr1en/commandprompter/api/Dispatcher.java

@@ -99,4 +99,18 @@ public interface Prompt {
      * @return true if input is valid
      */
     boolean isValidInput(String input);
+
+    /**
+     * Returns a boolean value if inputs should be sanitized.
+     *
+     * @return true if inputs should be sanitized
+     */
+    boolean sanitizeInput();
+
+    /**
+     * Set whether inputs should be sanitized.
+     *
+     * @param sanitize true if inputs should be sanitized
+     */
+    void setInputSanitization(boolean sanitize);
 }

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

@@ -2,13 +2,12 @@
 
 import com.cyr1en.commandprompter.CommandPrompter;
 import com.cyr1en.commandprompter.util.Util;
-
 import dev.jorel.commandapi.CommandAPI;
 import dev.jorel.commandapi.CommandAPIBukkitConfig;
 
 /**
  * Wrapper for CommandAPI.
- * 
+ *
  * <p>
  * Since CommandPrompter loads CommandAPI dynamically, we need a wrapper to
  * prevent
@@ -24,6 +23,7 @@ public CommandAPIWrapper(CommandPrompter plugin) {
 
     public void load() {
         var config = new CommandAPIBukkitConfig(plugin);
+        config.useLatestNMSVersion(false);
         config = plugin.getConfiguration().debugMode() ? config.silentLogs(false).verboseOutput(true)
                 : config.silentLogs(true).verboseOutput(false);
 
@@ -42,6 +42,7 @@ public void onDisable() {
 
     public void registerCommands() {
         new MainCommand(plugin).register();
-        new ConsoleDelegate(plugin).register();
+        new DelegateCommand.ConsoleDelegate(plugin).register();
+        new DelegateCommand.PlayerDelegate(plugin).register();
     }
 }