From 6560a704c9cd2cfa9fce0017857d7d223784e18d Mon Sep 17 00:00:00 2001 From: Bixilon Date: Tue, 22 Sep 2020 19:59:10 +0200 Subject: [PATCH] refactor code --- src/main/java/de/bixilon/minosoft/Launcher.java | 1 - src/main/java/de/bixilon/minosoft/Minosoft.java | 1 - src/main/java/de/bixilon/minosoft/config/Configuration.java | 1 - .../bixilon/minosoft/game/datatypes/ChatTextPositions.java | 1 - .../java/de/bixilon/minosoft/game/datatypes/Colors.java | 1 - .../java/de/bixilon/minosoft/game/datatypes/Player.java | 6 +++--- .../de/bixilon/minosoft/game/datatypes/TextComponent.java | 1 - .../game/datatypes/entities/meta/HorseMetaData.java | 3 --- .../minosoft/game/datatypes/entities/mob/OtherPlayer.java | 2 +- .../minosoft/game/datatypes/inventory/InventorySlots.java | 1 - .../game/datatypes/objectLoader/versions/Version.java | 1 - .../datatypes/objectLoader/versions/VersionMapping.java | 2 +- .../game/datatypes/scoreboard/ScoreboardManager.java | 1 - .../game/datatypes/world/palette/IndirectPalette.java | 4 ++-- .../java/de/bixilon/minosoft/gui/main/AccountListCell.java | 1 - .../java/de/bixilon/minosoft/gui/main/AccountWindow.java | 2 -- .../java/de/bixilon/minosoft/gui/main/ServerListCell.java | 6 ------ .../java/de/bixilon/minosoft/gui/main/SessionListCell.java | 1 - src/main/java/de/bixilon/minosoft/ping/ServerListPing.java | 1 - .../java/de/bixilon/minosoft/protocol/network/Network.java | 4 +--- .../packets/clientbound/play/PacketAdvancements.java | 5 ++--- .../protocol/packets/clientbound/play/PacketBossBar.java | 2 -- .../packets/clientbound/play/PacketCombatEvent.java | 1 - .../packets/clientbound/play/PacketEntityEquipment.java | 2 +- .../packets/clientbound/play/PacketEntityStatus.java | 1 - .../protocol/packets/clientbound/play/PacketMapData.java | 1 - .../packets/serverbound/play/PacketClientStatus.java | 1 - .../minosoft/protocol/protocol/ConnectionStates.java | 1 - .../bixilon/minosoft/protocol/protocol/PacketHandler.java | 2 +- .../java/de/bixilon/minosoft/protocol/protocol/Packets.java | 1 - .../de/bixilon/minosoft/protocol/protocol/Protocol.java | 4 +--- util/serverWrapper.py | 3 --- 32 files changed, 13 insertions(+), 52 deletions(-) diff --git a/src/main/java/de/bixilon/minosoft/Launcher.java b/src/main/java/de/bixilon/minosoft/Launcher.java index 148985d66..cfb407b3e 100644 --- a/src/main/java/de/bixilon/minosoft/Launcher.java +++ b/src/main/java/de/bixilon/minosoft/Launcher.java @@ -34,7 +34,6 @@ import javafx.util.Callback; import java.io.IOException; import java.util.Map; - public class Launcher extends Application { public static void start() { diff --git a/src/main/java/de/bixilon/minosoft/Minosoft.java b/src/main/java/de/bixilon/minosoft/Minosoft.java index 767cf6bb1..508f1a773 100644 --- a/src/main/java/de/bixilon/minosoft/Minosoft.java +++ b/src/main/java/de/bixilon/minosoft/Minosoft.java @@ -69,7 +69,6 @@ public class Minosoft { accountList = config.getMojangAccounts(); selectAccount(accountList.get(config.getString(GameConfiguration.ACCOUNT_SELECTED))); - serverList = config.getServers(); Launcher.start(); } diff --git a/src/main/java/de/bixilon/minosoft/config/Configuration.java b/src/main/java/de/bixilon/minosoft/config/Configuration.java index 3610cbf97..c5da6742e 100644 --- a/src/main/java/de/bixilon/minosoft/config/Configuration.java +++ b/src/main/java/de/bixilon/minosoft/config/Configuration.java @@ -233,4 +233,3 @@ public class Configuration { } } - diff --git a/src/main/java/de/bixilon/minosoft/game/datatypes/ChatTextPositions.java b/src/main/java/de/bixilon/minosoft/game/datatypes/ChatTextPositions.java index 7b47e8cd4..476e7dfcb 100644 --- a/src/main/java/de/bixilon/minosoft/game/datatypes/ChatTextPositions.java +++ b/src/main/java/de/bixilon/minosoft/game/datatypes/ChatTextPositions.java @@ -18,7 +18,6 @@ public enum ChatTextPositions { SYSTEM_MESSAGE, ABOVE_HOTBAR; - public static ChatTextPositions byId(int id) { return values()[id]; } diff --git a/src/main/java/de/bixilon/minosoft/game/datatypes/Colors.java b/src/main/java/de/bixilon/minosoft/game/datatypes/Colors.java index cfb648c81..f298eacd3 100644 --- a/src/main/java/de/bixilon/minosoft/game/datatypes/Colors.java +++ b/src/main/java/de/bixilon/minosoft/game/datatypes/Colors.java @@ -31,7 +31,6 @@ public enum Colors { RED, BLACK; - public static Colors byId(int id) { return values()[id]; } diff --git a/src/main/java/de/bixilon/minosoft/game/datatypes/Player.java b/src/main/java/de/bixilon/minosoft/game/datatypes/Player.java index b3f3c5bd3..f6e7370f1 100644 --- a/src/main/java/de/bixilon/minosoft/game/datatypes/Player.java +++ b/src/main/java/de/bixilon/minosoft/game/datatypes/Player.java @@ -30,20 +30,20 @@ import java.util.UUID; import static de.bixilon.minosoft.protocol.protocol.ProtocolDefinition.PLAYER_INVENTORY_ID; public class Player { + public final HashMap playerList = new HashMap<>(); final MojangAccount account; final ScoreboardManager scoreboardManager = new ScoreboardManager(); - public final HashMap playerList = new HashMap<>(); + final World world = new World("world"); + final HashMap inventories = new HashMap<>(); float health; int food; float saturation; BlockPosition spawnLocation; GameModes gameMode; - final World world = new World("world"); byte selectedSlot; int level; int totalExperience; OtherPlayer player; - final HashMap inventories = new HashMap<>(); boolean spawnConfirmed = false; TextComponent tabHeader; diff --git a/src/main/java/de/bixilon/minosoft/game/datatypes/TextComponent.java b/src/main/java/de/bixilon/minosoft/game/datatypes/TextComponent.java index 223b26de5..4a538b538 100644 --- a/src/main/java/de/bixilon/minosoft/game/datatypes/TextComponent.java +++ b/src/main/java/de/bixilon/minosoft/game/datatypes/TextComponent.java @@ -248,7 +248,6 @@ public class TextComponent { final ChatColors color; final String prefix; - ChatAttributes(String consolePrefix, ChatColors color) { this.consolePrefix = consolePrefix; this.color = color; diff --git a/src/main/java/de/bixilon/minosoft/game/datatypes/entities/meta/HorseMetaData.java b/src/main/java/de/bixilon/minosoft/game/datatypes/entities/meta/HorseMetaData.java index 9e49c520a..6f470acf4 100644 --- a/src/main/java/de/bixilon/minosoft/game/datatypes/entities/meta/HorseMetaData.java +++ b/src/main/java/de/bixilon/minosoft/game/datatypes/entities/meta/HorseMetaData.java @@ -76,7 +76,6 @@ public class HorseMetaData extends AbstractHorseMetaData { GOLD_ARMOR, DIAMOND_ARMOR; - public static HorseArmors byId(int id) { return values()[id]; } @@ -95,7 +94,6 @@ public class HorseMetaData extends AbstractHorseMetaData { GRAY, DARK_BROWN; - public static HorseColors byId(int id) { return values()[id]; } @@ -112,7 +110,6 @@ public class HorseMetaData extends AbstractHorseMetaData { WHITE_DOTS, BLACK_DOTS; - public static HorseDots byId(int id) { return values()[id]; } diff --git a/src/main/java/de/bixilon/minosoft/game/datatypes/entities/mob/OtherPlayer.java b/src/main/java/de/bixilon/minosoft/game/datatypes/entities/mob/OtherPlayer.java index 5050fe653..ace262972 100644 --- a/src/main/java/de/bixilon/minosoft/game/datatypes/entities/mob/OtherPlayer.java +++ b/src/main/java/de/bixilon/minosoft/game/datatypes/entities/mob/OtherPlayer.java @@ -27,8 +27,8 @@ public class OtherPlayer extends Mob implements MobInterface { final String name; final PlayerPropertyData[] properties; final short currentItem; - HumanMetaData metaData; final Poses status = Poses.STANDING; + HumanMetaData metaData; public OtherPlayer(int entityId, String name, UUID uuid, PlayerPropertyData[] properties, Location location, int yaw, int pitch, int headYaw, short currentItem, HumanMetaData metaData) { super(entityId, uuid, location, yaw, pitch, headYaw); diff --git a/src/main/java/de/bixilon/minosoft/game/datatypes/inventory/InventorySlots.java b/src/main/java/de/bixilon/minosoft/game/datatypes/inventory/InventorySlots.java index 7f2d25340..1fd3ffcc2 100644 --- a/src/main/java/de/bixilon/minosoft/game/datatypes/inventory/InventorySlots.java +++ b/src/main/java/de/bixilon/minosoft/game/datatypes/inventory/InventorySlots.java @@ -68,7 +68,6 @@ public class InventorySlots { HOTBAR_9, OFF_HAND; - public static PlayerInventorySlots byId(int id, int protocolId) { return values()[id]; } diff --git a/src/main/java/de/bixilon/minosoft/game/datatypes/objectLoader/versions/Version.java b/src/main/java/de/bixilon/minosoft/game/datatypes/objectLoader/versions/Version.java index 324b08612..b6676453d 100644 --- a/src/main/java/de/bixilon/minosoft/game/datatypes/objectLoader/versions/Version.java +++ b/src/main/java/de/bixilon/minosoft/game/datatypes/objectLoader/versions/Version.java @@ -77,7 +77,6 @@ public class Version { this.mapping = mapping; } - public boolean isGettingLoaded() { return isGettingLoaded; } diff --git a/src/main/java/de/bixilon/minosoft/game/datatypes/objectLoader/versions/VersionMapping.java b/src/main/java/de/bixilon/minosoft/game/datatypes/objectLoader/versions/VersionMapping.java index db22818b1..389a0d8f8 100644 --- a/src/main/java/de/bixilon/minosoft/game/datatypes/objectLoader/versions/VersionMapping.java +++ b/src/main/java/de/bixilon/minosoft/game/datatypes/objectLoader/versions/VersionMapping.java @@ -32,6 +32,7 @@ import java.util.HashSet; public class VersionMapping { final Version version; + final HashSet loaded = new HashSet<>(); HashBiMap motiveIdentifierMap; HashBiMap particleIdentifierMap; HashBiMap statisticIdentifierMap; @@ -45,7 +46,6 @@ public class VersionMapping { HashBiMap enchantmentMap; HashBiMap particleIdMap; HashBiMap statisticIdMap; - final HashSet loaded = new HashSet<>(); public VersionMapping(Version version) { this.version = version; diff --git a/src/main/java/de/bixilon/minosoft/game/datatypes/scoreboard/ScoreboardManager.java b/src/main/java/de/bixilon/minosoft/game/datatypes/scoreboard/ScoreboardManager.java index 388d20c28..f9c7fd9b6 100644 --- a/src/main/java/de/bixilon/minosoft/game/datatypes/scoreboard/ScoreboardManager.java +++ b/src/main/java/de/bixilon/minosoft/game/datatypes/scoreboard/ScoreboardManager.java @@ -19,7 +19,6 @@ public class ScoreboardManager { final HashMap teams = new HashMap<>(); final HashMap objectives = new HashMap<>(); - public void addTeam(Team team) { teams.put(team.getName(), team); } diff --git a/src/main/java/de/bixilon/minosoft/game/datatypes/world/palette/IndirectPalette.java b/src/main/java/de/bixilon/minosoft/game/datatypes/world/palette/IndirectPalette.java index c28da113c..ecc18315f 100644 --- a/src/main/java/de/bixilon/minosoft/game/datatypes/world/palette/IndirectPalette.java +++ b/src/main/java/de/bixilon/minosoft/game/datatypes/world/palette/IndirectPalette.java @@ -19,10 +19,10 @@ import de.bixilon.minosoft.game.datatypes.objectLoader.blocks.Block; import de.bixilon.minosoft.protocol.protocol.InByteBuffer; public class IndirectPalette implements Palette { - int protocolId; - CustomMapping mapping; final HashBiMap map = HashBiMap.create(); final byte bitsPerBlock; + int protocolId; + CustomMapping mapping; public IndirectPalette(byte bitsPerBlock) { this.bitsPerBlock = bitsPerBlock; diff --git a/src/main/java/de/bixilon/minosoft/gui/main/AccountListCell.java b/src/main/java/de/bixilon/minosoft/gui/main/AccountListCell.java index 131b80f05..eee333ab1 100644 --- a/src/main/java/de/bixilon/minosoft/gui/main/AccountListCell.java +++ b/src/main/java/de/bixilon/minosoft/gui/main/AccountListCell.java @@ -62,7 +62,6 @@ public class AccountListCell extends ListCell implements Initiali return root; } - @Override protected void updateItem(MojangAccount account, boolean empty) { super.updateItem(account, empty); diff --git a/src/main/java/de/bixilon/minosoft/gui/main/AccountWindow.java b/src/main/java/de/bixilon/minosoft/gui/main/AccountWindow.java index 3be8a9181..cb045ae73 100644 --- a/src/main/java/de/bixilon/minosoft/gui/main/AccountWindow.java +++ b/src/main/java/de/bixilon/minosoft/gui/main/AccountWindow.java @@ -62,7 +62,6 @@ public class AccountWindow implements Initializable { PasswordField password = new PasswordField(); password.setPromptText("Password"); - grid.add(new Label("Email:"), 0, 0); grid.add(email, 1, 0); grid.add(new Label("Password:"), 0, 1); @@ -100,7 +99,6 @@ public class AccountWindow implements Initializable { Window window = dialog.getDialogPane().getScene().getWindow(); window.setOnCloseRequest(windowEvent -> window.hide()); - dialog.showAndWait(); } } diff --git a/src/main/java/de/bixilon/minosoft/gui/main/ServerListCell.java b/src/main/java/de/bixilon/minosoft/gui/main/ServerListCell.java index ee5a8ab4b..c98b451ce 100644 --- a/src/main/java/de/bixilon/minosoft/gui/main/ServerListCell.java +++ b/src/main/java/de/bixilon/minosoft/gui/main/ServerListCell.java @@ -93,7 +93,6 @@ public class ServerListCell extends ListCell implements Initializable { return root; } - @Override protected void updateItem(Server server, boolean empty) { super.updateItem(server, empty); @@ -215,7 +214,6 @@ public class ServerListCell extends ListCell implements Initializable { serverAddress.setPromptText("Server address"); serverAddress.setText(server.getAddress()); - if (server.getDesiredVersion() == -1) { GUITools.versionList.getSelectionModel().select(Versions.getLowestVersionSupported()); } else { @@ -281,7 +279,6 @@ public class ServerListCell extends ListCell implements Initializable { } - private void resetCell() { // clear all cells setStyle(null); @@ -336,7 +333,6 @@ public class ServerListCell extends ListCell implements Initializable { Label serverAddressLabel = new Label(server.getAddress()); Label forcedVersionLabel = new Label(); - if (server.getDesiredVersion() == -1) { forcedVersionLabel.setText(Versions.getLowestVersionSupported().getVersionName()); } else { @@ -375,7 +371,6 @@ public class ServerListCell extends ListCell implements Initializable { Label motdLabel = new Label(lastPing.getMotd().getRawMessage()); Label moddedBrandLabel = new Label(lastPing.getServerModInfo().getBrand()); - grid.add(new Label("Real server address:"), 0, ++column); grid.add(realServerAddressLabel, 1, column); grid.add(new Label("Server version:"), 0, ++column); @@ -400,7 +395,6 @@ public class ServerListCell extends ListCell implements Initializable { } } - dialog.getDialogPane().setContent(grid); dialog.showAndWait(); diff --git a/src/main/java/de/bixilon/minosoft/gui/main/SessionListCell.java b/src/main/java/de/bixilon/minosoft/gui/main/SessionListCell.java index f1c9492a1..a3b26b229 100644 --- a/src/main/java/de/bixilon/minosoft/gui/main/SessionListCell.java +++ b/src/main/java/de/bixilon/minosoft/gui/main/SessionListCell.java @@ -59,7 +59,6 @@ public class SessionListCell extends ListCell implements Initializab return root; } - @Override protected void updateItem(Connection connection, boolean empty) { super.updateItem(connection, empty); diff --git a/src/main/java/de/bixilon/minosoft/ping/ServerListPing.java b/src/main/java/de/bixilon/minosoft/ping/ServerListPing.java index abc82e076..a71fbd822 100644 --- a/src/main/java/de/bixilon/minosoft/ping/ServerListPing.java +++ b/src/main/java/de/bixilon/minosoft/ping/ServerListPing.java @@ -44,7 +44,6 @@ public class ServerListPing { } serverBrand = json.getAsJsonObject("version").get("name").getAsString(); - if (json.has("modinfo") && json.getAsJsonObject("modinfo").has("type") && json.getAsJsonObject("modinfo").get("type").getAsString().equals("FML")) { serverModInfo = new ForgeModInfo(json.getAsJsonObject("modinfo")); } else { diff --git a/src/main/java/de/bixilon/minosoft/protocol/network/Network.java b/src/main/java/de/bixilon/minosoft/protocol/network/Network.java index 4171c6b23..7d16ce8bd 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/network/Network.java +++ b/src/main/java/de/bixilon/minosoft/protocol/network/Network.java @@ -146,8 +146,7 @@ public class Network { break; } - - // everything sent for now, waiting for data +// everything sent for now, waiting for data int numRead = 0; int length = 0; int read; @@ -269,7 +268,6 @@ public class Network { Log.debug("Encryption enabled!"); } - public void disconnect() { connection.setConnectionState(ConnectionStates.DISCONNECTING); try { diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketAdvancements.java b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketAdvancements.java index 8685d8fcb..8ed75287c 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketAdvancements.java +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketAdvancements.java @@ -29,11 +29,10 @@ import java.util.ArrayList; import java.util.HashMap; public class PacketAdvancements implements ClientboundPacket { - boolean reset; - final HashMap advancements = new HashMap<>(); - String[] toRemove; final HashMap progresses = new HashMap<>(); + boolean reset; + String[] toRemove; @Override public boolean read(InByteBuffer buffer) { diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketBossBar.java b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketBossBar.java index aff3d80a1..d418543ad 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketBossBar.java +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketBossBar.java @@ -129,7 +129,6 @@ public class PacketBossBar implements ClientboundPacket { UPDATE_STYLE, UPDATE_FLAGS; - public static BossBarActions byId(int id) { return values()[id]; } @@ -164,7 +163,6 @@ public class PacketBossBar implements ClientboundPacket { NOTCHES_12, NOTCHES_20; - public static BossBarDivisions byId(int id) { return values()[id]; } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketCombatEvent.java b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketCombatEvent.java index ed96754e7..02b3891c0 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketCombatEvent.java +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketCombatEvent.java @@ -63,7 +63,6 @@ public class PacketCombatEvent implements ClientboundPacket { END_COMBAT, ENTITY_DEAD; - public static CombatEvents byId(int id) { return values()[id]; } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketEntityEquipment.java b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketEntityEquipment.java index 8bedeff0b..606b61e82 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketEntityEquipment.java +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketEntityEquipment.java @@ -24,8 +24,8 @@ import java.util.HashMap; import java.util.Map; public class PacketEntityEquipment implements ClientboundPacket { - int entityId; final HashMap slots = new HashMap<>(); + int entityId; @Override public boolean read(InByteBuffer buffer) { diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketEntityStatus.java b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketEntityStatus.java index 8b753fdee..a25a41d03 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketEntityStatus.java +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketEntityStatus.java @@ -82,7 +82,6 @@ public class PacketEntityStatus implements ClientboundPacket { PORTAL_PARTICLE_CHORUS; // ToDo: 1.11+ (for each entity) - public static EntityStates byId(int id) { return values()[id]; } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketMapData.java b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketMapData.java index 4fdee53e0..82f750f47 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketMapData.java +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketMapData.java @@ -167,7 +167,6 @@ public class PacketMapData implements ClientboundPacket { PLAYERS, SCALE; - public static PacketMapDataDataActions byId(int id) { return values()[id]; } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/serverbound/play/PacketClientStatus.java b/src/main/java/de/bixilon/minosoft/protocol/packets/serverbound/play/PacketClientStatus.java index 083c06b8a..485450638 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/serverbound/play/PacketClientStatus.java +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/serverbound/play/PacketClientStatus.java @@ -48,7 +48,6 @@ public class PacketClientStatus implements ServerboundPacket { REQUEST_STATISTICS, OPEN_INVENTORY; - public static ClientStates byId(int id) { return values()[id]; } diff --git a/src/main/java/de/bixilon/minosoft/protocol/protocol/ConnectionStates.java b/src/main/java/de/bixilon/minosoft/protocol/protocol/ConnectionStates.java index 2aac4be52..004e3c95a 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/protocol/ConnectionStates.java +++ b/src/main/java/de/bixilon/minosoft/protocol/protocol/ConnectionStates.java @@ -24,7 +24,6 @@ public enum ConnectionStates { FAILED, FAILED_NO_RETRY; - public static ConnectionStates byId(int id) { return values()[id]; } diff --git a/src/main/java/de/bixilon/minosoft/protocol/protocol/PacketHandler.java b/src/main/java/de/bixilon/minosoft/protocol/protocol/PacketHandler.java index 9b0cfb095..3942f6755 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/protocol/PacketHandler.java +++ b/src/main/java/de/bixilon/minosoft/protocol/protocol/PacketHandler.java @@ -65,7 +65,7 @@ public class PacketHandler { if (version == null) { Log.fatal(String.format("Server is running on unknown version or a invalid version was forced (version=%d, brand=\"%s\")", versionId, pkg.getResponse().getServerBrand())); } else { - connection.setVersion(version); + connection.setVersion(version); } Log.info(String.format("Status response received: %s/%s online. MotD: '%s'", pkg.getResponse().getPlayerOnline(), pkg.getResponse().getMaxPlayers(), pkg.getResponse().getMotd().getColoredMessage())); connection.handlePingCallbacks(pkg.getResponse()); diff --git a/src/main/java/de/bixilon/minosoft/protocol/protocol/Packets.java b/src/main/java/de/bixilon/minosoft/protocol/protocol/Packets.java index a9d7ebed6..4a59cbb34 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/protocol/Packets.java +++ b/src/main/java/de/bixilon/minosoft/protocol/protocol/Packets.java @@ -200,7 +200,6 @@ public class Packets { PLAY_SET_COMPRESSION(PacketSetCompression.class), PLAY_ADVANCEMENT_PROGRESS(null); - final ConnectionStates state; final Class clazz; diff --git a/src/main/java/de/bixilon/minosoft/protocol/protocol/Protocol.java b/src/main/java/de/bixilon/minosoft/protocol/protocol/Protocol.java index 14952e261..e5c82b4ba 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/protocol/Protocol.java +++ b/src/main/java/de/bixilon/minosoft/protocol/protocol/Protocol.java @@ -21,7 +21,6 @@ public abstract class Protocol { static final HashMap> serverboundPacketMapping = new HashMap<>(); static final HashMap> clientboundPacketMapping = new HashMap<>(); - static { serverboundPacketMapping.put(ConnectionStates.HANDSHAKING, HashBiMap.create()); serverboundPacketMapping.put(ConnectionStates.STATUS, HashBiMap.create()); @@ -52,9 +51,8 @@ public abstract class Protocol { clientboundPacketMapping.get(ConnectionStates.LOGIN).put(Packets.Clientbound.LOGIN_PLUGIN_REQUEST, 0x04); } - public static int getPacketCommand(Packets.Serverbound packet) { - return serverboundPacketMapping.get(packet.getState()).get(packet); + return serverboundPacketMapping.get(packet.getState()).get(packet); } public static Packets.Clientbound getPacketByCommand(ConnectionStates state, int command) { diff --git a/util/serverWrapper.py b/util/serverWrapper.py index 37f241465..16062652c 100644 --- a/util/serverWrapper.py +++ b/util/serverWrapper.py @@ -19,7 +19,6 @@ import sys javaPath = "/usr/lib/jvm/java-8-openjdk-amd64/bin/java" print("Minecraft server wrapper") - def download(manifest, version): versionJson = "" for key in manifest["versions"]: @@ -31,7 +30,6 @@ def download(manifest, version): return downloadVersion(requests.get(versionJson).json()) - def downloadVersion(versionJson): server = versionJson["downloads"]["server"]["url"] if server == "": @@ -48,7 +46,6 @@ def downloadVersion(versionJson): f.write(server.content) print("done") - if len(sys.argv) > 1: # check args if sys.argv[1] == "download-all":