diff --git a/pom.xml b/pom.xml index e4c70b9..ecbeb2a 100644 --- a/pom.xml +++ b/pom.xml @@ -1,9 +1,9 @@ 4.0.0 - cn.citycraft + pw.yumc MenuProtect - 1.0 + 1.1 MenuProtect ${project.name} @@ -52,28 +52,34 @@ + + Jenkins + http://ci.yumc.pw/job/${project.artifactId}/ + - http://ci.citycraft.cn:8080 - 1 + DEBUG UTF-8 - spigot-repo - https://hub.spigotmc.org/nexus/content/groups/public/ - - - citycraft-repo - ${jenkins.url}/plugin/repository/everything/ + yumc-repo + http://repo.yumc.pw/content/groups/public/ + + + jtb + YUMC + http://repo.yumc.pw/content/repositories/yumcenter/ + + org.spigotmc spigot-api jar - 1.8.8-R0.1-SNAPSHOT + 1.9-R0.1-SNAPSHOT cn.citycraft diff --git a/src/main/java/cn/citycraft/MenuProtect/listen/ProtectListener.java b/src/main/java/cn/citycraft/MenuProtect/listen/ProtectListener.java deleted file mode 100644 index 028c696..0000000 --- a/src/main/java/cn/citycraft/MenuProtect/listen/ProtectListener.java +++ /dev/null @@ -1,94 +0,0 @@ -package cn.citycraft.MenuProtect.listen; - -import org.bukkit.Bukkit; -import org.bukkit.Material; -import org.bukkit.entity.Player; -import org.bukkit.event.EventHandler; -import org.bukkit.event.EventPriority; -import org.bukkit.event.Listener; -import org.bukkit.event.inventory.InventoryClickEvent; -import org.bukkit.event.inventory.InventoryMoveItemEvent; -import org.bukkit.event.inventory.InventoryPickupItemEvent; -import org.bukkit.event.player.PlayerItemHeldEvent; -import org.bukkit.event.player.PlayerPickupItemEvent; -import org.bukkit.inventory.Inventory; -import org.bukkit.inventory.ItemStack; -import org.bukkit.inventory.PlayerInventory; - -import cn.citycraft.MenuProtect.MenuProtect; -import cn.citycraft.MenuProtect.utils.MarkUtil; - -public class ProtectListener implements Listener { - - private final MenuProtect plugin; - - public ProtectListener(final MenuProtect plugin) { - this.plugin = plugin; - } - - @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true) - public void onInvMove(final InventoryMoveItemEvent e) { - final ItemStack ci = e.getItem(); - if (MarkUtil.hasMark(ci)) { - e.setCancelled(true); - } - } - - @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true) - public void onInvPickup(final InventoryPickupItemEvent e) { - final ItemStack ci = e.getItem().getItemStack(); - if (MarkUtil.hasMark(ci)) { - e.setCancelled(true); - } - } - - @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true) - public void onItemClick(final InventoryClickEvent e) { - final Player p = (Player) e.getWhoClicked(); - final ItemStack ci = e.getCurrentItem(); - final Inventory inv = e.getInventory(); - if (inv.getHolder() == null) { - return; - } - final int solt = e.getSlot(); - try { - if (MarkUtil.hasMark(ci)) { - inv.setItem(solt, new ItemStack(Material.AIR)); - p.closeInventory(); - } - } catch (final Exception ex) { - } - } - - @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true) - public void onPlayerHandlerItem(final PlayerItemHeldEvent e) { - Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() { - @Override - public void run() { - final Player p = e.getPlayer(); - final PlayerInventory inv = p.getInventory(); - final ItemStack[] cis = inv.getArmorContents(); - for (int i = 0; i < cis.length; i++) { - final ItemStack itemStack = cis[i]; - if (MarkUtil.hasMark(itemStack)) { - cis[i] = new ItemStack(Material.AIR); - } - } - inv.setArmorContents(cis); - final int newslot = e.getNewSlot(); - final ItemStack newItem = inv.getItem(newslot); - if (MarkUtil.hasMark(newItem)) { - inv.setItem(newslot, new ItemStack(Material.AIR)); - } - } - }); - } - - @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true) - public void onPlayerPickup(final PlayerPickupItemEvent e) { - final ItemStack ci = e.getItem().getItemStack(); - if (MarkUtil.hasMark(ci)) { - e.setCancelled(true); - } - } -} diff --git a/src/main/java/cn/citycraft/MenuProtect/MenuProtect.java b/src/main/java/pw/yumc/MenuProtect/MenuProtect.java similarity index 77% rename from src/main/java/cn/citycraft/MenuProtect/MenuProtect.java rename to src/main/java/pw/yumc/MenuProtect/MenuProtect.java index cf05b5e..f7e739d 100644 --- a/src/main/java/cn/citycraft/MenuProtect/MenuProtect.java +++ b/src/main/java/pw/yumc/MenuProtect/MenuProtect.java @@ -1,12 +1,12 @@ -package cn.citycraft.MenuProtect; +package pw.yumc.MenuProtect; import org.bukkit.Bukkit; import org.bukkit.plugin.PluginManager; import org.bukkit.plugin.java.JavaPlugin; -import cn.citycraft.MenuProtect.listen.ProtectListener; -import cn.citycraft.MenuProtect.utils.MarkUtil; import cn.citycraft.PluginHelper.config.FileConfig; +import pw.yumc.MenuProtect.listen.ProtectListener; +import pw.yumc.MenuProtect.utils.MarkUtil; public class MenuProtect extends JavaPlugin { FileConfig config; diff --git a/src/main/java/pw/yumc/MenuProtect/listen/ProtectListener.java b/src/main/java/pw/yumc/MenuProtect/listen/ProtectListener.java new file mode 100644 index 0000000..a8ffd09 --- /dev/null +++ b/src/main/java/pw/yumc/MenuProtect/listen/ProtectListener.java @@ -0,0 +1,105 @@ +package pw.yumc.MenuProtect.listen; + +import org.bukkit.Bukkit; +import org.bukkit.Material; +import org.bukkit.entity.Player; +import org.bukkit.event.EventHandler; +import org.bukkit.event.EventPriority; +import org.bukkit.event.Listener; +import org.bukkit.event.inventory.InventoryClickEvent; +import org.bukkit.event.inventory.InventoryCloseEvent; +import org.bukkit.event.inventory.InventoryMoveItemEvent; +import org.bukkit.event.inventory.InventoryPickupItemEvent; +import org.bukkit.event.player.PlayerItemHeldEvent; +import org.bukkit.event.player.PlayerPickupItemEvent; +import org.bukkit.inventory.Inventory; +import org.bukkit.inventory.ItemStack; +import org.bukkit.inventory.PlayerInventory; + +import pw.yumc.MenuProtect.MenuProtect; +import pw.yumc.MenuProtect.utils.MarkUtil; + +public class ProtectListener implements Listener { + + private final MenuProtect plugin; + + public ProtectListener(final MenuProtect plugin) { + this.plugin = plugin; + } + + @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true) + public void onInvClose(final InventoryCloseEvent e) { + if (e.getPlayer() instanceof Player) { + handlerPlayerInventory((Player) e.getPlayer()); + } + } + + @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true) + public void onInvMove(final InventoryMoveItemEvent e) { + final ItemStack ci = e.getItem(); + if (MarkUtil.hasMark(ci)) { + e.setCancelled(true); + } + } + + @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true) + public void onInvPickup(final InventoryPickupItemEvent e) { + final ItemStack ci = e.getItem().getItemStack(); + if (MarkUtil.hasMark(ci)) { + e.setCancelled(true); + } + } + + @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true) + public void onItemClick(final InventoryClickEvent e) { + final Player p = (Player) e.getWhoClicked(); + final ItemStack ci = e.getCurrentItem(); + final Inventory inv = e.getInventory(); + if (inv.getHolder() == null) { + return; + } + final int solt = e.getSlot(); + try { + if (MarkUtil.hasMark(ci)) { + inv.setItem(solt, new ItemStack(Material.AIR)); + p.closeInventory(); + } + } catch (final Exception ex) { + } + } + + @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true) + public void onPlayerHandlerItem(final PlayerItemHeldEvent e) { + final PlayerInventory inv = e.getPlayer().getInventory(); + final int newslot = e.getNewSlot(); + final ItemStack newItem = inv.getItem(newslot); + if (MarkUtil.hasMark(newItem)) { + inv.setItem(newslot, new ItemStack(Material.AIR)); + } + } + + @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true) + public void onPlayerPickup(final PlayerPickupItemEvent e) { + final ItemStack ci = e.getItem().getItemStack(); + if (MarkUtil.hasMark(ci)) { + e.setCancelled(true); + } + } + + private void handlerPlayerInventory(final Player p) { + Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() { + @Override + public void run() { + final PlayerInventory inv = p.getInventory(); + final ItemStack[] cis = inv.getArmorContents(); + for (int i = 0; i < cis.length; i++) { + final ItemStack itemStack = cis[i]; + if (MarkUtil.hasMark(itemStack)) { + cis[i] = new ItemStack(Material.AIR); + } + } + inv.setArmorContents(cis); + } + }); + } +} diff --git a/src/main/java/cn/citycraft/MenuProtect/utils/MarkUtil.java b/src/main/java/pw/yumc/MenuProtect/utils/MarkUtil.java similarity index 86% rename from src/main/java/cn/citycraft/MenuProtect/utils/MarkUtil.java rename to src/main/java/pw/yumc/MenuProtect/utils/MarkUtil.java index 3883f78..0a7bfda 100644 --- a/src/main/java/cn/citycraft/MenuProtect/utils/MarkUtil.java +++ b/src/main/java/pw/yumc/MenuProtect/utils/MarkUtil.java @@ -1,4 +1,4 @@ -package cn.citycraft.MenuProtect.utils; +package pw.yumc.MenuProtect.utils; import java.util.List; diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index c15b9f7..7d3eca2 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -1,9 +1,9 @@ name: ${project.artifactId} description: ${project.description} main: ${project.groupId}.${project.artifactId}.${project.artifactId} -version: ${project.version}-Build#${env.BUILD_NUMBER} +version: ${project.version}-git-${env.GIT_COMMIT} author: 喵♂呜 -website: ${jenkins.url}/job/${project.artifactId}/ +website: ${ciManagement.url} commands: ${project.artifactId}: description: ${project.artifactId} - ${project.description}