From 31056ed7eafd2af849ea3fa4a6aa15c0bfb09b95 Mon Sep 17 00:00:00 2001 From: KlNon Date: Sat, 20 Aug 2022 09:31:21 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=A1=B5=E7=A0=81=E6=BB=9A?= =?UTF-8?q?=E5=8A=A8=E5=8A=9F=E8=83=BD=E5=92=8C=E7=9B=B4=E6=8E=A5=E6=89=93?= =?UTF-8?q?=E5=BC=80=E4=B8=8D=E5=90=8C=E9=A1=B5=E7=A0=81=E7=9A=84=E6=8C=87?= =?UTF-8?q?=E4=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/.gitignore | 1 + pom.xml | 2 +- src/main/java/com/mcsyr/clearitem/Event.java | 40 ++++++++++-------- src/main/java/com/mcsyr/clearitem/Main.java | 2 +- .../java/com/mcsyr/clearitem/command.java | 19 ++++++++- src/main/resources/plugin.yml | 2 +- .../classes/com/mcsyr/clearitem/Event.class | Bin 8110 -> 0 bytes .../classes/com/mcsyr/clearitem/command.class | Bin 4833 -> 0 bytes 8 files changed, 45 insertions(+), 21 deletions(-) delete mode 100644 target/classes/com/mcsyr/clearitem/Event.class delete mode 100644 target/classes/com/mcsyr/clearitem/command.class diff --git a/.idea/.gitignore b/.idea/.gitignore index f6409dd..38e5b22 100644 --- a/.idea/.gitignore +++ b/.idea/.gitignore @@ -7,3 +7,4 @@ /dataSources/ /dataSources.local.xml ../clearItem.zip +../target/ diff --git a/pom.xml b/pom.xml index 5f8edbf..30a3032 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.example clearItem - 3.2.1-SNAPSHOT + 3.2.2-SNAPSHOT utf-8 diff --git a/src/main/java/com/mcsyr/clearitem/Event.java b/src/main/java/com/mcsyr/clearitem/Event.java index 9849736..1db17e8 100644 --- a/src/main/java/com/mcsyr/clearitem/Event.java +++ b/src/main/java/com/mcsyr/clearitem/Event.java @@ -6,6 +6,7 @@ import me.clip.placeholderapi.PlaceholderAPI; import org.bukkit.Bukkit; +import org.bukkit.Material; import org.bukkit.entity.Entity; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; @@ -140,24 +141,29 @@ public void onInventoryClose(InventoryCloseEvent event) { // 上下页(标题相同) public void onPageClick(InventoryClickEvent event){ if(event.getView().getTitle().startsWith(Main.PublicDustbinName)){ - if(event.getCurrentItem().getItemMeta().getDisplayName().equals(Main.PublicDustbinPrePageName)){ - event.setCancelled(true); - int count=Integer.parseInt(event.getView().getTitle().substring(event.getView().getTitle().length()-2,event.getView().getTitle().length()-1))-1; - if(count>0){ - count--; - } - Player player = (Player) event.getWhoClicked(); - player.closeInventory(); - player.openInventory(Dustbin.DustbinList.get(count)); - }else if(event.getCurrentItem().getItemMeta().getDisplayName().equals(Main.PublicDustbinNextPageName)){ - event.setCancelled(true); - int count=Integer.parseInt(event.getView().getTitle().substring(event.getView().getTitle().length()-2,event.getView().getTitle().length()-1))-1; - if(count0){ + count--; + }else { + count=Dustbin.DustbinList.size()-1; + } + Player player = (Player) event.getWhoClicked(); + player.closeInventory(); + player.openInventory(Dustbin.DustbinList.get(count)); + }else if(event.getCurrentItem().getItemMeta().getDisplayName().equals(Main.PublicDustbinNextPageName)){ + event.setCancelled(true); + int count=Integer.parseInt(event.getView().getTitle().substring(event.getView().getTitle().length()-2,event.getView().getTitle().length()-1))-1; + if(count PlayerPrivateDustbin = new HashMap<>(); - public static String Version = "3.2.1"; + public static String Version = "3.2.2"; public Main() { } diff --git a/src/main/java/com/mcsyr/clearitem/command.java b/src/main/java/com/mcsyr/clearitem/command.java index 2e64d06..5bfa02a 100644 --- a/src/main/java/com/mcsyr/clearitem/command.java +++ b/src/main/java/com/mcsyr/clearitem/command.java @@ -15,7 +15,6 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command cmd, @N Player player = (Player)sender; if (args[0].equalsIgnoreCase("open")) { if (Main.PublicDustbinEnable) { - ((Player)sender).openInventory(Dustbin.DustbinList.get(0)); sender.sendMessage(Main.PublicDustbinAction + Main.PublicDustbinName); } else { @@ -74,9 +73,24 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command cmd, @N if (args[0].equalsIgnoreCase("clean")) { sender.sendMessage("§b[ClearItem] §f公共垃圾桶清理中"); tools.cleanPublicDustbin(); + Dustbin.page(); return true; } } + }else if(args.length==2){ + Player player = (Player)sender; + if (args[0].equalsIgnoreCase("open")) { + int num=Integer.parseInt(args[1]); + if(Character.isDigit(num)&&Main.PublicDustbinEnable){ + + player.openInventory(Dustbin.DustbinList.get((num-1)%5)); + sender.sendMessage(Main.PublicDustbinAction + Main.PublicDustbinName); + }else { + sender.sendMessage( "公共垃圾箱已被服务器禁用!"); + } + + return true; + } } this.showHelp(sender); @@ -102,6 +116,9 @@ private void showHelp(CommandSender sender) { sender.sendMessage(Main.PublicDustbinName + " §f打开公共垃圾箱"); sender.sendMessage(Main.PublicDustbinName + " §f§l/citem open"); sender.sendMessage("§7"); + sender.sendMessage(Main.PublicDustbinName + " §f打开公共垃圾箱具体页"); + sender.sendMessage(Main.PublicDustbinName + " §f§l/citem open [num]"); + sender.sendMessage("§7"); sender.sendMessage(Main.PublicDustbinName + " §f打开私人垃圾箱"); sender.sendMessage(Main.PublicDustbinName + " §f§l/citem discard"); sender.sendMessage("§7"); diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 16b080a..8249a84 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -1,7 +1,7 @@ name: ClearItem main: com.mcsyr.clearitem.Main softdepend: [PlaceholderAPI] -version: 3.2.1-SNAPSHOT +version: 3.2.2-SNAPSHOT author: Luo_ma & KlNon commands: clearitem: diff --git a/target/classes/com/mcsyr/clearitem/Event.class b/target/classes/com/mcsyr/clearitem/Event.class deleted file mode 100644 index edc5e8b5aa2309f9ae1cfc0b21becf169bd248d7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8110 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 CV*d>Q diff --git a/target/classes/com/mcsyr/clearitem/command.class b/target/classes/com/mcsyr/clearitem/command.class deleted file mode 100644 index 8120c480cafb3236fd307e65782680dd3fefafc9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4833 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