Merge remote-tracking branch 'origin/main'

Author: ptthanh02

core/src/main/java/github/nighter/smartspawner/SmartSpawner.java

@@ -11,6 +11,7 @@
 import github.nighter.smartspawner.commands.list.gui.adminstacker.AdminStackerHandler;
 import github.nighter.smartspawner.commands.prices.PricesGUI;
 import github.nighter.smartspawner.spawner.config.SpawnerSettingsConfig;
+import github.nighter.smartspawner.spawner.config.ItemSpawnerSettingsConfig;
 import github.nighter.smartspawner.logging.LoggingConfig;
 import github.nighter.smartspawner.logging.SpawnerActionLogger;
 import github.nighter.smartspawner.logging.SpawnerAuditListener;
@@ -80,6 +81,7 @@ public class SmartSpawner extends JavaPlugin implements SmartSpawnerPlugin {
     private LanguageUpdater languageUpdater;
     private MessageService messageService;
     private SpawnerSettingsConfig spawnerSettingsConfig;
+    private ItemSpawnerSettingsConfig itemSpawnerSettingsConfig;
 
     // Factories
     private SpawnerItemFactory spawnerItemFactory;
@@ -229,6 +231,7 @@ private void initializeServices() {
 
         // Initialize new unified spawner settings config (but don't load yet)
         this.spawnerSettingsConfig = new SpawnerSettingsConfig(this);
+        this.itemSpawnerSettingsConfig = new ItemSpawnerSettingsConfig(this);
 
         // Initialize logging system
         this.loggingConfig = new LoggingConfig(this);
@@ -246,6 +249,11 @@ private void initializeEconomyComponents() {
             spawnerSettingsConfig.load();
         }
 
+        // Load item spawner settings
+        if (itemSpawnerSettingsConfig != null) {
+            itemSpawnerSettingsConfig.load();
+        }
+        
         // Pre-warm the head texture cache after settings are loaded
         // This prevents the brief flash of default player heads when opening GUIs
         SpawnerMobHeadTexture.prewarmCache();
@@ -405,6 +413,11 @@ public void reload() {
             SpawnerMobHeadTexture.clearCache();
         }
 
+        // Reload item spawner settings config
+        if (itemSpawnerSettingsConfig != null) {
+            itemSpawnerSettingsConfig.reload();
+        }
+        
         // Reload logging system
         loggingConfig.loadConfig();
         spawnerActionLogger.shutdown();

core/src/main/java/github/nighter/smartspawner/commands/give/GiveSubCommand.java

@@ -12,6 +12,7 @@
 import io.papermc.paper.command.brigadier.CommandSourceStack;
 import io.papermc.paper.command.brigadier.Commands;
 import io.papermc.paper.command.brigadier.argument.ArgumentTypes;
+import org.bukkit.Material;
 import org.bukkit.Sound;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.EntityType;
@@ -59,9 +60,10 @@ public LiteralArgumentBuilder<CommandSourceStack> build() {
         LiteralArgumentBuilder<CommandSourceStack> builder = Commands.literal(getName());
         builder.requires(source -> hasPermission(source.getSender()));
 
-        // Add subcommands for regular and vanilla spawners
+        // Add subcommands for regular, vanilla, and item spawners
         builder.then(buildRegularGiveCommand());
         builder.then(buildVanillaGiveCommand());
+        builder.then(buildItemSpawnerGiveCommand());
 
         return builder;
     }
@@ -88,6 +90,17 @@ private LiteralArgumentBuilder<CommandSourceStack> buildVanillaGiveCommand() {
                                                 IntegerArgumentType.getInteger(context, "amount"))))));
     }
 
