diff options
Diffstat (limited to 'EssentialsSigns/src/net/ess3')
11 files changed, 41 insertions, 32 deletions
diff --git a/EssentialsSigns/src/net/ess3/signs/EssentialsSign.java b/EssentialsSigns/src/net/ess3/signs/EssentialsSign.java index 3a9f9f903..e0698b680 100644 --- a/EssentialsSigns/src/net/ess3/signs/EssentialsSign.java +++ b/EssentialsSigns/src/net/ess3/signs/EssentialsSign.java @@ -297,7 +297,7 @@ public class EssentialsSign return new Trade(amount, ess); } final ItemStack item = getItemStack(sign.getLine(itemIndex), 1, ess); - final int amount = Math.min(getIntegerPositive(sign.getLine(amountIndex)), item.getType().getMaxStackSize() * player.getInventory().getSize()); + final int amount = Math.min(getIntegerPositive(sign.getLine(amountIndex)), item.getType().getMaxStackSize() * player.getPlayer().getInventory().getSize()); if (item.getTypeId() == 0 || amount < 1) { throw new SignException(_("moreThanZero")); diff --git a/EssentialsSigns/src/net/ess3/signs/EssentialsSignsPlugin.java b/EssentialsSigns/src/net/ess3/signs/EssentialsSignsPlugin.java index d2f615d52..1b661e458 100644 --- a/EssentialsSigns/src/net/ess3/signs/EssentialsSignsPlugin.java +++ b/EssentialsSigns/src/net/ess3/signs/EssentialsSignsPlugin.java @@ -4,6 +4,7 @@ import static net.ess3.I18n._; import net.ess3.api.IEssentials; import java.util.logging.Level; import java.util.logging.Logger; +import net.ess3.api.IPlugin; import org.bukkit.Bukkit; import org.bukkit.plugin.PluginManager; import org.bukkit.plugin.java.JavaPlugin; @@ -18,12 +19,13 @@ public class EssentialsSignsPlugin extends JavaPlugin implements ISignsPlugin public void onEnable() { final PluginManager pluginManager = getServer().getPluginManager(); - final IEssentials ess = (IEssentials)pluginManager.getPlugin("Essentials-3"); - if (!this.getDescription().getVersion().equals(ess.getDescription().getVersion())) + final IPlugin plugin = (IPlugin)pluginManager.getPlugin("Essentials-3"); + final IEssentials ess = (IEssentials)plugin.getEssentials(); + if (!this.getDescription().getVersion().equals(plugin.getDescription().getVersion())) { LOGGER.log(Level.WARNING, _("versionMismatchAll")); } - if (!ess.isEnabled()) + if (!plugin.isEnabled()) { this.setEnabled(false); return; diff --git a/EssentialsSigns/src/net/ess3/signs/SignEnchant.java b/EssentialsSigns/src/net/ess3/signs/SignEnchant.java index 6004d9f38..8369dd10e 100644 --- a/EssentialsSigns/src/net/ess3/signs/SignEnchant.java +++ b/EssentialsSigns/src/net/ess3/signs/SignEnchant.java @@ -88,7 +88,7 @@ public class SignEnchant extends EssentialsSign level = enchantment.getMaxLevel(); } - final ItemStack playerHand = player.getItemInHand(); + final ItemStack playerHand = player.getPlayer().getItemInHand(); if (playerHand == null || playerHand.getAmount() != 1 || (playerHand.containsEnchantment(enchantment) @@ -113,7 +113,7 @@ public class SignEnchant extends EssentialsSign charge.charge(player); Trade.log("Sign", "Enchant", "Interact", username, charge, username, charge, sign.getBlock().getLocation(), ess); - player.updateInventory(); + player.getPlayer().updateInventory(); return true; } } diff --git a/EssentialsSigns/src/net/ess3/signs/SignFree.java b/EssentialsSigns/src/net/ess3/signs/SignFree.java index 2cf049346..906929e09 100644 --- a/EssentialsSigns/src/net/ess3/signs/SignFree.java +++ b/EssentialsSigns/src/net/ess3/signs/SignFree.java @@ -33,9 +33,9 @@ public class SignFree extends EssentialsSign } item.setAmount(item.getType().getMaxStackSize()); - InventoryWorkaround.addItem(player.getInventory(), true, item); + InventoryWorkaround.addItem(player.getPlayer().getInventory(), true, item); player.sendMessage("Item added to your inventory."); - player.updateInventory(); + player.getPlayer().updateInventory(); //TODO: wait for a fix in bukkit //Problem: Items can be duplicated //Inventory i = ess.getServer().createInventory(player, InventoryType.CHEST); diff --git a/EssentialsSigns/src/net/ess3/signs/SignGameMode.java b/EssentialsSigns/src/net/ess3/signs/SignGameMode.java index b2e1b2db2..38acbc304 100644 --- a/EssentialsSigns/src/net/ess3/signs/SignGameMode.java +++ b/EssentialsSigns/src/net/ess3/signs/SignGameMode.java @@ -43,8 +43,8 @@ public class SignGameMode extends EssentialsSign charge.isAffordableFor(player); //this needs to be fixed - player.setGameMode(player.getGameMode() == GameMode.SURVIVAL ? GameMode.CREATIVE : GameMode.SURVIVAL); - player.sendMessage(_("gameMode", _(player.getGameMode().toString().toLowerCase(Locale.ENGLISH)), player.getDisplayName())); + player.getPlayer().setGameMode(player.getPlayer().getGameMode() == GameMode.SURVIVAL ? GameMode.CREATIVE : GameMode.SURVIVAL); + player.sendMessage(_("gameMode", _(player.getPlayer().getGameMode().toString().toLowerCase(Locale.ENGLISH)), player.getPlayer().getDisplayName())); charge.charge(player); return true; } diff --git a/EssentialsSigns/src/net/ess3/signs/SignHeal.java b/EssentialsSigns/src/net/ess3/signs/SignHeal.java index 787e7b166..6d82ba70f 100644 --- a/EssentialsSigns/src/net/ess3/signs/SignHeal.java +++ b/EssentialsSigns/src/net/ess3/signs/SignHeal.java @@ -26,9 +26,9 @@ public class SignHeal extends EssentialsSign { final Trade charge = getTrade(sign, 1, ess); charge.isAffordableFor(player); - player.setHealth(20); - player.setFoodLevel(20); - player.setFireTicks(0); + player.getPlayer().setHealth(20); + player.getPlayer().setFoodLevel(20); + player.getPlayer().setFireTicks(0); player.sendMessage(_("youAreHealed")); charge.charge(player); return true; diff --git a/EssentialsSigns/src/net/ess3/signs/SignInfo.java b/EssentialsSigns/src/net/ess3/signs/SignInfo.java index 426e7c04c..c738667b8 100644 --- a/EssentialsSigns/src/net/ess3/signs/SignInfo.java +++ b/EssentialsSigns/src/net/ess3/signs/SignInfo.java @@ -4,8 +4,8 @@ package net.ess3.signs; import java.io.IOException; import net.ess3.api.ChargeException; import net.ess3.api.IEssentials; +import net.ess3.api.IUser; import net.ess3.economy.Trade; -import net.ess3.user.User; import net.ess3.utils.textreader.IText; import net.ess3.utils.textreader.KeywordReplacer; import net.ess3.utils.textreader.TextInput; @@ -20,14 +20,14 @@ public class SignInfo extends EssentialsSign } @Override - protected boolean onSignCreate(final ISign sign, final User player, final String username, final IEssentials ess) throws SignException + protected boolean onSignCreate(final ISign sign, final IUser player, final String username, final IEssentials ess) throws SignException { validateTrade(sign, 3, ess); return true; } @Override - protected boolean onSignInteract(final ISign sign, final User player, final String username, final IEssentials ess) throws SignException, ChargeException + protected boolean onSignInteract(final ISign sign, final IUser player, final String username, final IEssentials ess) throws SignException, ChargeException { final Trade charge = getTrade(sign, 3, ess); charge.isAffordableFor(player); diff --git a/EssentialsSigns/src/net/ess3/signs/SignRepair.java b/EssentialsSigns/src/net/ess3/signs/SignRepair.java index aea1a69cb..9da4b4d3f 100644 --- a/EssentialsSigns/src/net/ess3/signs/SignRepair.java +++ b/EssentialsSigns/src/net/ess3/signs/SignRepair.java @@ -1,9 +1,11 @@ package net.ess3.signs; +import static net.ess3.I18n._; +import net.ess3.api.ChargeException; import net.ess3.api.IEssentials; +import net.ess3.api.IUser; import net.ess3.commands.Commandrepair; import net.ess3.economy.Trade; -import net.ess3.user.User; public class SignRepair extends EssentialsSign @@ -14,7 +16,7 @@ public class SignRepair extends EssentialsSign } @Override - protected boolean onSignCreate(final ISign sign, final User player, final String username, final IEssentials ess) throws SignException + protected boolean onSignCreate(final ISign sign, final IUser player, final String username, final IEssentials ess) throws SignException { final String repairTarget = sign.getLine(1); if (repairTarget.isEmpty()) @@ -30,20 +32,20 @@ public class SignRepair extends EssentialsSign } @Override - protected boolean onSignInteract(final ISign sign, final User player, final String username, final IEssentials ess) throws SignException, ChargeException + protected boolean onSignInteract(final ISign sign, final IUser player, final String username, final IEssentials ess) throws SignException, ChargeException { final Trade charge = getTrade(sign, 2, ess); charge.isAffordableFor(player); Commandrepair command = new Commandrepair(); - command.setEssentials(ess); + command.init(ess, "repair"); String[] args = new String[] { sign.getLine(1) }; try { - command.run(ess.getServer(), player, "repair", args); + command.run(player, "repair", args); } catch (Exception ex) { diff --git a/EssentialsSigns/src/net/ess3/signs/SignTime.java b/EssentialsSigns/src/net/ess3/signs/SignTime.java index 8ef98a4d5..215721b69 100644 --- a/EssentialsSigns/src/net/ess3/signs/SignTime.java +++ b/EssentialsSigns/src/net/ess3/signs/SignTime.java @@ -5,6 +5,7 @@ import net.ess3.api.ChargeException; import net.ess3.api.IEssentials; import net.ess3.api.IUser; import net.ess3.economy.Trade; +import org.bukkit.World; public class SignTime extends EssentialsSign @@ -38,17 +39,18 @@ public class SignTime extends EssentialsSign final Trade charge = getTrade(sign, 2, ess); charge.isAffordableFor(player); final String timeString = sign.getLine(1); - long time = player.getWorld().getTime(); + final World world = player.getPlayer().getWorld(); + long time = world.getTime(); time -= time % 24000; if ("§2Day".equalsIgnoreCase(timeString)) { - player.getWorld().setTime(time + 24000); + world.setTime(time + 24000); charge.charge(player); return true; } if ("§2Night".equalsIgnoreCase(timeString)) { - player.getWorld().setTime(time + 37700); + world.setTime(time + 37700); charge.charge(player); return true; } diff --git a/EssentialsSigns/src/net/ess3/signs/SignTrade.java b/EssentialsSigns/src/net/ess3/signs/SignTrade.java index c3e78e226..0993a5498 100644 --- a/EssentialsSigns/src/net/ess3/signs/SignTrade.java +++ b/EssentialsSigns/src/net/ess3/signs/SignTrade.java @@ -75,16 +75,17 @@ public class SignTrade extends EssentialsSign private Trade rechargeSign(final ISign sign, final IEssentials ess, final IUser player) throws SignException, ChargeException { final Trade trade = getTrade(sign, 2, false, false, ess); - if (trade.getItemStack() != null && player.getItemInHand() != null - && trade.getItemStack().getTypeId() == player.getItemInHand().getTypeId() - && trade.getItemStack().getDurability() == player.getItemInHand().getDurability() - && trade.getItemStack().getEnchantments().equals(player.getItemInHand().getEnchantments())) + ItemStack itemInHand = player.getPlayer().getItemInHand(); + if (trade.getItemStack() != null && itemInHand != null + && trade.getItemStack().getTypeId() == itemInHand.getTypeId() + && trade.getItemStack().getDurability() == itemInHand.getDurability() + && trade.getItemStack().getEnchantments().equals(itemInHand.getEnchantments())) { - int amount = player.getItemInHand().getAmount(); + int amount = itemInHand.getAmount(); amount -= amount % trade.getItemStack().getAmount(); if (amount > 0) { - final ItemStack stack = player.getItemInHand().clone(); + final ItemStack stack = itemInHand.clone(); stack.setAmount(amount); final Trade store = new Trade(stack, ess); addAmount(sign, 2, store, ess); diff --git a/EssentialsSigns/src/net/ess3/signs/SignWeather.java b/EssentialsSigns/src/net/ess3/signs/SignWeather.java index 94217aeec..18aa1f567 100644 --- a/EssentialsSigns/src/net/ess3/signs/SignWeather.java +++ b/EssentialsSigns/src/net/ess3/signs/SignWeather.java @@ -5,6 +5,7 @@ import net.ess3.api.ChargeException; import net.ess3.api.IEssentials; import net.ess3.api.IUser; import net.ess3.economy.Trade; +import org.bukkit.World; public class SignWeather extends EssentialsSign @@ -38,15 +39,16 @@ public class SignWeather extends EssentialsSign final Trade charge = getTrade(sign, 2, ess); charge.isAffordableFor(player); final String weatherString = sign.getLine(1); + final World world = player.getPlayer().getWorld(); if ("§2Sun".equalsIgnoreCase(weatherString)) { - player.getWorld().setStorm(false); + world.setStorm(false); charge.charge(player); return true; } if ("§2Storm".equalsIgnoreCase(weatherString)) { - player.getWorld().setStorm(true); + world.setStorm(true); charge.charge(player); return true; } |