Merge pull request #7 from Cold-Development/development

Development

Author: padrewin

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>dev.padrewin</groupId>
     <artifactId>confirm2drop</artifactId>
-    <version>1.3.1</version>
+    <version>1.4</version>
     <packaging>jar</packaging>
 
     <name>confirm2drop</name>

src/main/java/dev/padrewin/confirm2Drop/commands/ToggleCommand.java

@@ -62,7 +62,6 @@ public void execute(Confirm2Drop plugin, CommandSender sender, String[] args) {
         );
     }
 
-
     @Override
     public List<String> tabComplete(Confirm2Drop plugin, CommandSender sender, String[] args) {
         return Collections.emptyList();

src/main/java/dev/padrewin/confirm2Drop/listeners/DropListener.java

@@ -58,7 +58,12 @@ public void onItemDrop(PlayerDropItemEvent event) {
             long timeoutEnd = confirmationTimeouts.getOrDefault(playerUUID, 0L);
 
             if (areItemsEqual(pendingItem, item) && currentTime < timeoutEnd) {
-                debug("Player " + player.getName() + " confirmed the drop for item: " + item.getType());
+                if (isInventoryFull(player)) {
+                    dropItemToGround(player, item);
+                    event.getItemDrop().remove();
+                } else {
+                    debug("Player " + player.getName() + " confirmed the drop for item: " + item.getType());
+                }
                 pendingConfirmation.remove(playerUUID);
                 confirmationTimeouts.remove(playerUUID);
                 return;
@@ -79,8 +84,26 @@ public void onItemDrop(PlayerDropItemEvent event) {
         requestConfirmation(player, item);
     }
 
+
+    private boolean isInventoryFull(Player player) {
+        return player.getInventory().firstEmpty() == -1;
+    }
+
+    private void dropItemToGround(Player player, ItemStack item) {
+        player.getWorld().dropItemNaturally(player.getLocation(), item);
+        debug("Player " + player.getName() + "'s inventory is full. Dropped item " + item.getType() + " to the ground.");
+        plugin.getManager(LocaleManager.class).sendMessage(player, "inventory-full-drop-message");
+    }
+
     private void requestConfirmation(Player player, ItemStack item) {
         UUID playerUUID = player.getUniqueId();
+
+        if (isInventoryFull(player)) {
+            debug("Player " + player.getName() + "'s inventory is full. Dropping item to the ground.");
+            dropItemToGround(player, item);
+            return;
+        }
+
         pendingConfirmation.put(playerUUID, item.clone());
 
         int timeoutSeconds = plugin.getConfig().getInt("confirmation-timeout", 10);
@@ -91,6 +114,7 @@ private void requestConfirmation(Player player, ItemStack item) {
         plugin.getManager(LocaleManager.class).sendMessage(player, "drop-confirmation-message");
     }
 
+
     private boolean shouldRequireConfirmation(ItemStack item) {
         boolean toolsBlacklist = plugin.getConfig().getBoolean("blacklist.tools", true);
         boolean armorBlacklist = plugin.getConfig().getBoolean("blacklist.armor", true);

src/main/resources/locale/en_US.yml

@@ -14,15 +14,16 @@ no-permission: '&cYou don''t have permission for that!'
 unknown-command: '&cUnknown command &4%input%&c.'
 invalid-command-usage: '&cInvalid command usage.'
 player-only-command: '&cThis command can only be used by players!'
-drop-confirmation-message: "&7You need to drop the item again to confirm the action. To disable confirmation, use &c/confirm2drop toggle&7."
+drop-confirmation-message: '&7You need to drop the item again to confirm the action. To disable confirmation, use &c/confirm2drop toggle&7.'
 plugin-disabled-message: '&cOops! This feature is currently turned off in the server settings. Contact the server owner.'
-placeholder-status-enabled: "&aenabled"
-placeholder-status-disabled: "&cdisabled"
+placeholder-status-enabled: '&aenabled'
+placeholder-status-disabled: '&cdisabled'
+inventory-full-drop-message: '&cYour inventory is full! &nThe item has been dropped on the ground.'
 
 # Toggle Command Message
 command-toggle-description: '&8 - &c/confirm2drop toggle &7- Toggles drop confirmation for the player'
-command-toggle-usage: "&7Usage: &c/confirm2drop toggle confirm"
-command-toggle-warning: "&eWARNING: &7Are you sure you want to toggle drop confirmation? Use &c/confirm2drop toggle confirm &7to proceed."
+command-toggle-usage: '&7Usage: &c/confirm2drop toggle confirm'
+command-toggle-warning: '&eWARNING: &7Are you sure you want to toggle drop confirmation? Use &c/confirm2drop toggle confirm &7to proceed.'
 command-toggle-status: '&7Drop confirmation is now: %confirm2drop_toggle_status%&7.'
 
 # Reload Command

src/main/resources/locale/fr_FR.yml

@@ -3,32 +3,33 @@ prefix: '&8「&#635AA7C&#7D72B7o&#978BC7n&#B2A3D8f&#CCBCE8i&#E6D4F8r&#D8B8F8m&#C
 
 # Base Command Message
 base-command-color: '&7'
-base-command-help: '&7Utilisez &c/confirm2drop help &7pour les informations sur les commandes.'
+base-command-help: '&7Utilisez &c/confirm2drop help &7pour plus d''informations sur les commandes.'
 
 # Help Command
 command-help-description: '&8 - &c/confirm2drop help &7- Affiche le menu d''aide'
-command-help-title: '&cCommandes disponibles :'
+command-help-title: '&cCommandes Disponibles :'
 
 # Misc
 no-permission: '&cVous n''avez pas la permission de faire cela !'
 unknown-command: '&cCommande inconnue &4%input%&c.'
 invalid-command-usage: '&cUtilisation invalide de la commande.'
-player-only-command: '&cCette commande ne peut être utilisée que par des joueurs !'
-drop-confirmation-message: "&7Vous devez déposer l''objet à nouveau pour confirmer l''action. Pour désactiver la confirmation, utilisez &c/confirm2drop toggle&7."
-plugin-disabled-message: '&cOups ! Cette fonctionnalité est actuellement désactivée dans les paramètres du serveur. Contactez l''administrateur.'
+player-only-command: '&cCette commande est réservée aux joueurs !'
+drop-confirmation-message: "&7Vous devez relâcher l'objet à nouveau pour confirmer l'action. Pour désactiver la confirmation, utilisez &c/confirm2drop toggle&7."
+plugin-disabled-message: '&cOups ! Cette fonctionnalité est désactivée dans les paramètres du serveur. Contactez l''administrateur.'
 placeholder-status-enabled: "&aactivé"
 placeholder-status-disabled: "&cdésactivé"
+inventory-full-drop-message: "&cVotre inventaire est plein ! &nL''objet a été déposé au sol."
 
 # Toggle Command Message
-command-toggle-description: '&8 - &c/confirm2drop toggle &7- Active ou désactive la confirmation des dépôts pour le joueur'
+command-toggle-description: '&8 - &c/confirm2drop toggle &7- Active ou désactive la confirmation de dépôt pour le joueur'
 command-toggle-usage: "&7Utilisation : &c/confirm2drop toggle confirm"
-command-toggle-warning: "&eATTENTION : &7Êtes-vous sûr de vouloir basculer la confirmation des dépôts ? Utilisez &c/confirm2drop toggle confirm &7pour continuer."
-command-toggle-status: '&7La confirmation des dépôts est réglée sur : %confirm2drop_toggle_status%&7 !'
+command-toggle-warning: "&eATTENTION : &7Êtes-vous sûr de vouloir basculer la confirmation de dépôt ? Utilisez &c/confirm2drop toggle confirm &7pour continuer."
+command-toggle-status: '&7La confirmation de dépôt est maintenant : %confirm2drop_toggle_status%&7.'
 
 # Reload Command
 command-reload-description: '&8 - &c/confirm2drop reload &7- Recharge le plugin'
 command-reload-usage: '&7Utilisation : &c/confirm2drop reload'
-command-reload-success: '&7Les fichiers de configuration et de langue ont été rechargés avec succès.'
+command-reload-success: '&7Les fichiers de configuration et de localisation ont été rechargés avec succès.'
 
 # Version Command
-command-version-description: '&8 - &c/confirm2drop version &7- Affiche les informations de version de Confirm2Drop'
+command-version-description: '&8 - &c/confirm2drop version &7- Affiche les informations de version pour Confirm2Drop'

src/main/resources/locale/pt_PT.yml

@@ -3,32 +3,33 @@ prefix: '&8「&#635AA7C&#7D72B7o&#978BC7n&#B2A3D8f&#CCBCE8i&#E6D4F8r&#D8B8F8m&#C
 
 # Base Command Message
 base-command-color: '&7'
-base-command-help: '&7Use &c/confirm2drop help &7para informações sobre comandos.'
+base-command-help: '&7Use &c/confirm2drop help &7para mais informações sobre os comandos.'
 
 # Help Command
 command-help-description: '&8 - &c/confirm2drop help &7- Mostra o menu de ajuda'
 command-help-title: '&cComandos Disponíveis:'
 
 # Misc
-no-permission: '&cVocê não tem permissão para fazer isso!'
+no-permission: '&cVocê não tem permissão para isso!'
 unknown-command: '&cComando desconhecido &4%input%&c.'
 invalid-command-usage: '&cUso inválido do comando.'
 player-only-command: '&cEste comando só pode ser usado por jogadores!'
 drop-confirmation-message: "&7Você precisa soltar o item novamente para confirmar a ação. Para desativar a confirmação, use &c/confirm2drop toggle&7."
-plugin-disabled-message: '&cOps! Este recurso está desativado nas configurações do servidor. Contate o administrador.'
+plugin-disabled-message: '&cOps! Este recurso está desativado nas configurações do servidor. Entre em contato com o administrador.'
 placeholder-status-enabled: "&aativado"
 placeholder-status-disabled: "&cdesativado"
+inventory-full-drop-message: "&cSeu inventário está cheio! &nO item foi jogado no chão."
 
 # Toggle Command Message
-command-toggle-description: '&8 - &c/confirm2drop toggle &7- Ativa ou desativa a confirmação de soltar para o jogador'
+command-toggle-description: '&8 - &c/confirm2drop toggle &7- Ativa ou desativa a confirmação de drop para o jogador'
 command-toggle-usage: "&7Uso: &c/confirm2drop toggle confirm"
-command-toggle-warning: "&eAVISO: &7Tem certeza de que deseja alternar a confirmação de soltar? Use &c/confirm2drop toggle confirm &7para continuar."
-command-toggle-status: '&7A confirmação de soltar foi definida para: %confirm2drop_toggle_status%&7!'
+command-toggle-warning: "&eAVISO: &7Tem certeza de que deseja alternar a confirmação de drop? Use &c/confirm2drop toggle confirm &7para continuar."
+command-toggle-status: '&7A confirmação de drop agora está: %confirm2drop_toggle_status%&7.'
 
 # Reload Command
 command-reload-description: '&8 - &c/confirm2drop reload &7- Recarrega o plugin'
 command-reload-usage: '&7Uso: &c/confirm2drop reload'
-command-reload-success: '&7Os arquivos de configuração e idioma foram recarregados com sucesso.'
+command-reload-success: '&7Os arquivos de configuração e localização foram recarregados com sucesso.'
 
 # Version Command
-command-version-description: '&8 - &c/confirm2drop version &7- Mostra as informações de versão do Confirm2Drop'
+command-version-description: '&8 - &c/confirm2drop version &7- Mostra as informações da versão do Confirm2Drop'

src/main/resources/locale/ro_RO.yml

@@ -3,27 +3,28 @@ prefix: '&8「&#635AA7C&#7D72B7o&#978BC7n&#B2A3D8f&#CCBCE8i&#E6D4F8r&#D8B8F8m&#C
 
 # Base Command Message
 base-command-color: '&7'
-base-command-help: '&7Folosiți &c/confirm2drop help &7pentru informații despre comenzi.'
+base-command-help: '&7Folosește &c/confirm2drop help &7pentru mai multe informații despre comenzi.'
 
 # Help Command
 command-help-description: '&8 - &c/confirm2drop help &7- Afișează meniul de ajutor'
-command-help-title: '&cComenzi disponibile:'
+command-help-title: '&cComenzi Disponibile:'
 
 # Misc
-no-permission: '&cNu aveți permisiunea necesară pentru asta!'
+no-permission: '&cNu ai permisiunea necesară pentru asta!'
 unknown-command: '&cComandă necunoscută &4%input%&c.'
 invalid-command-usage: '&cUtilizare invalidă a comenzii.'
 player-only-command: '&cAceastă comandă poate fi folosită doar de jucători!'
-drop-confirmation-message: "&7Trebuie să aruncați din nou obiectul pentru a confirma acțiunea. Pentru a dezactiva confirmarea, utilizați &c/confirm2drop toggle&7."
-plugin-disabled-message: '&cUps! Această funcție este dezactivată în setările serverului. Contactați administratorul.'
+drop-confirmation-message: "&7Trebuie să arunci din nou obiectul pentru a confirma acțiunea. Pentru a dezactiva confirmarea, folosește &c/confirm2drop toggle&7."
+plugin-disabled-message: '&cOops! Această funcție este dezactivată în setările serverului. Contactează administratorul.'
 placeholder-status-enabled: "&aactivat"
 placeholder-status-disabled: "&cdezactivat"
+inventory-full-drop-message: "&cInventarul tău este plin! &nObiectul a fost aruncat pe jos."
 
 # Toggle Command Message
-command-toggle-description: '&8 - &c/confirm2drop toggle &7- Activează sau dezactivează confirmarea aruncării pentru jucător'
+command-toggle-description: '&8 - &c/confirm2drop toggle &7- Activează sau dezactivează confirmarea drop-ului pentru jucător'
 command-toggle-usage: "&7Utilizare: &c/confirm2drop toggle confirm"
-command-toggle-warning: "&eAVERTISMENT: &7Ești sigur că vrei să modifici starea confirmării? Folosește &c/confirm2drop toggle confirm &7pentru a continua."
-command-toggle-status: '&7Confirmarea aruncării: %confirm2drop_toggle_status%&7.'
+command-toggle-warning: "&eATENȚIE: &7Ești sigur că vrei să comuți confirmarea drop-ului? Folosește &c/confirm2drop toggle confirm &7pentru a continua."
+command-toggle-status: '&7Confirmarea drop-ului este acum: %confirm2drop_toggle_status%&7.'
 
 # Reload Command
 command-reload-description: '&8 - &c/confirm2drop reload &7- Reîncarcă pluginul'

src/main/resources/locale/zh_CN.yml

@@ -3,7 +3,7 @@ prefix: '&8「&#635AA7C&#7D72B7o&#978BC7n&#B2A3D8f&#CCBCE8i&#E6D4F8r&#D8B8F8m&#C
 
 # Base Command Message
 base-command-color: '&7'
-base-command-help: '&7使用 &c/confirm2drop help &7查看命令信息。'
+base-command-help: '&7使用 &c/confirm2drop help &7获取命令信息。'
 
 # Help Command
 command-help-description: '&8 - &c/confirm2drop help &7- 显示帮助菜单'
@@ -13,22 +13,23 @@ command-help-title: '&c可用命令：'
 no-permission: '&c你没有权限执行此操作！'
 unknown-command: '&c未知命令 &4%input%&c。'
 invalid-command-usage: '&c无效的命令用法。'
-player-only-command: '&c此命令只能由玩家使用！'
-drop-confirmation-message: "&7您需要再次丢弃物品以确认操作。要禁用确认功能，请使用 &c/confirm2drop toggle&7。"
-plugin-disabled-message: '&c抱歉！此功能已在服务器设置中禁用。请联系服务器管理员。'
-placeholder-status-enabled: "&a启用"
-placeholder-status-disabled: "&c禁用"
+player-only-command: '&c该命令只能由玩家使用！'
+drop-confirmation-message: "&7你需要再次丢弃该物品以确认操作。要禁用确认，请使用 &c/confirm2drop toggle&7。"
+plugin-disabled-message: '&c哎呀！此功能已在服务器设置中禁用。请联系服务器管理员。'
+placeholder-status-enabled: "&a已启用"
+placeholder-status-disabled: "&c已禁用"
+inventory-full-drop-message: "&c你的背包已满！&n物品已掉落在地上。"
 
 # Toggle Command Message
-command-toggle-description: '&8 - &c/confirm2drop toggle &7- 切换玩家的丢弃确认功能'
-command-toggle-usage: "&7用法： &c/confirm2drop toggle confirm"
-command-toggle-warning: "&e警告： &7确定要切换丢弃确认功能吗？使用 &c/confirm2drop toggle confirm &7继续。"
-command-toggle-status: '&7丢弃确认已设置为：%confirm2drop_toggle_status%&7！'
+command-toggle-description: '&8 - &c/confirm2drop toggle &7- 为玩家启用或禁用物品丢弃确认'
+command-toggle-usage: "&7用法：&c/confirm2drop toggle confirm"
+command-toggle-warning: "&e警告：&7你确定要切换物品丢弃确认吗？使用 &c/confirm2drop toggle confirm &7继续。"
+command-toggle-status: '&7物品丢弃确认状态：%confirm2drop_toggle_status%&7。'
 
 # Reload Command
 command-reload-description: '&8 - &c/confirm2drop reload &7- 重新加载插件'
-command-reload-usage: '&7用法： &c/confirm2drop reload'
-command-reload-success: '&7配置文件和本地化文件已成功重新加载。'
+command-reload-usage: '&7用法：&c/confirm2drop reload'
+command-reload-success: '&7配置文件和语言文件已成功重新加载。'
 
 # Version Command
 command-version-description: '&8 - &c/confirm2drop version &7- 显示 Confirm2Drop 的版本信息'