TotalFreedomMC/TF-EssentialsX
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-EssentialsX.git synced 2025-07-23 05:53:54 +00:00
Code Issues Projects Releases Wiki Activity

Command Cleanup

Browse source
This commit is contained in:
KHobbits 2011-12-01 13:42:39 +00:00
parent a8a9fc3dd6
commit 2dc6f8c202
22 changed files with 34 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Essentials/src/com/earth2me/essentials/EssentialsConf.java
View file

@ -2,7 +2,6 @@ package com.earth2me.essentials;
import static com.earth2me.essentials.I18n._; import static com.earth2me.essentials.I18n._;
import java.io.*; import java.io.*;
import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Locale; import java.util.Locale;

2
Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java
View file

@ -1,8 +1,8 @@
package com.earth2me.essentials; package com.earth2me.essentials;
import static com.earth2me.essentials.I18n._;
import com.earth2me.essentials.craftbukkit.EnchantmentFix; import com.earth2me.essentials.craftbukkit.EnchantmentFix;
import com.earth2me.essentials.craftbukkit.SetBed; import com.earth2me.essentials.craftbukkit.SetBed;
import static com.earth2me.essentials.I18n._;
import com.earth2me.essentials.textreader.IText; import com.earth2me.essentials.textreader.IText;
import com.earth2me.essentials.textreader.KeywordReplacer; import com.earth2me.essentials.textreader.KeywordReplacer;
import com.earth2me.essentials.textreader.TextInput; import com.earth2me.essentials.textreader.TextInput;

1
Essentials/src/com/earth2me/essentials/OfflinePlayer.java
View file

@ -4,7 +4,6 @@ import static com.earth2me.essentials.I18n._;
import java.net.InetSocketAddress; import java.net.InetSocketAddress;
import java.util.HashSet; import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Map;
import java.util.Set; import java.util.Set;
import java.util.UUID; import java.util.UUID;
import lombok.Delegate; import lombok.Delegate;

8
Essentials/src/com/earth2me/essentials/Settings.java
View file

@ -3,13 +3,7 @@ package com.earth2me.essentials;
import static com.earth2me.essentials.I18n._; import static com.earth2me.essentials.I18n._;
import com.earth2me.essentials.commands.IEssentialsCommand; import com.earth2me.essentials.commands.IEssentialsCommand;
import java.io.File; import java.io.File;
import java.util.ArrayList; import java.util.*;
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.Set;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;

2
Essentials/src/com/earth2me/essentials/UserMap.java
View file

@ -10,8 +10,6 @@ import java.util.Collections;
import java.util.Locale; import java.util.Locale;
import java.util.Set; import java.util.Set;
import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutionException;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;

8
Essentials/src/com/earth2me/essentials/commands/Commandenchant.java
View file

@ -1,18 +1,14 @@
package com.earth2me.essentials.commands; package com.earth2me.essentials.commands;
import static com.earth2me.essentials.I18n._;
import com.earth2me.essentials.User; import com.earth2me.essentials.User;
import com.earth2me.essentials.Util; import com.earth2me.essentials.Util;
import com.earth2me.essentials.craftbukkit.EnchantmentFix; import com.earth2me.essentials.craftbukkit.EnchantmentFix;
import java.util.HashMap; import java.util.*;
import java.util.Locale;
import java.util.Map;
import java.util.Set;
import java.util.TreeSet;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import org.bukkit.Server; import org.bukkit.Server;
import org.bukkit.enchantments.Enchantment; import org.bukkit.enchantments.Enchantment;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
import static com.earth2me.essentials.I18n._;
public class Commandenchant extends EssentialsCommand public class Commandenchant extends EssentialsCommand

16
Essentials/src/com/earth2me/essentials/commands/Commandr.java
View file

