Merge pull request #59 from CyR1en/development

1.21.4 support and improvements.

Author: CyR1en

build.gradle

@@ -39,7 +39,7 @@ java {
 
 PluginManifest pluginManifest = [
         name       : 'CommandPrompter',
-        version    : new Version(major: 2, minor: 11, patch: 0, fix: 0, classifier: 'SNAPSHOT'),
+        version    : new Version(major: 2, minor: 12, patch: 0, fix: 0, classifier: 'SNAPSHOT'),
         author     : 'CyR1en',
         description: 'Making Commands More Interactive!',
         entry      : 'com.cyr1en.commandprompter.CommandPrompter'
@@ -66,19 +66,19 @@ repositories {
 dependencies {
     implementation 'com.cyr1en:kiso-utils:1.8-SNAPSHOT'
     implementation 'com.cyr1en:kiso-mc:1.8-SNAPSHOT'
-    implementation 'net.wesjd:anvilgui:1.10.3-SNAPSHOT'
+    implementation 'net.wesjd:anvilgui:1.10.4-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.18'
+    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.6.1"
-    implementation 'de.rapha149.signgui:signgui:2.4.2'
+    implementation "dev.jorel:commandapi-bukkit-shade:9.7.0"
+    implementation 'de.rapha149.signgui:signgui:2.5.0'
 
-    compileOnly 'me.clip:placeholderapi:2.11.2'
+    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-R0.1-SNAPSHOT"
+    compileOnly "org.spigotmc:spigot-api:1.21.3-R0.1-SNAPSHOT"
     compileOnly 'com.github.LeonMangler:SuperVanish:6.2.18-3'
     compileOnly 'de.hexaoxi:carbonchat-api:3.0.0-beta.26'
     compileOnly 'com.github.mbax:VanishNoPacket:3.22'

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradle/wrapper/gradle-wrapper.properties

@@ -35,7 +35,7 @@
 import com.cyr1en.commandprompter.prompt.PromptManager;
 import com.cyr1en.commandprompter.prompt.prompts.ChatPrompt;
 import com.cyr1en.commandprompter.prompt.ui.HeadCache;
-import com.cyr1en.commandprompter.util.Util.ServerType;
+import com.cyr1en.commandprompter.util.ServerUtil;
 import com.cyr1en.kiso.mc.I18N;
 import com.cyr1en.kiso.mc.UpdateChecker;
 import com.cyr1en.kiso.utils.SRegex;
@@ -71,9 +71,9 @@ public void onEnable() {
         new Metrics(this, 5359);
         setupConfig();
         logger = new PluginLogger(this, "CommandPrompter");
-        var serverType = ServerType.resolve();
+        var serverType = ServerUtil.resolve();
         logger.debug("Server Name: " + serverType.name());
-        logger.debug("Server Version: " + serverType.version());
+        logger.debug("Server Version: " + ServerUtil.version());
 
         i18n = new I18N(this, "CommandPrompter");
 

gradlew

@@ -152,10 +152,17 @@ public record PromptConfig(
                 "Enable-Title - Show the first line of the prompt",
                 "(if with {br}) as title of Anvil GUI",
                 "",
-                "Item - The item to place on the Anvil GUI",
+                "Enable-Cancel-Item - Show a cancel item on the ",
+                "right slot input slot.",
+                "",
+                "Item - The Left item to place on the Anvil GUI",
                 "",
                 "Enchanted - Do you want the item enchanted?",
                 "",
+                "ResultItem - The Result item to place on the Anvil GUI",
+                "",
+                "Hide-Tooltips - Hide tooltips of item (1.21.2 OR ABOVE)",
+                "",
                 "Custom-Title - If title is enabled, and if custom",
                 "title is not empty, CommandPrompter will use this instead",
                 "",
@@ -174,20 +181,76 @@ public record PromptConfig(
         @NodeDefault("")
         String promptMessage,
 
+        @ConfigNode
+        @NodeName("AnvilGUI.Enable-Cancel-Item")
+        @NodeDefault("false")
+        boolean enableCancelItem,
+
         @ConfigNode
         @NodeName("AnvilGUI.Item.Material")
         @NodeDefault("Paper")
         String anvilItem,
 
+        @ConfigNode
+        @NodeName("AnvilGUI.Item.HideTooltips")
+        @NodeDefault("false")
+        boolean itemHideTooltips,
+
         @ConfigNode
         @NodeName("AnvilGUI.Item.Custom-Model-Data")
         @NodeDefault("0")
         int itemCustomModelData,
 
         @ConfigNode
-        @NodeName("AnvilGUI.Enchanted")
+        @NodeName("AnvilGUI.Item.Enchanted")
+        @NodeDefault("false")
+        boolean itemAnvilEnchanted,
+
+
+        @ConfigNode
+        @NodeName("AnvilGUI.ResultItem.Material")
+        @NodeDefault("Paper")
+        String anvilResultItem,
+
+        @ConfigNode
+        @NodeName("AnvilGUI.ResultItem.HideTooltips")
+        @NodeDefault("false")
+        boolean resultItemHideTooltips,
+
+        @ConfigNode
+        @NodeName("AnvilGUI.ResultItem.Custom-Model-Data")
+        @NodeDefault("0")
+        int resultItemCustomModelData,
+
+        @ConfigNode
+        @NodeName("AnvilGUI.ResultItem.Enchanted")
+        @NodeDefault("false")
+        boolean resultItemAnvilEnchanted,
+
+        @ConfigNode
+        @NodeName("AnvilGUI.CancelItem.Material")
+        @NodeDefault("Barrier")
+        String anvilCancelItem,
+
+        @ConfigNode
+        @NodeName("AnvilGUI.CancelItem.HideTooltips")
         @NodeDefault("false")
-        boolean anvilEnchanted,
+        boolean cancelItemHideTooltips,
+
+        @ConfigNode
+        @NodeName("AnvilGUI.CancelItem.Custom-Model-Data")
+        @NodeDefault("0")
+        int cancelItemCustomModelData,
+
+        @ConfigNode
+        @NodeName("AnvilGUI.CancelItem.Enchanted")
+        @NodeDefault("false")
+        boolean cancelItemAnvilEnchanted,
+
+        @ConfigNode
+        @NodeName("AnvilGUI.CancelItem.HoverText")
+        @NodeDefault("&cClick to Cancel")
+        String cancelItemHoverText,
 
         // ============================== Text Prompt ==============================
         @ConfigNode

gradlew.bat

@@ -30,6 +30,7 @@
 import com.cyr1en.commandprompter.prompt.prompts.ChatPrompt;
 import com.cyr1en.commandprompter.prompt.prompts.PlayerUIPrompt;
 import com.cyr1en.commandprompter.prompt.prompts.SignPrompt;
+import com.cyr1en.commandprompter.util.ServerUtil;
 import com.cyr1en.commandprompter.util.Util;
 import com.cyr1en.kiso.mc.Version;
 import org.bukkit.Bukkit;
@@ -66,7 +67,7 @@ public class PromptManager extends HashMap<String, Class<? extends Prompt>> {
 
     private static final HashMap<Class<? extends Prompt>, Version> supportTable;
 
-    private static final Version LATEST = Version.parse("1.21.3");
+    private static final Version LATEST = Version.parse("1.21.4");
     // Arbitrary 10 version, that means this should work until minecraft v10 lol "any".
     private static final Version ANY = Version.parse("10");
 
@@ -97,7 +98,7 @@ public void registerPrompts() {
     public Class<? extends Prompt> put(String key, Class<? extends Prompt> value) {
         if (!supportTable.containsKey(value)) return null;
         var version = supportTable.get(value);
-        var serverVersion = Util.ServerType.resolve().parsedVersion();
+        var serverVersion = ServerUtil.parsedVersion();
         plugin.getPluginLogger().debug("Server Version: " + serverVersion);
         plugin.getPluginLogger().debug("Prompt Version: " + version);
 

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

@@ -27,6 +27,7 @@
 import com.cyr1en.commandprompter.CommandPrompter;
 import com.cyr1en.commandprompter.prompt.PromptContext;
 import com.cyr1en.commandprompter.prompt.PromptParser;
+import com.cyr1en.commandprompter.util.ServerUtil;
 import com.cyr1en.commandprompter.util.Util;
 import net.wesjd.anvilgui.AnvilGUI;
 import org.bukkit.ChatColor;
@@ -46,18 +47,20 @@
 public class AnvilPrompt extends AbstractPrompt {
 
     public AnvilPrompt(CommandPrompter plugin, PromptContext context,
-            String prompt, List<PromptParser.PromptArgument> args) {
+                       String prompt, List<PromptParser.PromptArgument> args) {
         super(plugin, context, prompt, args);
     }
 
     @Override
     public void sendPrompt() {
         List<String> parts = Arrays.asList(getPrompt().split("\\{br}"));
-        var item = makeItem(parts);
-        makeAnvil(parts, item).open((Player) getContext().getSender());
+        var item = makeAnvilItem(parts);
+        var resultItem = makeResultItem(parts);
+        var cancelItem = makeCancelItem(parts);
+        makeAnvil(parts, item, resultItem, cancelItem).open((Player) getContext().getSender());
     }
 
-    private AnvilGUI.Builder makeAnvil(List<String> parts, ItemStack item) {
+    private AnvilGUI.Builder makeAnvil(List<String> parts, ItemStack item, ItemStack resultItem, ItemStack cancelItem) {
         var isComplete = new AtomicBoolean(false);
         var builder = getBuilder(isComplete);
         builder.onClose(p -> {
@@ -75,7 +78,11 @@ private AnvilGUI.Builder makeAnvil(List<String> parts, ItemStack item) {
             title = title.isEmpty() ? color(parts.get(0)) : color(title);
             builder.title(title);
         }
+
+        if (getPlugin().getPromptConfig().enableCancelItem())
+            builder.itemRight(cancelItem);
         builder.itemLeft(item);
+        builder.itemOutput(resultItem);
         builder.plugin(getPlugin());
         return builder;
     }
@@ -84,6 +91,12 @@ private AnvilGUI.Builder makeAnvil(List<String> parts, ItemStack item) {
     private AnvilGUI.Builder getBuilder(AtomicBoolean isComplete) {
         var builder = new AnvilGUI.Builder();
         builder.onClick((slot, stateSnapshot) -> {
+            var cancelEnabled = getPlugin().getPromptConfig().enableCancelItem();
+            if (slot == AnvilGUI.Slot.INPUT_RIGHT && cancelEnabled) {
+                getPromptManager().cancel(stateSnapshot.getPlayer());
+                return Collections.singletonList(AnvilGUI.ResponseAction.close());
+            }
+
             if (slot != AnvilGUI.Slot.OUTPUT)
                 return Collections.emptyList();
 
@@ -106,26 +119,59 @@ private AnvilGUI.Builder getBuilder(AtomicBoolean isComplete) {
         return builder;
     }
 
-    private ItemStack makeItem(List<String> parts) {
-        var item = new ItemStack(Util.getCheckedMaterial(getPlugin().getPromptConfig().anvilItem(), Material.PAPER));
+    private ItemStack makeItem(String prefix, List<String> parts, String customTitle) {
+        var config = getPlugin().getPromptConfig().rawConfig();
+        var material = config.getString(prefix + ".Material", "PAPER");
+        var enchanted = config.getBoolean(prefix + ".Enchanted", false);
+        var customModelData = config.getInt(prefix + ".Custom-Model-Data", 0);
+        var hideTooltips = config.getBoolean(prefix + ".HideTooltips", false);
+
+        var item = new ItemStack(Util.getCheckedMaterial(material, Material.PAPER));
         var meta = item.getItemMeta();
         getPlugin().getPluginLogger().debug("ItemMeta: " + meta);
-        if (getPlugin().getPromptConfig().anvilEnchanted()) {
+
+        if (enchanted) {
             Objects.requireNonNull(meta).addEnchant(Enchantment.LURE, 1, true);
             meta.addItemFlags(ItemFlag.HIDE_ENCHANTS);
         }
+
         Objects.requireNonNull(meta).addItemFlags(ItemFlag.HIDE_ATTRIBUTES);
-        meta.setDisplayName(parts.get(0));
+        if (customTitle != null)
+            meta.setDisplayName(customTitle);
+        else {
+            meta.setDisplayName(parts.get(0));
+
+            meta.setDisplayName(parts.get(0));
+
+            if (parts.size() > 1)
+                meta.setLore(parts.subList(1, parts.size()).stream().map(this::color).toList());
 
-        if (parts.size() > 1)
-            meta.setLore(parts.subList(1, parts.size()).stream().map(this::color).toList());
+            if (customModelData != 0)
+                meta.setCustomModelData(customModelData);
 
-        // set custom model data
-        var integerData = getPlugin().getPromptConfig().itemCustomModelData();
-        if (integerData != 0)
-            meta.setCustomModelData(integerData);
+            if (ServerUtil.isAtOrAbove("1.21.2")) {
+                meta.setHideTooltip(hideTooltips);
+            }
+        }
 
         item.setItemMeta(meta);
         return item;
     }
+
+    private ItemStack makeItem(String prefix, List<String> parts) {
+        return makeItem("AnvilGUI.Item", parts, null);
+    }
+
+    private ItemStack makeAnvilItem(List<String> parts) {
+        return makeItem("AnvilGUI.Item", parts);
+    }
+
+    private ItemStack makeResultItem(List<String> parts) {
+        return makeItem("AnvilGUI.ResultItem", parts);
+    }
+
+    private ItemStack makeCancelItem(List<String> parts) {
+        var cancelText = getPlugin().getPromptConfig().cancelItemHoverText();
+        return makeItem("AnvilGUI.CancelItem", parts, Util.color(cancelText));
+    }
 }