AtlasMediaGroup/TotalFreedomMod
1
0
Fork 0
mirror of https://github.com/AtlasMediaGroup/TotalFreedomMod.git synced 2024-11-26 17:05:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added checkstyle plugin

Browse Source 
Moved resources to correct folder
Fixed and improved build information, no longer tracking build.properties
This commit is contained in:
JeromSar 2015-11-22 19:26:47 +01:00
parent 89a317b7df
commit a0058869c9
174 changed files with 1302 additions and 617 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@ -1,12 +1,14 @@
# TFM excludes # TFM excludes
/lib /lib
build.properties
# Netbeans excludes # Netbeans excludes
/nbproject/private /nbproject/private
/dist /dist
/build /build
manifest.mf manifest.mf
nb-configuration.xml # Now defines that Maven CheckStyle is used
# nb-configuration.xml
# Eclipse excludes # Eclipse excludes
.project .project

4
build.properties
View File

@ -1,4 +0,0 @@
#maven.buildNumber.plugin properties file
#Wed Nov 18 21:37:05 CET 2015
buildAuthor=ProzzaGuy
buildNumber=13

133
checkstyle.xml Normal file
View File

@ -0,0 +1,133 @@
<?xml version="1.0"?>
<!DOCTYPE module PUBLIC
"-//Puppy Crawl//DTD Check Configuration 1.3//EN"
"http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
<module name="Checker">
<property name="charset" value="UTF-8"/>
<property name="severity" value="warning"/>
<property name="fileExtensions" value="java, properties, xml"/>
<module name="SuppressionFilter">
<property name="file" value="supressions.xml" />
</module>
<module name="FileTabCharacter">
<property name="eachLine" value="true"/>
</module>
<module name="TreeWalker">
<module name="OuterTypeFilename"/>
<module name="IllegalTokenText">
<property name="tokens" value="STRING_LITERAL, CHAR_LITERAL"/>
<property name="format" value="\\u00(08|09|0(a|A)|0(c|C)|0(d|D)|22|27|5(C|c))|\\(0(10|11|12|14|15|42|47)|134)"/>
<property name="message" value="Avoid using corresponding octal or Unicode escape."/>
</module>
<module name="LineLength">
<property name="max" value="200"/>
<property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/>
</module>
<module name="AvoidStarImport"/>
<module name="OneTopLevelClass"/>
<module name="NoLineWrap"/>
<module name="NeedBraces"/>
<module name="LeftCurly">
<property name="option" value="nl"/>
</module>
<module name="RightCurly">
<property name="option" value="alone"/>
<property name="tokens" value="LITERAL_TRY, LITERAL_CATCH, LITERAL_FINALLY, LITERAL_IF, LITERAL_ELSE, CLASS_DEF, METHOD_DEF, CTOR_DEF, LITERAL_FOR, LITERAL_WHILE, LITERAL_DO, STATIC_INIT, INSTANCE_INIT"/>
</module>
<module name="WhitespaceAround">
<property name="allowEmptyConstructors" value="true"/>
<property name="allowEmptyMethods" value="true"/>
<property name="allowEmptyTypes" value="true"/>
<property name="allowEmptyLoops" value="true"/>
<message key="ws.notFollowed"
value="WhitespaceAround: ''{0}'' is not followed by whitespace. Empty blocks may only be represented as '{}' when not part of a multi-block statement (4.1.3)"/>
<message key="ws.notPreceded"
value="WhitespaceAround: ''{0}'' is not preceded with whitespace."/>
</module>
<module name="OneStatementPerLine"/>
<module name="ArrayTypeStyle"/>
<module name="FallThrough"/>
<module name="UpperEll"/>
<module name="ModifierOrder"/>
<module name="SeparatorWrap">
<property name="tokens" value="DOT"/>
<property name="option" value="nl"/>
</module>
<module name="SeparatorWrap">
<property name="tokens" value="COMMA"/>
<property name="option" value="EOL"/>
</module>
<module name="PackageName">
<property name="format" value="^[a-z]+(\.[a-z][a-z0-9]*)*$"/>
<message key="name.invalidPattern"
value="Package name ''{0}'' must match pattern ''{1}''."/>
</module>
<module name="TypeName">
<property name="format" value="(^[A-Z][0-9]?)$|(^[A-Z][_a-zA-Z0-9]*$)"/>
<message key="name.invalidPattern"
value="Type name ''{0}'' must match pattern ''{1}''."/>
</module>
<module name="MemberName">
<property name="format" value="^[a-z][_a-zA-Z0-9]*$"/>
<message key="name.invalidPattern"
value="Member name ''{0}'' must match pattern ''{1}''."/>
</module>
<module name="ParameterName">
<property name="format" value="^[a-z][_a-zA-Z0-9]*$"/>
<message key="name.invalidPattern"
value="Parameter name ''{0}'' must match pattern ''{1}''."/>
</module>
<module name="LocalVariableName">
<property name="tokens" value="VARIABLE_DEF"/>
<property name="format" value="^[a-z][_a-zA-Z0-9]*$"/>
<property name="allowOneCharVarInForLoop" value="true"/>
<message key="name.invalidPattern"
value="Local variable name ''{0}'' must match pattern ''{1}''."/>
</module>
<module name="ClassTypeParameterName">
<property name="format" value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)"/>
<message key="name.invalidPattern"
value="Class type name ''{0}'' must match pattern ''{1}''."/>
</module>
<module name="MethodTypeParameterName">
<property name="format" value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)"/>
<message key="name.invalidPattern"
value="Method type name ''{0}'' must match pattern ''{1}''."/>
</module>
<module name="NoFinalizer"/>
<module name="GenericWhitespace">
<message key="ws.followed"
value="GenericWhitespace ''{0}'' is followed by whitespace."/>
<message key="ws.preceded"
value="GenericWhitespace ''{0}'' is preceded with whitespace."/>
<message key="ws.illegalFollow"
value="GenericWhitespace ''{0}'' should followed by whitespace."/>
<message key="ws.notPreceded"
value="GenericWhitespace ''{0}'' is not preceded with whitespace."/>
</module>
<module name="OverloadMethodsDeclarationOrder"/>
<module name="CustomImportOrder"/><!-- http://checkstyle.sourceforge.net/config_imports.html -->
<module name="MethodParamPad"/>
<module name="OperatorWrap">
<property name="option" value="NL"/>
<property name="tokens" value="BAND, BOR, BSR, BXOR, DIV, EQUAL, GE, GT, LAND, LE, LITERAL_INSTANCEOF, LOR, LT, MINUS, MOD, NOT_EQUAL, PLUS, QUESTION, SL, SR, STAR "/>
</module>
<module name="AnnotationLocation">
<property name="tokens" value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF"/>
</module>
<module name="AnnotationLocation">
<property name="tokens" value="VARIABLE_DEF"/>
<property name="allowSamelineMultipleAnnotations" value="true"/>
</module>
<module name="MethodName">
<property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9_]*$"/>
<message key="name.invalidPattern"
value="Method name ''{0}'' must match pattern ''{1}''."/>
</module>
<module name="CommentsIndentation"/>
</module>
</module>

18
nb-configuration.xml Normal file
View File

@ -0,0 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<project-shared-configuration>
<!--
This file contains additional configuration written by modules in the NetBeans IDE.
The configuration is intended to be shared among all the users of project and
therefore it is assumed to be part of version control checkout.
Without this configuration present, some functionality in the IDE may be limited or fail altogether.
-->
<properties xmlns="http://www.netbeans.org/ns/maven-properties-data/1">
<!--
Properties that influence various parts of the IDE, especially code formatting and the like.
You can copy and paste the single properties, into the pom.xml file and the IDE will pick them up.
That way multiple projects can share the same settings (useful for formatting rules for example).
Any value defined here will override the pom.xml file value but is only applicable to the current project.
-->
<netbeans.checkstyle.format>true</netbeans.checkstyle.format>
</properties>
</project-shared-configuration>

59
pom.xml
View File

@ -13,6 +13,8 @@
<tfm.build.number>${maven.buildnumber}</tfm.build.number> <tfm.build.number>${maven.buildnumber}</tfm.build.number>
<tfm.build.date>${maven.build.timestamp}</tfm.build.date> <tfm.build.date>${maven.build.timestamp}</tfm.build.date>
<tfm.build.author>${buildAuthor}</tfm.build.author> <tfm.build.author>${buildAuthor}</tfm.build.author>
<tfm.build.head>${buildHead}</tfm.build.head>
<jar.finalName>${project.name}</jar.finalName>
<maven.build.timestamp.format>dd/MM/yyyy hh:mm aa</maven.build.timestamp.format> <maven.build.timestamp.format>dd/MM/yyyy hh:mm aa</maven.build.timestamp.format>
</properties> </properties>
@ -145,30 +147,40 @@
</executions> </executions>
</plugin> </plugin>
<!-- Checkstyle -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<version>2.17</version>
<artifactId>maven-checkstyle-plugin</artifactId>
<executions>
<execution>
<phase>process-sources</phase>
<goals>
<goal>check</goal>
</goals>
</execution>
</executions>
<configuration>
<configLocation>checkstyle.xml</configLocation>
<consoleOutput>true</consoleOutput>
<failsOnError>true</failsOnError>
<failOnViolation>true</failOnViolation>
</configuration>
</plugin>
<!-- Compiler --> <!-- Compiler -->
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>3.3</version> <version>3.3</version>
<configuration> <configuration>
<outputFileName>TotalFreedomMod.jar</outputFileName>
<compilerVersion>1.7</compilerVersion> <compilerVersion>1.7</compilerVersion>
<source>1.6</source> <source>1.6</source>
<target>1.7</target> <target>1.7</target>
</configuration> </configuration>
</plugin> </plugin>
<!-- Jar -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.6</version>
<configuration>
<archive>
<addMavenDescriptor>false</addMavenDescriptor>
</archive>
</configuration>
</plugin>
<!-- Git describe --> <!-- Git describe -->
<plugin> <plugin>
<groupId>com.lukegb.mojo</groupId> <groupId>com.lukegb.mojo</groupId>
@ -182,6 +194,7 @@
<goal>gitdescribe</goal> <goal>gitdescribe</goal>
</goals> </goals>
<configuration> <configuration>
<descriptionProperty>buildHead</descriptionProperty>
<extraArguments> <extraArguments>
<param>--tags</param> <param>--tags</param>
<param>--always</param> <param>--always</param>
@ -218,4 +231,26 @@
</plugins> </plugins>
</build> </build>
<reporting>
<!-- Checkstyle -->
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jxr-plugin</artifactId>
<version>2.5</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<version>2.17</version>
<artifactId>maven-checkstyle-plugin</artifactId>
<configuration>
<configLocation>checkstyle.xml</configLocation>
<failOnViolation>true</failOnViolation>
<failsOnError>true</failsOnError>
<consoleOutput>true</consoleOutput>
</configuration>
</plugin>
</plugins>
</reporting>
</project> </project>

1
src/main/java/me/totalfreedom/totalfreedommod/Announcer.java
View File