+    private LiteralArgumentBuilder<CommandSourceStack> buildItemSpawnerGiveCommand() {
+        return Commands.literal("item_spawner")
+                .then(Commands.argument("player", ArgumentTypes.player())
+                        .then(Commands.argument("itemType", StringArgumentType.word())
+                                .suggests(createItemSuggestions())
+                                .executes(context -> executeGiveItemSpawner(context, 1))
+                                .then(Commands.argument("amount", IntegerArgumentType.integer(1, MAX_AMOUNT))
+                                        .executes(context -> executeGiveItemSpawner(context,
+                                                IntegerArgumentType.getInteger(context, "amount"))))));
+    }
+
     private SuggestionProvider<CommandSourceStack> createMobSuggestions() {
         return (context, builder) -> {
             String input = builder.getRemaining().toLowerCase();
@@ -99,6 +112,17 @@ private SuggestionProvider<CommandSourceStack> createMobSuggestions() {
         };
     }
 
+    private SuggestionProvider<CommandSourceStack> createItemSuggestions() {
+        return (context, builder) -> {
+            String input = builder.getRemaining().toLowerCase();
+            plugin.getItemSpawnerSettingsConfig().getValidItemSpawnerMaterials().stream()
+                    .map(material -> material.name().toLowerCase())
+                    .filter(item -> item.startsWith(input))
+                    .forEach(builder::suggest);
+            return builder.buildFuture();
+        };
+    }
+
     @Override
     public int execute(CommandContext<CommandSourceStack> context) {
         return 0;
@@ -179,4 +203,81 @@ private int executeGive(CommandContext<CommandSourceStack> context, boolean isVa
             return 0;
         }
     }
+
+    private int executeGiveItemSpawner(CommandContext<CommandSourceStack> context, int amount) {
+        CommandSender sender = context.getSource().getSender();
+        
+        // Log command execution
+        logCommandExecution(context);
+
+        try {
+            // Get the player selector and resolve it
+            var playerSelector = context.getArgument("player", io.papermc.paper.command.brigadier.argument.resolvers.selector.PlayerSelectorArgumentResolver.class);
+            List<Player> players = playerSelector.resolve(context.getSource());
+
+            if (players.isEmpty()) {
+                plugin.getMessageService().sendMessage(sender, "command_give_player_not_found");
+                return 0;
+            }
+
+            Player target = players.get(0);
+            String itemType = StringArgumentType.getString(context, "itemType");
+
+            // Validate item type
+            Material itemMaterial;
+            try {
+                itemMaterial = Material.valueOf(itemType.toUpperCase());
+            } catch (IllegalArgumentException e) {
+                plugin.getMessageService().sendMessage(sender, "command_give_invalid_item_type");
+                return 0;
+            }
+
+            // Verify it's a valid item spawner type
+            if (!plugin.getItemSpawnerSettingsConfig().isValidItemSpawner(itemMaterial)) {
+                plugin.getMessageService().sendMessage(sender, "command_give_invalid_item_spawner");
+                return 0;
+            }
+
+            // Create item spawner
+            ItemStack spawnerItem = spawnerItemFactory.createItemSpawnerItem(itemMaterial, amount);
+
+            // Give the item to the player
+            if (target.getInventory().firstEmpty() == -1) {
+                target.getWorld().dropItem(target.getLocation(), spawnerItem);
+                plugin.getMessageService().sendMessage(target, "command_give_inventory_full");
+            } else {
+                target.getInventory().addItem(spawnerItem);
+            }
+
+            // Play sound
+            target.playSound(target.getLocation(), Sound.ENTITY_ITEM_PICKUP, 1.0f, 1.0f);
+
+            // Get formatted item names for placeholders
+            String itemName = plugin.getLanguageManager().getVanillaItemName(itemMaterial);
+            String smallCapsItemName = plugin.getLanguageManager().getSmallCaps(itemName);
+
+            // Create placeholders for sender message (use "entity" key for compatibility with spawner messages)
+            HashMap<String, String> senderPlaceholders = new HashMap<>();
+            senderPlaceholders.put("player", target.getName());
+            senderPlaceholders.put("entity", itemName);
+            senderPlaceholders.put("ᴇɴᴛɪᴛʏ", smallCapsItemName);
+            senderPlaceholders.put("amount", String.valueOf(amount));
+
+            // Create placeholders for target message
+            HashMap<String, String> targetPlaceholders = new HashMap<>();
+            targetPlaceholders.put("amount", String.valueOf(amount));
+            targetPlaceholders.put("entity", itemName);
+            targetPlaceholders.put("ᴇɴᴛɪᴛʏ", smallCapsItemName);
+
+            // Send messages with placeholders (use same keys as regular spawners)
+            String messageKey = "command_give_spawner_";
+            plugin.getMessageService().sendMessage(sender, messageKey + "given", senderPlaceholders);
+            plugin.getMessageService().sendMessage(target, messageKey + "received", targetPlaceholders);
+
+            return 1;
+        } catch (Exception e) {
+            plugin.getLogger().severe("Error executing give item spawner command: " + e.getMessage());
+            return 0;
+        }
+    }
 }