SpigotMC/Saber-Factions
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Java 7 and make intellij happy

Browse Source
This commit is contained in:
Trent Hensler
2017-12-19 02:18:13 -08:00
parent ce132ed033
commit 3b644cd6c3
53 changed files with 222 additions and 285 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/massivecraft/factions/cmd/CmdAutoHelp.java
View File

@@ -27,7 +27,7 @@ public class CmdAutoHelp extends MCommand<P> {
}
MCommand<?> pcmd = this.commandChain.get(this.commandChain.size() - 1);
ArrayList<String> lines = new ArrayList<String>();
ArrayList<String> lines = new ArrayList<>();
lines.addAll(pcmd.helpLong);

48
src/main/java/com/massivecraft/factions/cmd/CmdConfig.java
View File

@@ -16,7 +16,7 @@ import java.util.Set;
public class CmdConfig extends FCommand {
private static HashMap<String, String> properFieldNames = new HashMap<String, String>();
private static HashMap<String, String> properFieldNames = new HashMap<>();
public CmdConfig() {
super();
@@ -41,8 +41,8 @@ public class CmdConfig extends FCommand {
// that way, if the person using this command messes up the capitalization, we can fix that
if (properFieldNames.isEmpty()) {
Field[] fields = Conf.class.getDeclaredFields();
for (int i = 0; i < fields.length; i++) {
properFieldNames.put(fields[i].getName().toLowerCase(), fields[i].getName());
for (Field field : fields) {
properFieldNames.put(field.getName().toLowerCase(), field.getName());
}
}
@@ -59,9 +59,9 @@ public class CmdConfig extends FCommand {
String success;
String value = args.get(1);
StringBuilder value = new StringBuilder(args.get(1));
for (int i = 2; i < args.size(); i++) {
value += ' ' + args.get(i);
value.append(' ').append(args.get(i));
}
try {
@@ -69,7 +69,7 @@ public class CmdConfig extends FCommand {
// boolean
if (target.getType() == boolean.class) {
boolean targetValue = this.strAsBool(value);
boolean targetValue = this.strAsBool(value.toString());
target.setBoolean(null, targetValue);
if (targetValue) {
@@ -82,7 +82,7 @@ public class CmdConfig extends FCommand {
// int
else if (target.getType() == int.class) {
try {
int intVal = Integer.parseInt(value);
int intVal = Integer.parseInt(value.toString());
target.setInt(null, intVal);
success = "\"" + fieldName + TL.COMMAND_CONFIG_OPTIONSET.toString() + intVal + ".";
} catch (NumberFormatException ex) {
@@ -94,7 +94,7 @@ public class CmdConfig extends FCommand {
// long
else if (target.getType() == long.class) {
try {
long longVal = Long.parseLong(value);
long longVal = Long.parseLong(value.toString());
target.setLong(null, longVal);
success = "\"" + fieldName + TL.COMMAND_CONFIG_OPTIONSET.toString() + longVal + ".";
} catch (NumberFormatException ex) {
@@ -106,7 +106,7 @@ public class CmdConfig extends FCommand {
// double
else if (target.getType() == double.class) {
try {
double doubleVal = Double.parseDouble(value);
double doubleVal = Double.parseDouble(value.toString());
target.setDouble(null, doubleVal);
success = "\"" + fieldName + TL.COMMAND_CONFIG_OPTIONSET.toString() + doubleVal + ".";
} catch (NumberFormatException ex) {
@@ -118,7 +118,7 @@ public class CmdConfig extends FCommand {
// float
else if (target.getType() == float.class) {
try {
float floatVal = Float.parseFloat(value);
float floatVal = Float.parseFloat(value.toString());
target.setFloat(null, floatVal);
success = "\"" + fieldName + TL.COMMAND_CONFIG_OPTIONSET.toString() + floatVal + ".";
} catch (NumberFormatException ex) {
@@ -129,7 +129,7 @@ public class CmdConfig extends FCommand {
// String
else if (target.getType() == String.class) {
target.set(null, value);
target.set(null, value.toString());
success = "\"" + fieldName + TL.COMMAND_CONFIG_OPTIONSET.toString() + value + "\".";
}
@@ -137,16 +137,16 @@ public class CmdConfig extends FCommand {
else if (target.getType() == ChatColor.class) {
ChatColor newColor = null;
try {
newColor = ChatColor.valueOf(value.toUpperCase());
newColor = ChatColor.valueOf(value.toString().toUpperCase());
} catch (IllegalArgumentException ex) {
}
if (newColor == null) {
sendMessage(TL.COMMAND_CONFIG_INVALID_COLOUR.format(fieldName, value.toUpperCase()));
sendMessage(TL.COMMAND_CONFIG_INVALID_COLOUR.format(fieldName, value.toString().toUpperCase()));
return;
}
target.set(null, newColor);
success = "\"" + fieldName + TL.COMMAND_CONFIG_COLOURSET.toString() + value.toUpperCase() + "\".";
success = "\"" + fieldName + TL.COMMAND_CONFIG_COLOURSET.toString() + value.toString().toUpperCase() + "\".";
}
// Set<?> or other parameterized collection
@@ -164,12 +164,12 @@ public class CmdConfig extends FCommand {
else if (innerType == Material.class) {
Material newMat = null;
try {
newMat = Material.valueOf(value.toUpperCase());
newMat = Material.valueOf(value.toString().toUpperCase());
} catch (IllegalArgumentException ex) {
}
if (newMat == null) {
sendMessage(TL.COMMAND_CONFIG_INVALID_MATERIAL.format(fieldName, value.toUpperCase()));
sendMessage(TL.COMMAND_CONFIG_INVALID_MATERIAL.format(fieldName, value.toString().toUpperCase()));
return;
}
@@ -179,13 +179,13 @@ public class CmdConfig extends FCommand {
if (matSet.contains(newMat)) {
matSet.remove(newMat);
target.set(null, matSet);
success = TL.COMMAND_CONFIG_MATERIAL_REMOVED.format(fieldName, value.toUpperCase());
success = TL.COMMAND_CONFIG_MATERIAL_REMOVED.format(fieldName, value.toString().toUpperCase());
}
// Material not present yet, add it
else {
matSet.add(newMat);
target.set(null, matSet);
success = TL.COMMAND_CONFIG_MATERIAL_ADDED.format(fieldName, value.toUpperCase());
success = TL.COMMAND_CONFIG_MATERIAL_ADDED.format(fieldName, value.toString().toUpperCase());
}
}
@@ -194,16 +194,16 @@ public class CmdConfig extends FCommand {
@SuppressWarnings("unchecked") Set<String> stringSet = (Set<String>) target.get(null);
// String already present, so remove it
if (stringSet.contains(value)) {
stringSet.remove(value);
if (stringSet.contains(value.toString())) {
stringSet.remove(value.toString());
target.set(null, stringSet);
success = TL.COMMAND_CONFIG_SET_REMOVED.format(fieldName, value);
success = TL.COMMAND_CONFIG_SET_REMOVED.format(fieldName, value.toString());
}
// String not present yet, add it
else {
stringSet.add(value);
stringSet.add(value.toString());
target.set(null, stringSet);
success = TL.COMMAND_CONFIG_SET_ADDED.format(fieldName, value);
success = TL.COMMAND_CONFIG_SET_ADDED.format(fieldName, value.toString());
}
}
@@ -223,7 +223,7 @@ public class CmdConfig extends FCommand {
sendMessage(TL.COMMAND_CONFIG_ERROR_MATCHING.format(fieldName));
return;
} catch (IllegalAccessException ex) {
sendMessage(TL.COMMAND_CONFIG_ERROR_SETTING.format(fieldName, value));
sendMessage(TL.COMMAND_CONFIG_ERROR_SETTING.format(fieldName, value.toString()));
return;
}

2
src/main/java/com/massivecraft/factions/cmd/CmdDisband.java
View File

@@ -37,7 +37,7 @@ public class CmdDisband extends FCommand {
return;
}
boolean isMyFaction = fme == null ? false : faction == myFaction;
boolean isMyFaction = fme != null && faction == myFaction;
if (isMyFaction) {
if (!assertMinRole(Role.ADMIN)) {

26
src/main/java/com/massivecraft/factions/cmd/CmdHelp.java
View File

@@ -53,7 +53,7 @@ public class CmdHelp extends FCommand {
ConfigurationSection help = P.p.getConfig().getConfigurationSection("help");
if (help == null) {
help = P.p.getConfig().createSection("help"); // create new help section
List<String> error = new ArrayList<String>();
List<String> error = new ArrayList<>();
error.add("&cUpdate help messages in config.yml!");
error.add("&cSet use-old-help for legacy help messages");
help.set("'1'", error); // add default error messages
@@ -76,10 +76,10 @@ public class CmdHelp extends FCommand {
public ArrayList<ArrayList<String>> helpPages;
public void updateHelp() {
helpPages = new ArrayList<ArrayList<String>>();
helpPages = new ArrayList<>();
ArrayList<String> pageLines;
pageLines = new ArrayList<String>();
pageLines = new ArrayList<>();
pageLines.add(p.cmdBase.cmdHelp.getUseageTemplate(true));
pageLines.add(p.cmdBase.cmdList.getUseageTemplate(true));
pageLines.add(p.cmdBase.cmdShow.getUseageTemplate(true));
@@ -92,7 +92,7 @@ public class CmdHelp extends FCommand {
pageLines.add(p.txt.parse(TL.COMMAND_HELP_NEXTCREATE.toString()));
helpPages.add(pageLines);
pageLines = new ArrayList<String>();
pageLines = new ArrayList<>();
pageLines.add(p.cmdBase.cmdCreate.getUseageTemplate(true));
pageLines.add(p.cmdBase.cmdDescription.getUseageTemplate(true));
pageLines.add(p.cmdBase.cmdTag.getUseageTemplate(true));
@@ -105,7 +105,7 @@ public class CmdHelp extends FCommand {
helpPages.add(pageLines);
if (Econ.isSetup() && Conf.econEnabled && Conf.bankEnabled) {
pageLines = new ArrayList<String>();
pageLines = new ArrayList<>();
pageLines.add("");
pageLines.add(p.txt.parse(TL.COMMAND_HELP_BANK_1.toString()));
pageLines.add(p.txt.parse(TL.COMMAND_HELP_BANK_2.toString()));
@@ -118,7 +118,7 @@ public class CmdHelp extends FCommand {
helpPages.add(pageLines);
}
pageLines = new ArrayList<String>();
pageLines = new ArrayList<>();
pageLines.add(p.cmdBase.cmdClaim.getUseageTemplate(true));
pageLines.add(p.cmdBase.cmdAutoClaim.getUseageTemplate(true));
pageLines.add(p.cmdBase.cmdUnclaim.getUseageTemplate(true));
@@ -133,7 +133,7 @@ public class CmdHelp extends FCommand {
pageLines.add(p.txt.parse(TL.COMMAND_HELP_PLAYERTITLES.toString()));
helpPages.add(pageLines);
pageLines = new ArrayList<String>();
pageLines = new ArrayList<>();
pageLines.add(p.cmdBase.cmdMap.getUseageTemplate(true));
pageLines.add(p.cmdBase.cmdBoom.getUseageTemplate(true));
pageLines.add(p.cmdBase.cmdOwner.getUseageTemplate(true));
@@ -143,7 +143,7 @@ public class CmdHelp extends FCommand {
pageLines.add(p.txt.parse(TL.COMMAND_HELP_OWNERSHIP_3.toString()));
helpPages.add(pageLines);
pageLines = new ArrayList<String>();
pageLines = new ArrayList<>();
pageLines.add(p.cmdBase.cmdDisband.getUseageTemplate(true));
pageLines.add("");
pageLines.add(p.cmdBase.cmdRelationAlly.getUseageTemplate(true));
@@ -155,7 +155,7 @@ public class CmdHelp extends FCommand {
pageLines.add(p.txt.parse(TL.COMMAND_HELP_RELATIONS_4.toString()));
helpPages.add(pageLines);
pageLines = new ArrayList<String>();
pageLines = new ArrayList<>();
pageLines.add(p.txt.parse(TL.COMMAND_HELP_RELATIONS_5.toString()));
pageLines.add(p.txt.parse(TL.COMMAND_HELP_RELATIONS_6.toString()));
pageLines.add(p.txt.parse(TL.COMMAND_HELP_RELATIONS_7.toString()));
@@ -167,7 +167,7 @@ public class CmdHelp extends FCommand {
pageLines.add(p.txt.parse(TL.COMMAND_HELP_RELATIONS_13.toString()));
helpPages.add(pageLines);
pageLines = new ArrayList<String>();
pageLines = new ArrayList<>();
pageLines.add(p.txt.parse(TL.COMMAND_HELP_PERMISSIONS_1.toString()));
pageLines.add(p.txt.parse(TL.COMMAND_HELP_PERMISSIONS_2.toString()));
pageLines.add(p.txt.parse(TL.COMMAND_HELP_PERMISSIONS_3.toString()));
@@ -179,7 +179,7 @@ public class CmdHelp extends FCommand {
pageLines.add(p.txt.parse(TL.COMMAND_HELP_PERMISSIONS_9.toString()));
helpPages.add(pageLines);
pageLines = new ArrayList<String>();
pageLines = new ArrayList<>();
pageLines.add(TL.COMMAND_HELP_MOAR_1.toString());
pageLines.add(p.cmdBase.cmdBypass.getUseageTemplate(true));
pageLines.add(p.txt.parse(TL.COMMAND_HELP_ADMIN_1.toString()));
@@ -192,7 +192,7 @@ public class CmdHelp extends FCommand {
pageLines.add(p.cmdBase.cmdPeaceful.getUseageTemplate(true));
helpPages.add(pageLines);
pageLines = new ArrayList<String>();
pageLines = new ArrayList<>();
pageLines.add(p.txt.parse(TL.COMMAND_HELP_MOAR_2.toString()));
pageLines.add(p.cmdBase.cmdChatSpy.getUseageTemplate(true));
pageLines.add(p.cmdBase.cmdPermanent.getUseageTemplate(true));
@@ -201,7 +201,7 @@ public class CmdHelp extends FCommand {
pageLines.add(p.cmdBase.cmdConfig.getUseageTemplate(true));
helpPages.add(pageLines);
pageLines = new ArrayList<String>();
pageLines = new ArrayList<>();
pageLines.add(p.txt.parse(TL.COMMAND_HELP_MOAR_3.toString()));
pageLines.add(p.cmdBase.cmdLock.getUseageTemplate(true));
pageLines.add(p.cmdBase.cmdReload.getUseageTemplate(true));

2
src/main/java/com/massivecraft/factions/cmd/CmdHome.java
View File

@@ -116,7 +116,7 @@ public class CmdHome extends FCommand {
public void run() {
// Create a smoke effect
if (Conf.homesTeleportCommandSmokeEffectEnabled) {
List<Location> smokeLocations = new ArrayList<Location>();
List<Location> smokeLocations = new ArrayList<>();
smokeLocations.add(loc);
smokeLocations.add(loc.add(0, 1, 0));
smokeLocations.add(CmdHome.this.myFaction.getHome());

2
src/main/java/com/massivecraft/factions/cmd/CmdList.java
View File

@@ -91,7 +91,7 @@ public class CmdList extends FCommand {
}
});
ArrayList<String> lines = new ArrayList<String>();
ArrayList<String> lines = new ArrayList<>();
factionList.add(0, Factions.getInstance().getNone());

1
src/main/java/com/massivecraft/factions/cmd/CmdSetMaxVaults.java
View File

@@ -1,7 +1,6 @@
package com.massivecraft.factions.cmd;
import com.massivecraft.factions.Faction;
import com.massivecraft.factions.P;
import com.massivecraft.factions.struct.Permission;
import com.massivecraft.factions.zcore.util.TL;
import org.bukkit.ChatColor;

2
src/main/java/com/massivecraft/factions/cmd/CmdShow.java
View File

@@ -14,7 +14,7 @@ import java.util.List;
public class CmdShow extends FCommand {
List<String> defaults = new ArrayList<String>();
List<String> defaults = new ArrayList<>();
public CmdShow() {
this.aliases.add("show");

2
src/main/java/com/massivecraft/factions/cmd/CmdStatus.java
View File

@@ -25,7 +25,7 @@ public class CmdStatus extends FCommand {
@Override
public void perform() {
ArrayList<String> ret = new ArrayList<String>();
ArrayList<String> ret = new ArrayList<>();
for (FPlayer fp : myFaction.getFPlayers()) {
String humanized = DurationFormatUtils.formatDurationWords(System.currentTimeMillis() - fp.getLastLoginTime(), true, true) + TL.COMMAND_STATUS_AGOSUFFIX;
String last = fp.isOnline() ? ChatColor.GREEN + TL.COMMAND_STATUS_ONLINE.toString() : (System.currentTimeMillis() - fp.getLastLoginTime() < 432000000 ? ChatColor.YELLOW + humanized : ChatColor.RED + humanized);

2
src/main/java/com/massivecraft/factions/cmd/CmdTop.java
View File

@@ -140,7 +140,7 @@ public class CmdTop extends FCommand {
msg(TL.COMMAND_TOP_INVALID, criteria);
}
ArrayList<String> lines = new ArrayList<String>();
ArrayList<String> lines = new ArrayList<>();
final int pageheight = 9;
int pagenumber = this.argAsInt(1, 1);

2
src/main/java/com/massivecraft/factions/cmd/CmdVault.java
View File

@@ -8,8 +8,6 @@ import com.drtshock.playervaults.vaultmanagement.VaultViewInfo;
import com.massivecraft.factions.Conf;
import com.massivecraft.factions.struct.Permission;
import com.massivecraft.factions.zcore.util.TL;
import org.bukkit.Bukkit;
import org.bukkit.OfflinePlayer;
import org.bukkit.configuration.file.YamlConfiguration;
import org.bukkit.entity.Player;