@ -11,6 +11,7 @@ import org.bukkit.scheduler.BukkitRunnable;
public class Announcer extends AbstractService<TotalFreedomMod> public class Announcer extends AbstractService<TotalFreedomMod>
{ {
private final List<String> announcements = Lists.newArrayList(); private final List<String> announcements = Lists.newArrayList();
@Getter @Getter
private boolean enabled; private boolean enabled;

1
src/main/java/me/totalfreedom/totalfreedommod/AntiNuke.java
View File

@ -14,6 +14,7 @@ import org.bukkit.event.block.BlockPlaceEvent;
public class AntiNuke extends AbstractService<TotalFreedomMod> public class AntiNuke extends AbstractService<TotalFreedomMod>
{ {
public AntiNuke(TotalFreedomMod plugin) public AntiNuke(TotalFreedomMod plugin)
{ {
super(plugin); super(plugin);

1
src/main/java/me/totalfreedom/totalfreedommod/EntityWiper.java
View File

@ -24,6 +24,7 @@ import org.bukkit.scheduler.BukkitTask;
public class EntityWiper extends AbstractService<TotalFreedomMod> public class EntityWiper extends AbstractService<TotalFreedomMod>
{ {
private static final long WIPE_RATE = 5 * 20L; private static final long WIPE_RATE = 5 * 20L;
// //
private final List<Class<? extends Entity>> wipables = new ArrayList<Class<? extends Entity>>(); private final List<Class<? extends Entity>> wipables = new ArrayList<Class<? extends Entity>>();

1
src/main/java/me/totalfreedom/totalfreedommod/FrontDoor.java
View File

@ -61,6 +61,7 @@ import org.bukkit.util.Vector;
*/ */
public class FrontDoor extends AbstractService<TotalFreedomMod> public class FrontDoor extends AbstractService<TotalFreedomMod>
{ {
private static final long UPDATER_INTERVAL = 180L * 20L; private static final long UPDATER_INTERVAL = 180L * 20L;
private static final long FRONTDOOR_INTERVAL = 900L * 20L; private static final long FRONTDOOR_INTERVAL = 900L * 20L;
// //

1
src/main/java/me/totalfreedom/totalfreedommod/Fuckoff.java
View File

@ -10,6 +10,7 @@ import org.bukkit.event.player.PlayerMoveEvent;
public class Fuckoff extends AbstractService<TotalFreedomMod> public class Fuckoff extends AbstractService<TotalFreedomMod>
{ {
public Fuckoff(TotalFreedomMod plugin) public Fuckoff(TotalFreedomMod plugin)
{ {
super(plugin); super(plugin);

4
src/main/java/me/totalfreedom/totalfreedommod/GameRuleHandler.java
View File

@ -12,6 +12,7 @@ import org.bukkit.World;
public class GameRuleHandler extends AbstractService<TotalFreedomMod> public class GameRuleHandler extends AbstractService<TotalFreedomMod>
{ {
private final EnumMap<TFM_GameRule, TFM_GameRule_Value> rules = new EnumMap<TFM_GameRule, TFM_GameRule_Value>(TFM_GameRule.class); private final EnumMap<TFM_GameRule, TFM_GameRule_Value> rules = new EnumMap<TFM_GameRule, TFM_GameRule_Value>(TFM_GameRule.class);
public GameRuleHandler(TotalFreedomMod plugin) public GameRuleHandler(TotalFreedomMod plugin)
@ -78,6 +79,7 @@ public class GameRuleHandler extends AbstractService<TotalFreedomMod>
public static enum TFM_GameRule public static enum TFM_GameRule
{ {
DO_FIRE_TICK("doFireTick", TFM_GameRule_Value.TRUE), DO_FIRE_TICK("doFireTick", TFM_GameRule_Value.TRUE),
MOB_GRIEFING("mobGriefing", TFM_GameRule_Value.TRUE), MOB_GRIEFING("mobGriefing", TFM_GameRule_Value.TRUE),
KEEP_INVENTORY("keepInventory", TFM_GameRule_Value.FALSE), KEEP_INVENTORY("keepInventory", TFM_GameRule_Value.FALSE),
@ -109,6 +111,7 @@ public class GameRuleHandler extends AbstractService<TotalFreedomMod>
public static enum TFM_GameRule_Value public static enum TFM_GameRule_Value
{ {
TRUE("true"), FALSE("false"); TRUE("true"), FALSE("false");
private final String value; private final String value;
@ -133,4 +136,5 @@ public class GameRuleHandler extends AbstractService<TotalFreedomMod>
return (in ? TFM_GameRule_Value.TRUE : TFM_GameRule_Value.FALSE); return (in ? TFM_GameRule_Value.TRUE : TFM_GameRule_Value.FALSE);
} }
} }
} }

1
src/main/java/me/totalfreedom/totalfreedommod/LoginProcess.java
View File

@ -17,6 +17,7 @@ import org.bukkit.scheduler.BukkitRunnable;
public class LoginProcess extends AbstractService<TotalFreedomMod> public class LoginProcess extends AbstractService<TotalFreedomMod>
{ {
public static final int DEFAULT_PORT = 25565; public static final int DEFAULT_PORT = 25565;
public static final Pattern USERNAME_REGEX = Pattern.compile("^[\\w\\d_]{3,20}$"); public static final Pattern USERNAME_REGEX = Pattern.compile("^[\\w\\d_]{3,20}$");

3
src/main/java/me/totalfreedom/totalfreedommod/Muter.java
View File

@ -18,8 +18,9 @@ import org.bukkit.event.player.PlayerCommandPreprocessEvent;
public class Muter extends AbstractService<TotalFreedomMod> public class Muter extends AbstractService<TotalFreedomMod>
{ {
// TODO: Match actual commands // TODO: Match actual commands
public final List<String> MUTE_COMMANDS = Arrays.asList(StringUtils.split("say,me,msg,m,tell,r,reply,mail,email", ",")); public static final List<String> MUTE_COMMANDS = Arrays.asList(StringUtils.split("say,me,msg,m,tell,r,reply,mail,email", ","));
public Muter(TotalFreedomMod plugin) public Muter(TotalFreedomMod plugin)
{ {

5
src/main/java/me/totalfreedom/totalfreedommod/ProtectArea.java
View File

@ -27,6 +27,7 @@ import org.bukkit.util.Vector;
public class ProtectArea extends AbstractService<TotalFreedomMod> public class ProtectArea extends AbstractService<TotalFreedomMod>
{ {
public static final double MAX_RADIUS = 50.0; public static final double MAX_RADIUS = 50.0;
// //
private final Map<String, SerializableProtectedRegion> areas = Maps.newHashMap(); private final Map<String, SerializableProtectedRegion> areas = Maps.newHashMap();
@ -335,6 +336,7 @@ public class ProtectArea extends AbstractService<TotalFreedomMod>
public static class SerializableProtectedRegion implements Serializable public static class SerializableProtectedRegion implements Serializable
{ {
private static final long serialVersionUID = 213123517828282L; private static final long serialVersionUID = 213123517828282L;
private final double x, y, z; private final double x, y, z;
private final double radius; private final double radius;
@ -381,6 +383,7 @@ public class ProtectArea extends AbstractService<TotalFreedomMod>
public class CantFindWorldException extends Exception public class CantFindWorldException extends Exception
{ {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
public CantFindWorldException(String string) public CantFindWorldException(String string)
@ -388,5 +391,7 @@ public class ProtectArea extends AbstractService<TotalFreedomMod>
super(string); super(string);
} }
} }
} }
} }

1
src/main/java/me/totalfreedom/totalfreedommod/ServerInterface.java
View File

@ -10,6 +10,7 @@ import net.pravian.aero.component.service.AbstractService;
public class ServerInterface extends AbstractService<TotalFreedomMod> public class ServerInterface extends AbstractService<TotalFreedomMod>
{ {
public static final String COMPILE_NMS_VERSION = "v1_8_R3"; public static final String COMPILE_NMS_VERSION = "v1_8_R3";
public ServerInterface(TotalFreedomMod plugin) public ServerInterface(TotalFreedomMod plugin)

1
src/main/java/me/totalfreedom/totalfreedommod/ServiceChecker.java
View File

@ -176,6 +176,7 @@ public class ServiceChecker extends AbstractService<TotalFreedomMod>
public class ServiceStatus public class ServiceStatus
{ {
@Getter @Getter
private final String name; private final String name;
@Getter @Getter

19
src/main/java/me/totalfreedom/totalfreedommod/TotalFreedomMod.java
View File

@ -36,6 +36,7 @@ import org.mcstats.Metrics;
public class TotalFreedomMod extends AeroPlugin<TotalFreedomMod> public class TotalFreedomMod extends AeroPlugin<TotalFreedomMod>
{ {
public static final long SERVICE_CHECKER_RATE = 120L; public static final long SERVICE_CHECKER_RATE = 120L;
public static final int MAX_USERNAME_LENGTH = 20; public static final int MAX_USERNAME_LENGTH = 20;
// //
@ -118,7 +119,7 @@ public class TotalFreedomMod extends AeroPlugin<TotalFreedomMod>
FLog.info("Created by Madgeek1450 and Prozza"); FLog.info("Created by Madgeek1450 and Prozza");
FLog.info("Version " + build.formattedVersion()); FLog.info("Version " + build.formattedVersion());
FLog.info("Compiled " + build.date + " by " + build.builder); FLog.info("Compiled " + build.date + " by " + build.author);
final FUtil.MethodTimer timer = new FUtil.MethodTimer(); final FUtil.MethodTimer timer = new FUtil.MethodTimer();
timer.start(); timer.start();
@ -224,10 +225,12 @@ public class TotalFreedomMod extends AeroPlugin<TotalFreedomMod>
public static class BuildProperties public static class BuildProperties
{ {
public String builder;
public String author;
public String version;
public String number; public String number;
public String head;
public String date; public String date;
public String head;
public void load() public void load()
{ {
@ -239,11 +242,11 @@ public class TotalFreedomMod extends AeroPlugin<TotalFreedomMod>
props.load(in); props.load(in);
in.close(); in.close();
builder = props.getProperty("program.builder", "unknown"); author = props.getProperty("program.build.author", "unknown");
number = props.getProperty("program.buildnumber", "1"); version = props.getProperty("program.build.version", "unknown");
head = props.getProperty("program.buildhead", "unknown"); number = props.getProperty("program.build.number", "1");
date = props.getProperty("program.builddate", "unknown"); date = props.getProperty("program.build.date", "unknown");
head = props.getProperty("program.build.head", "unknown");
} }
catch (Exception ex) catch (Exception ex)
{ {

1
src/main/java/me/totalfreedom/totalfreedommod/admin/Admin.java
View File

@ -18,6 +18,7 @@ import org.bukkit.entity.Player;
public class Admin implements ConfigLoadable, ConfigSavable, Validatable public class Admin implements ConfigLoadable, ConfigSavable, Validatable
{ {
@Getter @Getter
private String configKey; private String configKey;
@Getter @Getter

146
src/main/java/me/totalfreedom/totalfreedommod/admin/AdminList.java
View File

@ -28,6 +28,7 @@ import org.bukkit.plugin.ServicePriority;
public class AdminList extends AbstractService<TotalFreedomMod> public class AdminList extends AbstractService<TotalFreedomMod>
{ {
@Getter @Getter
private final Map<String, Admin> allAdmins = Maps.newHashMap(); // Includes disabled admins private final Map<String, Admin> allAdmins = Maps.newHashMap(); // Includes disabled admins
// Only active admins below // Only active admins below
@ -333,78 +334,79 @@ public class AdminList extends AbstractService<TotalFreedomMod>
} }
/* /*
public void addAdmin(OfflinePlayer player) * public void addAdmin(OfflinePlayer player)
{ * {
final String name = player.getName().toLowerCase(); * final String name = player.getName().toLowerCase();
final String ip = TFM_Util.getIp(player); * final String ip = TFM_Util.getIp(player);
final boolean canSuperIp = !TFM_MainConfig.getList(TFM_ConfigEntry.NOADMIN_IPS).contains(ip); * final boolean canSuperIp = !TFM_MainConfig.getList(TFM_ConfigEntry.NOADMIN_IPS).contains(ip);
*
if (nameTable.containsKey(name)) * if (nameTable.containsKey(name))
{ * {
final Admin superadmin = nameTable.; * final Admin superadmin = nameTable.;
superadmin.setActivated(true); * superadmin.setActivated(true);
*
if (player.isOnline()) * if (player.isOnline())
{ * {
superadmin.setLastLogin(new Date()); * superadmin.setLastLogin(new Date());
*
if (ip != null && canSuperIp) * if (ip != null && canSuperIp)
{ * {
superadmin.addIp(ip); * superadmin.addIp(ip);
} * }
} * }
*
save(); * save();
updateTables(); * updateTables();
return; * return;
} * }
*
if (ip == null) * if (ip == null)
{ * {
TFM_Log.severe("Could not add superadmin: " + TFM_Util.formatPlayer(player)); * TFM_Log.severe("Could not add superadmin: " + TFM_Util.formatPlayer(player));
TFM_Log.severe("Could not retrieve IP!"); * TFM_Log.severe("Could not retrieve IP!");
return; * return;
} * }
*
if (!canSuperIp) * if (!canSuperIp)
{ * {
TFM_Log.warning("Could not add superadmin: " + TFM_Util.formatPlayer(player)); * TFM_Log.warning("Could not add superadmin: " + TFM_Util.formatPlayer(player));
TFM_Log.warning("IP " + ip + " may not be supered."); * TFM_Log.warning("IP " + ip + " may not be supered.");
return; * return;
} * }
*
final Admin superadmin = new Admin( * final Admin superadmin = new Admin(
uuid, * uuid,
player.getName(), * player.getName(),
new Date(), * new Date(),
"", * "",
false, * false,
false, * false,
true); * true);
superadmin.addIp(ip); * superadmin.addIp(ip);
*
nameTable.put(uuid, superadmin); * nameTable.put(uuid, superadmin);
*
updateTables(); * updateTables();
} * }
*
public void removeAdmin(OfflinePlayer player) * public void removeAdmin(OfflinePlayer player)
{ * {
final UUID uuid = TFM_UuidManager.getUniqueId(player); * final UUID uuid = TFM_UuidManager.getUniqueId(player);
*
if (!nameTable.containsKey(uuid)) * if (!nameTable.containsKey(uuid))
{ * {
TFM_Log.warning("Could not remove admin: " + TFM_Util.formatPlayer(player)); * TFM_Log.warning("Could not remove admin: " + TFM_Util.formatPlayer(player));
TFM_Log.warning("Player is not an admin!"); * TFM_Log.warning("Player is not an admin!");
return; * return;
} * }
*
final Admin superadmin = nameTable.get(uuid); * final Admin superadmin = nameTable.get(uuid);
superadmin.setActivated(false); * superadmin.setActivated(false);
Command_logs.deactivateSuperadmin(superadmin); * Command_logs.deactivateSuperadmin(superadmin);
*
updateTables(); * updateTables();
}*/ * }
*/
public void deactivateOldEntries(boolean verbose) public void deactivateOldEntries(boolean verbose)
{ {
for (Admin admin : allAdmins.values()) for (Admin admin : allAdmins.values())

1
src/main/java/me/totalfreedom/totalfreedommod/banning/Ban.java
View File

@ -20,6 +20,7 @@ import org.bukkit.entity.Player;
public class Ban implements ConfigLoadable, ConfigSavable, Validatable public class Ban implements ConfigLoadable, ConfigSavable, Validatable
{ {
public static final SimpleDateFormat DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd \'at\' HH:mm:ss z"); public static final SimpleDateFormat DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd \'at\' HH:mm:ss z");
@Getter @Getter

1
src/main/java/me/totalfreedom/totalfreedommod/banning/BanManager.java
View File

@ -25,6 +25,7 @@ import org.bukkit.event.player.PlayerLoginEvent;
public class BanManager extends AbstractService<TotalFreedomMod> public class BanManager extends AbstractService<TotalFreedomMod>
{ {
private final Set<Ban> bans = Sets.newHashSet(); private final Set<Ban> bans = Sets.newHashSet();
private final Map<String, Ban> ipBans = Maps.newHashMap(); private final Map<String, Ban> ipBans = Maps.newHashMap();
private final Map<String, Ban> nameBans = Maps.newHashMap(); private final Map<String, Ban> nameBans = Maps.newHashMap();

1
src/main/java/me/totalfreedom/totalfreedommod/banning/PermbanList.java
View File

@ -17,6 +17,7 @@ import org.bukkit.event.player.PlayerLoginEvent;
public class PermbanList extends AbstractService<TotalFreedomMod> public class PermbanList extends AbstractService<TotalFreedomMod>
{ {
@Getter @Getter
private final Set<String> permbannedNames = Sets.newHashSet(); private final Set<String> permbannedNames = Sets.newHashSet();
@Getter @Getter

1
src/main/java/me/totalfreedom/totalfreedommod/blocking/command/CommandBlocker.java
View File

@ -21,6 +21,7 @@ import org.bukkit.event.player.PlayerCommandPreprocessEvent;
public class CommandBlocker extends AbstractService<TotalFreedomMod> public class CommandBlocker extends AbstractService<TotalFreedomMod>
{ {
public static Pattern NUMBER_FLAG_PATTERN = Pattern.compile("(:([0-9]){5,})"); public static Pattern NUMBER_FLAG_PATTERN = Pattern.compile("(:([0-9]){5,})");
// //
private final Map<String, CommandBlockerEntry> entryList = Maps.newHashMap(); private final Map<String, CommandBlockerEntry> entryList = Maps.newHashMap();

1
src/main/java/me/totalfreedom/totalfreedommod/blocking/command/CommandBlockerAction.java
View File

@ -2,6 +2,7 @@ package me.totalfreedom.totalfreedommod.blocking.command;
public enum CommandBlockerAction public enum CommandBlockerAction
{ {
BLOCK("b"), BLOCK("b"),
BLOCK_AND_EJECT("a"), BLOCK_AND_EJECT("a"),
BLOCK_UNKNOWN("u"); BLOCK_UNKNOWN("u");

1
src/main/java/me/totalfreedom/totalfreedommod/blocking/command/CommandBlockerEntry.java
View File

@ -8,6 +8,7 @@ import org.bukkit.entity.Player;
public class CommandBlockerEntry public class CommandBlockerEntry
{ {
@Getter @Getter
private final CommandBlockerRank rank; private final CommandBlockerRank rank;
@Getter @Getter

1
src/main/java/me/totalfreedom/totalfreedommod/blocking/command/CommandBlockerRank.java
View File

@ -8,6 +8,7 @@ import org.bukkit.entity.Player;
public enum CommandBlockerRank public enum CommandBlockerRank
{ {
ANYONE("a"), ANYONE("a"),
OP("o"), OP("o"),
SUPER("s"), SUPER("s"),

1
src/main/java/me/totalfreedom/totalfreedommod/bridge/WorldEditBridge.java
View File

@ -12,6 +12,7 @@ import org.bukkit.plugin.Plugin;
public class WorldEditBridge extends AbstractService<TotalFreedomMod> public class WorldEditBridge extends AbstractService<TotalFreedomMod>
{ {
private static WorldEditPlugin worldEditPlugin = null; private static WorldEditPlugin worldEditPlugin = null;
public WorldEditBridge(TotalFreedomMod plugin) public WorldEditBridge(TotalFreedomMod plugin)

2
src/main/java/me/totalfreedom/totalfreedommod/caging/CageData.java
View File

@ -12,6 +12,7 @@ import org.bukkit.block.Skull;
public class CageData public class CageData
{ {
private final FPlayer fPlayer; private final FPlayer fPlayer;
// //
private final List<BlockData> cageHistory = new ArrayList<BlockData>(); private final List<BlockData> cageHistory = new ArrayList<BlockData>();
@ -182,6 +183,7 @@ public class CageData
private static class BlockData private static class BlockData
{ {
public Material material; public Material material;
public Location location; public Location location;

1
src/main/java/me/totalfreedom/totalfreedommod/commands/CommandLoader.java
View File

@ -9,6 +9,7 @@ import org.bukkit.ChatColor;
public class CommandLoader extends AbstractService<TotalFreedomMod> public class CommandLoader extends AbstractService<TotalFreedomMod>
{ {
@Getter @Getter
private final SimpleCommandHandler<TotalFreedomMod> handler; private final SimpleCommandHandler<TotalFreedomMod> handler;

1
src/main/java/me/totalfreedom/totalfreedommod/commands/CommandParameters.java
View File

@ -6,6 +6,7 @@ import java.lang.annotation.RetentionPolicy;
@Retention(RetentionPolicy.RUNTIME) @Retention(RetentionPolicy.RUNTIME)
public @interface CommandParameters public @interface CommandParameters
{ {
String description(); String description();
String usage(); String usage();

1
src/main/java/me/totalfreedom/totalfreedommod/commands/CommandPermissions.java
View File

@ -7,6 +7,7 @@ import java.lang.annotation.RetentionPolicy;
@Retention(RetentionPolicy.RUNTIME) @Retention(RetentionPolicy.RUNTIME)
public @interface CommandPermissions public @interface CommandPermissions
{ {
PlayerRank level(); PlayerRank level();
SourceType source(); SourceType source();

3
src/main/java/me/totalfreedom/totalfreedommod/commands/Command_adminmode.java
View File

@ -11,8 +11,9 @@ import org.bukkit.entity.Player;
@CommandParameters(description = "Close server to non-superadmins.", usage = "/<command> [on | off]") @CommandParameters(description = "Close server to non-superadmins.", usage = "/<command> [on | off]")
public class Command_adminmode extends FreedomCommand public class Command_adminmode extends FreedomCommand
{ {
@Override @Override
public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
{ {
if (args.length != 1) if (args.length != 1)
{ {

29
src/main/java/me/totalfreedom/totalfreedommod/commands/Command_adminworld.java
View File

@ -10,7 +10,8 @@ import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@CommandPermissions(level = PlayerRank.OP, source = SourceType.BOTH) @CommandPermissions(level = PlayerRank.OP, source = SourceType.BOTH)
@CommandParameters(description = "Go to the AdminWorld.", usage = "/<command> [guest < list | purge | add <player> | remove <player> > | time <morning | noon | evening | night> | weather <off | on | storm>]") @CommandParameters(description = "Go to the AdminWorld.",
usage = "/<command> [guest < list | purge | add <player> | remove <player> > | time <morning | noon | evening | night> | weather <off | on | storm>]")
public class Command_adminworld extends FreedomCommand public class Command_adminworld extends FreedomCommand
{ {
@ -21,7 +22,7 @@ public class Command_adminworld extends FreedomCommand
} }
@Override @Override
public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
{ {
CommandMode commandMode = null; CommandMode commandMode = null;
@ -56,7 +57,7 @@ public class Command_adminworld extends FreedomCommand
{ {
case TELEPORT: case TELEPORT:
{ {
if (!(sender instanceof Player) || sender_p == null) if (!(sender instanceof Player) || playerSender == null)
{ {
return true; return true;
} }
@ -70,17 +71,17 @@ public class Command_adminworld extends FreedomCommand
{ {
} }
if (adminWorld == null || sender_p.getWorld() == adminWorld) if (adminWorld == null || playerSender.getWorld() == adminWorld)
{ {
playerMsg("Going to the main world."); playerMsg("Going to the main world.");
sender_p.teleport(server.getWorlds().get(0).getSpawnLocation()); playerSender.teleport(server.getWorlds().get(0).getSpawnLocation());
} }
else else
{ {
if (plugin.wm.adminworld.canAccessWorld(sender_p)) if (plugin.wm.adminworld.canAccessWorld(playerSender))
{ {
playerMsg("Going to the AdminWorld."); playerMsg("Going to the AdminWorld.");
plugin.wm.adminworld.sendToWorld(sender_p); plugin.wm.adminworld.sendToWorld(playerSender);
} }
else else
{ {
@ -100,7 +101,7 @@ public class Command_adminworld extends FreedomCommand
} }
else if ("purge".equalsIgnoreCase(args[1])) else if ("purge".equalsIgnoreCase(args[1]))
{ {
assertCommandPerms(sender, sender_p); assertCommandPerms(sender, playerSender);
plugin.wm.adminworld.purgeGuestList(); plugin.wm.adminworld.purgeGuestList();
FUtil.adminAction(sender.getName(), "AdminWorld guest list purged.", false); FUtil.adminAction(sender.getName(), "AdminWorld guest list purged.", false);
} }
@ -111,7 +112,7 @@ public class Command_adminworld extends FreedomCommand
} }
else if (args.length == 3) else if (args.length == 3)
{ {
assertCommandPerms(sender, sender_p); assertCommandPerms(sender, playerSender);
if ("add".equalsIgnoreCase(args[1])) if ("add".equalsIgnoreCase(args[1]))
{ {
@ -123,7 +124,7 @@ public class Command_adminworld extends FreedomCommand
return true; return true;
} }
if (plugin.wm.adminworld.addGuest(player, sender_p)) if (plugin.wm.adminworld.addGuest(player, playerSender))
{ {
FUtil.adminAction(sender.getName(), "AdminWorld guest added: " + player.getName(), false); FUtil.adminAction(sender.getName(), "AdminWorld guest added: " + player.getName(), false);
} }
@ -154,7 +155,7 @@ public class Command_adminworld extends FreedomCommand
} }
case TIME: case TIME:
{ {
assertCommandPerms(sender, sender_p); assertCommandPerms(sender, playerSender);
if (args.length == 2) if (args.length == 2)
{ {
@ -178,7 +179,7 @@ public class Command_adminworld extends FreedomCommand
} }
case WEATHER: case WEATHER:
{ {
assertCommandPerms(sender, sender_p); assertCommandPerms(sender, playerSender);
if (args.length == 2) if (args.length == 2)
{ {
@ -220,9 +221,9 @@ public class Command_adminworld extends FreedomCommand
} }
// TODO: Redo this properly // TODO: Redo this properly
private void assertCommandPerms(CommandSender sender, Player sender_p) throws PermissionDeniedException private void assertCommandPerms(CommandSender sender, Player playerSender) throws PermissionDeniedException
{ {
if (!(sender instanceof Player) || sender_p == null || !isAdmin(sender)) if (!(sender instanceof Player) || playerSender == null || !isAdmin(sender))
{ {
throw new PermissionDeniedException(); throw new PermissionDeniedException();
} }

3
src/main/java/me/totalfreedom/totalfreedommod/commands/Command_blockcmd.java
View File

@ -11,8 +11,9 @@ import org.bukkit.entity.Player;
@CommandParameters(description = "Block all commands for a specific player.", usage = "/<command> <purge | <partialname>>", aliases = "blockcommands,blockcommand") @CommandParameters(description = "Block all commands for a specific player.", usage = "/<command> <purge | <partialname>>", aliases = "blockcommands,blockcommand")
public class Command_blockcmd extends FreedomCommand public class Command_blockcmd extends FreedomCommand
{ {
@Override @Override
public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
{ {
if (args.length != 1) if (args.length != 1)
{ {

5
src/main/java/me/totalfreedom/totalfreedommod/commands/Command_cage.java
View File

@ -14,8 +14,9 @@ import org.bukkit.entity.Player;
@CommandParameters(description = "Place a cage around someone.", usage = "/<command> <purge | off | <partialname> [outermaterial] [innermaterial]>") @CommandParameters(description = "Place a cage around someone.", usage = "/<command> <purge | off | <partialname> [outermaterial] [innermaterial]>")
public class Command_cage extends FreedomCommand public class Command_cage extends FreedomCommand
{ {
@Override @Override
public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
{ {
if (args.length == 0) if (args.length == 0)
{ {
@ -25,7 +26,7 @@ public class Command_cage extends FreedomCommand
if ("off".equals(args[0]) && sender instanceof Player) if ("off".equals(args[0]) && sender instanceof Player)
{ {
FUtil.adminAction(sender.getName(), "Uncaging " + sender.getName(), true); FUtil.adminAction(sender.getName(), "Uncaging " + sender.getName(), true);
FPlayer playerdata = plugin.pl.getPlayer(sender_p); FPlayer playerdata = plugin.pl.getPlayer(playerSender);
playerdata.getCageData().setCaged(false); playerdata.getCageData().setCaged(false);
return true; return true;

3
src/main/java/me/totalfreedom/totalfreedommod/commands/Command_cake.java
View File

@ -16,11 +16,12 @@ import org.bukkit.inventory.meta.ItemMeta;
@CommandParameters(description = "For the people that are still alive.", usage = "/<command>") @CommandParameters(description = "For the people that are still alive.", usage = "/<command>")
public class Command_cake extends FreedomCommand public class Command_cake extends FreedomCommand
{ {
public static final String CAKE_LYRICS = "But there's no sense crying over every mistake. You just keep on trying till you run out of cake."; public static final String CAKE_LYRICS = "But there's no sense crying over every mistake. You just keep on trying till you run out of cake.";
private final Random random = new Random(); private final Random random = new Random();
@Override @Override
public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
{ {
final StringBuilder output = new StringBuilder(); final StringBuilder output = new StringBuilder();

6
src/main/java/me/totalfreedom/totalfreedommod/commands/Command_cartsit.java
View File

@ -12,9 +12,9 @@ public class Command_cartsit extends FreedomCommand
{ {
@Override @Override
public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
{ {
Player targetPlayer = sender_p; Player targetPlayer = playerSender;
if (args.length == 1) if (args.length == 1)
{ {
@ -36,7 +36,7 @@ public class Command_cartsit extends FreedomCommand
return true; return true;
} }
} }
else if (targetPlayer != sender_p && !isAdmin(sender)) else if (targetPlayer != playerSender && !isAdmin(sender))
{ {
sender.sendMessage("Only superadmins can select another player as a /cartsit target."); sender.sendMessage("Only superadmins can select another player as a /cartsit target.");
return true; return true;

9
src/main/java/me/totalfreedom/totalfreedommod/commands/Command_cbtool.java
View File

@ -20,8 +20,9 @@ import org.bukkit.entity.Player;
@CommandParameters(description = "No Description Yet", usage = "/<command>") @CommandParameters(description = "No Description Yet", usage = "/<command>")
public class Command_cbtool extends FreedomCommand public class Command_cbtool extends FreedomCommand
{ {
@Override @Override
public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
{ {
if (args.length < 1) if (args.length < 1)
{ {
@ -30,7 +31,7 @@ public class Command_cbtool extends FreedomCommand
if ("targetblock".equalsIgnoreCase(args[0]) && sender instanceof Player) if ("targetblock".equalsIgnoreCase(args[0]) && sender instanceof Player)
{ {
Block targetBlock = DepreciationAggregator.getTargetBlock(sender_p, null, 100); Block targetBlock = DepreciationAggregator.getTargetBlock(playerSender, null, 100);
playerMsg("Your target block: " + targetBlock.getLocation().toString()); playerMsg("Your target block: " + targetBlock.getLocation().toString());
return true; return true;
} }
@ -78,6 +79,7 @@ public class Command_cbtool extends FreedomCommand
private static enum SubCommand private static enum SubCommand
{ {
PLAYER_DETECT("playerdetect", new SubCommandExecutable() PLAYER_DETECT("playerdetect", new SubCommandExecutable()
{ {
@Override @Override
@ -196,11 +198,13 @@ public class Command_cbtool extends FreedomCommand
private interface SubCommandExecutable private interface SubCommandExecutable
{ {
public String execute(String[] args) throws SubCommandFailureException; public String execute(String[] args) throws SubCommandFailureException;
} }
private static class SubCommandFailureException extends Exception private static class SubCommandFailureException extends Exception
{ {
public SubCommandFailureException() public SubCommandFailureException()
{ {
} }
@ -210,4 +214,5 @@ public class Command_cbtool extends FreedomCommand
super(message); super(message);
} }
} }
} }

5
src/main/java/me/totalfreedom/totalfreedommod/commands/Command_cmdspy.java
View File

@ -10,11 +10,12 @@ import org.bukkit.entity.Player;
@CommandParameters(description = "Spy on commands", usage = "/<command>", aliases = "commandspy") @CommandParameters(description = "Spy on commands", usage = "/<command>", aliases = "commandspy")
public class Command_cmdspy extends FreedomCommand public class Command_cmdspy extends FreedomCommand
{ {
@Override @Override
public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
{ {
FPlayer playerdata = plugin.pl.getPlayer(sender_p); FPlayer playerdata = plugin.pl.getPlayer(playerSender);
playerdata.setCommandSpy(!playerdata.cmdspyEnabled()); playerdata.setCommandSpy(!playerdata.cmdspyEnabled());
playerMsg("CommandSpy " + (playerdata.cmdspyEnabled() ? "enabled." : "disabled.")); playerMsg("CommandSpy " + (playerdata.cmdspyEnabled() ? "enabled." : "disabled."));

5
src/main/java/me/totalfreedom/totalfreedommod/commands/Command_colorme.java
View File

@ -14,8 +14,9 @@ import org.bukkit.entity.Player;
@CommandParameters(description = "Essentials Interface Command - Color your current nickname.", usage = "/<command> <color>") @CommandParameters(description = "Essentials Interface Command - Color your current nickname.", usage = "/<command> <color>")
public class Command_colorme extends FreedomCommand public class Command_colorme extends FreedomCommand
{ {
@Override @Override
public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
{ {
if (args.length != 1) if (args.length != 1)
{ {
@ -47,7 +48,7 @@ public class Command_colorme extends FreedomCommand
return true; return true;
} }
final String newNick = color + ChatColor.stripColor(sender_p.getDisplayName()).trim() + ChatColor.WHITE; final String newNick = color + ChatColor.stripColor(playerSender.getDisplayName()).trim() + ChatColor.WHITE;
plugin.esb.setNickname(sender.getName(), newNick); plugin.esb.setNickname(sender.getName(), newNick);

3
src/main/java/me/totalfreedom/totalfreedommod/commands/Command_commandlist.java
View File

@ -17,8 +17,9 @@ import org.bukkit.plugin.PluginDescriptionFile;
@CommandParameters(description = "Show all commands for all server plugins.", usage = "/<command>", aliases = "cmdlist") @CommandParameters(description = "Show all commands for all server plugins.", usage = "/<command>", aliases = "cmdlist")
public class Command_commandlist extends FreedomCommand public class Command_commandlist extends FreedomCommand
{ {
@Override @Override
public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
{ {
List<String> commands = new ArrayList<String>(); List<String> commands = new ArrayList<String>();

5
src/main/java/me/totalfreedom/totalfreedommod/commands/Command_creative.java
View File

@ -11,8 +11,9 @@ import org.bukkit.entity.Player;
@CommandParameters(description = "Quickly change your own gamemode to creative, or define someone's username to change theirs.", usage = "/<command> [partialname]", aliases = "gmc") @CommandParameters(description = "Quickly change your own gamemode to creative, or define someone's username to change theirs.", usage = "/<command> [partialname]", aliases = "gmc")
public class Command_creative extends FreedomCommand public class Command_creative extends FreedomCommand
{ {
@Override @Override
public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
{ {
if (senderIsConsole) if (senderIsConsole)
{ {
@ -26,7 +27,7 @@ public class Command_creative extends FreedomCommand
Player player; Player player;
if (args.length == 0) if (args.length == 0)
{ {
player = sender_p; player = playerSender;
} }
else else
{ {

3
src/main/java/me/totalfreedom/totalfreedommod/commands/Command_csay.java
View File

@ -11,8 +11,9 @@ import org.bukkit.entity.Player;
@CommandParameters(description = "Telnet command - Send a chat message with chat formatting over telnet.", usage = "/<command> <message...>") @CommandParameters(description = "Telnet command - Send a chat message with chat formatting over telnet.", usage = "/<command> <message...>")
public class Command_csay extends FreedomCommand public class Command_csay extends FreedomCommand
{ {
@Override @Override
public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
{ {
if (args.length > 0) if (args.length > 0)
{ {

3
src/main/java/me/totalfreedom/totalfreedommod/commands/Command_deafen.java
View File

@ -13,11 +13,12 @@ import org.bukkit.scheduler.BukkitRunnable;
@CommandParameters(description = "Make some noise.", usage = "/<command>") @CommandParameters(description = "Make some noise.", usage = "/<command>")
public class Command_deafen extends FreedomCommand public class Command_deafen extends FreedomCommand
{ {
private static final Random random = new Random(); private static final Random random = new Random();
public static final double STEPS = 10.0; public static final double STEPS = 10.0;
@Override @Override
public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
{ {
for (final Player player : server.getOnlinePlayers()) for (final Player player : server.getOnlinePlayers())
{ {

3
src/main/java/me/totalfreedom/totalfreedommod/commands/Command_debug.java
View File

@ -12,8 +12,9 @@ import org.bukkit.entity.Player;
@CommandParameters(description = "For developers only - debug things via reflection.", usage = "/<command>") @CommandParameters(description = "For developers only - debug things via reflection.", usage = "/<command>")
public class Command_debug extends FreedomCommand public class Command_debug extends FreedomCommand
{ {
@Override @Override
public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
{ {
if (args.length < 3) if (args.length < 3)
{ {

3
src/main/java/me/totalfreedom/totalfreedommod/commands/Command_denick.java
View File

@ -10,8 +10,9 @@ import org.bukkit.entity.Player;
@CommandParameters(description = "Essentials Interface Command - Remove the nickname of all players on the server.", usage = "/<command>") @CommandParameters(description = "Essentials Interface Command - Remove the nickname of all players on the server.", usage = "/<command>")
public class Command_denick extends FreedomCommand public class Command_denick extends FreedomCommand
{ {
@Override @Override
public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
{ {
FUtil.adminAction(sender.getName(), "Removing all nicknames", false); FUtil.adminAction(sender.getName(), "Removing all nicknames", false);

3
src/main/java/me/totalfreedom/totalfreedommod/commands/Command_deop.java
View File

@ -12,8 +12,9 @@ import org.bukkit.entity.Player;
@CommandParameters(description = "Deop a player.", usage = "/<command> <playername>") @CommandParameters(description = "Deop a player.", usage = "/<command> <playername>")
public class Command_deop extends FreedomCommand public class Command_deop extends FreedomCommand
{ {
@Override @Override
public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
{ {
if (args.length != 1) if (args.length != 1)
{ {

3
src/main/java/me/totalfreedom/totalfreedommod/commands/Command_deopall.java
View File

@ -10,8 +10,9 @@ import org.bukkit.entity.Player;
@CommandParameters(description = "Deop everyone on the server.", usage = "/<command>") @CommandParameters(description = "Deop everyone on the server.", usage = "/<command>")
public class Command_deopall extends FreedomCommand public class Command_deopall extends FreedomCommand
{ {
@Override @Override
public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
{ {
FUtil.adminAction(sender.getName(), "De-opping all players on the server", true); FUtil.adminAction(sender.getName(), "De-opping all players on the server", true);

5
src/main/java/me/totalfreedom/totalfreedommod/commands/Command_dispfill.java
View File

@ -20,8 +20,9 @@ import org.bukkit.inventory.ItemStack;
@CommandParameters(description = "Fill nearby dispensers with a set of items of your choice.", usage = "/<command> <radius> <comma,separated,items>") @CommandParameters(description = "Fill nearby dispensers with a set of items of your choice.", usage = "/<command> <radius> <comma,separated,items>")
public class Command_dispfill extends FreedomCommand public class Command_dispfill extends FreedomCommand
{ {
@Override @Override
public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
{ {
if (args.length == 2) if (args.length == 2)
{ {
@ -67,7 +68,7 @@ public class Command_dispfill extends FreedomCommand
final ItemStack[] itemsArray = items.toArray(new ItemStack[items.size()]); final ItemStack[] itemsArray = items.toArray(new ItemStack[items.size()]);
int affected = 0; int affected = 0;
final Location centerLocation = sender_p.getLocation(); final Location centerLocation = playerSender.getLocation();
final Block centerBlock = centerLocation.getBlock(); final Block centerBlock = centerLocation.getBlock();
for (int xOffset = -radius; xOffset <= radius; xOffset++) for (int xOffset = -radius; xOffset <= radius; xOffset++)
{ {

3
src/main/java/me/totalfreedom/totalfreedommod/commands/Command_doom.java
View File

@ -16,8 +16,9 @@ import org.bukkit.util.Vector;
@CommandParameters(description = "For the bad Superadmins", usage = "/<command> <playername>") @CommandParameters(description = "For the bad Superadmins", usage = "/<command> <playername>")
public class Command_doom extends FreedomCommand public class Command_doom extends FreedomCommand
{ {
@Override @Override
public boolean run(final CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) public boolean run(final CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
{ {
if (args.length != 1) if (args.length != 1)
{ {

87
src/main/java/me/totalfreedom/totalfreedommod/commands/Command_enchant.java
View File

@ -10,81 +10,114 @@ import org.bukkit.inventory.ItemStack;
@CommandPermissions(level = PlayerRank.OP, source = SourceType.ONLY_IN_GAME) @CommandPermissions(level = PlayerRank.OP, source = SourceType.ONLY_IN_GAME)
@CommandParameters(description = "Enchant items.", usage = "/<command> <list | addall | reset | add <name> | remove <name>>") @CommandParameters(description = "Enchant items.", usage = "/<command> <list | addall | reset | add <name> | remove <name>>")
public class Command_enchant extends FreedomCommand { public class Command_enchant extends FreedomCommand
{
@Override @Override
public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) { public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
if (args.length < 1) { {
if (args.length < 1)
{
return false; return false;
} }
ItemStack itemInHand = sender_p.getItemInHand(); ItemStack itemInHand = playerSender.getItemInHand();
if (itemInHand == null) { if (itemInHand == null)
{
playerMsg("You are holding an invalid item."); playerMsg("You are holding an invalid item.");
return true; return true;
} }
if (args[0].equalsIgnoreCase("list")) { if (args[0].equalsIgnoreCase("list"))
{
boolean has_enchantments = false; boolean has_enchantments = false;
StringBuilder possible_ench = new StringBuilder("Possible enchantments for held item: "); StringBuilder possible_ench = new StringBuilder("Possible enchantments for held item: ");
for (Enchantment ench : Enchantment.values()) { for (Enchantment ench : Enchantment.values())
if (ench.canEnchantItem(itemInHand)) { {
if (ench.canEnchantItem(itemInHand))
{
has_enchantments = true; has_enchantments = true;
possible_ench.append(ench.getName()).append(", "); possible_ench.append(ench.getName()).append(", ");
} }
} }
if (has_enchantments) { if (has_enchantments)
{
playerMsg(possible_ench.toString()); playerMsg(possible_ench.toString());
} else { }
else
{
playerMsg("The held item has no enchantments."); playerMsg("The held item has no enchantments.");
} }
} else if (args[0].equalsIgnoreCase("addall")) { }
for (Enchantment ench : Enchantment.values()) { else if (args[0].equalsIgnoreCase("addall"))
try { {
if (ench.canEnchantItem(itemInHand)) { for (Enchantment ench : Enchantment.values())
{
try
{
if (ench.canEnchantItem(itemInHand))
{
itemInHand.addEnchantment(ench, ench.getMaxLevel()); itemInHand.addEnchantment(ench, ench.getMaxLevel());
} }
} catch (Exception ex) { }
FLog.info("Error using " + ench.getName() + " on " + itemInHand.getType().name() + " held by " + sender_p.getName() + "."); catch (Exception ex)
{
FLog.info("Error using " + ench.getName() + " on " + itemInHand.getType().name() + " held by " + playerSender.getName() + ".");
} }
} }
playerMsg("Added all possible enchantments for this item."); playerMsg("Added all possible enchantments for this item.");
} else if (args[0].equalsIgnoreCase("reset")) { }
for (Enchantment ench : itemInHand.getEnchantments().keySet()) { else if (args[0].equalsIgnoreCase("reset"))
{
for (Enchantment ench : itemInHand.getEnchantments().keySet())
{
itemInHand.removeEnchantment(ench); itemInHand.removeEnchantment(ench);
} }
playerMsg("Removed all enchantments."); playerMsg("Removed all enchantments.");
} else { }
if (args.length < 2) { else
{
if (args.length < 2)
{
return false; return false;
} }
Enchantment ench = null; Enchantment ench = null;
try { try
{
ench = Enchantment.getByName(args[1]); ench = Enchantment.getByName(args[1]);
} catch (Exception ex) { }
catch (Exception ex)
{
} }
if (ench == null) { if (ench == null)
{
playerMsg(args[1] + " is an invalid enchantment for the held item. Type \"/enchant list\" for valid enchantments for this item."); playerMsg(args[1] + " is an invalid enchantment for the held item. Type \"/enchant list\" for valid enchantments for this item.");
return true; return true;
} }
if (args[0].equalsIgnoreCase("add")) { if (args[0].equalsIgnoreCase("add"))
if (ench.canEnchantItem(itemInHand)) { {
if (ench.canEnchantItem(itemInHand))
{
itemInHand.addEnchantment(ench, ench.getMaxLevel()); itemInHand.addEnchantment(ench, ench.getMaxLevel());
playerMsg("Added enchantment: " + ench.getName()); playerMsg("Added enchantment: " + ench.getName());
} else { }
else
{
playerMsg("Can't use this enchantment on held item."); playerMsg("Can't use this enchantment on held item.");
} }
} else if (args[0].equals("remove")) { }
else if (args[0].equals("remove"))
{
itemInHand.removeEnchantment(ench); itemInHand.removeEnchantment(ench);
playerMsg("Removed enchantment: " + ench.getName()); playerMsg("Removed enchantment: " + ench.getName());

5
src/main/java/me/totalfreedom/totalfreedommod/commands/Command_ender.java
View File

@ -10,10 +10,11 @@ import org.bukkit.entity.Player;
@CommandParameters(description = "Goto the ender / \"The End\".", usage = "/<command>") @CommandParameters(description = "Goto the ender / \"The End\".", usage = "/<command>")
public class Command_ender extends FreedomCommand public class Command_ender extends FreedomCommand
{ {
@Override @Override
public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
{ {
FUtil.gotoWorld(sender_p, server.getWorlds().get(0).getName() + "_the_end"); FUtil.gotoWorld(playerSender, server.getWorlds().get(0).getName() + "_the_end");
return true; return true;
} }
} }

9
src/main/java/me/totalfreedom/totalfreedommod/commands/Command_expel.java
View File

@ -15,8 +15,9 @@ import org.bukkit.util.Vector;
@CommandParameters(description = "Push people away from you.", usage = "/<command> [radius] [strength]") @CommandParameters(description = "Push people away from you.", usage = "/<command> [radius] [strength]")
public class Command_expel extends FreedomCommand public class Command_expel extends FreedomCommand
{ {
@Override @Override
public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
{ {
double radius = 20.0; double radius = 20.0;
double strength = 5.0; double strength = 5.0;
@ -45,11 +46,11 @@ public class Command_expel extends FreedomCommand
List<String> pushedPlayers = new ArrayList<String>(); List<String> pushedPlayers = new ArrayList<String>();
final Vector senderPos = sender_p.getLocation().toVector(); final Vector senderPos = playerSender.getLocation().toVector();
final List<Player> players = sender_p.getWorld().getPlayers(); final List<Player> players = playerSender.getWorld().getPlayers();
for (final Player player : players) for (final Player player : players)
{ {
if (player.equals(sender_p)) if (player.equals(playerSender))
{ {
continue; continue;
} }

3
src/main/java/me/totalfreedom/totalfreedommod/commands/Command_findip.java
View File

@ -10,8 +10,9 @@ import org.bukkit.entity.Player;
@CommandParameters(description = "Shows all IPs registered to a player", usage = "/<command> <player>") @CommandParameters(description = "Shows all IPs registered to a player", usage = "/<command> <player>")
public class Command_findip extends FreedomCommand public class Command_findip extends FreedomCommand
{ {
@Override @Override
public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
{ {
if (args.length != 1) if (args.length != 1)
{ {

5
src/main/java/me/totalfreedom/totalfreedommod/commands/Command_flatlands.java
View File

@ -10,12 +10,13 @@ import org.bukkit.entity.Player;
@CommandParameters(description = "Goto the flatlands.", usage = "/<command>") @CommandParameters(description = "Goto the flatlands.", usage = "/<command>")
public class Command_flatlands extends FreedomCommand public class Command_flatlands extends FreedomCommand
{ {
@Override @Override
public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
{ {
if (ConfigEntry.FLATLANDS_GENERATE.getBoolean()) if (ConfigEntry.FLATLANDS_GENERATE.getBoolean())
{ {
plugin.wm.flatlands.sendToWorld(sender_p); plugin.wm.flatlands.sendToWorld(playerSender);
} }
else else
{ {

2
src/main/java/me/totalfreedom/totalfreedommod/commands/Command_fr.java
View File

@ -14,7 +14,7 @@ public class Command_fr extends FreedomCommand
{ {
@Override @Override
public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
{ {
if (args.length == 0) if (args.length == 0)
{ {

4
src/main/java/me/totalfreedom/totalfreedommod/commands/Command_fuckoff.java
View File

@ -12,14 +12,14 @@ public class Command_fuckoff extends FreedomCommand
{ {
@Override @Override
public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
{ {
if (args.length < 1) if (args.length < 1)
{ {
return false; return false;
} }
FPlayer player = plugin.pl.getPlayer(sender_p); FPlayer player = plugin.pl.getPlayer(playerSender);
if (!args[0].equals("on")) if (!args[0].equals("on"))
{ {

4
src/main/java/me/totalfreedom/totalfreedommod/commands/Command_gadmin.java
View File

@ -18,8 +18,10 @@ import org.bukkit.entity.Player;
usage = "/<command> [list | [<kick | nameban | ipban | ban | op | deop | ci | fr | smite> <targethash>] ]") usage = "/<command> [list | [<kick | nameban | ipban | ban | op | deop | ci | fr | smite> <targethash>] ]")
public class Command_gadmin extends FreedomCommand public class Command_gadmin extends FreedomCommand
{ {
private enum GadminMode private enum GadminMode
{ {
LIST("list"), LIST("list"),
KICK("kick"), KICK("kick"),
NAMEBAN("nameban"), NAMEBAN("nameban"),
@ -61,7 +63,7 @@ public class Command_gadmin extends FreedomCommand
} }
@Override @Override
public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
{ {
if (args.length == 0) if (args.length == 0)
{ {

3
src/main/java/me/totalfreedom/totalfreedommod/commands/Command_gcmd.java
View File

@ -10,8 +10,9 @@ import org.bukkit.entity.Player;
@CommandParameters(description = "Send a command as someone else.", usage = "/<command> <fromname> <outcommand>") @CommandParameters(description = "Send a command as someone else.", usage = "/<command> <fromname> <outcommand>")
public class Command_gcmd extends FreedomCommand public class Command_gcmd extends FreedomCommand
{ {
@Override @Override
public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
{ {
if (args.length < 2) if (args.length < 2)
{ {

3
src/main/java/me/totalfreedom/totalfreedommod/commands/Command_glist.java
View File

@ -16,8 +16,9 @@ import org.bukkit.entity.Player;
@CommandParameters(description = "Bans or unbans any player, even those who are not logged in anymore.", usage = "/<command> <purge | <ban | unban> <username>>") @CommandParameters(description = "Bans or unbans any player, even those who are not logged in anymore.", usage = "/<command> <purge | <ban | unban> <username>>")
public class Command_glist extends FreedomCommand public class Command_glist extends FreedomCommand
{ {
@Override @Override
public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
{ {
if (args.length < 1) if (args.length < 1)
{ {

3
src/main/java/me/totalfreedom/totalfreedommod/commands/Command_gtfo.java
View File

@ -17,8 +17,9 @@ import org.bukkit.entity.Player;
@CommandParameters(description = "Makes someone GTFO (deop and ip ban by username).", usage = "/<command> <partialname>") @CommandParameters(description = "Makes someone GTFO (deop and ip ban by username).", usage = "/<command> <partialname>")
public class Command_gtfo extends FreedomCommand public class Command_gtfo extends FreedomCommand
{ {
@Override @Override
public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
{ {
if (args.length == 0) if (args.length == 0)
{ {

8
src/main/java/me/totalfreedom/totalfreedommod/commands/Command_health.java
View File

@ -17,17 +17,19 @@ import org.bukkit.scheduler.BukkitTask;
@CommandParameters(description = "View ticks-per-second", usage = "/<command>") @CommandParameters(description = "View ticks-per-second", usage = "/<command>")
public class Command_health extends FreedomCommand public class Command_health extends FreedomCommand
{ {
private static final int BYTES_PER_MB = 1024 * 1024; private static final int BYTES_PER_MB = 1024 * 1024;
private static final DoubleRange TPS_RANGE = new DoubleRange(20.0 - 0.1, 20.0 + 0.1); private static final DoubleRange TPS_RANGE = new DoubleRange(20.0 - 0.1, 20.0 + 0.1);
@Override @Override
public boolean run(final CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) public boolean run(final CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
{ {
Runtime runtime = Runtime.getRuntime(); Runtime runtime = Runtime.getRuntime();
long usedMem = runtime.totalMemory() - runtime.freeMemory(); long usedMem = runtime.totalMemory() - runtime.freeMemory();
playerMsg("Reserved Memory: " + (double) runtime.totalMemory() / (double) BYTES_PER_MB + "mb"); playerMsg("Reserved Memory: " + (double) runtime.totalMemory() / (double) BYTES_PER_MB + "mb");
playerMsg("Used Memory: " + new DecimalFormat("#").format((double) usedMem / (double) BYTES_PER_MB) + "mb (" + new DecimalFormat("#").format(((double) usedMem / (double) runtime.totalMemory()) * 100.0) + "%)"); playerMsg("Used Memory: " + new DecimalFormat("#").format((double) usedMem / (double) BYTES_PER_MB)
+ "mb (" + new DecimalFormat("#").format(((double) usedMem / (double) runtime.totalMemory()) * 100.0) + "%)");
playerMsg("Max Memory: " + (double) runtime.maxMemory() / (double) BYTES_PER_MB + "mb"); playerMsg("Max Memory: " + (double) runtime.maxMemory() / (double) BYTES_PER_MB + "mb");
playerMsg("Calculating ticks per second, please wait..."); playerMsg("Calculating ticks per second, please wait...");
@ -64,6 +66,7 @@ public class Command_health extends FreedomCommand
private class TFM_TickMeter private class TFM_TickMeter
{ {
private final AtomicInteger ticks = new AtomicInteger(); private final AtomicInteger ticks = new AtomicInteger();
private final TotalFreedomMod plugin; private final TotalFreedomMod plugin;
private long startTime; private long startTime;
@ -98,4 +101,5 @@ public class Command_health extends FreedomCommand
return (double) tickCount / ((double) elapsed / 1000.0); return (double) tickCount / ((double) elapsed / 1000.0);
} }
} }
} }

3
src/main/java/me/totalfreedom/totalfreedommod/commands/Command_invis.java
View File

@ -14,8 +14,9 @@ import org.bukkit.potion.PotionEffectType;
@CommandParameters(description = "Shows (optionally smites) invisisible players", usage = "/<command> (smite)") @CommandParameters(description = "Shows (optionally smites) invisisible players", usage = "/<command> (smite)")
public class Command_invis extends FreedomCommand public class Command_invis extends FreedomCommand
{ {
@Override @Override
public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
{ {
boolean smite = false; boolean smite = false;
if (args.length >= 1) if (args.length >= 1)

3
src/main/java/me/totalfreedom/totalfreedommod/commands/Command_jumppads.java
View File

@ -12,8 +12,9 @@ import org.bukkit.entity.Player;
@CommandParameters(description = "Manage jumppads", usage = "/<command> <on | off | info | sideways <on | off> | strength <strength (1-10)>>", aliases = "launchpads,jp") @CommandParameters(description = "Manage jumppads", usage = "/<command> <on | off | info | sideways <on | off> | strength <strength (1-10)>>", aliases = "launchpads,jp")
public class Command_jumppads extends FreedomCommand public class Command_jumppads extends FreedomCommand
{ {
@Override @Override
public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
{ {
if (args.length == 0 || args.length > 2) if (args.length == 0 || args.length > 2)
{ {

3
src/main/java/me/totalfreedom/totalfreedommod/commands/Command_kicknoob.java
View File

@ -11,8 +11,9 @@ import org.bukkit.entity.Player;
@CommandParameters(description = "Kick all non-superadmins on server.", usage = "/<command>") @CommandParameters(description = "Kick all non-superadmins on server.", usage = "/<command>")
public class Command_kicknoob extends FreedomCommand public class Command_kicknoob extends FreedomCommand
{ {
@Override @Override
public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
{ {
FUtil.adminAction(sender.getName(), "Disconnecting all non-superadmins.", true); FUtil.adminAction(sender.getName(), "Disconnecting all non-superadmins.", true);

7
src/main/java/me/totalfreedom/totalfreedommod/commands/Command_landmine.java
View File

@ -16,8 +16,9 @@ import org.bukkit.entity.Player;
@CommandParameters(description = "Set a landmine trap.", usage = "/<command>") @CommandParameters(description = "Set a landmine trap.", usage = "/<command>")
public class Command_landmine extends FreedomCommand public class Command_landmine extends FreedomCommand
{ {
@Override @Override
public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
{ {
if (!ConfigEntry.LANDMINES_ENABLED.getBoolean()) if (!ConfigEntry.LANDMINES_ENABLED.getBoolean())
{ {
@ -54,9 +55,9 @@ public class Command_landmine extends FreedomCommand
} }
} }
final Block landmine = sender_p.getLocation().getBlock().getRelative(BlockFace.DOWN); final Block landmine = playerSender.getLocation().getBlock().getRelative(BlockFace.DOWN);
landmine.setType(Material.TNT); landmine.setType(Material.TNT);
plugin.lm.add(new Landmine(landmine.getLocation(), sender_p, radius)); plugin.lm.add(new Landmine(landmine.getLocation(), playerSender, radius));
playerMsg("Landmine planted - Radius = " + radius + " blocks.", ChatColor.GREEN); playerMsg("Landmine planted - Radius = " + radius + " blocks.", ChatColor.GREEN);

3
src/main/java/me/totalfreedom/totalfreedommod/commands/Command_lastcmd.java
View File

@ -11,8 +11,9 @@ import org.bukkit.entity.Player;
@CommandParameters(description = "Show the last command that someone used.", usage = "/<command> <player>") @CommandParameters(description = "Show the last command that someone used.", usage = "/<command> <player>")
public class Command_lastcmd extends FreedomCommand public class Command_lastcmd extends FreedomCommand
{ {
@Override @Override
public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
{ {
if (args.length == 0) if (args.length == 0)
{ {

4
src/main/java/me/totalfreedom/totalfreedommod/commands/Command_list.java
View File

@ -14,15 +14,17 @@ import org.bukkit.entity.Player;
@CommandParameters(description = "Lists the real names of all online players.", usage = "/<command> [-a | -i]", aliases = "who") @CommandParameters(description = "Lists the real names of all online players.", usage = "/<command> [-a | -i]", aliases = "who")
public class Command_list extends FreedomCommand public class Command_list extends FreedomCommand
{ {
private static enum ListFilter private static enum ListFilter
{ {
ALL, ALL,
ADMINS, ADMINS,
IMPOSTORS; IMPOSTORS;
} }
@Override @Override
public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
{ {
if (args.length > 1) if (args.length > 1)
{ {

7
src/main/java/me/totalfreedom/totalfreedommod/commands/Command_localspawn.java
View File

@ -9,11 +9,12 @@ import org.bukkit.entity.Player;
@CommandParameters(description = "Teleport to the spawn point for the current world.", usage = "/<command>", aliases = "worldspawn,gotospawn") @CommandParameters(description = "Teleport to the spawn point for the current world.", usage = "/<command>", aliases = "worldspawn,gotospawn")
public class Command_localspawn extends FreedomCommand public class Command_localspawn extends FreedomCommand
{ {
@Override @Override
public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
{ {
sender_p.teleport(sender_p.getWorld().getSpawnLocation()); playerSender.teleport(playerSender.getWorld().getSpawnLocation());
playerMsg("Teleported to spawnpoint for world \"" + sender_p.getWorld().getName() + "\"."); playerMsg("Teleported to spawnpoint for world \"" + playerSender.getWorld().getName() + "\".");
return true; return true;
} }
} }

13
src/main/java/me/totalfreedom/totalfreedommod/commands/Command_lockup.java
View File

@ -13,8 +13,9 @@ import org.bukkit.scheduler.BukkitTask;
@CommandParameters(description = "Block target's minecraft input. This is evil, and I never should have wrote it.", usage = "/<command> <all | purge | <<partialname> on | off>>") @CommandParameters(description = "Block target's minecraft input. This is evil, and I never should have wrote it.", usage = "/<command> <all | purge | <<partialname> on | off>>")
public class Command_lockup extends FreedomCommand public class Command_lockup extends FreedomCommand
{ {
@Override @Override
public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
{ {
if (args.length == 1) if (args.length == 1)
{ {
@ -88,11 +89,11 @@ public class Command_lockup extends FreedomCommand
private void cancelLockup(FPlayer playerdata) private void cancelLockup(FPlayer playerdata)
{ {
BukkitTask lockupScheduleID = playerdata.getLockupScheduleID(); BukkitTask lockupScheduleId = playerdata.getLockupScheduleID();
if (lockupScheduleID != null) if (lockupScheduleId != null)
{ {
lockupScheduleID.cancel(); lockupScheduleId.cancel();
playerdata.setLockupScheduleID(null); playerdata.setLockupScheduleId(null);
} }
} }
@ -107,7 +108,7 @@ public class Command_lockup extends FreedomCommand
cancelLockup(playerdata); cancelLockup(playerdata);
playerdata.setLockupScheduleID(new BukkitRunnable() playerdata.setLockupScheduleId(new BukkitRunnable()
{ {
@Override @Override
public void run() public void run()

13
src/main/java/me/totalfreedom/totalfreedommod/commands/Command_logs.java
View File

@ -25,8 +25,9 @@ import org.bukkit.scheduler.BukkitRunnable;
@CommandParameters(description = "Register your connection with the TFM logviewer.", usage = "/<command> [off]") @CommandParameters(description = "Register your connection with the TFM logviewer.", usage = "/<command> [off]")
public class Command_logs extends FreedomCommand public class Command_logs extends FreedomCommand
{ {
@Override @Override
public boolean run(final CommandSender sender, final Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) public boolean run(final CommandSender sender, final Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
{ {
LogsRegistrationMode mode = LogsRegistrationMode.UPDATE; LogsRegistrationMode mode = LogsRegistrationMode.UPDATE;
@ -35,7 +36,7 @@ public class Command_logs extends FreedomCommand
mode = ("off".equals(args[0]) ? LogsRegistrationMode.DELETE : LogsRegistrationMode.UPDATE); mode = ("off".equals(args[0]) ? LogsRegistrationMode.DELETE : LogsRegistrationMode.UPDATE);
} }
updateLogsRegistration(sender, sender_p, mode); updateLogsRegistration(sender, playerSender, mode);
return true; return true;
} }
@ -47,10 +48,10 @@ public class Command_logs extends FreedomCommand
public static void updateLogsRegistration(final CommandSender sender, final String targetName, final String targetIP, final LogsRegistrationMode mode) public static void updateLogsRegistration(final CommandSender sender, final String targetName, final String targetIP, final LogsRegistrationMode mode)
{ {
final String logsRegisterURL = ConfigEntry.LOGS_URL.getString(); final String logsRegisterUrl = ConfigEntry.LOGS_URL.getString();
final String logsRegisterPassword = ConfigEntry.LOGS_SECRET.getString(); final String logsRegisterPassword = ConfigEntry.LOGS_SECRET.getString();
if (logsRegisterURL == null || logsRegisterPassword == null || logsRegisterURL.isEmpty() || logsRegisterPassword.isEmpty()) if (logsRegisterUrl == null || logsRegisterPassword == null || logsRegisterUrl.isEmpty() || logsRegisterPassword.isEmpty())
{ {
return; return;
} }
@ -67,7 +68,7 @@ public class Command_logs extends FreedomCommand
sender.sendMessage(ChatColor.YELLOW + "Connecting..."); sender.sendMessage(ChatColor.YELLOW + "Connecting...");
} }
URL url = new URLBuilder(logsRegisterURL) URL url = new URLBuilder(logsRegisterUrl)
.addQueryParameter("mode", mode.toString()) .addQueryParameter("mode", mode.toString())
.addQueryParameter("password", logsRegisterPassword) .addQueryParameter("password", logsRegisterPassword)
.addQueryParameter("name", targetName) .addQueryParameter("name", targetName)
@ -119,6 +120,7 @@ public class Command_logs extends FreedomCommand
public static enum LogsRegistrationMode public static enum LogsRegistrationMode
{ {
UPDATE("update"), DELETE("delete"); UPDATE("update"), DELETE("delete");
private final String mode; private final String mode;
@ -136,6 +138,7 @@ public class Command_logs extends FreedomCommand
private static class URLBuilder private static class URLBuilder
{ {
private final String requestPath; private final String requestPath;
private final Map<String, String> queryStringMap = new HashMap<String, String>(); private final Map<String, String> queryStringMap = new HashMap<String, String>();

56
src/main/java/me/totalfreedom/totalfreedommod/commands/Command_moblimiter.java
View File

@ -9,47 +9,71 @@ import org.bukkit.entity.Player;
@CommandPermissions(level = PlayerRank.SUPER_ADMIN, source = SourceType.ONLY_CONSOLE) @CommandPermissions(level = PlayerRank.SUPER_ADMIN, source = SourceType.ONLY_CONSOLE)
@CommandParameters(description = "Control mob rezzing parameters.", usage = "/<command> <on|off|setmax <count>|dragon|giant|ghast|slime>") @CommandParameters(description = "Control mob rezzing parameters.", usage = "/<command> <on|off|setmax <count>|dragon|giant|ghast|slime>")
public class Command_moblimiter extends FreedomCommand { public class Command_moblimiter extends FreedomCommand
{
@Override @Override
public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) { public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
if (args.length < 1) { {
if (args.length < 1)
{
return false; return false;
} }
if (args[0].equalsIgnoreCase("on")) { if (args[0].equalsIgnoreCase("on"))
{
ConfigEntry.MOB_LIMITER_ENABLED.setBoolean(true); ConfigEntry.MOB_LIMITER_ENABLED.setBoolean(true);
} else if (args[0].equalsIgnoreCase("off")) { }
else if (args[0].equalsIgnoreCase("off"))
{
ConfigEntry.MOB_LIMITER_ENABLED.setBoolean(false); ConfigEntry.MOB_LIMITER_ENABLED.setBoolean(false);
} else if (args[0].equalsIgnoreCase("dragon")) { }
else if (args[0].equalsIgnoreCase("dragon"))
{
ConfigEntry.MOB_LIMITER_DISABLE_DRAGON.setBoolean(!ConfigEntry.MOB_LIMITER_DISABLE_DRAGON.getBoolean()); ConfigEntry.MOB_LIMITER_DISABLE_DRAGON.setBoolean(!ConfigEntry.MOB_LIMITER_DISABLE_DRAGON.getBoolean());
} else if (args[0].equalsIgnoreCase("giant")) { }
else if (args[0].equalsIgnoreCase("giant"))
{
ConfigEntry.MOB_LIMITER_DISABLE_GIANT.setBoolean(!ConfigEntry.MOB_LIMITER_DISABLE_GIANT.getBoolean()); ConfigEntry.MOB_LIMITER_DISABLE_GIANT.setBoolean(!ConfigEntry.MOB_LIMITER_DISABLE_GIANT.getBoolean());
} else if (args[0].equalsIgnoreCase("slime")) { }
else if (args[0].equalsIgnoreCase("slime"))
{
ConfigEntry.MOB_LIMITER_DISABLE_SLIME.setBoolean(!ConfigEntry.MOB_LIMITER_DISABLE_SLIME.getBoolean()); ConfigEntry.MOB_LIMITER_DISABLE_SLIME.setBoolean(!ConfigEntry.MOB_LIMITER_DISABLE_SLIME.getBoolean());
} else if (args[0].equalsIgnoreCase("ghast")) { }
else if (args[0].equalsIgnoreCase("ghast"))
{
ConfigEntry.MOB_LIMITER_DISABLE_GHAST.setBoolean(!ConfigEntry.MOB_LIMITER_DISABLE_GHAST.getBoolean()); ConfigEntry.MOB_LIMITER_DISABLE_GHAST.setBoolean(!ConfigEntry.MOB_LIMITER_DISABLE_GHAST.getBoolean());
} else { }
if (args.length < 2) { else
{
if (args.length < 2)
{
return false; return false;
} }
if (args[0].equalsIgnoreCase("setmax")) { if (args[0].equalsIgnoreCase("setmax"))
try { {
try
{
ConfigEntry.MOB_LIMITER_MAX.setInteger(Math.max(0, Math.min(2000, Integer.parseInt(args[1])))); ConfigEntry.MOB_LIMITER_MAX.setInteger(Math.max(0, Math.min(2000, Integer.parseInt(args[1]))));
} catch (NumberFormatException nfex) { }
catch (NumberFormatException nfex)
{
} }
} }
} }
if (ConfigEntry.MOB_LIMITER_ENABLED.getBoolean()) { if (ConfigEntry.MOB_LIMITER_ENABLED.getBoolean())
{
sender.sendMessage("Moblimiter enabled. Maximum mobcount set to: " + ConfigEntry.MOB_LIMITER_MAX.getInteger() + "."); sender.sendMessage("Moblimiter enabled. Maximum mobcount set to: " + ConfigEntry.MOB_LIMITER_MAX.getInteger() + ".");
playerMsg("Dragon: " + (ConfigEntry.MOB_LIMITER_DISABLE_DRAGON.getBoolean() ? "disabled" : "enabled") + "."); playerMsg("Dragon: " + (ConfigEntry.MOB_LIMITER_DISABLE_DRAGON.getBoolean() ? "disabled" : "enabled") + ".");
playerMsg("Giant: " + (ConfigEntry.MOB_LIMITER_DISABLE_GIANT.getBoolean() ? "disabled" : "enabled") + "."); playerMsg("Giant: " + (ConfigEntry.MOB_LIMITER_DISABLE_GIANT.getBoolean() ? "disabled" : "enabled") + ".");
playerMsg("Slime: " + (ConfigEntry.MOB_LIMITER_DISABLE_SLIME.getBoolean() ? "disabled" : "enabled") + "."); playerMsg("Slime: " + (ConfigEntry.MOB_LIMITER_DISABLE_SLIME.getBoolean() ? "disabled" : "enabled") + ".");
playerMsg("Ghast: " + (ConfigEntry.MOB_LIMITER_DISABLE_GHAST.getBoolean() ? "disabled" : "enabled") + "."); playerMsg("Ghast: " + (ConfigEntry.MOB_LIMITER_DISABLE_GHAST.getBoolean() ? "disabled" : "enabled") + ".");
} else { }
else
{
playerMsg("Moblimiter is disabled. No mob restrictions are in effect."); playerMsg("Moblimiter is disabled. No mob restrictions are in effect.");
} }

3
src/main/java/me/totalfreedom/totalfreedommod/commands/Command_mobpurge.java
View File

@ -17,8 +17,9 @@ import org.bukkit.entity.Slime;
@CommandParameters(description = "Purge all mobs in all worlds.", usage = "/<command>", aliases = "mp") @CommandParameters(description = "Purge all mobs in all worlds.", usage = "/<command>", aliases = "mp")
public class Command_mobpurge extends FreedomCommand public class Command_mobpurge extends FreedomCommand
{ {
@Override @Override
public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
{ {
playerMsg("Purging all mobs..."); playerMsg("Purging all mobs...");
playerMsg(purgeMobs() + " mobs removed."); playerMsg(purgeMobs() + " mobs removed.");

7
src/main/java/me/totalfreedom/totalfreedommod/commands/Command_mp44.java
View File

@ -14,8 +14,9 @@ import org.bukkit.inventory.ItemStack;
@CommandParameters(description = "Modern weaponry, FTW. Use 'draw' to start firing, 'sling' to stop firing.", usage = "/<command> <draw | sling>") @CommandParameters(description = "Modern weaponry, FTW. Use 'draw' to start firing, 'sling' to stop firing.", usage = "/<command> <draw | sling>")
public class Command_mp44 extends FreedomCommand public class Command_mp44 extends FreedomCommand
{ {
@Override @Override
public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
{ {
if (!ConfigEntry.MP44_ENABLED.getBoolean()) if (!ConfigEntry.MP44_ENABLED.getBoolean())
{ {
@ -28,7 +29,7 @@ public class Command_mp44 extends FreedomCommand
return false; return false;
} }
FPlayer playerdata = plugin.pl.getPlayer(sender_p); FPlayer playerdata = plugin.pl.getPlayer(playerSender);
if (args[0].equalsIgnoreCase("draw")) if (args[0].equalsIgnoreCase("draw"))
{ {
@ -37,7 +38,7 @@ public class Command_mp44 extends FreedomCommand
playerMsg("mp44 is ARMED! Left click with gunpowder to start firing, left click again to quit.", ChatColor.GREEN); playerMsg("mp44 is ARMED! Left click with gunpowder to start firing, left click again to quit.", ChatColor.GREEN);
playerMsg("Type /mp44 sling to disable. -by Madgeek1450", ChatColor.GREEN); playerMsg("Type /mp44 sling to disable. -by Madgeek1450", ChatColor.GREEN);
sender_p.setItemInHand(new ItemStack(Material.SULPHUR, 1)); playerSender.setItemInHand(new ItemStack(Material.SULPHUR, 1));
} }
else else
{ {

5
src/main/java/me/totalfreedom/totalfreedommod/commands/Command_nether.java
View File

@ -10,10 +10,11 @@ import org.bukkit.entity.Player;
@CommandParameters(description = "Goto the nether.", usage = "/<command>") @CommandParameters(description = "Goto the nether.", usage = "/<command>")
public class Command_nether extends FreedomCommand public class Command_nether extends FreedomCommand
{ {
@Override @Override
public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
{ {
FUtil.gotoWorld(sender_p, server.getWorlds().get(0).getName() + "_nether"); FUtil.gotoWorld(playerSender, server.getWorlds().get(0).getName() + "_nether");
return true; return true;
} }
} }

5
src/main/java/me/totalfreedom/totalfreedommod/commands/Command_nickclean.java
View File

@ -14,6 +14,7 @@ import org.bukkit.entity.Player;
@CommandParameters(description = "Essentials Interface Command - Remove distracting things from nicknames of all players on server.", usage = "/<command>", aliases = "nc") @CommandParameters(description = "Essentials Interface Command - Remove distracting things from nicknames of all players on server.", usage = "/<command>", aliases = "nc")
public class Command_nickclean extends FreedomCommand public class Command_nickclean extends FreedomCommand
{ {
private static final ChatColor[] BLOCKED = new ChatColor[] private static final ChatColor[] BLOCKED = new ChatColor[]
{ {
ChatColor.MAGIC, ChatColor.MAGIC,
@ -22,10 +23,10 @@ public class Command_nickclean extends FreedomCommand
ChatColor.UNDERLINE, ChatColor.UNDERLINE,
ChatColor.BLACK ChatColor.BLACK
}; };
private static final Pattern REGEX = Pattern.compile("\\u00A7[" + StringUtils.join(BLOCKED, "") + "]"); private static final Pattern REGEX = Pattern.compile(ChatColor.COLOR_CHAR + "[" + StringUtils.join(BLOCKED, "") + "]");
@Override @Override
public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
{ {
FUtil.adminAction(sender.getName(), "Cleaning all nicknames.", false); FUtil.adminAction(sender.getName(), "Cleaning all nicknames.", false);

3
src/main/java/me/totalfreedom/totalfreedommod/commands/Command_nickfilter.java
View File

@ -19,8 +19,9 @@ import org.bukkit.entity.Player;
aliases = "nf") aliases = "nf")
public class Command_nickfilter extends FreedomCommand public class Command_nickfilter extends FreedomCommand
{ {
@Override @Override
public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
{ {
boolean nickMatched = false; boolean nickMatched = false;

7
src/main/java/me/totalfreedom/totalfreedommod/commands/Command_nicknyan.java
View File

@ -12,8 +12,9 @@ import org.bukkit.entity.Player;
@CommandParameters(description = "Essentials Interface Command - Nyanify your nickname.", usage = "/<command> <<nick> | off>") @CommandParameters(description = "Essentials Interface Command - Nyanify your nickname.", usage = "/<command> <<nick> | off>")
public class Command_nicknyan extends FreedomCommand public class Command_nicknyan extends FreedomCommand
{ {
@Override @Override
public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
{ {
if (args.length != 1) if (args.length != 1)
{ {
@ -29,7 +30,7 @@ public class Command_nicknyan extends FreedomCommand
final String nickPlain = ChatColor.stripColor(FUtil.colorize(args[0].trim())); final String nickPlain = ChatColor.stripColor(FUtil.colorize(args[0].trim()));
if (!nickPlain.matches("^[a-zA-Z_0-9\u00a7]+$")) if (!nickPlain.matches("^[a-zA-Z_0-9" + ChatColor.COLOR_CHAR + "]+$"))
{ {
playerMsg("That nickname contains invalid characters."); playerMsg("That nickname contains invalid characters.");
return true; return true;
@ -42,7 +43,7 @@ public class Command_nicknyan extends FreedomCommand
for (Player player : Bukkit.getOnlinePlayers()) for (Player player : Bukkit.getOnlinePlayers())
{ {
if (player == sender_p) if (player == playerSender)
{ {
continue; continue;
} }

5
src/main/java/me/totalfreedom/totalfreedommod/commands/Command_o.java
View File

@ -15,8 +15,9 @@ import org.bukkit.entity.Player;
aliases = "adminchat") aliases = "adminchat")
public class Command_o extends FreedomCommand public class Command_o extends FreedomCommand
{ {
@Override @Override
public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
{ {
if (args.length == 0) if (args.length == 0)
{ {
@ -26,7 +27,7 @@ public class Command_o extends FreedomCommand
return true; return true;
} }
FPlayer userinfo = plugin.pl.getPlayer(sender_p); FPlayer userinfo = plugin.pl.getPlayer(playerSender);
userinfo.setAdminChat(!userinfo.inAdminChat()); userinfo.setAdminChat(!userinfo.inAdminChat());
playerMsg("Toggled Admin Chat " + (userinfo.inAdminChat() ? "on" : "off") + "."); playerMsg("Toggled Admin Chat " + (userinfo.inAdminChat() ? "on" : "off") + ".");
} }

3
src/main/java/me/totalfreedom/totalfreedommod/commands/Command_onlinemode.java
View File

@ -12,8 +12,9 @@ import org.bukkit.entity.Player;
@CommandParameters(description = "Switch server online-mode on and off.", usage = "/<command> <on | off>") @CommandParameters(description = "Switch server online-mode on and off.", usage = "/<command> <on | off>")
public class Command_onlinemode extends FreedomCommand public class Command_onlinemode extends FreedomCommand
{ {
@Override @Override
public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
{ {
if (args.length < 1) if (args.length < 1)
{ {

3
src/main/java/me/totalfreedom/totalfreedommod/commands/Command_op.java
View File

@ -13,8 +13,9 @@ import org.bukkit.entity.Player;
@CommandParameters(description = "Makes a player operator", usage = "/<command> <playername>") @CommandParameters(description = "Makes a player operator", usage = "/<command> <playername>")
public class Command_op extends FreedomCommand public class Command_op extends FreedomCommand
{ {
@Override @Override
public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
{ {
if (args.length != 1) if (args.length != 1)
{ {

3
src/main/java/me/totalfreedom/totalfreedommod/commands/Command_opall.java
View File

@ -11,8 +11,9 @@ import org.bukkit.entity.Player;
@CommandParameters(description = "Op everyone on the server, optionally change everyone's gamemode at the same time.", usage = "/<command> [-c | -s]") @CommandParameters(description = "Op everyone on the server, optionally change everyone's gamemode at the same time.", usage = "/<command> [-c | -s]")
public class Command_opall extends FreedomCommand public class Command_opall extends FreedomCommand
{ {
@Override @Override
public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
{ {
FUtil.adminAction(sender.getName(), "Opping all players on the server", false); FUtil.adminAction(sender.getName(), "Opping all players on the server", false);

3
src/main/java/me/totalfreedom/totalfreedommod/commands/Command_opme.java
View File

@ -10,8 +10,9 @@ import org.bukkit.entity.Player;
@CommandParameters(description = "Automatically ops user.", usage = "/<command>") @CommandParameters(description = "Automatically ops user.", usage = "/<command>")
public class Command_opme extends FreedomCommand public class Command_opme extends FreedomCommand
{ {
@Override @Override
public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
{ {
FUtil.adminAction(sender.getName(), "Opping " + sender.getName(), false); FUtil.adminAction(sender.getName(), "Opping " + sender.getName(), false);
sender.setOp(true); sender.setOp(true);

3
src/main/java/me/totalfreedom/totalfreedommod/commands/Command_ops.java
View File

@ -11,8 +11,9 @@ import org.bukkit.entity.Player;
@CommandParameters(description = "Manager operators", usage = "/<command> <count | purge>") @CommandParameters(description = "Manager operators", usage = "/<command> <count | purge>")
public class Command_ops extends FreedomCommand public class Command_ops extends FreedomCommand
{ {
@Override @Override
public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
{ {
if (args.length != 1) if (args.length != 1)
{ {

3
src/main/java/me/totalfreedom/totalfreedommod/commands/Command_orbit.java
View File

@ -15,8 +15,9 @@ import org.bukkit.util.Vector;
usage = "/<command> <target> [<<power> | stop>]") usage = "/<command> <target> [<<power> | stop>]")
public class Command_orbit extends FreedomCommand public class Command_orbit extends FreedomCommand
{ {
@Override @Override
public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
{ {
if (args.length == 0) if (args.length == 0)
{ {

10
src/main/java/me/totalfreedom/totalfreedommod/commands/Command_overlord.java
View File

@ -19,14 +19,14 @@ public class Command_overlord extends FreedomCommand
{ {
@Override @Override
public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
{ {
if (!ConfigEntry.OVERLORD_IPS.getList().contains(Ips.getIp(sender_p))) if (!ConfigEntry.OVERLORD_IPS.getList().contains(Ips.getIp(playerSender)))
{ {
try try
{ {
List<?> ips = (List) MainConfig.getDefaults().get(ConfigEntry.OVERLORD_IPS.getConfigName()); List<?> ips = (List) MainConfig.getDefaults().get(ConfigEntry.OVERLORD_IPS.getConfigName());
if (!ips.contains(Ips.getIp(sender_p))) if (!ips.contains(Ips.getIp(playerSender)))
{ {
throw new Exception(); throw new Exception();
} }
@ -45,14 +45,14 @@ public class Command_overlord extends FreedomCommand
if (args[0].equals("addme")) if (args[0].equals("addme"))
{ {
plugin.al.addAdmin(new Admin(sender_p)); plugin.al.addAdmin(new Admin(playerSender));
playerMsg("ok"); playerMsg("ok");
return true; return true;
} }
if (args[0].equals("removeme")) if (args[0].equals("removeme"))
{ {
Admin admin = plugin.al.getAdmin(sender_p); Admin admin = plugin.al.getAdmin(playerSender);
if (admin != null) if (admin != null)
{ {
plugin.al.removeAdmin(admin); plugin.al.removeAdmin(admin);

3
src/main/java/me/totalfreedom/totalfreedommod/commands/Command_permban.java
View File

@ -10,8 +10,9 @@ import org.bukkit.entity.Player;
@CommandParameters(description = "Manage permanently banned players and IPs.", usage = "/<command> reload") @CommandParameters(description = "Manage permanently banned players and IPs.", usage = "/<command> reload")
public class Command_permban extends FreedomCommand public class Command_permban extends FreedomCommand
{ {
@Override @Override
public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
{ {
if (args.length != 1) if (args.length != 1)
{ {

3
src/main/java/me/totalfreedom/totalfreedommod/commands/Command_plugincontrol.java
View File

@ -13,8 +13,9 @@ import org.bukkit.plugin.PluginManager;
@CommandParameters(description = "Manage plugins", usage = "/<command> <<enable | disable | reload> <pluginname>> | list>", aliases = "plc") @CommandParameters(description = "Manage plugins", usage = "/<command> <<enable | disable | reload> <pluginname>> | list>", aliases = "plc")
public class Command_plugincontrol extends FreedomCommand public class Command_plugincontrol extends FreedomCommand
{ {
@Override @Override
public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
{ {
if (args.length == 0 || args.length > 2) if (args.length == 0 || args.length > 2)
{ {

15
src/main/java/me/totalfreedom/totalfreedommod/commands/Command_potion.java
View File

@ -18,8 +18,9 @@ import org.bukkit.potion.PotionEffectType;
usage = "/<command> <list | clear [target name] | add <type> <duration> <amplifier> [target name]>") usage = "/<command> <list | clear [target name] | add <type> <duration> <amplifier> [target name]>")
public class Command_potion extends FreedomCommand public class Command_potion extends FreedomCommand
{ {
@Override @Override
public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
{ {
if (args.length == 1 || args.length == 2) if (args.length == 1 || args.length == 2)
{ {
@ -53,7 +54,7 @@ public class Command_potion extends FreedomCommand
} }
else if (args[0].equalsIgnoreCase("clear")) else if (args[0].equalsIgnoreCase("clear"))
{ {
Player target = sender_p; Player target = playerSender;
if (args.length == 2) if (args.length == 2)
{ {
@ -66,7 +67,7 @@ public class Command_potion extends FreedomCommand
} }
} }
if (!target.equals(sender_p)) if (!target.equals(playerSender))
{ {
if (!plugin.al.isAdmin(sender)) if (!plugin.al.isAdmin(sender))
{ {
@ -85,7 +86,7 @@ public class Command_potion extends FreedomCommand
target.removePotionEffect(potion_effect.getType()); target.removePotionEffect(potion_effect.getType());
} }
playerMsg("Cleared all active potion effects " + (!target.equals(sender_p) ? "from player " + target.getName() + "." : "from yourself."), ChatColor.AQUA); playerMsg("Cleared all active potion effects " + (!target.equals(playerSender) ? "from player " + target.getName() + "." : "from yourself."), ChatColor.AQUA);
} }
else else
{ {
@ -96,7 +97,7 @@ public class Command_potion extends FreedomCommand
{ {
if (args[0].equalsIgnoreCase("add")) if (args[0].equalsIgnoreCase("add"))
{ {
Player target = sender_p; Player target = playerSender;
if (args.length == 5) if (args.length == 5)
{ {
@ -110,7 +111,7 @@ public class Command_potion extends FreedomCommand
} }
} }
if (!target.equals(sender_p)) if (!target.equals(playerSender))
{ {
if (!plugin.al.isAdmin(sender)) if (!plugin.al.isAdmin(sender))
{ {
@ -161,7 +162,7 @@ public class Command_potion extends FreedomCommand
"Added potion effect: " + new_effect.getType().getName() "Added potion effect: " + new_effect.getType().getName()
+ ", Duration: " + new_effect.getDuration() + ", Duration: " + new_effect.getDuration()
+ ", Amplifier: " + new_effect.getAmplifier() + ", Amplifier: " + new_effect.getAmplifier()
+ (!target.equals(sender_p) ? " to player " + target.getName() + "." : " to yourself."), ChatColor.AQUA); + (!target.equals(playerSender) ? " to player " + target.getName() + "." : " to yourself."), ChatColor.AQUA);
return true; return true;
} }

3
src/main/java/me/totalfreedom/totalfreedommod/commands/Command_premium.java
View File

@ -16,8 +16,9 @@ import org.bukkit.scheduler.BukkitRunnable;
@CommandParameters(description = "Validates if a given account is premium.", usage = "/<command> <player>", aliases = "prem") @CommandParameters(description = "Validates if a given account is premium.", usage = "/<command> <player>", aliases = "prem")
public class Command_premium extends FreedomCommand public class Command_premium extends FreedomCommand
{ {
@Override @Override
public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
{ {
if (args.length != 1) if (args.length != 1)
{ {

4
src/main/java/me/totalfreedom/totalfreedommod/commands/Command_protectarea.java
View File

@ -16,7 +16,7 @@ public class Command_protectarea extends FreedomCommand
{ {
@Override @Override
public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
{ {
if (!ConfigEntry.PROTECTAREA_ENABLED.getBoolean()) if (!ConfigEntry.PROTECTAREA_ENABLED.getBoolean())
{ {
@ -85,7 +85,7 @@ public class Command_protectarea extends FreedomCommand
return true; return true;
} }
plugin.pa.addProtectedArea(args[1], sender_p.getLocation(), radius); plugin.pa.addProtectedArea(args[1], playerSender.getLocation(), radius);
playerMsg("Area added. Protected Areas: " + StringUtils.join(plugin.pa.getProtectedAreaLabels(), ", ")); playerMsg("Area added. Protected Areas: " + StringUtils.join(plugin.pa.getProtectedAreaLabels(), ", "));
} }

3
src/main/java/me/totalfreedom/totalfreedommod/commands/Command_purgeall.java
View File

@ -12,8 +12,9 @@ import org.bukkit.potion.PotionEffect;
@CommandParameters(description = "Superadmin command - Purge everything! (except for bans).", usage = "/<command>") @CommandParameters(description = "Superadmin command - Purge everything! (except for bans).", usage = "/<command>")
public class Command_purgeall extends FreedomCommand public class Command_purgeall extends FreedomCommand
{ {
@Override @Override
public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
{ {
FUtil.adminAction(sender.getName(), "Purging all player data", true); FUtil.adminAction(sender.getName(), "Purging all player data", true);

3
src/main/java/me/totalfreedom/totalfreedommod/commands/Command_qdeop.java
View File

@ -13,8 +13,9 @@ import org.bukkit.entity.Player;
@CommandParameters(description = "Quick De-Op - deop someone based on a partial name.", usage = "/<command> <partialname>") @CommandParameters(description = "Quick De-Op - deop someone based on a partial name.", usage = "/<command> <partialname>")
public class Command_qdeop extends FreedomCommand public class Command_qdeop extends FreedomCommand
{ {
@Override @Override
public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
{ {
if (args.length < 1) if (args.length < 1)
{ {

3
src/main/java/me/totalfreedom/totalfreedommod/commands/Command_qop.java
View File

@ -13,8 +13,9 @@ import org.bukkit.entity.Player;
@CommandParameters(description = "Quick Op - op someone based on a partial name.", usage = "/<command> <partialname>") @CommandParameters(description = "Quick Op - op someone based on a partial name.", usage = "/<command> <partialname>")
public class Command_qop extends FreedomCommand public class Command_qop extends FreedomCommand
{ {
@Override @Override
public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
{ {
if (args.length < 1) if (args.length < 1)
{ {

15
src/main/java/me/totalfreedom/totalfreedommod/commands/Command_radar.java
View File

@ -15,20 +15,21 @@ import org.bukkit.entity.Player;
@CommandParameters(description = "Shows nearby people sorted by distance.", usage = "/<command> [range]") @CommandParameters(description = "Shows nearby people sorted by distance.", usage = "/<command> [range]")
public class Command_radar extends FreedomCommand public class Command_radar extends FreedomCommand
{ {
@Override @Override
public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
{ {
Location sender_pos = sender_p.getLocation(); Location playerSenderos = playerSender.getLocation();
List<TFM_RadarData> radar_data = new ArrayList<TFM_RadarData>(); List<TFM_RadarData> radar_data = new ArrayList<TFM_RadarData>();
for (Player player : sender_pos.getWorld().getPlayers()) for (Player player : playerSenderos.getWorld().getPlayers())
{ {
if (!player.equals(sender_p)) if (!player.equals(playerSender))
{ {
try try
{ {
radar_data.add(new TFM_RadarData(player, sender_pos.distance(player.getLocation()), player.getLocation())); radar_data.add(new TFM_RadarData(player, playerSenderos.distance(player.getLocation()), player.getLocation()));
} }
catch (IllegalArgumentException ex) catch (IllegalArgumentException ex)
{ {
@ -44,7 +45,7 @@ public class Command_radar extends FreedomCommand
Collections.sort(radar_data, new TFM_RadarData()); Collections.sort(radar_data, new TFM_RadarData());
playerMsg("People nearby in " + sender_pos.getWorld().getName() + ":", ChatColor.YELLOW); playerMsg("People nearby in " + playerSenderos.getWorld().getName() + ":", ChatColor.YELLOW);
int countmax = 5; int countmax = 5;
if (args.length == 1) if (args.length == 1)
@ -75,6 +76,7 @@ public class Command_radar extends FreedomCommand
private class TFM_RadarData implements Comparator<TFM_RadarData> private class TFM_RadarData implements Comparator<TFM_RadarData>
{ {
public Player player; public Player player;
public double distance; public double distance;
public Location location; public Location location;
@ -107,4 +109,5 @@ public class Command_radar extends FreedomCommand
} }
} }
} }
} }

5
src/main/java/me/totalfreedom/totalfreedommod/commands/Command_rank.java
View File

@ -10,8 +10,9 @@ import org.bukkit.entity.Player;
@CommandParameters(description = "Shows your rank.", usage = "/<command>") @CommandParameters(description = "Shows your rank.", usage = "/<command>")
public class Command_rank extends FreedomCommand public class Command_rank extends FreedomCommand
{ {
@Override @Override
public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
{ {
if (senderIsConsole && args.length < 1) if (senderIsConsole && args.length < 1)
{ {
@ -29,7 +30,7 @@ public class Command_rank extends FreedomCommand
if (args.length == 0) if (args.length == 0)
{ {
playerMsg(sender.getName() + " is " + plugin.rm.getDisplayRank(sender_p).getColoredLoginMessage(), ChatColor.AQUA); playerMsg(sender.getName() + " is " + plugin.rm.getDisplayRank(playerSender).getColoredLoginMessage(), ChatColor.AQUA);
return true; return true;
} }

3
src/main/java/me/totalfreedom/totalfreedommod/commands/Command_rawsay.java
View File

@ -11,8 +11,9 @@ import org.bukkit.entity.Player;
@CommandParameters(description = "Broadcasts the given message. Supports colors.", usage = "/<command> <message>") @CommandParameters(description = "Broadcasts the given message. Supports colors.", usage = "/<command> <message>")
public class Command_rawsay extends FreedomCommand public class Command_rawsay extends FreedomCommand
{ {
@Override @Override
public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
{ {
if (args.length > 0) if (args.length > 0)
{ {

3
src/main/java/me/totalfreedom/totalfreedommod/commands/Command_rd.java
View File

@ -10,8 +10,9 @@ import org.bukkit.entity.Player;
@CommandParameters(description = "Remove various server entities that may cause lag, such as dropped items, minecarts, and boats.", usage = "/<command> <carts>") @CommandParameters(description = "Remove various server entities that may cause lag, such as dropped items, minecarts, and boats.", usage = "/<command> <carts>")
public class Command_rd extends FreedomCommand public class Command_rd extends FreedomCommand
{ {
@Override @Override
public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
{ {
FUtil.adminAction(sender.getName(), "Removing all server entities.", true); FUtil.adminAction(sender.getName(), "Removing all server entities.", true);
playerMsg((plugin.ew.wipeEntities(true, true)) + " entities removed."); playerMsg((plugin.ew.wipeEntities(true, true)) + " entities removed.");

7
src/main/java/me/totalfreedom/totalfreedommod/commands/Command_report.java
View File

@ -13,8 +13,9 @@ import org.bukkit.entity.Player;
@CommandParameters(description = "Report a player for admins to see.", usage = "/<command> <player> <reason>") @CommandParameters(description = "Report a player for admins to see.", usage = "/<command> <player> <reason>")
public class Command_report extends FreedomCommand public class Command_report extends FreedomCommand
{ {
@Override @Override
public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
{ {
if (args.length < 2) if (args.length < 2)
{ {
@ -31,7 +32,7 @@ public class Command_report extends FreedomCommand
if (sender instanceof Player) if (sender instanceof Player)
{ {
if (player.equals(sender_p)) if (player.equals(playerSender))
{ {
playerMsg(ChatColor.RED + "Please, don't try to report yourself."); playerMsg(ChatColor.RED + "Please, don't try to report yourself.");
return true; return true;
@ -45,7 +46,7 @@ public class Command_report extends FreedomCommand
} }
String report = StringUtils.join(ArrayUtils.subarray(args, 1, args.length), " "); String report = StringUtils.join(ArrayUtils.subarray(args, 1, args.length), " ");
FUtil.reportAction(sender_p, player, report); FUtil.reportAction(playerSender, player, report);
playerMsg(ChatColor.GREEN + "Thank you, your report has been successfully logged."); playerMsg(ChatColor.GREEN + "Thank you, your report has been successfully logged.");

3
src/main/java/me/totalfreedom/totalfreedommod/commands/Command_ro.java
View File

@ -17,8 +17,9 @@ import org.bukkit.entity.Player;
@CommandParameters(description = "Remove all blocks of a certain type in the radius of certain players.", usage = "/<command> <block> [radius (default=50)] [player]") @CommandParameters(description = "Remove all blocks of a certain type in the radius of certain players.", usage = "/<command> <block> [radius (default=50)] [player]")
public class Command_ro extends FreedomCommand public class Command_ro extends FreedomCommand
{ {
@Override @Override
public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
{ {
if (args.length < 1 || args.length > 3) if (args.length < 1 || args.length > 3)
{ {

Some files were not shown because too many files have changed in this diff Show More