@ -17,18 +17,18 @@ public class Commandr extends EssentialsCommand
} }
@Override @Override
public void run(Server server, CommandSender sender, String commandLabel, String[] args) throws Exception public void run(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception
{ {
if (args.length < 1) if (args.length < 1)
{ {
throw new NotEnoughArgumentsException(); throw new NotEnoughArgumentsException();
} }
String message = getFinalArg(args, 0); final String message = getFinalArg(args, 0);
IReplyTo replyTo = sender instanceof Player ? ess.getUser((Player)sender) : Console.getConsoleReplyTo(); final IReplyTo replyTo = sender instanceof Player ? ess.getUser((Player)sender) : Console.getConsoleReplyTo();
String senderName = sender instanceof Player ? ((Player)sender).getDisplayName() : Console.NAME; final String senderName = sender instanceof Player ? ((Player)sender).getDisplayName() : Console.NAME;
CommandSender target = replyTo.getReplyTo(); final CommandSender target = replyTo.getReplyTo();
String targetName = target instanceof Player ? ((Player)target).getDisplayName() : Console.NAME; final String targetName = target instanceof Player ? ((Player)target).getDisplayName() : Console.NAME;
if (target == null) if (target == null)
{ {
@ -38,8 +38,8 @@ public class Commandr extends EssentialsCommand
sender.sendMessage(_("msgFormat", _("me"), targetName, message)); sender.sendMessage(_("msgFormat", _("me"), targetName, message));
if (target instanceof Player) if (target instanceof Player)
{ {
User u = ess.getUser(target); User player = ess.getUser(target);
if (u.isIgnoredPlayer(sender instanceof Player ? ((Player)sender).getName() : Console.NAME)) if (player.isIgnoredPlayer(sender instanceof Player ? ((Player)sender).getName() : Console.NAME))
{ {
return; return;
} }

6
Essentials/src/com/earth2me/essentials/commands/Commandrealname.java
View file

@ -17,16 +17,16 @@ public class Commandrealname extends EssentialsCommand
} }
@Override @Override
protected void run(Server server, CommandSender sender, String commandLabel, String[] args) throws Exception protected void run(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception
{ {
if (args.length < 1) if (args.length < 1)
{ {
throw new NotEnoughArgumentsException(); throw new NotEnoughArgumentsException();
} }
final String whois = args[0].toLowerCase(Locale.ENGLISH); final String whois = args[0].toLowerCase(Locale.ENGLISH);
for (Player p : server.getOnlinePlayers()) for (Player onlinePlayer : server.getOnlinePlayers())
{ {
final User u = ess.getUser(p); final User u = ess.getUser(onlinePlayer);
if (u.isHidden()) if (u.isHidden())
{ {
continue; continue;

2
Essentials/src/com/earth2me/essentials/commands/Commandrules.java
View file

@ -16,7 +16,7 @@ public class Commandrules extends EssentialsCommand
} }
@Override @Override
public void run(final Server server, final CommandSender sender, final String commandLabel, String[] args) throws Exception public void run(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception
{ {
final IText input = new TextInput(sender, "rules", true, ess); final IText input = new TextInput(sender, "rules", true, ess);
final IText output = new KeywordReplacer(input, sender, ess); final IText output = new KeywordReplacer(input, sender, ess);

2
Essentials/src/com/earth2me/essentials/commands/Commandseen.java
View file

@ -15,7 +15,7 @@ public class Commandseen extends EssentialsCommand
} }
@Override @Override
protected void run(Server server, CommandSender sender, String commandLabel, String[] args) throws Exception protected void run(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception
{ {
if (args.length < 1) if (args.length < 1)
{ {

2
Essentials/src/com/earth2me/essentials/commands/Commandsell.java
View file

@ -20,7 +20,7 @@ public class Commandsell extends EssentialsCommand
} }
@Override @Override
public void run(Server server, User user, String commandLabel, String[] args) throws Exception public void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception
{ {
if (args.length < 1) if (args.length < 1)
{ {

2
Essentials/src/com/earth2me/essentials/commands/Commandsethome.java
View file

@ -14,7 +14,7 @@ public class Commandsethome extends EssentialsCommand
} }
@Override @Override
public void run(Server server, User user, String commandLabel, String[] args) throws Exception public void run(final Server server, final User user, final String commandLabel, String[] args) throws Exception
{ {
if (args.length > 0) if (args.length > 0)
{ {

2
Essentials/src/com/earth2me/essentials/commands/Commandsetjail.java
View file

@ -13,7 +13,7 @@ public class Commandsetjail extends EssentialsCommand
} }
@Override @Override
public void run(Server server, User user, String commandLabel, String[] args) throws Exception public void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception
{ {
if (args.length < 1) if (args.length < 1)
{ {

4
Essentials/src/com/earth2me/essentials/commands/Commandsetwarp.java
View file

@ -14,14 +14,14 @@ public class Commandsetwarp extends EssentialsCommand
} }
@Override @Override
public void run(Server server, User user, String commandLabel, String[] args) throws Exception public void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception
{ {
if (args.length < 1) if (args.length < 1)
{ {
throw new NotEnoughArgumentsException(); throw new NotEnoughArgumentsException();
} }
Location loc = user.getLocation(); final Location loc = user.getLocation();
ess.getWarps().setWarp(args[0], loc); ess.getWarps().setWarp(args[0], loc);
user.sendMessage(_("warpSet", args[0])); user.sendMessage(_("warpSet", args[0]));
} }

2
Essentials/src/com/earth2me/essentials/commands/Commandsetworth.java
View file

@ -14,7 +14,7 @@ public class Commandsetworth extends EssentialsCommand
} }
@Override @Override
public void run(Server server, User user, String commandLabel, String[] args) throws Exception public void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception
{ {
if (args.length < 2) if (args.length < 2)
{ {

2
Essentials/src/com/earth2me/essentials/commands/Commandsocialspy.java
View file

@ -13,7 +13,7 @@ public class Commandsocialspy extends EssentialsCommand
} }
@Override @Override
public void run(Server server, User user, String commandLabel, String[] args) throws Exception public void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception
{ {
user.sendMessage("§7SocialSpy " + (user.toggleSocialSpy() ? _("enabled") : _("disabled"))); user.sendMessage("§7SocialSpy " + (user.toggleSocialSpy() ? _("enabled") : _("disabled")));
} }

3
Essentials/src/com/earth2me/essentials/commands/Commandspawner.java
View file

@ -8,7 +8,6 @@ import java.util.Locale;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.Server; import org.bukkit.Server;
import org.bukkit.block.Block;
import org.bukkit.block.CreatureSpawner; import org.bukkit.block.CreatureSpawner;
@ -20,7 +19,7 @@ public class Commandspawner extends EssentialsCommand
} }
@Override @Override
protected void run(Server server, User user, String commandLabel, String[] args) throws Exception protected void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception
{ {
if (args.length < 1 || args[0].length() < 2) if (args.length < 1 || args[0].length() < 2)
{ {

10
Essentials/src/com/earth2me/essentials/commands/Commandspawnmob.java
View file

@ -22,7 +22,7 @@ public class Commandspawnmob extends EssentialsCommand
} }
@Override @Override
public void run(Server server, User user, String commandLabel, String[] args) throws Exception public void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception
{ {
if (args.length < 1) if (args.length < 1)
{ {
@ -30,7 +30,7 @@ public class Commandspawnmob extends EssentialsCommand
} }
String[] mountparts = args[0].split(","); final String[] mountparts = args[0].split(",");
String[] parts = mountparts[0].split(":"); String[] parts = mountparts[0].split(":");
String mobType = parts[0]; String mobType = parts[0];
String mobData = null; String mobData = null;
@ -76,8 +76,8 @@ public class Commandspawnmob extends EssentialsCommand
{ {
throw new Exception(_("unableToSpawnMob")); throw new Exception(_("unableToSpawnMob"));
} }
Location loc = block.getLocation(); final Location loc = block.getLocation();
Location sloc = Util.getSafeDestination(loc); final Location sloc = Util.getSafeDestination(loc);
try try
{ {
spawnedMob = mob.spawn(user, server, sloc); spawnedMob = mob.spawn(user, server, sloc);
@ -179,7 +179,7 @@ public class Commandspawnmob extends EssentialsCommand
} }
} }
private void changeMobData(CreatureType type, Entity spawned, String data, User user) throws Exception private void changeMobData(final CreatureType type, final Entity spawned, final String data, final User user) throws Exception
{ {
if (type == CreatureType.SLIME || type == CreatureType.MAGMA_CUBE) if (type == CreatureType.SLIME || type == CreatureType.MAGMA_CUBE)
{ {

6
Essentials/src/com/earth2me/essentials/storage/BukkitConstructor.java
View file

@ -10,11 +10,7 @@ import org.bukkit.enchantments.Enchantment;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
import org.bukkit.material.MaterialData; import org.bukkit.material.MaterialData;
import org.yaml.snakeyaml.constructor.Constructor; import org.yaml.snakeyaml.constructor.Constructor;
import org.yaml.snakeyaml.nodes.MappingNode; import org.yaml.snakeyaml.nodes.*;
import org.yaml.snakeyaml.nodes.Node;
import org.yaml.snakeyaml.nodes.NodeId;
import org.yaml.snakeyaml.nodes.NodeTuple;
import org.yaml.snakeyaml.nodes.ScalarNode;
public class BukkitConstructor extends Constructor public class BukkitConstructor extends Constructor

1
Essentials/src/com/earth2me/essentials/storage/YamlStorageReader.java
View file

@ -22,6 +22,7 @@ public class YamlStorageReader implements IStorageReader
this.reader = reader; this.reader = reader;
} }
@Override
public <T extends StorageObject> T load(final Class<? extends T> clazz) public <T extends StorageObject> T load(final Class<? extends T> clazz)
{ {
Yaml yaml = preparedYamls.get(clazz); Yaml yaml = preparedYamls.get(clazz);

1
Essentials/src/com/earth2me/essentials/storage/YamlStorageWriter.java
View file

@ -30,6 +30,7 @@ public class YamlStorageWriter implements IStorageWriter
this.writer = writer; this.writer = writer;
} }
@Override
public void save(final StorageObject object) public void save(final StorageObject object)
{ {
try try

7
Essentials/src/com/earth2me/essentials/userdata/UserData.java
View file

@ -4,12 +4,7 @@ import com.earth2me.essentials.storage.ListType;
import com.earth2me.essentials.storage.MapKeyType; import com.earth2me.essentials.storage.MapKeyType;
import com.earth2me.essentials.storage.MapValueType; import com.earth2me.essentials.storage.MapValueType;
import com.earth2me.essentials.storage.StorageObject; import com.earth2me.essentials.storage.StorageObject;
import java.util.Collections; import java.util.*;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import org.bukkit.Location; import org.bukkit.Location;