Spigot version bump for crafter support (Not compat with sub 1.21 yet),

Initial Kyori updates, Full # and Hex code support( couple visual bugs but working otherwise)

Spigot and Paper adaptor for chat events (No more using "p.sendmessage", USE "PSL.msg"

Need to add all hardcoded msgs to the Messages.yml

Author: jerzean

pom.xml

@@ -213,7 +213,7 @@
         <dependency>
             <groupId>com.sk89q.worldguard</groupId>
             <artifactId>worldguard-bukkit</artifactId>
-            <version>7.0.9-SNAPSHOT</version>
+            <version>7.0.14-SNAPSHOT</version>
             <scope>provided</scope>
             <exclusions>
                 <exclusion>
@@ -231,7 +231,7 @@
         <dependency>
             <groupId>com.sk89q.worldedit</groupId>
             <artifactId>worldedit-bukkit</artifactId>
-            <version>7.2.6-SNAPSHOT</version>
+            <version>7.3.16-SNAPSHOT</version>
             <scope>provided</scope>
             <exclusions>
                 <exclusion>
@@ -240,6 +240,36 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>net.kyori</groupId>
+            <artifactId>adventure-api</artifactId>
+            <version>4.17.0</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>net.kyori</groupId>
+            <artifactId>adventure-platform-bukkit</artifactId>
+            <version>4.3.2</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>net.kyori</groupId>
+            <artifactId>adventure-text-serializer-plain</artifactId>
+            <version>4.17.0</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>net.kyori</groupId>
+            <artifactId>adventure-text-serializer-bungeecord</artifactId>
+            <version>4.4.1</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>net.kyori</groupId>
+            <artifactId>adventure-text-minimessage</artifactId>
+            <version>4.17.0</version>
+            <scope>compile</scope>
+        </dependency>
         <dependency>
             <groupId>me.clip</groupId>
             <artifactId>placeholderapi</artifactId>

src/main/java/dev/espi/protectionstones/BlockHandler.java

@@ -30,17 +30,15 @@
 import dev.espi.protectionstones.utils.MiscUtil;
 import dev.espi.protectionstones.utils.WGMerge;
 import dev.espi.protectionstones.utils.WGUtils;
+import net.kyori.adventure.text.Component;
 import net.md_5.bungee.api.chat.TextComponent;
 import net.milkbowl.vault.economy.EconomyResponse;
 import org.bukkit.*;
 import org.bukkit.block.Block;
 import org.bukkit.entity.Player;
 import org.bukkit.event.block.BlockPlaceEvent;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
+import java.util.*;
 
 public class BlockHandler {
     private static HashMap<Player, Double> lastProtectStonePlaced = new HashMap<>();
@@ -140,7 +138,7 @@ public static boolean createPSRegion(Player p, Location l, PSProtectBlock blockO
         if (ProtectionStones.getInstance().getConfigOptions().placingCooldown != -1) {
             String time = checkCooldown(p);
             if (time != null) {
-                PSL.msg(p, PSL.COOLDOWN.msg().replace("%time%", time));
+                PSL.msg(p, PSL.COOLDOWN.replace("%time%", time));
                 return false;
             }
         }
@@ -168,7 +166,7 @@ public static boolean createPSRegion(Player p, Location l, PSProtectBlock blockO
 
         // check if player has enough money
         if (ProtectionStones.getInstance().isVaultSupportEnabled() && blockOptions.costToPlace != 0 && !ProtectionStones.getInstance().getVaultEconomy().has(p, blockOptions.costToPlace)) {
-            PSL.msg(p, PSL.NOT_ENOUGH_MONEY.msg().replace("%price%", String.format("%.2f", blockOptions.costToPlace)));
+            PSL.msg(p, PSL.NOT_ENOUGH_MONEY.replace("%price%", String.format("%.2f", blockOptions.costToPlace)));
             return false;
         }
 
@@ -183,10 +181,10 @@ public static boolean createPSRegion(Player p, Location l, PSProtectBlock blockO
             if (ProtectionStones.getInstance().isVaultSupportEnabled() && blockOptions.costToPlace != 0) {
                 EconomyResponse er = ProtectionStones.getInstance().getVaultEconomy().withdrawPlayer(p, blockOptions.costToPlace);
                 if (!er.transactionSuccess()) {
-                    PSL.msg(p, er.errorMessage);
+                    PSL.msg(p, Component.text(er.errorMessage));
                     return true;
                 }
-                PSL.msg(p, PSL.PAID_MONEY.msg().replace("%price%", String.format("%.2f", blockOptions.costToPlace)));
+                PSL.msg(p, PSL.PAID_MONEY.replace("%price%", String.format("%.2f", blockOptions.costToPlace)));
             }
 
             return true;
@@ -214,7 +212,7 @@ public static boolean createActualRegion(Player p, Location l, PSProtectBlock bl
         // check for minimum distance between claims by using fake region
         if (blockOptions.distanceBetweenClaims != -1 && !p.hasPermission("protectionstones.superowner")) {
             if (!isFarEnoughFromOtherClaims(blockOptions, p.getWorld(), lp, bx, by, bz)) {
-                PSL.msg(p, PSL.REGION_TOO_CLOSE.msg().replace("%num%", "" + blockOptions.distanceBetweenClaims));
+                PSL.msg(p, PSL.REGION_TOO_CLOSE.replace("%num%", "" + blockOptions.distanceBetweenClaims));
                 return false;
             }
         }
@@ -315,7 +313,7 @@ private static void playerMergeTask(Player p, PSRegion r) {
                 Bukkit.getScheduler().runTaskAsynchronously(ProtectionStones.getInstance(), () -> {
                     try {
                         WGMerge.mergeRealRegions(p.getWorld(), r.getWGRegionManager(), finalMergeTo, Arrays.asList(finalMergeTo, r));
-                        PSL.msg(p, PSL.MERGE_AUTO_MERGED.msg().replace("%region%", finalMergeTo.getId()));
+                        PSL.msg(p, PSL.MERGE_AUTO_MERGED.replace("%region%", finalMergeTo.getId()));
                     } catch (WGMerge.RegionHoleException e) {
                         PSL.msg(p, PSL.NO_REGION_HOLES.msg()); // TODO github issue #120, prevent holes even if showGUI is true
                     } catch (WGMerge.RegionCannotMergeWhileRentedException e) {
@@ -327,14 +325,21 @@ private static void playerMergeTask(Player p, PSRegion r) {
 
         // show merge gui
         if (showGUI) {
-            List<TextComponent> tc = ArgMerge.getGUI(p, r);
+            List<Component> tc = ArgMerge.getGUI(p, r);
             if (!tc.isEmpty()) { // if there are regions you can merge into
-                p.sendMessage(ChatColor.WHITE + ""); // send empty line
+                PSL.msg(p, Component.empty());
                 PSL.msg(p, PSL.MERGE_INTO.msg());
-                PSL.msg(p, PSL.MERGE_HEADER.msg().replace("%region%", r.getId()));
-                for (TextComponent t : tc) p.spigot().sendMessage(t);
-                p.sendMessage(ChatColor.WHITE + ""); // send empty line
+                PSL.msg(p, PSL.MERGE_HEADER.replaceAll(Map.of("%region%", r.getId())));
+
+                // GUI entries
+                for (Component t : tc) {
+                    PSL.msg(p, t);
+                }
+
+                // empty line again
+                PSL.msg(p, Component.empty());
             }
         }
+
     }
 }

src/main/java/dev/espi/protectionstones/ListenerClass.java

@@ -29,6 +29,8 @@
 import dev.espi.protectionstones.utils.RecipeUtil;
 import dev.espi.protectionstones.utils.UUIDCache;
 import dev.espi.protectionstones.utils.WGUtils;
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.format.NamedTextColor;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.Material;
@@ -37,6 +39,7 @@
 import org.bukkit.block.BlockFace;
 import org.bukkit.block.BlockState;
 import org.bukkit.block.Furnace;
+import org.bukkit.block.data.type.Crafter;
 import org.bukkit.command.CommandSender;
 import org.bukkit.enchantments.Enchantment;
 import org.bukkit.entity.Player;
@@ -53,10 +56,7 @@
 import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.event.player.PlayerTeleportEvent;
 import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
-import org.bukkit.inventory.CraftingRecipe;
-import org.bukkit.inventory.ItemStack;
-import org.bukkit.inventory.ShapedRecipe;
-import org.bukkit.inventory.ShapelessRecipe;
+import org.bukkit.inventory.*;
 
 import java.util.List;
 
@@ -95,7 +95,7 @@ public void onPlayerJoin(PlayerJoinEvent e) {
                 }
 
                 if (amount != 0) {
-                    PSL.msg(psp, PSL.TAX_JOIN_MSG_PENDING_PAYMENTS.msg().replace("%money%", "" + amount));
+                    PSL.msg(psp.getPlayer(), PSL.TAX_JOIN_MSG_PENDING_PAYMENTS.replace("%money%", "" + amount));
                 }
             });
         }
@@ -140,7 +140,7 @@ public void onBlockPlace(BlockPlaceEvent e) {
 
     // returns the error message, or "" if the player has permission to break the region
     // TODO: refactor and move this to PSRegion, so that /ps unclaim can use the same checks
-    private String checkPermissionToBreakProtection(Player p, PSRegion r) {
+    private Component checkPermissionToBreakProtection(Player p, PSRegion r) {
         // check for destroy permission
         if (!p.hasPermission("protectionstones.destroy")) {
             return PSL.NO_PERMISSION_DESTROY.msg();
@@ -156,7 +156,7 @@ private String checkPermissionToBreakProtection(Player p, PSRegion r) {
             return PSL.RENT_CANNOT_BREAK_WHILE_RENTING.msg();
         }
 
-        return "";
+        return Component.empty();
     }
 
     // helper method for breaking protection blocks
@@ -165,8 +165,8 @@ private boolean playerBreakProtection(Player p, PSRegion r) {
         PSProtectBlock blockOptions = r.getTypeOptions();
 
         // check if player has permission to break the protection
-        String error = checkPermissionToBreakProtection(p, r);
-        if (!error.isEmpty()) {
+        Component error = checkPermissionToBreakProtection(p, r);
+        if (!error.contains(Component.empty())) {
             PSL.msg(p, error);
             return false;
         }
@@ -235,8 +235,8 @@ public void onBlockBreakLowPriority(BlockBreakEvent e) {
             ProtectionStones.getInstance().debug("Player:"+ p.getName()+", Holding:"+ p.getPlayer().getInventory().getItemInMainHand().getType().name()+", Enchants:" +p.getPlayer().getInventory().getItemInMainHand().getEnchantments());
 
 
-            String error = checkPermissionToBreakProtection(p, r);
-            if (!error.isEmpty()) {
+            Component error = checkPermissionToBreakProtection(p, r);
+            if (!error.contains(Component.empty())) {
                 PSL.msg(p, error);
                 e.setCancelled(true);
             }
@@ -318,37 +318,42 @@ public void onPrepareItemCraft(PrepareItemCraftEvent e) {
         }
     }
 
-    @EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)
-    public void onCrafterCraft(CrafterCraftEvent e) {
-        ProtectionStones.getInstance().debug("ListenerClass.java, onCrafterCraft");
-
-        CraftingRecipe recipe = e.getRecipe();
-        if (recipe == null) return;
-
-        // Shaped recipes (grid-based)
-        if (recipe instanceof ShapedRecipe shaped) {
-            for (ItemStack ingredient : shaped.getIngredientMap().values()) {
-                if (ingredient != null) {
-                    PSProtectBlock options = ProtectionStones.getBlockOptions(ingredient);
-                    if (options != null && !options.allowUseInCrafting) {
-                        e.setResult(new ItemStack(Material.AIR));
-                        e.setCancelled(true);
-                        return;
-                    }
-                }
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void onCrafterClick(InventoryClickEvent e) {
+        if (!(e.getInventory().getHolder() instanceof Crafter)) return;
+
+        ItemStack item = e.getCursor(); // item being placed
+        if (item != null && ProtectionStones.getBlockOptions(item) != null) {
+            e.setCancelled(true);
+            e.getWhoClicked().sendMessage(ChatColor.RED + "You cannot insert ProtectionStone blocks into a Crafter.");
+        }
+    }
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void onCrafterHopperMove(InventoryMoveItemEvent e) {
+        if (!(e.getDestination().getHolder() instanceof Crafter)) return;
+
+        ItemStack item = e.getItem();
+        if (item != null) {
+            PSProtectBlock options = ProtectionStones.getBlockOptions(item);
+            if (options != null && !options.allowUseInCrafting) {
+                e.setCancelled(true);
             }
         }
+    }
 
-        // Shapeless recipes (unordered list)
-        if (recipe instanceof ShapelessRecipe shapeless) {
-            for (ItemStack ingredient : shapeless.getIngredientList()) {
-                if (ingredient != null) {
-                    PSProtectBlock options = ProtectionStones.getBlockOptions(ingredient);
-                    if (options != null && !options.allowUseInCrafting) {
-                        e.setResult(new ItemStack(Material.AIR));
-                        e.setCancelled(true);
-                        return;
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void onCrafterDrag(InventoryDragEvent e) {
+        if (!(e.getInventory().getHolder() instanceof Crafter)) return;
+
+        for (ItemStack item : e.getNewItems().values()) {
+            if (item != null) {
+                PSProtectBlock options = ProtectionStones.getBlockOptions(item);
+                if (options != null && !options.allowUseInCrafting) {
+                    e.setCancelled(true);
+                    if (e.getWhoClicked() instanceof Player player) {
+                    PSL.msg(player, Component.text("You cannot use ProtectionStones blocks in a Crafter.", NamedTextColor.RED));
                     }
+                    return;
                 }
             }
         }