diff --git a/src/main/java/cn/nukkit/Server.java b/src/main/java/cn/nukkit/Server.java index b1138654b63..aa6a4aec257 100644 --- a/src/main/java/cn/nukkit/Server.java +++ b/src/main/java/cn/nukkit/Server.java @@ -505,13 +505,13 @@ public Level remove(Object key) { String[] opts = (this.getConfig("worlds." + name + ".generator", Generator.getGenerator("default").getSimpleName())).split(":"); Class generator = Generator.getGenerator(opts[0]); if (opts.length > 1) { - String preset = ""; + StringBuilder preset = new StringBuilder(); for (int i = 1; i < opts.length; i++) { - preset += opts[i] + ":"; + preset.append(opts[i]).append(":"); } - preset = preset.substring(0, preset.length() - 1); + preset = new StringBuilder(preset.substring(0, preset.length() - 1)); - options.put("preset", preset); + options.put("preset", preset.toString()); } this.generateLevel(name, seed, generator, options); @@ -530,7 +530,7 @@ public Level remove(Object key) { long seed; String seedString = String.valueOf(this.getProperty("level-seed", System.currentTimeMillis())); try { - seed = Long.valueOf(seedString); + seed = Long.parseLong(seedString); } catch (NumberFormatException e) { seed = seedString.hashCode(); } diff --git a/src/main/java/cn/nukkit/block/BlockRailDetector.java b/src/main/java/cn/nukkit/block/BlockRailDetector.java index 18023d9363b..28f83f07b81 100644 --- a/src/main/java/cn/nukkit/block/BlockRailDetector.java +++ b/src/main/java/cn/nukkit/block/BlockRailDetector.java @@ -78,6 +78,7 @@ protected void updateState() { getFloorZ() + 0.875D))) { if (entity instanceof EntityMinecartAbstract) { isPowered = true; + break; } } diff --git a/src/main/java/cn/nukkit/blockentity/BlockEntityPistonArm.java b/src/main/java/cn/nukkit/blockentity/BlockEntityPistonArm.java index e8772ed2466..c722c423bbc 100644 --- a/src/main/java/cn/nukkit/blockentity/BlockEntityPistonArm.java +++ b/src/main/java/cn/nukkit/blockentity/BlockEntityPistonArm.java @@ -66,9 +66,9 @@ protected void initBlockEntity() { private void pushEntities() { float lastProgress = this.getExtendedProgress(this.lastProgress); - double x = (double) (lastProgress * (float) this.facing.getXOffset()); - double y = (double) (lastProgress * (float) this.facing.getYOffset()); - double z = (double) (lastProgress * (float) this.facing.getZOffset()); + double x = lastProgress * (float) this.facing.getXOffset(); + double y = lastProgress * (float) this.facing.getYOffset(); + double z = lastProgress * (float) this.facing.getZOffset(); AxisAlignedBB bb = new SimpleAxisAlignedBB(x, y, z, x + 1.0D, y + 1.0D, z + 1.0D); Entity[] entities = this.level.getCollidingEntities(bb); if (entities.length != 0) { @@ -98,4 +98,4 @@ public void saveNBT() { public CompoundTag getSpawnCompound() { return (new CompoundTag()).putString("id", "PistonArm").putInt("x", (int) this.x).putInt("y", (int) this.y).putInt("z", (int) this.z); } -} \ No newline at end of file +} diff --git a/src/main/java/cn/nukkit/command/FormattedCommandAlias.java b/src/main/java/cn/nukkit/command/FormattedCommandAlias.java index 106c20692e2..8e84261e176 100644 --- a/src/main/java/cn/nukkit/command/FormattedCommandAlias.java +++ b/src/main/java/cn/nukkit/command/FormattedCommandAlias.java @@ -85,7 +85,7 @@ private String buildCommand(String formatString, String[] args) { throw new IllegalArgumentException("Invalid replacement token"); } - int position = Integer.valueOf(formatString.substring(argStart, index)); + int position = Integer.parseInt(formatString.substring(argStart, index)); // Arguments are not 0 indexed if (position == 0) { diff --git a/src/main/java/cn/nukkit/command/SimpleCommandMap.java b/src/main/java/cn/nukkit/command/SimpleCommandMap.java index d3de3b460df..c4d8fe06194 100644 --- a/src/main/java/cn/nukkit/command/SimpleCommandMap.java +++ b/src/main/java/cn/nukkit/command/SimpleCommandMap.java @@ -300,7 +300,7 @@ public void registerServerAliases() { } List targets = new ArrayList<>(); - String bad = ""; + StringBuilder bad = new StringBuilder(); for (String commandString : commandStrings) { String[] args = commandString.split(" "); @@ -308,16 +308,16 @@ public void registerServerAliases() { if (command == null) { if (bad.length() > 0) { - bad += ", "; + bad.append(", "); } - bad += commandString; + bad.append(commandString); } else { targets.add(commandString); } } if (bad.length() > 0) { - this.server.getLogger().warning(this.server.getLanguage().translateString("nukkit.command.alias.notFound", new String[]{alias, bad})); + this.server.getLogger().warning(this.server.getLanguage().translateString("nukkit.command.alias.notFound", new String[]{alias, bad.toString()})); continue; } @@ -328,4 +328,4 @@ public void registerServerAliases() { } } } -} \ No newline at end of file +} diff --git a/src/main/java/cn/nukkit/command/defaults/BanCommand.java b/src/main/java/cn/nukkit/command/defaults/BanCommand.java index caf6dc3474b..9ae05584693 100644 --- a/src/main/java/cn/nukkit/command/defaults/BanCommand.java +++ b/src/main/java/cn/nukkit/command/defaults/BanCommand.java @@ -38,20 +38,20 @@ public boolean execute(CommandSender sender, String commandLabel, String[] args) } String name = args[0]; - String reason = ""; + StringBuilder reason = new StringBuilder(); for (int i = 1; i < args.length; i++) { - reason += args[i] + " "; + reason.append(args[i]).append(" "); } if (reason.length() > 0) { - reason = reason.substring(0, reason.length() - 1); + reason = new StringBuilder(reason.substring(0, reason.length() - 1)); } - sender.getServer().getNameBans().addBan(name, reason, null, sender.getName()); + sender.getServer().getNameBans().addBan(name, reason.toString(), null, sender.getName()); Player player = sender.getServer().getPlayerExact(name); if (player != null) { - player.kick(PlayerKickEvent.Reason.NAME_BANNED, !reason.isEmpty() ? "Banned by admin. Reason: " + reason : "Banned by admin"); + player.kick(PlayerKickEvent.Reason.NAME_BANNED, (reason.length() > 0) ? "Banned by admin. Reason: " + reason : "Banned by admin"); } Command.broadcastCommandMessage(sender, new TranslationContainer("%commands.ban.success", player != null ? player.getName() : name)); diff --git a/src/main/java/cn/nukkit/command/defaults/BanIpCommand.java b/src/main/java/cn/nukkit/command/defaults/BanIpCommand.java index 44a6c65d9f7..7534ea0ab35 100644 --- a/src/main/java/cn/nukkit/command/defaults/BanIpCommand.java +++ b/src/main/java/cn/nukkit/command/defaults/BanIpCommand.java @@ -46,23 +46,23 @@ public boolean execute(CommandSender sender, String commandLabel, String[] args) } String value = args[0]; - String reason = ""; + StringBuilder reason = new StringBuilder(); for (int i = 1; i < args.length; i++) { - reason += args[i] + " "; + reason.append(args[i]).append(" "); } if (reason.length() > 0) { - reason = reason.substring(0, reason.length() - 1); + reason = new StringBuilder(reason.substring(0, reason.length() - 1)); } if (Pattern.matches("^(25[0-5]|2[0-4][0-9]|[0-1]{1}[0-9]{2}|[1-9]{1}[0-9]{1}|[1-9])\\.(25[0-5]|2[0-4][0-9]|[0-1]{1}[0-9]{2}|[1-9]{1}[0-9]{1}|[1-9]|0)\\.(25[0-5]|2[0-4][0-9]|[0-1]{1}[0-9]{2}|[1-9]{1}[0-9]{1}|[1-9]|0)\\.(25[0-5]|2[0-4][0-9]|[0-1]{1}[0-9]{2}|[1-9]{1}[0-9]{1}|[0-9])$", value)) { - this.processIPBan(value, sender, reason); + this.processIPBan(value, sender, reason.toString()); Command.broadcastCommandMessage(sender, new TranslationContainer("commands.banip.success", value)); } else { Player player = sender.getServer().getPlayer(value); if (player != null) { - this.processIPBan(player.getAddress(), sender, reason); + this.processIPBan(player.getAddress(), sender, reason.toString()); Command.broadcastCommandMessage(sender, new TranslationContainer("commands.banip.success.players", player.getAddress(), player.getName())); } else { @@ -79,7 +79,7 @@ public boolean execute(CommandSender sender, String commandLabel, String[] args) } if (nbt != null && nbt.contains("lastIP") && Pattern.matches("^(25[0-5]|2[0-4][0-9]|[0-1]{1}[0-9]{2}|[1-9]{1}[0-9]{1}|[1-9])\\.(25[0-5]|2[0-4][0-9]|[0-1]{1}[0-9]{2}|[1-9]{1}[0-9]{1}|[1-9]|0)\\.(25[0-5]|2[0-4][0-9]|[0-1]{1}[0-9]{2}|[1-9]{1}[0-9]{1}|[1-9]|0)\\.(25[0-5]|2[0-4][0-9]|[0-1]{1}[0-9]{2}|[1-9]{1}[0-9]{1}|[0-9])$", (value = nbt.getString("lastIP")))) { - this.processIPBan(value, sender, reason); + this.processIPBan(value, sender, reason.toString()); Command.broadcastCommandMessage(sender, new TranslationContainer("commands.banip.success", value)); } else { diff --git a/src/main/java/cn/nukkit/command/defaults/EffectCommand.java b/src/main/java/cn/nukkit/command/defaults/EffectCommand.java index 0e92f600ed8..78dbfe90849 100644 --- a/src/main/java/cn/nukkit/command/defaults/EffectCommand.java +++ b/src/main/java/cn/nukkit/command/defaults/EffectCommand.java @@ -69,7 +69,7 @@ public boolean execute(CommandSender sender, String commandLabel, String[] args) int amplification = 0; if (args.length >= 3) { try { - duration = Integer.valueOf(args[2]); + duration = Integer.parseInt(args[2]); } catch (NumberFormatException a) { sender.sendMessage(new TranslationContainer("commands.generic.usage", this.usageMessage)); return true; @@ -82,7 +82,7 @@ public boolean execute(CommandSender sender, String commandLabel, String[] args) } if (args.length >= 4) { try { - amplification = Integer.valueOf(args[3]); + amplification = Integer.parseInt(args[3]); } catch (NumberFormatException a) { sender.sendMessage(new TranslationContainer("commands.generic.usage", this.usageMessage)); return true; diff --git a/src/main/java/cn/nukkit/command/defaults/HelpCommand.java b/src/main/java/cn/nukkit/command/defaults/HelpCommand.java index a23f4e97205..5c8f7b718ee 100644 --- a/src/main/java/cn/nukkit/command/defaults/HelpCommand.java +++ b/src/main/java/cn/nukkit/command/defaults/HelpCommand.java @@ -31,12 +31,12 @@ public boolean execute(CommandSender sender, String commandLabel, String[] args) if (!this.testPermission(sender)) { return true; } - String command = ""; + StringBuilder command = new StringBuilder(); int pageNumber = 1; int pageHeight = 5; if (args.length != 0) { try { - pageNumber = Integer.valueOf(args[args.length - 1]); + pageNumber = Integer.parseInt(args[args.length - 1]); if (pageNumber <= 0) { pageNumber = 1; } @@ -50,18 +50,18 @@ public boolean execute(CommandSender sender, String commandLabel, String[] args) args = new String[0]; }*/ for (String arg : args) { - if (!command.equals("")) { - command += " "; + if (!command.toString().equals("")) { + command.append(" "); } - command += arg; + command.append(arg); } } catch (NumberFormatException e) { pageNumber = 1; for (String arg : args) { - if (!command.equals("")) { - command += " "; + if (!command.toString().equals("")) { + command.append(" "); } - command += arg; + command.append(arg); } } } @@ -70,7 +70,7 @@ public boolean execute(CommandSender sender, String commandLabel, String[] args) pageHeight = Integer.MAX_VALUE; } - if (command.equals("")) { + if (command.toString().equals("")) { Map commands = new TreeMap<>(); for (Command cmd : sender.getServer().getCommandMap().getCommands().values()) { if (cmd.testPermissionSilent(sender)) { @@ -94,18 +94,18 @@ public boolean execute(CommandSender sender, String commandLabel, String[] args) return true; } else { - Command cmd = sender.getServer().getCommandMap().getCommand(command.toLowerCase()); + Command cmd = sender.getServer().getCommandMap().getCommand(command.toString().toLowerCase()); if (cmd != null) { if (cmd.testPermissionSilent(sender)) { String message = TextFormat.YELLOW + "--------- " + TextFormat.WHITE + " Help: /" + cmd.getName() + TextFormat.YELLOW + " ---------\n"; message += TextFormat.GOLD + "Description: " + TextFormat.WHITE + cmd.getDescription() + "\n"; - String usage = ""; + StringBuilder usage = new StringBuilder(); String[] usages = cmd.getUsage().split("\n"); for (String u : usages) { - if (!usage.equals("")) { - usage += "\n" + TextFormat.WHITE; + if (!usage.toString().equals("")) { + usage.append("\n" + TextFormat.WHITE); } - usage += u; + usage.append(u); } message += TextFormat.GOLD + "Usage: " + TextFormat.WHITE + usage + "\n"; sender.sendMessage(message); @@ -113,7 +113,7 @@ public boolean execute(CommandSender sender, String commandLabel, String[] args) } } - sender.sendMessage(TextFormat.RED + "No help for " + command.toLowerCase()); + sender.sendMessage(TextFormat.RED + "No help for " + command.toString().toLowerCase()); return true; } } diff --git a/src/main/java/cn/nukkit/command/defaults/KickCommand.java b/src/main/java/cn/nukkit/command/defaults/KickCommand.java index a0560f3610c..01045116f8b 100644 --- a/src/main/java/cn/nukkit/command/defaults/KickCommand.java +++ b/src/main/java/cn/nukkit/command/defaults/KickCommand.java @@ -37,20 +37,20 @@ public boolean execute(CommandSender sender, String commandLabel, String[] args) String name = args[0]; - String reason = ""; + StringBuilder reason = new StringBuilder(); for (int i = 1; i < args.length; i++) { - reason += args[i] + " "; + reason.append(args[i]).append(" "); } if (reason.length() > 0) { - reason = reason.substring(0, reason.length() - 1); + reason = new StringBuilder(reason.substring(0, reason.length() - 1)); } Player player = sender.getServer().getPlayer(name); if (player != null) { - player.kick(PlayerKickEvent.Reason.KICKED_BY_ADMIN, reason); + player.kick(PlayerKickEvent.Reason.KICKED_BY_ADMIN, reason.toString()); if (reason.length() >= 1) { - Command.broadcastCommandMessage(sender, new TranslationContainer("commands.kick.success.reason", player.getName(), reason) + Command.broadcastCommandMessage(sender, new TranslationContainer("commands.kick.success.reason", player.getName(), reason.toString()) ); } else { Command.broadcastCommandMessage(sender, new TranslationContainer("commands.kick.success", player.getName())); diff --git a/src/main/java/cn/nukkit/command/defaults/ListCommand.java b/src/main/java/cn/nukkit/command/defaults/ListCommand.java index e3292b087bd..7417211d0c2 100644 --- a/src/main/java/cn/nukkit/command/defaults/ListCommand.java +++ b/src/main/java/cn/nukkit/command/defaults/ListCommand.java @@ -21,22 +21,22 @@ public boolean execute(CommandSender sender, String commandLabel, String[] args) if (!this.testPermission(sender)) { return true; } - String online = ""; + StringBuilder online = new StringBuilder(); int onlineCount = 0; for (Player player : sender.getServer().getOnlinePlayers().values()) { if (player.isOnline() && (!(sender instanceof Player) || ((Player) sender).canSee(player))) { - online += player.getDisplayName() + ", "; + online.append(player.getDisplayName()).append(", "); ++onlineCount; } } if (online.length() > 0) { - online = online.substring(0, online.length() - 2); + online = new StringBuilder(online.substring(0, online.length() - 2)); } sender.sendMessage(new TranslationContainer("commands.players.list", String.valueOf(onlineCount), String.valueOf(sender.getServer().getMaxPlayers()))); - sender.sendMessage(online); + sender.sendMessage(online.toString()); return true; } } diff --git a/src/main/java/cn/nukkit/command/defaults/MeCommand.java b/src/main/java/cn/nukkit/command/defaults/MeCommand.java index af1ca772380..fb701d91d5d 100644 --- a/src/main/java/cn/nukkit/command/defaults/MeCommand.java +++ b/src/main/java/cn/nukkit/command/defaults/MeCommand.java @@ -41,16 +41,16 @@ public boolean execute(CommandSender sender, String commandLabel, String[] args) name = sender.getName(); } - String msg = ""; + StringBuilder msg = new StringBuilder(); for (String arg : args) { - msg += arg + " "; + msg.append(arg).append(" "); } if (msg.length() > 0) { - msg = msg.substring(0, msg.length() - 1); + msg = new StringBuilder(msg.substring(0, msg.length() - 1)); } - sender.getServer().broadcastMessage(new TranslationContainer("chat.type.emote", name, TextFormat.WHITE + msg)); + sender.getServer().broadcastMessage(new TranslationContainer("chat.type.emote", name, TextFormat.WHITE + msg.toString())); return true; } diff --git a/src/main/java/cn/nukkit/command/defaults/ParticleCommand.java b/src/main/java/cn/nukkit/command/defaults/ParticleCommand.java index 3d07d6e605f..b26dd4e80e3 100644 --- a/src/main/java/cn/nukkit/command/defaults/ParticleCommand.java +++ b/src/main/java/cn/nukkit/command/defaults/ParticleCommand.java @@ -72,7 +72,7 @@ public boolean execute(CommandSender sender, String commandLabel, String[] args) int count = 1; if (args.length > 4) { try { - double c = Double.valueOf(args[4]); + double c = Double.parseDouble(args[4]); count = (int) c; } catch (Exception e) { //ignore @@ -83,7 +83,7 @@ public boolean execute(CommandSender sender, String commandLabel, String[] args) int data = -1; if (args.length > 5) { try { - double d = Double.valueOf(args[5]); + double d = Double.parseDouble(args[5]); data = (int) d; } catch (Exception e) { //ignore @@ -184,17 +184,17 @@ private Particle getParticle(String name, Vector3 pos, int data) { if (name.startsWith("iconcrack_")) { String[] d = name.split("_"); if (d.length == 3) { - return new ItemBreakParticle(pos, Item.get(Integer.valueOf(d[1]), Integer.valueOf(d[2]))); + return new ItemBreakParticle(pos, Item.get(Integer.parseInt(d[1]), Integer.valueOf(d[2]))); } } else if (name.startsWith("blockcrack_")) { String[] d = name.split("_"); if (d.length == 2) { - return new TerrainParticle(pos, Block.get(Integer.valueOf(d[1]) & 0xff, Integer.valueOf(d[1]) >> 12)); + return new TerrainParticle(pos, Block.get(Integer.parseInt(d[1]) & 0xff, Integer.parseInt(d[1]) >> 12)); } } else if (name.startsWith("blockdust_")) { String[] d = name.split("_"); if (d.length >= 4) { - return new DustParticle(pos, Integer.valueOf(d[1]) & 0xff, Integer.valueOf(d[2]) & 0xff, Integer.valueOf(d[3]) & 0xff, d.length >= 5 ? Integer.valueOf(d[4]) & 0xff : 255); + return new DustParticle(pos, Integer.parseInt(d[1]) & 0xff, Integer.parseInt(d[2]) & 0xff, Integer.parseInt(d[3]) & 0xff, d.length >= 5 ? Integer.parseInt(d[4]) & 0xff : 255); } } diff --git a/src/main/java/cn/nukkit/command/defaults/PluginsCommand.java b/src/main/java/cn/nukkit/command/defaults/PluginsCommand.java index 2bc72e26c81..b3377bfd251 100644 --- a/src/main/java/cn/nukkit/command/defaults/PluginsCommand.java +++ b/src/main/java/cn/nukkit/command/defaults/PluginsCommand.java @@ -34,16 +34,16 @@ public boolean execute(CommandSender sender, String commandLabel, String[] args) } private void sendPluginList(CommandSender sender) { - String list = ""; + StringBuilder list = new StringBuilder(); Map plugins = sender.getServer().getPluginManager().getPlugins(); for (Plugin plugin : plugins.values()) { if (list.length() > 0) { - list += TextFormat.WHITE + ", "; + list.append(TextFormat.WHITE + ", "); } - list += plugin.isEnabled() ? TextFormat.GREEN : TextFormat.RED; - list += plugin.getDescription().getFullName(); + list.append(plugin.isEnabled() ? TextFormat.GREEN : TextFormat.RED); + list.append(plugin.getDescription().getFullName()); } - sender.sendMessage(new TranslationContainer("nukkit.command.plugins.success", String.valueOf(plugins.size()), list)); + sender.sendMessage(new TranslationContainer("nukkit.command.plugins.success", String.valueOf(plugins.size()), list.toString())); } } diff --git a/src/main/java/cn/nukkit/command/defaults/SayCommand.java b/src/main/java/cn/nukkit/command/defaults/SayCommand.java index bb79462fa9d..738bbac5bf1 100644 --- a/src/main/java/cn/nukkit/command/defaults/SayCommand.java +++ b/src/main/java/cn/nukkit/command/defaults/SayCommand.java @@ -42,18 +42,18 @@ public boolean execute(CommandSender sender, String commandLabel, String[] args) senderString = sender.getName(); } - String msg = ""; + StringBuilder msg = new StringBuilder(); for (String arg : args) { - msg += arg + " "; + msg.append(arg).append(" "); } if (msg.length() > 0) { - msg = msg.substring(0, msg.length() - 1); + msg = new StringBuilder(msg.substring(0, msg.length() - 1)); } sender.getServer().broadcastMessage(new TranslationContainer( TextFormat.LIGHT_PURPLE + "%chat.type.announcement", - senderString, TextFormat.LIGHT_PURPLE + msg)); + senderString, TextFormat.LIGHT_PURPLE + msg.toString())); return true; } } diff --git a/src/main/java/cn/nukkit/command/defaults/TellCommand.java b/src/main/java/cn/nukkit/command/defaults/TellCommand.java index b7e4e5a8cb5..fa5640bfe9e 100644 --- a/src/main/java/cn/nukkit/command/defaults/TellCommand.java +++ b/src/main/java/cn/nukkit/command/defaults/TellCommand.java @@ -50,12 +50,12 @@ public boolean execute(CommandSender sender, String commandLabel, String[] args) return true; } - String msg = ""; + StringBuilder msg = new StringBuilder(); for (int i = 1; i < args.length; i++) { - msg += args[i] + " "; + msg.append(args[i]).append(" "); } if (msg.length() > 0) { - msg = msg.substring(0, msg.length() - 1); + msg = new StringBuilder(msg.substring(0, msg.length() - 1)); } String displayName = (sender instanceof Player ? ((Player) sender).getDisplayName() : sender.getName()); diff --git a/src/main/java/cn/nukkit/command/defaults/VersionCommand.java b/src/main/java/cn/nukkit/command/defaults/VersionCommand.java index 151eca5d8f7..17d439c77fe 100644 --- a/src/main/java/cn/nukkit/command/defaults/VersionCommand.java +++ b/src/main/java/cn/nukkit/command/defaults/VersionCommand.java @@ -38,15 +38,15 @@ public boolean execute(CommandSender sender, String commandLabel, String[] args) sender.getServer().getVersion(), String.valueOf(ProtocolInfo.CURRENT_PROTOCOL))); } else { - String pluginName = ""; - for (String arg : args) pluginName += arg + " "; - pluginName = pluginName.trim(); + StringBuilder pluginName = new StringBuilder(); + for (String arg : args) pluginName.append(arg).append(" "); + pluginName = new StringBuilder(pluginName.toString().trim()); final boolean[] found = {false}; - final Plugin[] exactPlugin = {sender.getServer().getPluginManager().getPlugin(pluginName)}; + final Plugin[] exactPlugin = {sender.getServer().getPluginManager().getPlugin(pluginName.toString())}; if (exactPlugin[0] == null) { - pluginName = pluginName.toLowerCase(); - final String finalPluginName = pluginName; + pluginName = new StringBuilder(pluginName.toString().toLowerCase()); + final String finalPluginName = pluginName.toString(); sender.getServer().getPluginManager().getPlugins().forEach((s, p) -> { if (s.toLowerCase().contains(finalPluginName)) { exactPlugin[0] = p; diff --git a/src/main/java/cn/nukkit/command/defaults/WhitelistCommand.java b/src/main/java/cn/nukkit/command/defaults/WhitelistCommand.java index 5dba3ea7515..0e30f93987d 100644 --- a/src/main/java/cn/nukkit/command/defaults/WhitelistCommand.java +++ b/src/main/java/cn/nukkit/command/defaults/WhitelistCommand.java @@ -66,10 +66,10 @@ public boolean execute(CommandSender sender, String commandLabel, String[] args) return true; case "list": - String result = ""; + StringBuilder result = new StringBuilder(); int count = 0; for (String player : sender.getServer().getWhitelist().getAll().keySet()) { - result += player + ", "; + result.append(player).append(", "); ++count; } sender.sendMessage(new TranslationContainer("commands.whitelist.list", String.valueOf(count), String.valueOf(count))); diff --git a/src/main/java/cn/nukkit/entity/item/EntityFirework.java b/src/main/java/cn/nukkit/entity/item/EntityFirework.java index 89eac5d4a7d..479a34a44a9 100644 --- a/src/main/java/cn/nukkit/entity/item/EntityFirework.java +++ b/src/main/java/cn/nukkit/entity/item/EntityFirework.java @@ -87,7 +87,7 @@ public boolean onUpdate(int currentTick) { float f = (float) Math.sqrt(this.motionX * this.motionX + this.motionZ * this.motionZ); this.yaw = (float) (Math.atan2(this.motionX, this.motionZ) * (180D / Math.PI)); - this.pitch = (float) (Math.atan2(this.motionY, (double) f) * (180D / Math.PI)); + this.pitch = (float) (Math.atan2(this.motionY, f) * (180D / Math.PI)); if (this.fireworkAge == 0) { diff --git a/src/main/java/cn/nukkit/entity/item/EntityMinecartAbstract.java b/src/main/java/cn/nukkit/entity/item/EntityMinecartAbstract.java index cdb15b00330..c64943cab37 100644 --- a/src/main/java/cn/nukkit/entity/item/EntityMinecartAbstract.java +++ b/src/main/java/cn/nukkit/entity/item/EntityMinecartAbstract.java @@ -335,7 +335,7 @@ public void applyEntityCollision(cn.nukkit.entity.Entity entity) { double desinityX = mine.x - x; double desinityZ = mine.z - z; Vector3 vector = new Vector3(desinityX, 0, desinityZ).normalize(); - Vector3 vec = new Vector3((double) MathHelper.cos((float) yaw * 0.017453292F), 0, (double) MathHelper.sin((float) yaw * 0.017453292F)).normalize(); + Vector3 vec = new Vector3(MathHelper.cos((float) yaw * 0.017453292F), 0, MathHelper.sin((float) yaw * 0.017453292F)).normalize(); double desinityXZ = Math.abs(vector.dot(vec)); if (desinityXZ < 0.800000011920929D) { @@ -426,7 +426,7 @@ private void processMovement(int dx, int dy, int dz, BlockRail block) { fallDistance = 0.0F; Vector3 vector = getNextRail(x, y, z); - y = (double) dy; + y = dy; boolean isPowered = false; boolean isSlowed = false; @@ -455,8 +455,8 @@ private void processMovement(int dx, int dy, int dz, BlockRail block) { } int[][] facing = matrix[block.getRealMeta()]; - double facing1 = (double) (facing[1][0] - facing[0][0]); - double facing2 = (double) (facing[1][2] - facing[0][2]); + double facing1 = facing[1][0] - facing[0][0]; + double facing2 = facing[1][2] - facing[0][2]; double speedOnTurns = Math.sqrt(facing1 * facing1 + facing2 * facing2); double realFacing = motionX * facing1 + motionZ * facing2; diff --git a/src/main/java/cn/nukkit/event/server/QueryRegenerateEvent.java b/src/main/java/cn/nukkit/event/server/QueryRegenerateEvent.java index 2d4c9c0c868..0383b7dd896 100644 --- a/src/main/java/cn/nukkit/event/server/QueryRegenerateEvent.java +++ b/src/main/java/cn/nukkit/event/server/QueryRegenerateEvent.java @@ -142,14 +142,14 @@ public byte[] getLongQuery(byte[] buffer) { if (buffer == null) buffer = new byte[Character.MAX_VALUE]; FastByteArrayOutputStream query = new FastByteArrayOutputStream(buffer); try { - String plist = this.server_engine; + StringBuilder plist = new StringBuilder(this.server_engine); if (this.plugins.length > 0 && this.listPlugins) { - plist += ":"; + plist.append(":"); for (Plugin p : this.plugins) { PluginDescription d = p.getDescription(); - plist += " " + d.getName().replace(";", "").replace(":", "").replace(" ", "_") + " " + d.getVersion().replace(";", "").replace(":", "").replace(" ", "_") + ";"; + plist.append(" ").append(d.getName().replace(";", "").replace(":", "").replace(" ", "_")).append(" ").append(d.getVersion().replace(";", "").replace(":", "").replace(" ", "_")).append(";"); } - plist = plist.substring(0, plist.length() - 2); + plist = new StringBuilder(plist.substring(0, plist.length() - 2)); } query.write("splitnum".getBytes()); @@ -163,7 +163,7 @@ public byte[] getLongQuery(byte[] buffer) { KVdata.put("game_id", GAME_ID); KVdata.put("version", this.version); KVdata.put("server_engine", this.server_engine); - KVdata.put("plugins", plist); + KVdata.put("plugins", plist.toString()); KVdata.put("map", this.map); KVdata.put("numplayers", String.valueOf(this.numPlayers)); KVdata.put("maxplayers", String.valueOf(this.maxPlayers)); diff --git a/src/main/java/cn/nukkit/item/Item.java b/src/main/java/cn/nukkit/item/Item.java index a13d80f235f..bec24bf4852 100644 --- a/src/main/java/cn/nukkit/item/Item.java +++ b/src/main/java/cn/nukkit/item/Item.java @@ -422,7 +422,7 @@ public static Item fromString(String str) { Pattern integerPattern = Pattern.compile("^[1-9]\\d*$"); if (integerPattern.matcher(b[0]).matches()) { - id = Integer.valueOf(b[0]); + id = Integer.parseInt(b[0]); } else { try { id = Item.class.getField(b[0].toUpperCase()).getInt(null); @@ -431,7 +431,7 @@ public static Item fromString(String str) { } id = id & 0xFFFF; - if (b.length != 1) meta = Integer.valueOf(b[1]) & 0xFFFF; + if (b.length != 1) meta = Integer.parseInt(b[1]) & 0xFFFF; return get(id, meta); } diff --git a/src/main/java/cn/nukkit/lang/BaseLang.java b/src/main/java/cn/nukkit/lang/BaseLang.java index 640c63e634f..9103009273c 100644 --- a/src/main/java/cn/nukkit/lang/BaseLang.java +++ b/src/main/java/cn/nukkit/lang/BaseLang.java @@ -77,15 +77,15 @@ protected Map loadLang(String path) { continue; } String key = t[0]; - String value = ""; + StringBuilder value = new StringBuilder(); for (int i = 1; i < t.length - 1; i++) { - value += t[i] + "="; + value.append(t[i]).append("="); } - value += t[t.length - 1]; - if (value.equals("")) { + value.append(t[t.length - 1]); + if (value.toString().equals("")) { continue; } - d.put(key, value); + d.put(key, value.toString()); } return d; } catch (IOException e) { @@ -108,15 +108,15 @@ protected Map loadLang(InputStream stream) { continue; } String key = t[0]; - String value = ""; + StringBuilder value = new StringBuilder(); for (int i = 1; i < t.length - 1; i++) { - value += t[i] + "="; + value.append(t[i]).append("="); } - value += t[t.length - 1]; - if (value.equals("")) { + value.append(t[t.length - 1]); + if (value.toString().equals("")) { continue; } - d.put(key, value); + d.put(key, value.toString()); } return d; } catch (IOException e) { @@ -196,10 +196,10 @@ protected String parseTranslation(String text) { } protected String parseTranslation(String text, String onlyPrefix) { - String newString = ""; + StringBuilder newString = new StringBuilder(); text = String.valueOf(text); - String replaceString = null; + StringBuilder replaceString = null; int len = text.length(); @@ -211,36 +211,36 @@ protected String parseTranslation(String text, String onlyPrefix) { || (ord >= 0x41 && ord <= 0x5a) // A-Z || (ord >= 0x61 && ord <= 0x7a) || // a-z c == '.' || c == '-') { - replaceString += String.valueOf(c); + replaceString.append(String.valueOf(c)); } else { String t = this.internalGet(replaceString.substring(1)); if (t != null && (onlyPrefix == null || replaceString.indexOf(onlyPrefix) == 1)) { - newString += t; + newString.append(t); } else { - newString += replaceString; + newString.append(replaceString); } replaceString = null; if (c == '%') { - replaceString = String.valueOf(c); + replaceString = new StringBuilder(String.valueOf(c)); } else { - newString += String.valueOf(c); + newString.append(String.valueOf(c)); } } } else if (c == '%') { - replaceString = String.valueOf(c); + replaceString = new StringBuilder(String.valueOf(c)); } else { - newString += String.valueOf(c); + newString.append(String.valueOf(c)); } } if (replaceString != null) { String t = this.internalGet(replaceString.substring(1)); if (t != null && (onlyPrefix == null || replaceString.indexOf(onlyPrefix) == 1)) { - newString += t; + newString.append(t); } else { - newString += replaceString; + newString.append(replaceString); } } - return newString; + return newString.toString(); } } diff --git a/src/main/java/cn/nukkit/level/Level.java b/src/main/java/cn/nukkit/level/Level.java index 6d075cd20e9..709d5c76612 100644 --- a/src/main/java/cn/nukkit/level/Level.java +++ b/src/main/java/cn/nukkit/level/Level.java @@ -3109,7 +3109,7 @@ private boolean unloadChunks(long now, long allocatedTime, boolean force) { } if (toUnload != null) { - long[] arr = (long[]) toUnload.toLongArray(); + long[] arr = toUnload.toLongArray(); for (long index : arr) { int X = getHashX(index); int Z = getHashZ(index); diff --git a/src/main/java/cn/nukkit/level/generator/Flat.java b/src/main/java/cn/nukkit/level/generator/Flat.java index 005b1129513..e9452225b79 100644 --- a/src/main/java/cn/nukkit/level/generator/Flat.java +++ b/src/main/java/cn/nukkit/level/generator/Flat.java @@ -89,9 +89,9 @@ protected void parsePreset(String preset, int chunkX, int chunkZ) { try { this.preset = preset; String[] presetArray = preset.split(";"); - int version = Integer.valueOf(presetArray[0]); + int version = Integer.parseInt(presetArray[0]); String blocks = presetArray.length > 1 ? presetArray[1] : ""; - this.biome = presetArray.length > 2 ? Integer.valueOf(presetArray[2]) : 1; + this.biome = presetArray.length > 2 ? Integer.parseInt(presetArray[2]) : 1; String options = presetArray.length > 3 ? presetArray[1] : ""; this.structure = new int[256][]; int y = 0; @@ -100,16 +100,16 @@ protected void parsePreset(String preset, int chunkX, int chunkZ) { if (Pattern.matches("^[0-9]{1,3}x[0-9]$", block)) { //AxB String[] s = block.split("x"); - cnt = Integer.valueOf(s[0]); - id = Integer.valueOf(s[1]); + cnt = Integer.parseInt(s[0]); + id = Integer.parseInt(s[1]); } else if (Pattern.matches("^[0-9]{1,3}:[0-9]{0,2}$", block)) { //A:B String[] s = block.split(":"); - id = Integer.valueOf(s[0]); - meta = Integer.valueOf(s[1]); + id = Integer.parseInt(s[0]); + meta = Integer.parseInt(s[1]); } else if (Pattern.matches("^[0-9]{1,3}$", block)) { //A - id = Integer.valueOf(block); + id = Integer.parseInt(block); } else { continue; } diff --git a/src/main/java/cn/nukkit/level/generator/object/ore/OreType.java b/src/main/java/cn/nukkit/level/generator/object/ore/OreType.java index 32f4177b46d..ce318bae2c3 100644 --- a/src/main/java/cn/nukkit/level/generator/object/ore/OreType.java +++ b/src/main/java/cn/nukkit/level/generator/object/ore/OreType.java @@ -35,12 +35,12 @@ public OreType(Block material, int clusterCount, int clusterSize, int minHeight, public boolean spawn(ChunkManager level, NukkitRandom rand, int replaceId, int x, int y, int z) { float piScaled = rand.nextFloat() * (float) Math.PI; - double scaleMaxX = (double) ((float) (x + 8) + MathHelper.sin(piScaled) * (float) clusterSize / 8.0F); - double scaleMinX = (double) ((float) (x + 8) - MathHelper.sin(piScaled) * (float) clusterSize / 8.0F); - double scaleMaxZ = (double) ((float) (z + 8) + MathHelper.cos(piScaled) * (float) clusterSize / 8.0F); - double scaleMinZ = (double) ((float) (z + 8) - MathHelper.cos(piScaled) * (float) clusterSize / 8.0F); - double scaleMaxY = (double) (y + rand.nextBoundedInt(3) - 2); - double scaleMinY = (double) (y + rand.nextBoundedInt(3) - 2); + double scaleMaxX = (float) (x + 8) + MathHelper.sin(piScaled) * (float) clusterSize / 8.0F; + double scaleMinX = (float) (x + 8) - MathHelper.sin(piScaled) * (float) clusterSize / 8.0F; + double scaleMaxZ = (float) (z + 8) + MathHelper.cos(piScaled) * (float) clusterSize / 8.0F; + double scaleMinZ = (float) (z + 8) - MathHelper.cos(piScaled) * (float) clusterSize / 8.0F; + double scaleMaxY = y + rand.nextBoundedInt(3) - 2; + double scaleMinY = y + rand.nextBoundedInt(3) - 2; for (int i = 0; i < clusterSize; ++i) { float sizeIncr = (float) i / (float) clusterSize; diff --git a/src/main/java/cn/nukkit/math/MathHelper.java b/src/main/java/cn/nukkit/math/MathHelper.java index 36c9a3a111f..72a9f82610f 100644 --- a/src/main/java/cn/nukkit/math/MathHelper.java +++ b/src/main/java/cn/nukkit/math/MathHelper.java @@ -92,7 +92,7 @@ public static int ceil(float floatNumber) { } public static int clamp(int check, int min, int max) { - return check > max ? max : (check < min ? min : check); + return check > max ? max : (Math.max(check, min)); } public static double denormalizeClamp(double lowerBnd, double upperBnd, double slide) { @@ -102,4 +102,4 @@ public static double denormalizeClamp(double lowerBnd, double upperBnd, double s public static float denormalizeClamp(float lowerBnd, float upperBnd, float slide) { return slide < 0.0f ? lowerBnd : (slide > 1.0f ? upperBnd : lowerBnd + (upperBnd - lowerBnd) * slide); } -} \ No newline at end of file +} diff --git a/src/main/java/cn/nukkit/math/NukkitMath.java b/src/main/java/cn/nukkit/math/NukkitMath.java index e04b58fadd9..5f1857feb12 100644 --- a/src/main/java/cn/nukkit/math/NukkitMath.java +++ b/src/main/java/cn/nukkit/math/NukkitMath.java @@ -47,18 +47,18 @@ public static double round(double d, int precision) { } public static double clamp(double value, double min, double max) { - return value < min ? min : (value > max ? max : value); + return value < min ? min : (Math.min(value, max)); } public static int clamp(int value, int min, int max) { - return value < min ? min : (value > max ? max : value); + return value < min ? min : (Math.min(value, max)); } public static double getDirection(double diffX, double diffZ) { diffX = Math.abs(diffX); diffZ = Math.abs(diffZ); - return diffX > diffZ ? diffX : diffZ; + return Math.max(diffX, diffZ); } } diff --git a/src/main/java/cn/nukkit/nbt/stream/BufferedRandomAccessFile.java b/src/main/java/cn/nukkit/nbt/stream/BufferedRandomAccessFile.java index 48588c93239..7959c4f94c0 100644 --- a/src/main/java/cn/nukkit/nbt/stream/BufferedRandomAccessFile.java +++ b/src/main/java/cn/nukkit/nbt/stream/BufferedRandomAccessFile.java @@ -41,7 +41,7 @@ public class BufferedRandomAccessFile extends RandomAccessFile { static final int LogBuffSz_ = 16; // 64K buffer public static final int BuffSz_ = (1 << LogBuffSz_); - static final long BuffMask_ = ~(((long) BuffSz_) - 1L); + static final long BuffMask_ = -((long) BuffSz_); /* * This implementation is based on the buffer implementation in Modula-3's @@ -148,7 +148,7 @@ private void init(int size) this.dirty_ = this.closed_ = false; this.lo_ = this.curr_ = this.hi_ = 0; this.buff_ = (size > BuffSz_) ? new byte[size] : new byte[BuffSz_]; - this.maxHi_ = (long) BuffSz_; + this.maxHi_ = BuffSz_; this.hitEOF_ = false; this.diskPos_ = 0L; } @@ -464,4 +464,4 @@ private int writeAtMost(byte[] b, int off, int len) throws IOException this.curr_ += len; return len; } -} \ No newline at end of file +} diff --git a/src/main/java/cn/nukkit/nbt/stream/PGZIPOutputStream.java b/src/main/java/cn/nukkit/nbt/stream/PGZIPOutputStream.java index 99ee3d21ac9..b63edc477ae 100644 --- a/src/main/java/cn/nukkit/nbt/stream/PGZIPOutputStream.java +++ b/src/main/java/cn/nukkit/nbt/stream/PGZIPOutputStream.java @@ -72,7 +72,7 @@ public PGZIPOutputStream(OutputStream out, ExecutorService executor, int nthread super(out); this.executor = executor; this.nthreads = nthreads; - this.emitQueue = new ArrayBlockingQueue>(nthreads); + this.emitQueue = new ArrayBlockingQueue<>(nthreads); writeHeader(); } @@ -238,4 +238,4 @@ public void close() throws IOException { // LOG.warn("Already closed."); } } -} \ No newline at end of file +} diff --git a/src/main/java/cn/nukkit/nbt/tag/CompoundTag.java b/src/main/java/cn/nukkit/nbt/tag/CompoundTag.java index 52d187f9fdb..51a88dd6d4c 100644 --- a/src/main/java/cn/nukkit/nbt/tag/CompoundTag.java +++ b/src/main/java/cn/nukkit/nbt/tag/CompoundTag.java @@ -149,7 +149,7 @@ public int getInt(String name) { } public long getLong(String name) { - if (!tags.containsKey(name)) return (long) 0; + if (!tags.containsKey(name)) return 0; return ((NumberTag) tags.get(name)).getData().longValue(); } @@ -159,7 +159,7 @@ public float getFloat(String name) { } public double getDouble(String name) { - if (!tags.containsKey(name)) return (double) 0; + if (!tags.containsKey(name)) return 0; return ((NumberTag) tags.get(name)).getData().doubleValue(); } diff --git a/src/main/java/cn/nukkit/network/RakNetInterface.java b/src/main/java/cn/nukkit/network/RakNetInterface.java index 1f0ebbe1b5a..1b6fa75992a 100644 --- a/src/main/java/cn/nukkit/network/RakNetInterface.java +++ b/src/main/java/cn/nukkit/network/RakNetInterface.java @@ -230,7 +230,7 @@ public void setPortCheck(boolean value) { public void handleOption(String name, String value) { if ("bandwidth".equals(name)) { String[] v = value.split(";"); - this.network.addStatistics(Double.valueOf(v[0]), Double.valueOf(v[1])); + this.network.addStatistics(Double.parseDouble(v[0]), Double.parseDouble(v[1])); } } diff --git a/src/main/java/cn/nukkit/network/protocol/CraftingDataPacket.java b/src/main/java/cn/nukkit/network/protocol/CraftingDataPacket.java index 55ab658e284..40ee79017e4 100644 --- a/src/main/java/cn/nukkit/network/protocol/CraftingDataPacket.java +++ b/src/main/java/cn/nukkit/network/protocol/CraftingDataPacket.java @@ -28,15 +28,15 @@ public class CraftingDataPacket extends DataPacket { public boolean cleanRecipes; public void addShapelessRecipe(ShapelessRecipe... recipe) { - Collections.addAll(entries, (ShapelessRecipe[]) recipe); + Collections.addAll(entries, recipe); } public void addShapedRecipe(ShapedRecipe... recipe) { - Collections.addAll(entries, (ShapedRecipe[]) recipe); + Collections.addAll(entries, recipe); } public void addFurnaceRecipe(FurnaceRecipe... recipe) { - Collections.addAll(entries, (FurnaceRecipe[]) recipe); + Collections.addAll(entries, recipe); } @Override diff --git a/src/main/java/cn/nukkit/network/protocol/ProtocolInfo.java b/src/main/java/cn/nukkit/network/protocol/ProtocolInfo.java index dfd029cd2eb..32b6a9a30e3 100644 --- a/src/main/java/cn/nukkit/network/protocol/ProtocolInfo.java +++ b/src/main/java/cn/nukkit/network/protocol/ProtocolInfo.java @@ -13,7 +13,7 @@ public interface ProtocolInfo { /** * Actual Minecraft: PE protocol version */ - int CURRENT_PROTOCOL = Integer.valueOf("361"); //plugins can change it + int CURRENT_PROTOCOL = Integer.parseInt("361"); //plugins can change it List SUPPORTED_PROTOCOLS = Ints.asList(CURRENT_PROTOCOL); diff --git a/src/main/java/cn/nukkit/network/rcon/RCONServer.java b/src/main/java/cn/nukkit/network/rcon/RCONServer.java index 330db5abe84..fb979499cb6 100644 --- a/src/main/java/cn/nukkit/network/rcon/RCONServer.java +++ b/src/main/java/cn/nukkit/network/rcon/RCONServer.java @@ -13,6 +13,7 @@ import java.nio.channels.SocketChannel; import java.nio.channels.spi.SelectorProvider; import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; import java.util.*; /** @@ -154,7 +155,7 @@ private void handle(SocketChannel channel, RCONPacket packet) { case SERVERDATA_AUTH: byte[] payload = new byte[1]; - if (new String(packet.getPayload(), Charset.forName("UTF-8")).equals(this.password)) { + if (new String(packet.getPayload(), StandardCharsets.UTF_8).equals(this.password)) { this.rconSessions.add(channel); this.send(channel, new RCONPacket(packet.getId(), SERVERDATA_AUTH_RESPONSE, payload)); return; @@ -167,7 +168,7 @@ private void handle(SocketChannel channel, RCONPacket packet) { return; } - String command = new String(packet.getPayload(), Charset.forName("UTF-8")).trim(); + String command = new String(packet.getPayload(), StandardCharsets.UTF_8).trim(); synchronized (this.receiveQueue) { this.receiveQueue.add(new RCONCommand(channel, packet.getId(), command)); } diff --git a/src/main/java/cn/nukkit/plugin/PluginManager.java b/src/main/java/cn/nukkit/plugin/PluginManager.java index fab4bc5c7a1..419a857807b 100644 --- a/src/main/java/cn/nukkit/plugin/PluginManager.java +++ b/src/main/java/cn/nukkit/plugin/PluginManager.java @@ -194,7 +194,7 @@ public Map loadPlugins(File dictionary, List newLoaders, } //If the plugin requires new API features, being backwards compatible - if (Integer.valueOf(versionArray[1]) > Integer.valueOf(apiVersion[1])) { + if (Integer.parseInt(versionArray[1]) > Integer.parseInt(apiVersion[1])) { continue; } @@ -591,7 +591,7 @@ public void registerEvents(Listener listener, Plugin plugin) { for (Class clazz = eventClass; Event.class.isAssignableFrom(clazz); clazz = clazz.getSuperclass()) { // This loop checks for extending deprecated events if (clazz.getAnnotation(Deprecated.class) != null) { - if (Boolean.valueOf(String.valueOf(this.server.getConfig("settings.deprecated-verbpse", true)))) { + if (Boolean.parseBoolean(String.valueOf(this.server.getConfig("settings.deprecated-verbpse", true)))) { this.server.getLogger().warning(this.server.getLanguage().translateString("nukkit.plugin.deprecatedEvent", plugin.getName(), clazz.getName(), listener.getClass().getName() + "." + method.getName() + "()")); } break; diff --git a/src/main/java/cn/nukkit/raknet/protocol/Packet.java b/src/main/java/cn/nukkit/raknet/protocol/Packet.java index 0020998d433..8f72ba48207 100644 --- a/src/main/java/cn/nukkit/raknet/protocol/Packet.java +++ b/src/main/java/cn/nukkit/raknet/protocol/Packet.java @@ -140,7 +140,7 @@ protected void putAddress(String addr, int port, byte version) { this.putByte(version); if (version == 4) { for (String b : addr.split("\\.")) { - this.putByte((byte) ((~Integer.valueOf(b)) & 0xff)); + this.putByte((byte) ((~Integer.parseInt(b)) & 0xff)); } this.putShort(port); } else { diff --git a/src/main/java/cn/nukkit/raknet/server/SessionManager.java b/src/main/java/cn/nukkit/raknet/server/SessionManager.java index df6053554e8..db970871085 100644 --- a/src/main/java/cn/nukkit/raknet/server/SessionManager.java +++ b/src/main/java/cn/nukkit/raknet/server/SessionManager.java @@ -369,10 +369,10 @@ public boolean receiveStream() throws Exception { this.name = value; break; case "portChecking": - this.portChecking = Boolean.valueOf(value); + this.portChecking = Boolean.parseBoolean(value); break; case "packetLimit": - this.packetLimit = Integer.valueOf(value); + this.packetLimit = Integer.parseInt(value); break; } break; diff --git a/src/main/java/cn/nukkit/utils/Config.java b/src/main/java/cn/nukkit/utils/Config.java index 79d9d6098ad..882152f6bdd 100644 --- a/src/main/java/cn/nukkit/utils/Config.java +++ b/src/main/java/cn/nukkit/utils/Config.java @@ -216,33 +216,33 @@ public boolean save() { public boolean save(Boolean async) { if (this.file == null) throw new IllegalStateException("Failed to save Config. File object is undefined."); if (this.correct) { - String content = ""; + StringBuilder content = new StringBuilder(); switch (this.type) { case Config.PROPERTIES: - content = this.writeProperties(); + content = new StringBuilder(this.writeProperties()); break; case Config.JSON: - content = new GsonBuilder().setPrettyPrinting().create().toJson(this.config); + content = new StringBuilder(new GsonBuilder().setPrettyPrinting().create().toJson(this.config)); break; case Config.YAML: DumperOptions dumperOptions = new DumperOptions(); dumperOptions.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK); Yaml yaml = new Yaml(dumperOptions); - content = yaml.dump(this.config); + content = new StringBuilder(yaml.dump(this.config)); break; case Config.ENUM: for (Object o : this.config.entrySet()) { Map.Entry entry = (Map.Entry) o; - content += entry.getKey() + "\r\n"; + content.append(entry.getKey()).append("\r\n"); } break; } if (async) { - Server.getInstance().getScheduler().scheduleAsyncTask(new FileWriteTask(this.file, content)); + Server.getInstance().getScheduler().scheduleAsyncTask(new FileWriteTask(this.file, content.toString())); } else { try { - Utils.writeFile(this.file, content); + Utils.writeFile(this.file, content.toString()); } catch (IOException e) { Server.getInstance().getLogger().logException(e); } @@ -458,7 +458,7 @@ private void parseList(String content) { } private String writeProperties() { - String content = "#Properties Config file\r\n#" + new SimpleDateFormat("yyyy-MM-dd hh:mm:ss").format(new Date()) + "\r\n"; + StringBuilder content = new StringBuilder("#Properties Config file\r\n#" + new SimpleDateFormat("yyyy-MM-dd hh:mm:ss").format(new Date()) + "\r\n"); for (Object o : this.config.entrySet()) { Map.Entry entry = (Map.Entry) o; Object v = entry.getValue(); @@ -466,9 +466,9 @@ private String writeProperties() { if (v instanceof Boolean) { v = (Boolean) v ? "on" : "off"; } - content += k + "=" + v + "\r\n"; + content.append(k).append("=").append(v).append("\r\n"); } - return content; + return content.toString(); } private void parseProperties(String content) { diff --git a/src/main/java/cn/nukkit/utils/TextFormat.java b/src/main/java/cn/nukkit/utils/TextFormat.java index b5150288780..5a068f80937 100644 --- a/src/main/java/cn/nukkit/utils/TextFormat.java +++ b/src/main/java/cn/nukkit/utils/TextFormat.java @@ -222,7 +222,7 @@ public static String colorize(String textToTranslate) { * @return Any remaining chat color to pass onto the next line. */ public static String getLastColors(String input) { - String result = ""; + StringBuilder result = new StringBuilder(); int length = input.length(); // Search backwards from the end as it is faster @@ -233,7 +233,7 @@ public static String getLastColors(String input) { TextFormat color = getByChar(c); if (color != null) { - result = color.toString() + result; + result.insert(0, color.toString()); // Once we find a color or reset we can stop searching if (color.isColor() || color.equals(RESET)) { @@ -243,7 +243,7 @@ public static String getLastColors(String input) { } } - return result; + return result.toString(); } /** @@ -273,4 +273,4 @@ public boolean isFormat() { public boolean isColor() { return !isFormat && this != RESET; } -} \ No newline at end of file +}