mirror of
https://github.com/BentoBoxWorld/BentoBox.git
synced 2024-09-28 14:47:30 +02:00
Code smell reduction
This commit is contained in:
parent
458ea6b027
commit
54bc554763
@ -37,10 +37,10 @@ public class AdminDeathsAddCommand extends CompositeCommand {
|
||||
UUID targetUUID = Util.getUUID(args.get(0));
|
||||
if (targetUUID == null) {
|
||||
user.sendMessage("general.errors.unknown-player", TextVariables.NAME, args.get(0));
|
||||
} else if (!Util.isInteger(args.get(1), true) || Integer.valueOf(args.get(1)) < 0) {
|
||||
} else if (!Util.isInteger(args.get(1), true) || Integer.parseInt(args.get(1)) < 0) {
|
||||
user.sendMessage("general.errors.must-be-positive-number", TextVariables.NUMBER, args.get(1));
|
||||
} else {
|
||||
getPlayers().setDeaths(getWorld(), targetUUID, getPlayers().getDeaths(getWorld(), targetUUID) + Integer.valueOf(args.get(1)));
|
||||
getPlayers().setDeaths(getWorld(), targetUUID, getPlayers().getDeaths(getWorld(), targetUUID) + Integer.parseInt(args.get(1)));
|
||||
user.sendMessage("commands.admin.deaths.add.success",
|
||||
TextVariables.NAME, args.get(0), TextVariables.NUMBER, args.get(1),
|
||||
"[total]", String.valueOf(getPlayers().getDeaths(getWorld(), targetUUID)));
|
||||
|
@ -37,11 +37,11 @@ public class AdminDeathsRemoveCommand extends CompositeCommand {
|
||||
UUID targetUUID = Util.getUUID(args.get(0));
|
||||
if (targetUUID == null) {
|
||||
user.sendMessage("general.errors.unknown-player", TextVariables.NAME, args.get(0));
|
||||
} else if (!Util.isInteger(args.get(1), true) || Integer.valueOf(args.get(1)) < 0) {
|
||||
} else if (!Util.isInteger(args.get(1), true) || Integer.parseInt(args.get(1)) < 0) {
|
||||
user.sendMessage("general.errors.must-be-positive-number", TextVariables.NUMBER, args.get(1));
|
||||
} else {
|
||||
// Make sure it cannot go under 0.
|
||||
int newDeaths = Math.max(getPlayers().getDeaths(getWorld(), targetUUID) - Integer.valueOf(args.get(1)), 0);
|
||||
int newDeaths = Math.max(getPlayers().getDeaths(getWorld(), targetUUID) - Integer.parseInt(args.get(1)), 0);
|
||||
getPlayers().setDeaths(getWorld(), targetUUID, newDeaths);
|
||||
user.sendMessage("commands.admin.deaths.remove.success",
|
||||
TextVariables.NAME, args.get(0), TextVariables.NUMBER, args.get(1),
|
||||
|
@ -36,10 +36,10 @@ public class AdminDeathsSetCommand extends CompositeCommand {
|
||||
UUID targetUUID = Util.getUUID(args.get(0));
|
||||
if (targetUUID == null) {
|
||||
user.sendMessage("general.errors.unknown-player", TextVariables.NAME, args.get(0));
|
||||
} else if (!Util.isInteger(args.get(1), true) || Integer.valueOf(args.get(1)) < 0) {
|
||||
} else if (!Util.isInteger(args.get(1), true) || Integer.parseInt(args.get(1)) < 0) {
|
||||
user.sendMessage("general.errors.must-be-positive-number", TextVariables.NUMBER, args.get(1));
|
||||
} else {
|
||||
getPlayers().setDeaths(getWorld(), targetUUID, Integer.valueOf(args.get(1)));
|
||||
getPlayers().setDeaths(getWorld(), targetUUID, Integer.parseInt(args.get(1)));
|
||||
user.sendMessage("commands.admin.deaths.set.success", TextVariables.NAME, args.get(0), TextVariables.NUMBER, args.get(1));
|
||||
return true;
|
||||
}
|
||||
|
@ -47,13 +47,13 @@ public class AdminRangeAddCommand extends CompositeCommand {
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!Util.isInteger(args.get(1), true) || Integer.valueOf(args.get(1)) < 0) {
|
||||
if (!Util.isInteger(args.get(1), true) || Integer.parseInt(args.get(1)) < 0) {
|
||||
user.sendMessage("general.errors.must-be-positive-number", TextVariables.NUMBER, args.get(1));
|
||||
return false;
|
||||
}
|
||||
|
||||
Island island = getIslands().getIsland(getWorld(), targetUUID);
|
||||
int newRange = island.getProtectionRange() + Integer.valueOf(args.get(1));
|
||||
int newRange = island.getProtectionRange() + Integer.parseInt(args.get(1));
|
||||
|
||||
if (newRange > island.getRange()) {
|
||||
user.sendMessage("commands.admin.range.invalid-value.too-high", TextVariables.NUMBER, String.valueOf(island.getRange()));
|
||||
|
@ -47,13 +47,13 @@ public class AdminRangeRemoveCommand extends CompositeCommand {
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!Util.isInteger(args.get(1), true) || Integer.valueOf(args.get(1)) < 0) {
|
||||
if (!Util.isInteger(args.get(1), true) || Integer.parseInt(args.get(1)) < 0) {
|
||||
user.sendMessage("general.errors.must-be-positive-number", TextVariables.NUMBER, args.get(1));
|
||||
return false;
|
||||
}
|
||||
|
||||
Island island = getIslands().getIsland(getWorld(), targetUUID);
|
||||
int newRange = island.getProtectionRange() - Integer.valueOf(args.get(1));
|
||||
int newRange = island.getProtectionRange() - Integer.parseInt(args.get(1));
|
||||
|
||||
if (newRange <= 1) {
|
||||
user.sendMessage("commands.admin.range.invalid-value.too-low", TextVariables.NUMBER, String.valueOf(island.getRange()));
|
||||
|
@ -37,10 +37,10 @@ public class AdminResetsAddCommand extends CompositeCommand {
|
||||
UUID targetUUID = Util.getUUID(args.get(0));
|
||||
if (targetUUID == null) {
|
||||
user.sendMessage("general.errors.unknown-player", TextVariables.NAME, args.get(0));
|
||||
} else if (!Util.isInteger(args.get(1), true) || Integer.valueOf(args.get(1)) < 0) {
|
||||
} else if (!Util.isInteger(args.get(1), true) || Integer.parseInt(args.get(1)) < 0) {
|
||||
user.sendMessage("general.errors.must-be-positive-number", TextVariables.NUMBER, args.get(1));
|
||||
} else {
|
||||
getPlayers().setResets(getWorld(), targetUUID, getPlayers().getResets(getWorld(), targetUUID) + Integer.valueOf(args.get(1)));
|
||||
getPlayers().setResets(getWorld(), targetUUID, getPlayers().getResets(getWorld(), targetUUID) + Integer.parseInt(args.get(1)));
|
||||
user.sendMessage("commands.admin.resets.add.success",
|
||||
TextVariables.NAME, args.get(0), TextVariables.NUMBER, args.get(1),
|
||||
"[total]", String.valueOf(getPlayers().getResets(getWorld(), targetUUID)));
|
||||
|
@ -37,11 +37,11 @@ public class AdminResetsRemoveCommand extends CompositeCommand {
|
||||
UUID targetUUID = Util.getUUID(args.get(0));
|
||||
if (targetUUID == null) {
|
||||
user.sendMessage("general.errors.unknown-player", TextVariables.NAME, args.get(0));
|
||||
} else if (!Util.isInteger(args.get(1), true) || Integer.valueOf(args.get(1)) < 0) {
|
||||
} else if (!Util.isInteger(args.get(1), true) || Integer.parseInt(args.get(1)) < 0) {
|
||||
user.sendMessage("general.errors.must-be-positive-number", TextVariables.NUMBER, args.get(1));
|
||||
} else {
|
||||
// Make sure it cannot go under 0.
|
||||
int newResets = Math.max(getPlayers().getResets(getWorld(), targetUUID) - Integer.valueOf(args.get(1)), 0);
|
||||
int newResets = Math.max(getPlayers().getResets(getWorld(), targetUUID) - Integer.parseInt(args.get(1)), 0);
|
||||
getPlayers().setResets(getWorld(), targetUUID, newResets);
|
||||
user.sendMessage("commands.admin.resets.remove.success",
|
||||
TextVariables.NAME, args.get(0), TextVariables.NUMBER, args.get(1),
|
||||
|
@ -31,10 +31,10 @@ public class AdminResetsSetCommand extends CompositeCommand {
|
||||
UUID targetUUID = Util.getUUID(args.get(0));
|
||||
if (targetUUID == null) {
|
||||
user.sendMessage("general.errors.unknown-player", TextVariables.NAME, args.get(0));
|
||||
} else if (!Util.isInteger(args.get(1), true) || Integer.valueOf(args.get(1)) <= 0) {
|
||||
} else if (!Util.isInteger(args.get(1), true) || Integer.parseInt(args.get(1)) <= 0) {
|
||||
user.sendMessage("general.errors.must-be-positive-number", TextVariables.NUMBER, args.get(1));
|
||||
} else {
|
||||
getPlayers().setResets(getWorld(), targetUUID, Integer.valueOf(args.get(1)));
|
||||
getPlayers().setResets(getWorld(), targetUUID, Integer.parseInt(args.get(1)));
|
||||
user.sendMessage("commands.admin.resets.set.success",
|
||||
TextVariables.NAME, args.get(0), TextVariables.NUMBER, args.get(1));
|
||||
return true;
|
||||
|
@ -47,7 +47,7 @@ public class IslandSethomeCommand extends ConfirmableCommand {
|
||||
// Check the number given is a number
|
||||
int number;
|
||||
try {
|
||||
number = Integer.valueOf(args.get(0));
|
||||
number = Integer.parseInt(args.get(0));
|
||||
if (number < 1 || number > maxHomes) {
|
||||
user.sendMessage("commands.island.sethome.num-homes", TextVariables.NUMBER, String.valueOf(maxHomes));
|
||||
return false;
|
||||
|
@ -46,7 +46,7 @@ public class SQLConfiguration {
|
||||
"EXECUTE stmt;");
|
||||
}
|
||||
|
||||
private final String TABLE_NAME = "\\[tableName\\]";
|
||||
private final String TABLE_NAME = "\\[tableName]";
|
||||
/**
|
||||
* By default, use quotes around the unique ID in the SQL statement
|
||||
*/
|
||||
|
@ -463,10 +463,8 @@ public class BlueprintsManager {
|
||||
}
|
||||
// Paste
|
||||
if (bp != null) {
|
||||
new BlueprintPaster(plugin, bp, addon.getOverWorld(), island).paste().thenAccept(b -> {
|
||||
pasteNether(addon, bb, island).thenAccept(b2 ->
|
||||
pasteEnd(addon, bb, island).thenAccept(b3 -> Bukkit.getScheduler().runTask(plugin, task)));
|
||||
});
|
||||
new BlueprintPaster(plugin, bp, addon.getOverWorld(), island).paste().thenAccept(b -> pasteNether(addon, bb, island).thenAccept(b2 ->
|
||||
pasteEnd(addon, bb, island).thenAccept(b3 -> Bukkit.getScheduler().runTask(plugin, task))));
|
||||
}
|
||||
return true;
|
||||
|
||||
|
@ -130,7 +130,7 @@ public class PlaceholdersManager {
|
||||
* @since 1.15.0
|
||||
*/
|
||||
public void unregisterAll() {
|
||||
getPlaceholderAPIHook().ifPresent(hook -> hook.unregisterAll());
|
||||
getPlaceholderAPIHook().ifPresent(PlaceholderAPIHook::unregisterAll);
|
||||
|
||||
}
|
||||
}
|
||||
|
@ -279,11 +279,7 @@ public class Util {
|
||||
return 90F;
|
||||
case EAST_NORTH_EAST:
|
||||
return 67.5F;
|
||||
case EAST_SOUTH_EAST:
|
||||
return 0F;
|
||||
case NORTH:
|
||||
return 0F;
|
||||
case NORTH_EAST:
|
||||
case NORTH_EAST:
|
||||
return 45F;
|
||||
case NORTH_NORTH_EAST:
|
||||
return 22.5F;
|
||||
|
Loading…
Reference in New Issue
Block a user