diff --git a/README.md b/README.md index 2651753..9718ba6 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ Developing/Building === If you want to make some changes, build, and run the unit tests you will notice we require CraftBukkit 1.8 with maven and it isn't hosted anywhere publically for legal reasons. You will need to build CraftBukkit 1.8 yourself and then put it locally for maven with the following command: -`mvn install:install-file -Dfile=craftbukkit-1.8.jar -DgroupId=org.bukkit -DartifactId=craftbukkit -Dversion=1.8-R0.1-SNAPSHOT -Dpackaging=jar` +`mvn install:install-file -Dfile=craftbukkit-1.9-R0.1.jar -DgroupId=org.bukkit -DartifactId=craftbukkit -Dversion=1.9-R0.1-SNAPSHOT -Dpackaging=jar` Beta 5 Changes === diff --git a/pom.xml b/pom.xml index 4428062..aebe330 100644 --- a/pom.xml +++ b/pom.xml @@ -51,28 +51,28 @@ org.bukkit bukkit - 1.8-R0.1-SNAPSHOT + 1.9-R0.1-SNAPSHOT jar org.bukkit craftbukkit - 1.8-R0.1-SNAPSHOT + 1.9-R0.1-SNAPSHOT jar provided - com.sk89q - worldedit - 5.5.7-SNAPSHOT + com.sk89q.worldedit + worldedit-bukkit + 6.1 net.milkbowl.vault Vault - 1.4.1 + 1.5.6 jar diff --git a/src/main/java/com/graywolf336/jail/listeners/PlayerListener.java b/src/main/java/com/graywolf336/jail/listeners/PlayerListener.java index 6061e88..39604de 100644 --- a/src/main/java/com/graywolf336/jail/listeners/PlayerListener.java +++ b/src/main/java/com/graywolf336/jail/listeners/PlayerListener.java @@ -48,7 +48,7 @@ public class PlayerListener implements Listener { Location loc = event.getClickedBlock() == null ? p.getLocation() : event.getClickedBlock().getLocation(); JailManager jm = pl.getJailManager(); - if(p.getItemInHand().isSimilar(Util.getWand())) { + if(p.getInventory().getItemInMainHand().isSimilar(Util.getWand())) { if(jm.isCreatingSomething(p.getName())) { if(jm.isCreatingAJail(p.getName())) { pl.debug("Stepping into creating a jail."); @@ -225,8 +225,8 @@ public class PlayerListener implements Listener { Player player = (Player) event.getEntity(); if(pl.getJailStickManager().isUsingJailStick(attacker.getUniqueId())) { - if(pl.getJailStickManager().isValidStick(attacker.getItemInHand().getType())) { - if(attacker.hasPermission("jail.usejailstick." + attacker.getItemInHand().getType().toString().toLowerCase())) { + if(pl.getJailStickManager().isValidStick(attacker.getInventory().getItemInMainHand().getType())) { + if(attacker.hasPermission("jail.usejailstick." + attacker.getInventory().getItemInMainHand().getType().toString().toLowerCase())) { //The person the attacker is trying to jail stick is already jailed, don't handle that if(pl.getJailManager().isPlayerJailed(player.getUniqueId())) { attacker.sendMessage(Lang.ALREADYJAILED.get(player.getName())); @@ -234,7 +234,7 @@ public class PlayerListener implements Listener { if(player.hasPermission("jail.cantbejailed")) { attacker.sendMessage(Lang.CANTBEJAILED.get()); }else { - Stick s = pl.getJailStickManager().getStick(attacker.getItemInHand().getType()); + Stick s = pl.getJailStickManager().getStick(attacker.getInventory().getItemInMainHand().getType()); if(player.getHealth() <= s.getHealth() || s.getHealth() == -1) { Prisoner p = new Prisoner(player.getUniqueId().toString(), player.getName(), diff --git a/src/main/java/com/graywolf336/jail/listeners/ProtectionListener.java b/src/main/java/com/graywolf336/jail/listeners/ProtectionListener.java index 011bf81..ebd0488 100644 --- a/src/main/java/com/graywolf336/jail/listeners/ProtectionListener.java +++ b/src/main/java/com/graywolf336/jail/listeners/ProtectionListener.java @@ -289,7 +289,7 @@ public class ProtectionListener implements Listener { event.setCancelled(true); } - }else if (event.getPlayer().getItemInHand() != null) { + }else if (event.getPlayer().getInventory().getItemInMainHand() != null) { //Otherwise let's check if they have something in hand //Get the interaction blacklist, check if the current item is in there //if it is, then let's take action diff --git a/src/main/java/com/graywolf336/jail/steps/CellCreationSteps.java b/src/main/java/com/graywolf336/jail/steps/CellCreationSteps.java index 98c08f2..f44aec6 100644 --- a/src/main/java/com/graywolf336/jail/steps/CellCreationSteps.java +++ b/src/main/java/com/graywolf336/jail/steps/CellCreationSteps.java @@ -37,8 +37,8 @@ public class CellCreationSteps { if(player.getInventory().contains(wand)) { int i = player.getInventory().first(wand); if(i != -1) { - player.getInventory().setItem(i, player.getItemInHand()); - player.setItemInHand(wand); + player.getInventory().setItem(i, player.getInventory().getItemInMainHand()); + player.getInventory().setItemInMainHand(wand); } }else { player.getInventory().addItem(wand); diff --git a/src/main/java/com/graywolf336/jail/steps/JailCreationSteps.java b/src/main/java/com/graywolf336/jail/steps/JailCreationSteps.java index 181cedc..2fe806e 100644 --- a/src/main/java/com/graywolf336/jail/steps/JailCreationSteps.java +++ b/src/main/java/com/graywolf336/jail/steps/JailCreationSteps.java @@ -30,8 +30,8 @@ public class JailCreationSteps { if(player.getInventory().contains(wand)) { int i = player.getInventory().first(wand); if(i != -1) { - player.getInventory().setItem(i, player.getItemInHand()); - player.setItemInHand(wand); + player.getInventory().setItem(i, player.getInventory().getItemInMainHand()); + player.getInventory().setItemInMainHand(wand); } }else { player.getInventory().addItem(wand); diff --git a/src/test/java/test/java/com/graywolf336/jail/util/MockPlayerInventory.java b/src/test/java/test/java/com/graywolf336/jail/util/MockPlayerInventory.java index 6ba0107..4f3f259 100644 --- a/src/test/java/test/java/com/graywolf336/jail/util/MockPlayerInventory.java +++ b/src/test/java/test/java/com/graywolf336/jail/util/MockPlayerInventory.java @@ -6,6 +6,7 @@ import java.util.List; import java.util.ListIterator; import java.util.Map; +import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.entity.HumanEntity; import org.bukkit.event.inventory.InventoryType; @@ -13,7 +14,6 @@ import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.PlayerInventory; public class MockPlayerInventory implements PlayerInventory { - private int armorSize = 4, inventorySize = 36; ItemStack[] armorContents = new ItemStack[armorSize]; ItemStack[] inventoryContents = new ItemStack[inventorySize]; @@ -294,8 +294,27 @@ public class MockPlayerInventory implements PlayerInventory { + ",\"armorContents\":" + makeMap(getArmorContents()) + "}"; } - @Override public void setHeldItemSlot(int slot) { } -} \ No newline at end of file + + public Location getLocation() { + return null; + } + + public ItemStack getItemInMainHand() { + return null; + } + + public ItemStack getItemInOffHand() { + return null; + } + + public void setItemInMainHand(ItemStack item) { + + } + + public void setItemInOffHand(ItemStack item) { + + } +} diff --git a/src/test/java/test/java/com/graywolf336/jail/util/TestInstanceCreator.java b/src/test/java/test/java/com/graywolf336/jail/util/TestInstanceCreator.java index de36e43..e696950 100644 --- a/src/test/java/test/java/com/graywolf336/jail/util/TestInstanceCreator.java +++ b/src/test/java/test/java/com/graywolf336/jail/util/TestInstanceCreator.java @@ -30,7 +30,7 @@ import org.bukkit.WorldCreator; import org.bukkit.WorldType; import org.bukkit.command.CommandSender; import org.bukkit.command.ConsoleCommandSender; -import org.bukkit.craftbukkit.v1_8_R1.inventory.CraftItemFactory; +import org.bukkit.craftbukkit.v1_9_R1.inventory.CraftItemFactory; import org.bukkit.entity.Player; import org.bukkit.permissions.Permission; import org.bukkit.plugin.Plugin;