Upstream/bentobox
1
0
Fork 0
mirror of https://github.com/BentoBoxWorld/BentoBox.git synced 2024-06-23 13:24:51 +02:00
Code Issues Projects Releases Wiki Activity

Code smell reduction

Browse Source
This commit is contained in:
tastybento 2020-09-12 16:55:54 -07:00
parent 458ea6b027
commit 54bc554763
13 changed files with 22 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/world/bentobox/bentobox/api/commands/admin/deaths/AdminDeathsAddCommand.java
View File

@ -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)));

4
src/main/java/world/bentobox/bentobox/api/commands/admin/deaths/AdminDeathsRemoveCommand.java
View File

@ -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),

4
src/main/java/world/bentobox/bentobox/api/commands/admin/deaths/AdminDeathsSetCommand.java
View File

@ -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;
}

4
src/main/java/world/bentobox/bentobox/api/commands/admin/range/AdminRangeAddCommand.java
View File

@ -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()));

4
src/main/java/world/bentobox/bentobox/api/commands/admin/range/AdminRangeRemoveCommand.java
View File

@ -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()));

4
src/main/java/world/bentobox/bentobox/api/commands/admin/resets/AdminResetsAddCommand.java
View File

@ -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)));

4
src/main/java/world/bentobox/bentobox/api/commands/admin/resets/AdminResetsRemoveCommand.java
View File

@ -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),

4
src/main/java/world/bentobox/bentobox/api/commands/admin/resets/AdminResetsSetCommand.java
View File

@ -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;

2
src/main/java/world/bentobox/bentobox/api/commands/island/IslandSethomeCommand.java
View File

@ -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;

2
src/main/java/world/bentobox/bentobox/database/sql/SQLConfiguration.java
View File

@ -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
*/

6
src/main/java/world/bentobox/bentobox/managers/BlueprintsManager.java
View File

@ -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;

2
src/main/java/world/bentobox/bentobox/managers/PlaceholdersManager.java
View File

@ -130,7 +130,7 @@ public class PlaceholdersManager {
* @since 1.15.0
*/
public void unregisterAll() {
getPlaceholderAPIHook().ifPresent(hook -> hook.unregisterAll());
getPlaceholderAPIHook().ifPresent(PlaceholderAPIHook::unregisterAll);
}
}

6
src/main/java/world/bentobox/bentobox/util/Util.java
View File

@ -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;