remove block listen change config class...

Signed-off-by: j502647092 <jtb1@163.com>

src/cn/citycraft/ProtectItem/Main.java

@@ -9,10 +9,8 @@ import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.plugin.java.JavaPlugin;
 
-import cn.citycraft.ProtectItem.listen.BreakBlockListen;
 import cn.citycraft.ProtectItem.listen.DropItemListen;
 import cn.citycraft.ProtectItem.listen.PickupItemListen;
-import cn.citycraft.ProtectItem.listen.PlaceBlockListen;
 
 public class Main extends JavaPlugin {
 	public String servername;
@@ -32,12 +30,12 @@ public class Main extends JavaPlugin {
 		if (getConfig().getBoolean("Protect.Pickup", true))
 			Bukkit.getPluginManager().registerEvents(
 					new PickupItemListen(this), this);
-		if (getConfig().getBoolean("Protect.Break", true))
+		// if (getConfig().getBoolean("Protect.Break", true))
-			Bukkit.getPluginManager().registerEvents(
+		// Bukkit.getPluginManager().registerEvents(
-					new BreakBlockListen(this), this);
+		// new BreakBlockListen(this), this);
-		if (getConfig().getBoolean("Protect.Place", true))
+		// if (getConfig().getBoolean("Protect.Place", true))
-			Bukkit.getPluginManager().registerEvents(
+		// Bukkit.getPluginManager().registerEvents(
-					new PlaceBlockListen(this), this);
+		// new PlaceBlockListen(this), this);
 		getLogger().info("ProtectItem已加载!");
 	}
 
@@ -48,9 +46,10 @@ public class Main extends JavaPlugin {
 		switch (args.length) {
 		case 0:
 			ItemStack item = p.getItemInHand();
-			p.sendMessage("手上物品类型名称为: " + item.getType().name());
+			p.sendMessage("\u00a7a手上物品类型名称为: \u00a76" + getItemName(item));
 			return true;
 		case 1:
+			if (p.hasPermission("pi.bypass"))
 				if (args[0].equalsIgnoreCase("reload")) {
 					this.reloadConfig();
 					p.sendMessage("\u00a7a配置文件已重载...");
@@ -62,16 +61,17 @@ public class Main extends JavaPlugin {
 		return false;
 	}
 
-	public boolean checkevent(Player p, String i, String type) {
+	public boolean checkevent(Player p, ItemStack i, String type) {
 		if (p.hasPermission("pi.bypass"))
 			return false;
+		String iname = getItemName(i);
 		Location l = p.getLocation();
 		World pw = l.getWorld();
 		for (String protectworld : getConfig().getStringList("ProtectWorld")) {
 			if (pw.getName().equalsIgnoreCase(protectworld))
 				for (String protectitem : getConfig().getStringList(
 						"ProtectItem")) {
-					if (i.equalsIgnoreCase(protectitem)) {
+					if (iname.equalsIgnoreCase(protectitem)) {
 						p.sendMessage(pluginname
 								+ getmessage("Message." + type));
 						return true;
@@ -81,6 +81,14 @@ public class Main extends JavaPlugin {
 		return false;
 	}
 
+	public static String getItemName(ItemStack i) {
+		String name = i.getType().name();
+		int dur = i.getDurability();
+		String dura = i.getMaxStackSize() != 1 ? dur != 0 ? "_" + dur : "" : "";
+		String iname = name + dura;
+		return iname;
+	}
+
 	public String getmessage(String path) {
 		String message = getConfig().getString(path).replaceAll("&", "§");
 		return message;

src/cn/citycraft/ProtectItem/listen/BreakBlockListen.java

@@ -1,23 +0,0 @@
-package cn.citycraft.ProtectItem.listen;
-
-import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.Listener;
-import org.bukkit.event.block.BlockBreakEvent;
-
-import cn.citycraft.ProtectItem.Main;
-
-public class BreakBlockListen implements Listener {
-	Main plugin;
-
-	public BreakBlockListen(Main main) {
-		plugin = main;
-	}
-
-	@EventHandler(ignoreCancelled = true)
-	public void onBreakItem(BlockBreakEvent e) {
-		Player p = e.getPlayer();
-		String i = e.getBlock().getType().name();
-		e.setCancelled(plugin.checkevent(p, i, "Break")); 
-	}
-}

src/cn/citycraft/ProtectItem/listen/DropItemListen.java

@@ -4,6 +4,7 @@ import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerDropItemEvent;
+import org.bukkit.inventory.ItemStack;
 
 import cn.citycraft.ProtectItem.Main;
 
@@ -17,7 +18,7 @@ public class DropItemListen implements Listener {
 	@EventHandler(ignoreCancelled = true)
 	public void onDropItem(PlayerDropItemEvent e) {
 		Player p = e.getPlayer();
-		String i = e.getItemDrop().getItemStack().getType().name();
+		ItemStack i = e.getItemDrop().getItemStack();
 		e.setCancelled(plugin.checkevent(p, i, "Drop")); 
 	}
 }

src/cn/citycraft/ProtectItem/listen/PickupItemListen.java

@@ -4,6 +4,7 @@ import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerPickupItemEvent;
+import org.bukkit.inventory.ItemStack;
 
 import cn.citycraft.ProtectItem.Main;
 
@@ -17,7 +18,7 @@ public class PickupItemListen implements Listener {
 	@EventHandler(ignoreCancelled = true)
 	public void onPickupItem(PlayerPickupItemEvent e) {
 		Player p = e.getPlayer();
-		String i = e.getItem().getItemStack().getType().name();
+		ItemStack i = e.getItem().getItemStack();
 		e.setCancelled(plugin.checkevent(p, i,  "Pickup")); 
 	}
 

src/cn/citycraft/ProtectItem/listen/PlaceBlockListen.java

@@ -1,23 +0,0 @@
-package cn.citycraft.ProtectItem.listen;
-
-import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.Listener;
-import org.bukkit.event.block.BlockPlaceEvent;
-
-import cn.citycraft.ProtectItem.Main;
-
-public class PlaceBlockListen implements Listener {
-	Main plugin;
-
-	public PlaceBlockListen(Main main) {
-		plugin = main;
-	}
-
-	@EventHandler(ignoreCancelled = true)
-	public void onPlaceItem(BlockPlaceEvent e) {
-		Player p = e.getPlayer();
-		String i = e.getBlock().getType().name();
-		e.setCancelled(plugin.checkevent(p, i, "Place")); 
-	}
-}

src/config.yml

@@ -10,15 +10,15 @@ Message:
 #<23><><EFBFBD>鰲ȫ<E9B0B2><C8AB>ʾ
   Drop: '&c<><63>ǰ<EFBFBD><C7B0><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ֹ<EFBFBD><D6B9><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ʒ<EFBFBD><C6B7>'
   Pickup: '&c<><63>ǰ<EFBFBD><C7B0><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ֹʰȡ<CAB0><C8A1><EFBFBD><EFBFBD>Ʒ<EFBFBD><C6B7>'
-  Place: '&c<><63>ǰ<EFBFBD><C7B0><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ֹ<EFBFBD><D6B9><EFBFBD>ø<EFBFBD><C3B8><EFBFBD>Ʒ<EFBFBD><C6B7>'
+# Place: '&c<><63>ǰ<EFBFBD><C7B0><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ֹ<EFBFBD><D6B9><EFBFBD>ø<EFBFBD><C3B8><EFBFBD>Ʒ<EFBFBD><C6B7>'
-  Break: '&c<><63>ǰ<EFBFBD><C7B0><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ֹ<EFBFBD>ƻ<EFBFBD><C6BB><EFBFBD><EFBFBD><EFBFBD>Ʒ<EFBFBD><C6B7>'
+# Break: '&c<><63>ǰ<EFBFBD><C7B0><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ֹ<EFBFBD>ƻ<EFBFBD><C6BB><EFBFBD><EFBFBD><EFBFBD>Ʒ<EFBFBD><C6B7>'
   
 #<23>ܵ<EFBFBD><DCB5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 Protect: 
   Drop: true
-  Pickup: true
+  Pickup: false
-  Place: true
+##Place: false
-  Break: true
+##Break: false
   
 #<23>ܵ<EFBFBD><DCB5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>(<28><><EFBFBD><EFBFBD><EFBFBD>ִ<EFBFBD>Сд)
 ProtectWorld: 
@@ -26,6 +26,7 @@ ProtectWorld:
   
 #<23><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ʒ(<28><><EFBFBD><EFBFBD><EFBFBD>ִ<EFBFBD>Сд)
 ProtectItem: 
+  - XXXX
 #<23><><EFBFBD><EFBFBD>(<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ʒ<EFBFBD><C6B7><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>,/pishow<6F>鿴<EFBFBD><E9BFB4>Ʒ<EFBFBD><C6B7><EFBFBD><EFBFBD>)
 #  - DIRT 
 #  - GRASS