diff options
19 files changed, 129 insertions, 1163 deletions
diff --git a/Essentials/src/com/earth2me/essentials/Kits.java b/Essentials/src/com/earth2me/essentials/Kits.java index 74d2a73e5..730e63c2f 100644 --- a/Essentials/src/com/earth2me/essentials/Kits.java +++ b/Essentials/src/com/earth2me/essentials/Kits.java @@ -97,13 +97,13 @@ public class Kits extends AsyncStorageObjectHolder<com.earth2me.essentials.setti @Override public void finishRead() { - throw new UnsupportedOperationException("Not supported yet."); + } @Override public void finishWrite() { - throw new UnsupportedOperationException("Not supported yet."); + } public void checkTime(final IUser user, Kit kit) throws NoChargeException diff --git a/Essentials/src/com/earth2me/essentials/api/IEssentials.java b/Essentials/src/com/earth2me/essentials/api/IEssentials.java index 3972fb26a..488b1aceb 100644 --- a/Essentials/src/com/earth2me/essentials/api/IEssentials.java +++ b/Essentials/src/com/earth2me/essentials/api/IEssentials.java @@ -3,6 +3,7 @@ package com.earth2me.essentials.api; import com.earth2me.essentials.EssentialsTimer; import com.earth2me.essentials.economy.register.Methods; import com.earth2me.essentials.listener.TntExplodeListener; +import com.earth2me.essentials.metrics.Metrics; import java.util.List; import org.bukkit.World; import org.bukkit.plugin.Plugin; @@ -64,4 +65,8 @@ public interface IEssentials extends Plugin List<String> getVanishedPlayers(); EssentialsTimer getTimer(); + + Metrics getMetrics(); + + void setMetrics(Metrics metrics); } diff --git a/Essentials/src/com/earth2me/essentials/api/IUser.java b/Essentials/src/com/earth2me/essentials/api/IUser.java index c5177162c..b7a22ac4d 100644 --- a/Essentials/src/com/earth2me/essentials/api/IUser.java +++ b/Essentials/src/com/earth2me/essentials/api/IUser.java @@ -120,4 +120,6 @@ public interface IUser extends Player, IStorageObjectHolder<UserData>, IReload, void setInvSee(boolean invsee); + void update(final Player base); + } diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandback.java b/Essentials/src/com/earth2me/essentials/commands/Commandback.java index 2b112ffa9..d325b7f6a 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandback.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandback.java @@ -13,7 +13,7 @@ public class Commandback extends EssentialsCommand { final String worldName = user.getData().getLastLocation().getWorldName(); if (user.getWorld() != user.getData().getLastLocation().getBukkitLocation().getWorld() && ess.getSettings().getData().getGeneral().isWorldTeleportPermissions() - && WorldPermissions.getPermission(worldName)) + && WorldPermissions.getPermission(worldName).isAuthorized(user)) { throw new Exception(_("noPerm", "essentials.world." + worldName)); } diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandbackup.java b/Essentials/src/com/earth2me/essentials/commands/Commandbackup.java index e620fa52d..6ea8aec87 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandbackup.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandbackup.java @@ -2,6 +2,8 @@ package com.earth2me.essentials.commands; import static com.earth2me.essentials.I18n._; import com.earth2me.essentials.api.IBackup; +import com.earth2me.essentials.api.ISettings; +import lombok.Cleanup; import org.bukkit.command.CommandSender; @@ -15,7 +17,11 @@ public class Commandbackup extends EssentialsCommand { throw new Exception(_("backupDisabled")); } - final String command = ess.getSettings().getData().getCommands().getBackupCommand(); + + @Cleanup + ISettings settings = ess.getSettings(); + settings.acquireReadLock(); + final String command = settings.getData().getGeneral().getBackup().getCommand(); if (command == null || "".equals(command) || "save-all".equalsIgnoreCase(command)) { throw new Exception(_("backupDisabled")); diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandbalance.java b/Essentials/src/com/earth2me/essentials/commands/Commandbalance.java index 4e8b8f8af..c8491a2c0 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandbalance.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandbalance.java @@ -1,9 +1,9 @@ package com.earth2me.essentials.commands; import static com.earth2me.essentials.I18n._; -import com.earth2me.essentials.utils.Util; import com.earth2me.essentials.api.IUser; import com.earth2me.essentials.permissions.Permissions; +import com.earth2me.essentials.utils.Util; import org.bukkit.command.CommandSender; @@ -16,7 +16,7 @@ public class Commandbalance extends EssentialsCommand { throw new NotEnoughArgumentsException(); } - sender.sendMessage(_("balance", Util.displayCurrency(getPlayer(server, args, 0, true).getMoney(), ess))); + sender.sendMessage(_("balance", Util.displayCurrency(getPlayer(args, 0, true).getMoney(), ess))); } @Override @@ -25,7 +25,7 @@ public class Commandbalance extends EssentialsCommand final double bal = (args.length < 1 || !Permissions.BALANCE_OTHERS.isAuthorized(user) ? user - : getPlayer(server, args, 0, true)).getMoney(); + : getPlayer(args, 0, true)).getMoney(); user.sendMessage(_("balance", Util.displayCurrency(bal, ess))); } } diff --git a/Essentials/src/com/earth2me/essentials/economy/MoneyHolder.java b/Essentials/src/com/earth2me/essentials/economy/MoneyHolder.java index cdde3506e..3ecf6b2d0 100644 --- a/Essentials/src/com/earth2me/essentials/economy/MoneyHolder.java +++ b/Essentials/src/com/earth2me/essentials/economy/MoneyHolder.java @@ -12,13 +12,13 @@ public class MoneyHolder extends AsyncStorageObjectHolder<Money> @Override public void finishRead() { - throw new UnsupportedOperationException("Not supported yet."); + } @Override public void finishWrite() { - throw new UnsupportedOperationException("Not supported yet."); + } diff --git a/Essentials/src/com/earth2me/essentials/economy/WorthHolder.java b/Essentials/src/com/earth2me/essentials/economy/WorthHolder.java index 499b92bac..d514c9797 100644 --- a/Essentials/src/com/earth2me/essentials/economy/WorthHolder.java +++ b/Essentials/src/com/earth2me/essentials/economy/WorthHolder.java @@ -19,13 +19,13 @@ public class WorthHolder extends AsyncStorageObjectHolder<com.earth2me.essential @Override public void finishRead() { - throw new UnsupportedOperationException("Not supported yet."); + } @Override public void finishWrite() { - throw new UnsupportedOperationException("Not supported yet."); + } diff --git a/Essentials/src/com/earth2me/essentials/metrics/MetricsListener.java b/Essentials/src/com/earth2me/essentials/metrics/MetricsListener.java index 5c71e54f9..77af2b5da 100644 --- a/Essentials/src/com/earth2me/essentials/metrics/MetricsListener.java +++ b/Essentials/src/com/earth2me/essentials/metrics/MetricsListener.java @@ -27,7 +27,7 @@ public class MetricsListener implements Listener @EventHandler(priority = EventPriority.MONITOR) public void onPlayerJoin(final PlayerJoinEvent event) { - final IUser player = ess.getUser(event.getPlayer()); + /*final IUser player = ess.getUser(event.getPlayer()); if (ess.getSettings().isMetricsEnabled() == false && (player.isAuthorized("essentials.essentials") || player.isAuthorized("bukkit.broadcast.admin"))) { player.sendMessage("PluginMetrics collects minimal statistic data, starting in about 5 minutes."); @@ -35,6 +35,6 @@ public class MetricsListener implements Listener ess.getLogger().log(Level.INFO, "[Metrics] Admin join - Starting 5 minute opt-out period."); ess.getSettings().setMetricsEnabled(true); ess.getScheduler().scheduleAsyncDelayedTask(ess, starter, 5 * 1200); - } + }*/ } } diff --git a/Essentials/src/com/earth2me/essentials/metrics/MetricsStarter.java b/Essentials/src/com/earth2me/essentials/metrics/MetricsStarter.java index 867b9e876..82bab0047 100644 --- a/Essentials/src/com/earth2me/essentials/metrics/MetricsStarter.java +++ b/Essentials/src/com/earth2me/essentials/metrics/MetricsStarter.java @@ -1,12 +1,18 @@ package com.earth2me.essentials.metrics; import com.earth2me.essentials.api.IEssentials; +import com.earth2me.essentials.api.ISettings; +import com.earth2me.essentials.economy.register.Method; +import com.earth2me.essentials.economy.register.methods.VaultEco; import com.earth2me.essentials.metrics.Metrics.Graph; import com.earth2me.essentials.metrics.Metrics.Plotter; -import com.earth2me.essentials.register.payment.Method; -import com.earth2me.essentials.register.payment.methods.VaultEco; +//import com.earth2me.essentials.register.payment.Method; +//import com.earth2me.essentials.register.payment.methods.VaultEco; +import com.nijikokun.bukkit.Permissions.Permissions; import java.util.Locale; import java.util.logging.Level; +import java.util.logging.Logger; +import lombok.Cleanup; public class MetricsStarter implements Runnable @@ -29,32 +35,36 @@ public class MetricsStarter implements Runnable public MetricsStarter(final IEssentials plugin) { ess = plugin; - try - { - - final Metrics metrics = new Metrics(ess); - ess.setMetrics(metrics); - - if (!metrics.isOptOut()) - { - if (ess.getSettings().isMetricsEnabled()) - { - start = true; - } - else - { - ess.getLogger().info("This plugin collects minimal statistic data and sends it to http://metrics.essentials3.net."); - ess.getLogger().info("You can opt out by running /essentials opt-out"); - ess.getLogger().info("This will start 5 minutes after the first admin/op joins."); - start = false; - } - return; - } - } - catch (Exception ex) - { - metricsError(ex); - } + /* + try + { + + final Metrics metrics = new Metrics(ess); + ess.setMetrics(metrics); + + @Cleanup + ISettings settings = ess.getSettings(); + settings.acquireReadLock(); + if (!metrics.isOptOut()) + { + if (settings.getData().getGeneral().isMetricsEnabled()) + { + start = true; + } + else + { + ess.getLogger().info("This plugin collects minimal statistic data and sends it to http://metrics.essentials3.net."); + ess.getLogger().info("You can opt out by running /essentials opt-out"); + ess.getLogger().info("This will start 5 minutes after the first admin/op joins."); + start = false; + } + return; + } + } + catch (Exception ex) + { + metricsError(ex); + }*/ } @Override @@ -99,7 +109,16 @@ public class MetricsStarter implements Runnable @Override public int getValue() { - return ess.getSettings().getKits().getKeys(false).size(); + int size = 0; + try + { + size = ess.getKits().getList().size(); + } + catch (Exception ex) + { + } + return size; + } }); featureGraph.addPlotter(new Plotter("Warps") @@ -107,13 +126,16 @@ public class MetricsStarter implements Runnable @Override public int getValue() { - return ess.getWarps().getWarpNames().size(); + return ess.getWarps().getList().size(); } }); final Graph enabledGraph = metrics.createGraph("EnabledFeatures"); enabledGraph.addPlotter(new SimplePlotter("Total")); - final String BKcommand = ess.getSettings().getBackupCommand(); + @Cleanup + ISettings settings = ess.getSettings(); + settings.acquireReadLock(); + final String BKcommand = settings.getData().getGeneral().getBackup().getCommand();; if (BKcommand != null && !"".equals(BKcommand)) { enabledGraph.addPlotter(new SimplePlotter("Backup")); @@ -122,31 +144,33 @@ public class MetricsStarter implements Runnable { enabledGraph.addPlotter(new SimplePlotter("Jails")); } - if (ess.getSettings().getKits().getKeys(false).size() > 0) + if (ess.getKits().getList().size() > 0) { enabledGraph.addPlotter(new SimplePlotter("Kits")); } - if (ess.getWarps().getWarpNames().size() > 0) + if (ess.getWarps().getList().size() > 0) { enabledGraph.addPlotter(new SimplePlotter("Warps")); } - if (!ess.getSettings().areSignsDisabled()) - { - enabledGraph.addPlotter(new SimplePlotter("Signs")); - } - if (ess.getSettings().getAutoAfk() > 0) - { - enabledGraph.addPlotter(new SimplePlotter("AutoAFK")); - } - if (ess.getSettings().changeDisplayName()) - { - enabledGraph.addPlotter(new SimplePlotter("DisplayName")); - } - if (ess.getSettings().getChatRadius() >= 1) - { - enabledGraph.addPlotter(new SimplePlotter("LocalChat")); - } - + //todo - enable once settings are in + /* + if (!ess.getSettings().areSignsDisabled()) + { + enabledGraph.addPlotter(new SimplePlotter("Signs")); + } + if (ess.getSettings().getAutoAfk() > 0) + { + enabledGraph.addPlotter(new SimplePlotter("AutoAFK")); + } + if (ess.getSettings().changeDisplayName()) + { + enabledGraph.addPlotter(new SimplePlotter("DisplayName")); + } + if (ess.getSettings().getChatRadius() >= 1) + { + enabledGraph.addPlotter(new SimplePlotter("LocalChat")); + } + */ final Graph depGraph = metrics.createGraph("Dependencies"); final Method method = ess.getPaymentMethod().getMethod(); if (method != null) @@ -167,7 +191,8 @@ public class MetricsStarter implements Runnable } depGraph.addPlotter(new SimplePlotter(method.getName() + " " + version)); } - depGraph.addPlotter(new SimplePlotter(ess.getPermissionsHandler().getName())); + //todo - verify + depGraph.addPlotter(new SimplePlotter(Permissions.getInstance().getName())); metrics.start(); diff --git a/Essentials/src/com/earth2me/essentials/ranks/RanksStorage.java b/Essentials/src/com/earth2me/essentials/ranks/RanksStorage.java index 85658863b..7e3eac946 100644 --- a/Essentials/src/com/earth2me/essentials/ranks/RanksStorage.java +++ b/Essentials/src/com/earth2me/essentials/ranks/RanksStorage.java @@ -23,13 +23,13 @@ public class RanksStorage extends AsyncStorageObjectHolder<Ranks> implements IRa @Override public void finishRead() { - throw new UnsupportedOperationException("Not supported yet."); + } @Override public void finishWrite() { - throw new UnsupportedOperationException("Not supported yet."); + } public RanksStorage(final IEssentials ess) { diff --git a/Essentials/src/com/earth2me/essentials/settings/Kit.java b/Essentials/src/com/earth2me/essentials/settings/Kit.java index 19267e6f3..ea0631124 100644 --- a/Essentials/src/com/earth2me/essentials/settings/Kit.java +++ b/Essentials/src/com/earth2me/essentials/settings/Kit.java @@ -16,4 +16,5 @@ public class Kit implements StorageObject @ListType(ItemStack.class) private List<ItemStack> items = new ArrayList<ItemStack>(); private Double delay; + } diff --git a/Essentials/src/com/earth2me/essentials/settings/SettingsHolder.java b/Essentials/src/com/earth2me/essentials/settings/SettingsHolder.java index 56aecf378..2554ba9e8 100644 --- a/Essentials/src/com/earth2me/essentials/settings/SettingsHolder.java +++ b/Essentials/src/com/earth2me/essentials/settings/SettingsHolder.java @@ -13,13 +13,13 @@ public class SettingsHolder extends AsyncStorageObjectHolder<Settings> implement @Override public void finishRead() { - throw new UnsupportedOperationException("Not supported yet."); + } @Override public void finishWrite() { - throw new UnsupportedOperationException("Not supported yet."); + } private final transient AtomicBoolean debug = new AtomicBoolean(false); public SettingsHolder(final IEssentials ess) diff --git a/Essentials/src/com/earth2me/essentials/settings/SpawnsHolder.java b/Essentials/src/com/earth2me/essentials/settings/SpawnsHolder.java index c2dc0def2..c1826d9ef 100644 --- a/Essentials/src/com/earth2me/essentials/settings/SpawnsHolder.java +++ b/Essentials/src/com/earth2me/essentials/settings/SpawnsHolder.java @@ -33,13 +33,13 @@ public class SpawnsHolder extends AsyncStorageObjectHolder<Spawns> implements IE @Override public void finishRead() { - throw new UnsupportedOperationException("Not supported yet."); + } @Override public void finishWrite() { - throw new UnsupportedOperationException("Not supported yet."); + } public SpawnsHolder(final IEssentials ess) diff --git a/Essentials/src/com/earth2me/essentials/settings/WarpHolder.java b/Essentials/src/com/earth2me/essentials/settings/WarpHolder.java index a2facb824..a14db0339 100644 --- a/Essentials/src/com/earth2me/essentials/settings/WarpHolder.java +++ b/Essentials/src/com/earth2me/essentials/settings/WarpHolder.java @@ -14,13 +14,13 @@ public class WarpHolder extends AsyncStorageObjectHolder<Warp> implements IWarp @Override public void finishRead() { - throw new UnsupportedOperationException("Not supported yet."); + } @Override public void finishWrite() { - throw new UnsupportedOperationException("Not supported yet."); + } private final String name; diff --git a/Essentials/src/com/earth2me/essentials/user/User.java b/Essentials/src/com/earth2me/essentials/user/User.java index 5c9015237..fdd229794 100644 --- a/Essentials/src/com/earth2me/essentials/user/User.java +++ b/Essentials/src/com/earth2me/essentials/user/User.java @@ -9,61 +9,22 @@ import com.earth2me.essentials.economy.register.Method; import com.earth2me.essentials.permissions.Permissions; import com.earth2me.essentials.utils.DateUtil; import com.earth2me.essentials.utils.Util; -import java.net.InetSocketAddress; import java.util.Calendar; -import java.util.Collection; import java.util.GregorianCalendar; -import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Set; -import java.util.UUID; import java.util.concurrent.atomic.AtomicBoolean; -import java.util.logging.Level; import java.util.logging.Logger; import lombok.Cleanup; import lombok.Getter; import lombok.Setter; -import org.bukkit.Achievement; import org.bukkit.Bukkit; -import org.bukkit.Effect; -import org.bukkit.EntityEffect; -import org.bukkit.GameMode; -import org.bukkit.Instrument; import org.bukkit.Location; import org.bukkit.Material; -import org.bukkit.Note; import org.bukkit.OfflinePlayer; -import org.bukkit.Server; -import org.bukkit.Statistic; -import org.bukkit.World; -import org.bukkit.block.Block; import org.bukkit.command.CommandSender; -import org.bukkit.conversations.Conversation; -import org.bukkit.conversations.ConversationAbandonedEvent; -import org.bukkit.entity.Arrow; -import org.bukkit.entity.Egg; -import org.bukkit.entity.Entity; -import org.bukkit.entity.EntityType; import org.bukkit.entity.Player; -import org.bukkit.entity.Projectile; -import org.bukkit.entity.Snowball; -import org.bukkit.event.entity.EntityDamageEvent; -import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; -import org.bukkit.inventory.Inventory; -import org.bukkit.inventory.InventoryView; -import org.bukkit.inventory.InventoryView.Property; import org.bukkit.inventory.ItemStack; -import org.bukkit.inventory.PlayerInventory; -import org.bukkit.map.MapView; -import org.bukkit.metadata.MetadataValue; -import org.bukkit.permissions.Permission; -import org.bukkit.permissions.PermissionAttachment; -import org.bukkit.permissions.PermissionAttachmentInfo; -import org.bukkit.plugin.Plugin; -import org.bukkit.potion.PotionEffect; -import org.bukkit.potion.PotionEffectType; -import org.bukkit.util.Vector; public class User extends UserBase implements IUser @@ -100,6 +61,7 @@ public class User extends UserBase implements IUser teleport = new Teleport(this, ess); } + public User(final OfflinePlayer offlinePlayer, final IEssentials ess) { super(offlinePlayer, ess); @@ -130,6 +92,12 @@ public class User extends UserBase implements IUser public void finishWrite() { } + + @Override + public void update(final Player base) + { + super.update(base); + } @Override public void checkCooldown(final UserData.TimestampType cooldownType, final double cooldown, final boolean set, final IPermission bypassPermission) throws CooldownException @@ -462,6 +430,7 @@ public class User extends UserBase implements IUser } //Returns true if status expired during this check + @Override public boolean checkBanTimeout(final long currentTime) { acquireReadLock(); @@ -482,6 +451,7 @@ public class User extends UserBase implements IUser } } + @Override public void updateActivity(final boolean broadcast) { acquireReadLock(); @@ -504,6 +474,7 @@ public class User extends UserBase implements IUser } } + @Override public void checkActivity() { @Cleanup @@ -548,11 +519,13 @@ public class User extends UserBase implements IUser } } + @Override public Location getAfkPosition() { return afkPosition; } + @Override public boolean toggleGodModeEnabled() { if (!isGodModeEnabled()) @@ -562,6 +535,7 @@ public class User extends UserBase implements IUser return super.toggleGodmode(); } + @Override public boolean isGodModeEnabled() { acquireReadLock(); @@ -730,7 +704,6 @@ public class User extends UserBase implements IUser } return cost <= mon; } - @Override public void updateMoneyCache(double userMoney) { if (super.getMoney() != userMoney) { @@ -767,6 +740,7 @@ public class User extends UserBase implements IUser } } + @Override public void toggleVanished() { vanished = !vanished; @@ -779,1051 +753,4 @@ public class User extends UserBase implements IUser ess.getVanishedPlayers().remove(getName()); } } - - - //start// - @Override - public void setDisplayName(String string) - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public String getPlayerListName() - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public void setPlayerListName(String string) - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public void setCompassTarget(Location lctn) - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public Location getCompassTarget() - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public InetSocketAddress getAddress() - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public void sendRawMessage(String string) - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public void kickPlayer(String string) - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public void chat(String string) - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public boolean performCommand(String string) - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public boolean isSneaking() - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public void setSneaking(boolean bln) - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public boolean isSprinting() - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public void setSprinting(boolean bln) - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public void saveData() - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public void loadData() - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public void setSleepingIgnored(boolean bln) - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public boolean isSleepingIgnored() - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public void playNote(Location lctn, byte b, byte b1) - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public void playNote(Location lctn, Instrument i, Note note) - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public void playEffect(Location lctn, Effect effect, int i) - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public <T> void playEffect(Location lctn, Effect effect, T t) - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public void sendBlockChange(Location lctn, Material mtrl, byte b) - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public boolean sendChunkChange(Location lctn, int i, int i1, int i2, byte[] bytes) - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public void sendBlockChange(Location lctn, int i, byte b) - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public void sendMap(MapView mv) - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public void updateInventory() - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public void awardAchievement(Achievement a) - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public void incrementStatistic(Statistic ststc) - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public void incrementStatistic(Statistic ststc, int i) - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public void incrementStatistic(Statistic ststc, Material mtrl) - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public void incrementStatistic(Statistic ststc, Material mtrl, int i) - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public void setPlayerTime(long l, boolean bln) - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public long getPlayerTime() - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public long getPlayerTimeOffset() - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public boolean isPlayerTimeRelative() - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public void resetPlayerTime() - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public void giveExp(int i) - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public float getExp() - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public void setExp(float f) - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public int getLevel() - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public void setLevel(int i) - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public int getTotalExperience() - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public void setTotalExperience(int i) - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public float getExhaustion() - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public void setExhaustion(float f) - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public float getSaturation() - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public void setSaturation(float f) - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public int getFoodLevel() - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public void setFoodLevel(int i) - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public void setBedSpawnLocation(Location lctn) - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public boolean getAllowFlight() - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public void setAllowFlight(boolean bln) - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public void hidePlayer(Player player) - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public void showPlayer(Player player) - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public boolean canSee(Player player) - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public boolean isFlying() - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public void setFlying(boolean bln) - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public PlayerInventory getInventory() - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public boolean setWindowProperty(Property prprt, int i) - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public InventoryView getOpenInventory() - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public InventoryView openInventory(Inventory invntr) - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public InventoryView openWorkbench(Location lctn, boolean bln) - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public InventoryView openEnchanting(Location lctn, boolean bln) - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public void openInventory(InventoryView iv) - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public void closeInventory() - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public ItemStack getItemInHand() - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public void setItemInHand(ItemStack is) - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public ItemStack getItemOnCursor() - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public void setItemOnCursor(ItemStack is) - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public boolean isSleeping() - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public int getSleepTicks() - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public GameMode getGameMode() - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public void setGameMode(GameMode gm) - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public boolean isBlocking() - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public int getHealth() - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public void setHealth(int i) - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public int getMaxHealth() - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public double getEyeHeight() - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public double getEyeHeight(boolean bln) - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public Location getEyeLocation() - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public List<Block> getLineOfSight(HashSet<Byte> hs, int i) - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public Block getTargetBlock(HashSet<Byte> hs, int i) - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public List<Block> getLastTwoTargetBlocks(HashSet<Byte> hs, int i) - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public Egg throwEgg() - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public Snowball throwSnowball() - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public Arrow shootArrow() - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public <T extends Projectile> T launchProjectile(Class<? extends T> type) - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public int getRemainingAir() - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public void setRemainingAir(int i) - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public int getMaximumAir() - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public void setMaximumAir(int i) - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public void damage(int i) - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public void damage(int i, Entity entity) - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public int getMaximumNoDamageTicks() - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public void setMaximumNoDamageTicks(int i) - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public int getLastDamage() - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public void setLastDamage(int i) - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public int getNoDamageTicks() - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public void setNoDamageTicks(int i) - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public Player getKiller() - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public boolean addPotionEffect(PotionEffect pe) - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public boolean addPotionEffect(PotionEffect pe, boolean bln) - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public boolean addPotionEffects(Collection<PotionEffect> clctn) - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public boolean hasPotionEffect(PotionEffectType pet) - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public void removePotionEffect(PotionEffectType pet) - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public Collection<PotionEffect> getActivePotionEffects() - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public Location getLocation() - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public void setVelocity(Vector vector) - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public Vector getVelocity() - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public World getWorld() - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public boolean teleport(Location lctn) - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public boolean teleport(Location lctn, TeleportCause tc) - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public boolean teleport(Entity entity) - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public boolean teleport(Entity entity, TeleportCause tc) - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public List<Entity> getNearbyEntities(double d, double d1, double d2) - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public int getEntityId() - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public int getFireTicks() - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public int getMaxFireTicks() - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public void setFireTicks(int i) - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public void remove() - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public boolean isDead() - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public Server getServer() - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public Entity getPassenger() - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public boolean setPassenger(Entity entity) - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public boolean isEmpty() - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public boolean eject() - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public float getFallDistance() - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public void setFallDistance(float f) - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public void setLastDamageCause(EntityDamageEvent ede) - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public EntityDamageEvent getLastDamageCause() - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public UUID getUniqueId() - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public int getTicksLived() - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public void setTicksLived(int i) - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public void playEffect(EntityEffect ee) - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public EntityType getType() - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public boolean isInsideVehicle() - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public boolean leaveVehicle() - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public Entity getVehicle() - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public void setMetadata(String string, MetadataValue mv) - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public List<MetadataValue> getMetadata(String string) - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public boolean hasMetadata(String string) - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public void removeMetadata(String string, Plugin plugin) - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public boolean isPermissionSet(String string) - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public boolean isPermissionSet(Permission prmsn) - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public boolean hasPermission(String string) - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public PermissionAttachment addAttachment(Plugin plugin, String string, boolean bln) - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public PermissionAttachment addAttachment(Plugin plugin) - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public PermissionAttachment addAttachment(Plugin plugin, String string, boolean bln, int i) - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public PermissionAttachment addAttachment(Plugin plugin, int i) - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public void removeAttachment(PermissionAttachment pa) - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public void recalculatePermissions() - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public Set<PermissionAttachmentInfo> getEffectivePermissions() - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public boolean isOp() - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public void setOp(boolean bln) - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public boolean isConversing() - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public void acceptConversationInput(String string) - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public boolean beginConversation(Conversation c) - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public void abandonConversation(Conversation c) - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public void abandonConversation(Conversation c, ConversationAbandonedEvent cae) - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public void sendMessage(String string) - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public void sendMessage(String[] strings) - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public boolean isOnline() - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public boolean isBanned() - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public boolean isWhitelisted() - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public void setWhitelisted(boolean bln) - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public Player getPlayer() - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public long getFirstPlayed() - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public long getLastPlayed() - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public boolean hasPlayedBefore() - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public Map<String, Object> serialize() - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public void sendPluginMessage(Plugin plugin, String string, byte[] bytes) - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public Set<String> getListeningPluginChannels() - { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public void setName(String name) - { - throw new UnsupportedOperationException("Not supported yet."); - } - //end// } diff --git a/Essentials/src/com/earth2me/essentials/user/UserData.java b/Essentials/src/com/earth2me/essentials/user/UserData.java index d61d21a49..b181a5f24 100644 --- a/Essentials/src/com/earth2me/essentials/user/UserData.java +++ b/Essentials/src/com/earth2me/essentials/user/UserData.java @@ -13,7 +13,7 @@ public class UserData implements StorageObject { public enum TimestampType { - JAIL, MUTE, LASTHEAL, LASTTELEPORT, LOGIN, LOGOUT + JAIL, MUTE, LASTHEAL, LASTTELEPORT, LOGIN, LOGOUT, KIT } private String nickname; private Double money; diff --git a/Essentials/test/com/earth2me/essentials/UtilTest.java b/Essentials/test/com/earth2me/essentials/UtilTest.java index fb75d19b0..94cd2877d 100644 --- a/Essentials/test/com/earth2me/essentials/UtilTest.java +++ b/Essentials/test/com/earth2me/essentials/UtilTest.java @@ -189,7 +189,7 @@ public class UtilTest extends TestCase assertEquals("_-", Util.sanitizeFileName("../")); assertEquals("_-", Util.sanitizeFileName("\"")); assertEquals("_-", Util.sanitizeFileName("<>?:*.")); - assertEquals("a-0fa", Util.sanitizeFileName("aä")); + assertEquals("a-0fa", Util.sanitizeFileName("aä")); } catch (InvalidNameException ex) diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/ProtectHolder.java b/EssentialsProtect/src/com/earth2me/essentials/protect/ProtectHolder.java index c2ad4f8d3..8c3add157 100644 --- a/EssentialsProtect/src/com/earth2me/essentials/protect/ProtectHolder.java +++ b/EssentialsProtect/src/com/earth2me/essentials/protect/ProtectHolder.java @@ -23,12 +23,12 @@ public class ProtectHolder extends AsyncStorageObjectHolder<Protect> @Override public void finishRead() { - throw new UnsupportedOperationException("Not supported yet."); + } @Override public void finishWrite() { - throw new UnsupportedOperationException("Not supported yet."); + } } |