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 edc5e8b..0000000
Binary files a/target/classes/com/mcsyr/clearitem/Event.class and /dev/null differ
diff --git a/target/classes/com/mcsyr/clearitem/command.class b/target/classes/com/mcsyr/clearitem/command.class
deleted file mode 100644
index 8120c48..0000000
Binary files a/target/classes/com/mcsyr/clearitem/command.class and /dev/null differ