From 4d6db77986b0211952313303077afe0f5939e192 Mon Sep 17 00:00:00 2001 From: Bixilon Date: Tue, 21 Jul 2020 20:52:48 +0200 Subject: [PATCH] refactor enum to String (in messages do not use name()) --- src/main/java/de/bixilon/minosoft/Minosoft.java | 2 +- .../minosoft/game/datatypes/blocks/Block.java | 6 +++--- .../minosoft/game/datatypes/blocks/Blocks.java | 2 +- .../datatypes/blocks/actions/NoteBlockAction.java | 2 +- .../game/datatypes/blocks/actions/PistonAction.java | 2 +- .../game/datatypes/entities/StatusEffect.java | 2 +- .../minosoft/game/datatypes/inventory/Slot.java | 7 ++++++- .../minosoft/protocol/network/Connection.java | 2 +- .../bixilon/minosoft/protocol/network/Network.java | 4 ++-- .../clientbound/login/PacketLoginSuccess.java | 2 +- .../clientbound/play/PacketBlockEntityMetadata.java | 2 +- .../packets/clientbound/play/PacketBossBar.java | 12 ++++++------ .../clientbound/play/PacketChangeGameState.java | 4 ++-- .../packets/clientbound/play/PacketCombatEvent.java | 6 +++--- .../packets/clientbound/play/PacketEffect.java | 2 +- .../clientbound/play/PacketEntityAnimation.java | 2 +- .../clientbound/play/PacketEntityEquipment.java | 4 ++-- .../packets/clientbound/play/PacketEntityStatus.java | 2 +- .../packets/clientbound/play/PacketFacePlayer.java | 2 +- .../packets/clientbound/play/PacketJoinGame.java | 2 +- .../clientbound/play/PacketMultiBlockChange.java | 2 +- .../packets/clientbound/play/PacketOpenWindow.java | 2 +- .../packets/clientbound/play/PacketParticle.java | 2 +- .../packets/clientbound/play/PacketPlayerInfo.java | 2 +- .../clientbound/play/PacketRemoveEntityEffect.java | 2 +- .../packets/clientbound/play/PacketRespawn.java | 2 +- .../play/PacketScoreboardDisplayScoreboard.java | 2 +- .../clientbound/play/PacketScoreboardObjective.java | 4 ++-- .../play/PacketScoreboardUpdateScore.java | 2 +- .../clientbound/play/PacketSelectAdvancementTab.java | 2 +- .../clientbound/play/PacketServerDifficulty.java | 2 +- .../packets/clientbound/play/PacketSpawnMob.java | 2 +- .../packets/clientbound/play/PacketSpawnObject.java | 2 +- .../clientbound/play/PacketSpawnPainting.java | 2 +- .../packets/clientbound/play/PacketTeams.java | 2 +- .../packets/clientbound/play/PacketTitle.java | 8 ++++---- .../clientbound/play/PacketUnlockRecipes.java | 2 +- .../serverbound/play/PacketAdvancementTab.java | 2 +- .../packets/serverbound/play/PacketAnimation.java | 2 +- .../packets/serverbound/play/PacketClickWindow.java | 2 +- .../packets/serverbound/play/PacketClientStatus.java | 2 +- .../serverbound/play/PacketCraftingBookData.java | 4 ++-- .../packets/serverbound/play/PacketEntityAction.java | 2 +- .../serverbound/play/PacketInteractEntity.java | 2 +- .../serverbound/play/PacketPlayerBlockPlacement.java | 2 +- .../serverbound/play/PacketPlayerDigging.java | 2 +- .../serverbound/play/PacketResourcePackStatus.java | 2 +- .../serverbound/play/PacketUpdateCommandBlock.java | 2 +- .../packets/serverbound/play/PacketUseItem.java | 2 +- .../minosoft/protocol/protocol/ConnectionState.java | 7 +++---- .../bixilon/minosoft/protocol/protocol/Packets.java | 2 -- .../minosoft/protocol/protocol/ProtocolVersion.java | 4 ++++ .../protocol/protocol/versions/Protocol_1_14_4.java | 2 +- 53 files changed, 79 insertions(+), 73 deletions(-) diff --git a/src/main/java/de/bixilon/minosoft/Minosoft.java b/src/main/java/de/bixilon/minosoft/Minosoft.java index 10eef70e7..69541eb59 100644 --- a/src/main/java/de/bixilon/minosoft/Minosoft.java +++ b/src/main/java/de/bixilon/minosoft/Minosoft.java @@ -55,7 +55,7 @@ public class Minosoft { Log.info(String.format("Loaded config file (version=%s)", config.getInteger(GameConfiguration.CONFIG_VERSION))); // set log level from config Log.setLevel(LogLevel.byName(config.getString(GameConfiguration.GENERAL_LOG_LEVEL))); - Log.info(String.format("Logging info with level: %s", Log.getLevel().name())); + Log.info(String.format("Logging info with level: %s", Log.getLevel())); Log.info("Checking assets..."); checkAssets(); Log.info("Assets checking done"); diff --git a/src/main/java/de/bixilon/minosoft/game/datatypes/blocks/Block.java b/src/main/java/de/bixilon/minosoft/game/datatypes/blocks/Block.java index 3c8e923d1..dc2221b90 100644 --- a/src/main/java/de/bixilon/minosoft/game/datatypes/blocks/Block.java +++ b/src/main/java/de/bixilon/minosoft/game/datatypes/blocks/Block.java @@ -69,7 +69,7 @@ public class Block { if (rotation != BlockRotation.NONE) { out.append(" ("); out.append("rotation="); - out.append(getRotation().name()); + out.append(getRotation()); } if (properties.length > 0) { if (out.length() > 0) { @@ -79,7 +79,7 @@ public class Block { } out.append("properties={"); for (BlockProperties property : properties) { - out.append(property.name()); + out.append(property); out.append(","); } // remove last , @@ -89,6 +89,6 @@ public class Block { if (out.length() > 0) { out.append(")"); } - return String.format("%s:%s%s", getMod(), getIdentifier(), out.toString()); + return String.format("%s:%s%s", getMod(), getIdentifier(), out); } } diff --git a/src/main/java/de/bixilon/minosoft/game/datatypes/blocks/Blocks.java b/src/main/java/de/bixilon/minosoft/game/datatypes/blocks/Blocks.java index 537295b85..7d7d5284a 100644 --- a/src/main/java/de/bixilon/minosoft/game/datatypes/blocks/Blocks.java +++ b/src/main/java/de/bixilon/minosoft/game/datatypes/blocks/Blocks.java @@ -578,7 +578,7 @@ public class Blocks { } else { blockIdString = String.valueOf(blockId); } - throw new RuntimeException(String.format("Block Id %s is already present for %s! (identifier=%s, version=%s)", blockIdString, versionMapping.get(blockId), identifierName, version.name())); + throw new RuntimeException(String.format("Block Id %s is already present for %s! (identifier=%s, version=%s)", blockIdString, versionMapping.get(blockId), identifierName, version)); } } diff --git a/src/main/java/de/bixilon/minosoft/game/datatypes/blocks/actions/NoteBlockAction.java b/src/main/java/de/bixilon/minosoft/game/datatypes/blocks/actions/NoteBlockAction.java index 593eb2abd..7006028f7 100644 --- a/src/main/java/de/bixilon/minosoft/game/datatypes/blocks/actions/NoteBlockAction.java +++ b/src/main/java/de/bixilon/minosoft/game/datatypes/blocks/actions/NoteBlockAction.java @@ -24,7 +24,7 @@ public class NoteBlockAction implements BlockAction { @Override public String toString() { - return String.format("NOTEBLOCK_%s:%d", instrument.name(), pitch); + return String.format("NOTEBLOCK_%s:%d", instrument, pitch); } public enum Instruments { diff --git a/src/main/java/de/bixilon/minosoft/game/datatypes/blocks/actions/PistonAction.java b/src/main/java/de/bixilon/minosoft/game/datatypes/blocks/actions/PistonAction.java index afdb2b174..2e3465d88 100644 --- a/src/main/java/de/bixilon/minosoft/game/datatypes/blocks/actions/PistonAction.java +++ b/src/main/java/de/bixilon/minosoft/game/datatypes/blocks/actions/PistonAction.java @@ -26,7 +26,7 @@ public class PistonAction implements BlockAction { @Override public String toString() { - return String.format("PISTON_%s:%s", status.name(), direction.name()); + return String.format("PISTON_%s:%s", status, direction); } public enum PistonStates { diff --git a/src/main/java/de/bixilon/minosoft/game/datatypes/entities/StatusEffect.java b/src/main/java/de/bixilon/minosoft/game/datatypes/entities/StatusEffect.java index 118b43893..bd4a507a9 100644 --- a/src/main/java/de/bixilon/minosoft/game/datatypes/entities/StatusEffect.java +++ b/src/main/java/de/bixilon/minosoft/game/datatypes/entities/StatusEffect.java @@ -38,6 +38,6 @@ public class StatusEffect { @Override public String toString() { - return String.format("%s (amplifier: %d, duration: %d)", effect.name(), amplifier, duration); + return String.format("%s (amplifier: %d, duration: %d)", effect, amplifier, duration); } } diff --git a/src/main/java/de/bixilon/minosoft/game/datatypes/inventory/Slot.java b/src/main/java/de/bixilon/minosoft/game/datatypes/inventory/Slot.java index a13cf1d96..4147e6628 100644 --- a/src/main/java/de/bixilon/minosoft/game/datatypes/inventory/Slot.java +++ b/src/main/java/de/bixilon/minosoft/game/datatypes/inventory/Slot.java @@ -60,7 +60,7 @@ public class Slot { public String getDisplayName() { if (nbt != null && nbt.containsKey("display") && nbt.getCompoundTag("display").containsKey("Name")) { // check if object has nbt data, and a custom display name - return String.format("%s (%s)", new TextComponent(nbt.getCompoundTag("display").getStringTag("Name").getValue()).getColoredMessage(), item.toString()); + return String.format("%s (%s)", new TextComponent(nbt.getCompoundTag("display").getStringTag("Name").getValue()).getColoredMessage(), item); } return item.toString(); // ToDo display name per Item (from language file) } @@ -76,4 +76,9 @@ public class Slot { return their.getItem().equals(getItem()) && their.getItemCount() == getItemCount() && their.getItemMetadata() == getItemMetadata(); } + + @Override + public String toString() { + return getDisplayName(); + } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/network/Connection.java b/src/main/java/de/bixilon/minosoft/protocol/network/Connection.java index bf0397d6f..786b8058f 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/network/Connection.java +++ b/src/main/java/de/bixilon/minosoft/protocol/network/Connection.java @@ -92,7 +92,7 @@ public class Connection { if (this.state == state) { return; } - Log.verbose("ConnectionStatus changed: " + state.name()); + Log.verbose("ConnectionStatus changed: " + state); this.state = state; switch (state) { case HANDSHAKING: 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 9efa829a9..b81aa0a42 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/network/Network.java +++ b/src/main/java/de/bixilon/minosoft/protocol/network/Network.java @@ -164,7 +164,7 @@ public class Network { Class clazz = Protocol.getPacketByPacket(p); if (clazz == null) { - Log.warn(String.format("[IN] Received unknown packet (id=0x%x, name=%s, length=%d, dataLength=%d, version=%s, state=%s)", inPacketBuffer.getCommand(), ((p != null) ? p.name() : "UNKNOWN"), inPacketBuffer.getLength(), inPacketBuffer.getBytesLeft(), connection.getVersion().name(), connection.getConnectionState().name())); + Log.warn(String.format("[IN] Received unknown packet (id=0x%x, name=%s, length=%d, dataLength=%d, version=%s, state=%s)", inPacketBuffer.getCommand(), p, inPacketBuffer.getLength(), inPacketBuffer.getBytesLeft(), connection.getVersion(), connection.getConnectionState())); continue; } try { @@ -178,7 +178,7 @@ public class Network { } if (inPacketBuffer.getBytesLeft() > 0 || !success) { // warn not all data used - Log.warn(String.format("[IN] Could not parse packet %s (used=%d, available=%d, total=%d, success=%s)", ((p != null) ? p.name() : "null"), inPacketBuffer.getPosition(), inPacketBuffer.getBytesLeft(), inPacketBuffer.getLength(), success)); + Log.warn(String.format("[IN] Could not parse packet %s (used=%d, available=%d, total=%d, success=%s)", p, inPacketBuffer.getPosition(), inPacketBuffer.getBytesLeft(), inPacketBuffer.getLength(), success)); continue; } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/login/PacketLoginSuccess.java b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/login/PacketLoginSuccess.java index 9010e323d..b8b810697 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/login/PacketLoginSuccess.java +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/login/PacketLoginSuccess.java @@ -33,7 +33,7 @@ public class PacketLoginSuccess implements ClientboundPacket { @Override public void log() { - Log.protocol(String.format("Receiving login success packet (username: %s, UUID: %s)", username, uuid.toString())); + Log.protocol(String.format("Receiving login success packet (username: %s, UUID: %s)", username, uuid)); } @Override diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketBlockEntityMetadata.java b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketBlockEntityMetadata.java index ecd8ea0a6..e81b30f02 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketBlockEntityMetadata.java +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketBlockEntityMetadata.java @@ -54,7 +54,7 @@ public class PacketBlockEntityMetadata implements ClientboundPacket { @Override public void log() { - Log.protocol(String.format("Receiving blockEntityMeta (position=%s, action=%s)", position.toString(), action.name())); + Log.protocol(String.format("Receiving blockEntityMeta (position=%s, action=%s)", position, action)); } @Override 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 d69e74b12..31fdfdcde 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 @@ -78,22 +78,22 @@ public class PacketBossBar implements ClientboundPacket { public void log() { switch (action) { case ADD: - Log.protocol(String.format("Received boss bar (action=%s, uuid=%s, title=\"%s\", health=%s, color=%s, divisions=%s, dragonBar=%s, darkenSky=%s)", action.name(), uuid.toString(), title.getColoredMessage(), health, color.name(), divisions.name(), isDragonBar(), shouldDarkenSky())); + Log.protocol(String.format("Received boss bar (action=%s, uuid=%s, title=\"%s\", health=%s, color=%s, divisions=%s, dragonBar=%s, darkenSky=%s)", action, uuid.toString(), title.getColoredMessage(), health, color, divisions, isDragonBar(), shouldDarkenSky())); break; case REMOVE: - Log.protocol(String.format("Received boss bar (action=%s, uuid=%s)", action.name(), uuid.toString())); + Log.protocol(String.format("Received boss bar (action=%s, uuid=%s)", action, uuid.toString())); break; case UPDATE_HEALTH: - Log.protocol(String.format("Received boss bar (action=%s, uuid=%s, health=%s)", action.name(), uuid.toString(), health)); + Log.protocol(String.format("Received boss bar (action=%s, uuid=%s, health=%s)", action, uuid.toString(), health)); break; case UPDATE_TITLE: - Log.protocol(String.format("Received boss bar (action=%s, uuid=%s, title=\"%s\")", action.name(), uuid.toString(), title.getColoredMessage())); + Log.protocol(String.format("Received boss bar (action=%s, uuid=%s, title=\"%s\")", action, uuid.toString(), title.getColoredMessage())); break; case UPDATE_STYLE: - Log.protocol(String.format("Received boss bar (action=%s, uuid=%s, color=%s, divisions=%s)", action.name(), uuid.toString(), color.name(), divisions.name())); + Log.protocol(String.format("Received boss bar (action=%s, uuid=%s, color=%s, divisions=%s)", action, uuid.toString(), color, divisions)); break; case UPDATE_FLAGS: - Log.protocol(String.format("Received boss bar (action=%s, uuid=%s, dragonBar=%s, darkenSky=%s)", action.name(), uuid.toString(), isDragonBar(), shouldDarkenSky())); + Log.protocol(String.format("Received boss bar (action=%s, uuid=%s, dragonBar=%s, darkenSky=%s)", action, uuid.toString(), isDragonBar(), shouldDarkenSky())); break; } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketChangeGameState.java b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketChangeGameState.java index 98b8cc152..75b49c5c7 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketChangeGameState.java +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketChangeGameState.java @@ -55,10 +55,10 @@ public class PacketChangeGameState implements ClientboundPacket { Log.game("Received weather packet: Stopping rain..."); break; case CHANGE_GAMEMODE: - Log.game(String.format("Received game mode change: Now in %s", GameMode.byId(getValue().intValue()).name())); + Log.game(String.format("Received game mode change: Now in %s", GameMode.byId(getValue().intValue()))); break; default: - Log.protocol(String.format("Received game status change (%s)", getReason().name())); + Log.protocol(String.format("Received game status change (%s)", getReason())); break; } } 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 f17721917..76f31e21c 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 @@ -58,13 +58,13 @@ public class PacketCombatEvent implements ClientboundPacket { public void log() { switch (action) { case ENTER_COMBAT: - Log.protocol(String.format("Received combat packet (action=%s)", action.name())); + Log.protocol(String.format("Received combat packet (action=%s)", action)); break; case END_COMBAT: - Log.protocol(String.format("Received combat packet (action=%s, duration=%d, entityId=%d)", action.name(), duration, entityId)); + Log.protocol(String.format("Received combat packet (action=%s, duration=%d, entityId=%d)", action, duration, entityId)); break; case ENTITY_DEAD: - Log.protocol(String.format("Received combat packet (action=%s, playerId=%d, entityId=%d, message=\"%s\")", action.name(), playerId, entityId, message)); + Log.protocol(String.format("Received combat packet (action=%s, playerId=%d, entityId=%d, message=\"%s\")", action, playerId, entityId, message)); break; } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketEffect.java b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketEffect.java index 9e40aa775..d64ab5976 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketEffect.java +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketEffect.java @@ -55,7 +55,7 @@ public class PacketEffect implements ClientboundPacket { @Override public void log() { - Log.protocol(String.format("Received effect packet at %s (effect=%s, data=%d, disableRelativeVolume=%s)", position.toString(), effect.name(), data, disableRelativeVolume)); + Log.protocol(String.format("Received effect packet at %s (effect=%s, data=%d, disableRelativeVolume=%s)", position.toString(), effect, data, disableRelativeVolume)); } @Override diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketEntityAnimation.java b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketEntityAnimation.java index 2d901ef4e..b0c792c3c 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketEntityAnimation.java +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketEntityAnimation.java @@ -45,7 +45,7 @@ public class PacketEntityAnimation implements ClientboundPacket { @Override public void log() { - Log.protocol(String.format("Play entity animation (entityId=%d, animation=%s)", entityId, animation.name())); + Log.protocol(String.format("Play entity animation (entityId=%d, animation=%s)", entityId, animation)); } @Override 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 199cf5174..a01d4b49e 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 @@ -56,10 +56,10 @@ public class PacketEntityEquipment implements ClientboundPacket { @Override public void log() { if (data != null) { - Log.protocol(String.format("Entity equipment changed (entityId=%d, slot=%s): %dx %s", entityId, slot.name(), data.getItemCount(), data.getDisplayName())); + Log.protocol(String.format("Entity equipment changed (entityId=%d, slot=%s): %dx %s", entityId, slot, data.getItemCount(), data.getDisplayName())); } else { // null means nothing, means air - Log.protocol(String.format("Entity equipment changed (entityId=%d, slot=%s): AIR", entityId, slot.name())); + Log.protocol(String.format("Entity equipment changed (entityId=%d, slot=%s): AIR", entityId, slot)); } } 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 0a09cddcb..cb36f7118 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 @@ -42,7 +42,7 @@ public class PacketEntityStatus implements ClientboundPacket { @Override public void log() { - Log.protocol(String.format("Entity status: (entityId=%d, animation=%s)", entityId, status.name())); + Log.protocol(String.format("Entity status: (entityId=%d, animation=%s)", entityId, status)); } @Override diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketFacePlayer.java b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketFacePlayer.java index 15569ac7f..1d239522d 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketFacePlayer.java +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketFacePlayer.java @@ -45,7 +45,7 @@ public class PacketFacePlayer implements ClientboundPacket { @Override public void log() { - Log.protocol(String.format("Received face player packet (face=%s, location=%s, entityId=%d, entityFace=%s)", face.name(), location.toString(), entityId, ((entityFace != null) ? entityFace.name() : null))); + Log.protocol(String.format("Received face player packet (face=%s, location=%s, entityId=%d, entityFace=%s)", face, location.toString(), entityId, entityFace)); } @Override diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketJoinGame.java b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketJoinGame.java index 5d489061c..5ee169b78 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketJoinGame.java +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketJoinGame.java @@ -100,7 +100,7 @@ public class PacketJoinGame implements ClientboundPacket { @Override public void log() { - Log.protocol(String.format("Receiving join game packet (entityId=%s, gameMode=%s, dimension=%s, difficulty=%s, hardcore=%s, viewDistance=%d)", entityId, gameMode.name(), dimension.name(), difficulty.name(), hardcore, viewDistance)); + Log.protocol(String.format("Receiving join game packet (entityId=%s, gameMode=%s, dimension=%s, difficulty=%s, hardcore=%s, viewDistance=%d)", entityId, gameMode, dimension, difficulty, hardcore, viewDistance)); } @Override diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketMultiBlockChange.java b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketMultiBlockChange.java index c4d85769e..0fecc4816 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketMultiBlockChange.java +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketMultiBlockChange.java @@ -72,7 +72,7 @@ public class PacketMultiBlockChange implements ClientboundPacket { @Override public void log() { - Log.protocol(String.format("Multi block change received at %s (size=%d)", location.toString(), blocks.size())); + Log.protocol(String.format("Multi block change received at %s (size=%d)", location, blocks.size())); } @Override diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketOpenWindow.java b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketOpenWindow.java index 6a6007123..b863f02a3 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketOpenWindow.java +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketOpenWindow.java @@ -64,7 +64,7 @@ public class PacketOpenWindow implements ClientboundPacket { @Override public void log() { - Log.protocol(String.format("Received inventory open packet (windowId=%d, type=%s, title=%s, entityId=%d, slotCount=%d)", windowId, type.name(), ((title == null) ? "null" : title), entityId, slotCount)); + Log.protocol(String.format("Received inventory open packet (windowId=%d, type=%s, title=%s, entityId=%d, slotCount=%d)", windowId, type, title, entityId, slotCount)); } @Override diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketParticle.java b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketParticle.java index 0aea7fcf1..f24ad639d 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketParticle.java +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketParticle.java @@ -93,7 +93,7 @@ public class PacketParticle implements ClientboundPacket { @Override public void log() { - Log.protocol(String.format("Received particle spawn at %s %s %s (particle=%s, data=%s, count=%d, dataClass=%s)", x, y, z, particle.name(), particleData, count, particleDataClass)); + Log.protocol(String.format("Received particle spawn at %s %s %s (particle=%s, data=%s, count=%d, dataClass=%s)", x, y, z, particle, particleData, count, particleDataClass)); } @Override diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketPlayerInfo.java b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketPlayerInfo.java index f094c2a1c..3969637d2 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketPlayerInfo.java +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketPlayerInfo.java @@ -94,7 +94,7 @@ public class PacketPlayerInfo implements ClientboundPacket { if (property.isLegacy()) { Log.game(String.format("[TAB] Player info bulk (uuid=%s, name=%s, ping=%d)", property.getUUID(), property.getName(), property.getPing())); } else { - Log.game(String.format("[TAB] Player info bulk (uuid=%s, action=%s, name=%s, gameMode=%s, ping=%d, displayName=%s)", property.getUUID(), property.getAction(), property.getName(), ((property.getGameMode() == null) ? "null" : property.getGameMode().name()), property.getPing(), ((property.getDisplayName() == null) ? "null" : property.getDisplayName().getColoredMessage()))); + Log.game(String.format("[TAB] Player info bulk (uuid=%s, action=%s, name=%s, gameMode=%s, ping=%d, displayName=%s)", property.getUUID(), property.getAction(), property.getName(), property.getGameMode(), property.getPing(), property.getDisplayName())); } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketRemoveEntityEffect.java b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketRemoveEntityEffect.java index a6df7bb12..c4b2bb5b2 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketRemoveEntityEffect.java +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketRemoveEntityEffect.java @@ -47,7 +47,7 @@ public class PacketRemoveEntityEffect implements ClientboundPacket { @Override public void log() { - Log.game(String.format("Entity effect removed (entityId=%d, effect=%s)", entityId, effect.name())); + Log.game(String.format("Entity effect removed (entityId=%d, effect=%s)", entityId, effect)); } @Override diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketRespawn.java b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketRespawn.java index be09572a3..33f1d4173 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketRespawn.java +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketRespawn.java @@ -56,7 +56,7 @@ public class PacketRespawn implements ClientboundPacket { @Override public void log() { - Log.protocol(String.format("Respawn packet received (dimension=%s, difficulty=%s, gamemode=%s, levelType=%s)", dimension.name(), difficulty.name(), gameMode.name(), levelType.name())); + Log.protocol(String.format("Respawn packet received (dimension=%s, difficulty=%s, gamemode=%s, levelType=%s)", dimension, difficulty, gameMode, levelType)); } public Dimension getDimension() { diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketScoreboardDisplayScoreboard.java b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketScoreboardDisplayScoreboard.java index 2a1215542..812409e90 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketScoreboardDisplayScoreboard.java +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketScoreboardDisplayScoreboard.java @@ -44,7 +44,7 @@ public class PacketScoreboardDisplayScoreboard implements ClientboundPacket { @Override public void log() { - Log.protocol(String.format("Received display scoreboard packet (position=%s, scoreName=\"%s\"", action.name(), scoreName)); + Log.protocol(String.format("Received display scoreboard packet (position=%s, scoreName=\"%s\"", action, scoreName)); } @Override diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketScoreboardObjective.java b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketScoreboardObjective.java index 72ff61b54..0db8c1121 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketScoreboardObjective.java +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketScoreboardObjective.java @@ -62,9 +62,9 @@ public class PacketScoreboardObjective implements ClientboundPacket { @Override public void log() { if (action == ScoreboardObjectiveAction.CREATE || action == ScoreboardObjectiveAction.UPDATE) { - Log.protocol(String.format("Received scoreboard objective action (action=%s, name=\"%s\", value=\"%s\", type=%s", action.name(), name, value.getColoredMessage(), type.name)); + Log.protocol(String.format("Received scoreboard objective action (action=%s, name=\"%s\", value=\"%s\", type=%s", action, name, value.getColoredMessage(), type.name)); } else { - Log.protocol(String.format("Received scoreboard objective action (action=%s, name=\"%s\")", action.name(), name)); + Log.protocol(String.format("Received scoreboard objective action (action=%s, name=\"%s\")", action, name)); } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketScoreboardUpdateScore.java b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketScoreboardUpdateScore.java index b24457398..3c839036b 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketScoreboardUpdateScore.java +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketScoreboardUpdateScore.java @@ -61,7 +61,7 @@ public class PacketScoreboardUpdateScore implements ClientboundPacket { @Override public void log() { - Log.protocol(String.format("Received scoreboard score update (itemName=\"%s\", action=%s, scoreName=\"%s\", scoreValue=%d", itemName, action.name(), scoreName, scoreValue)); + Log.protocol(String.format("Received scoreboard score update (itemName=\"%s\", action=%s, scoreName=\"%s\", scoreValue=%d", itemName, action, scoreName, scoreValue)); } @Override diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketSelectAdvancementTab.java b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketSelectAdvancementTab.java index b5a66e587..456f222ff 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketSelectAdvancementTab.java +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketSelectAdvancementTab.java @@ -40,7 +40,7 @@ public class PacketSelectAdvancementTab implements ClientboundPacket { @Override public void log() { - Log.protocol(String.format("Received select advancement tab (tab=%s)", ((tab == null) ? null : tab.name()))); + Log.protocol(String.format("Received select advancement tab (tab=%s)", tab)); } @Override diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketServerDifficulty.java b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketServerDifficulty.java index 419d6cf2a..97819d5ac 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketServerDifficulty.java +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketServerDifficulty.java @@ -46,7 +46,7 @@ public class PacketServerDifficulty implements ClientboundPacket { @Override public void log() { - Log.protocol(String.format("Received server difficulty (difficulty=%s)", difficulty.name())); + Log.protocol(String.format("Received server difficulty (difficulty=%s)", difficulty)); } @Override diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketSpawnMob.java b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketSpawnMob.java index 398a9300d..1b1d417d0 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketSpawnMob.java +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketSpawnMob.java @@ -101,7 +101,7 @@ public class PacketSpawnMob implements ClientboundPacket { @Override public void log() { - Log.protocol(String.format("Mob spawned at %s (entityId=%d, type=%s)", entity.getLocation().toString(), entity.getEntityId(), entity.getEntityType().name())); + Log.protocol(String.format("Mob spawned at %s (entityId=%d, type=%s)", entity.getLocation().toString(), entity.getEntityId(), entity.getEntityType())); } public Entity getMob() { diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketSpawnObject.java b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketSpawnObject.java index ef658d026..6e52daec6 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketSpawnObject.java +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketSpawnObject.java @@ -38,7 +38,7 @@ public class PacketSpawnObject implements ClientboundPacket { @Override public void log() { - Log.protocol(String.format("Object spawned at %s (entityId=%d, type=%s)", object.getLocation().toString(), object.getEntityId(), object.getEntityType().name())); + Log.protocol(String.format("Object spawned at %s (entityId=%d, type=%s)", object.getLocation().toString(), object.getEntityId(), object.getEntityType())); } public Entity getObject() { diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketSpawnPainting.java b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketSpawnPainting.java index 4e38ba6b7..a99295e5d 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketSpawnPainting.java +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketSpawnPainting.java @@ -68,7 +68,7 @@ public class PacketSpawnPainting implements ClientboundPacket { @Override public void log() { - Log.protocol(String.format("Spawning painting at %s (entityId=%d, painting=%s, direction=%d)", position.toString(), entityId, painting.name(), direction)); + Log.protocol(String.format("Spawning painting at %s (entityId=%d, painting=%s, direction=%d)", position.toString(), entityId, painting, direction)); } @Override diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketTeams.java b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketTeams.java index 81b45cfd9..919437cc1 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketTeams.java +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketTeams.java @@ -128,7 +128,7 @@ public class PacketTeams implements ClientboundPacket { @Override public void log() { - Log.protocol(String.format("Received scoreboard Team update (name=\"%s\", action=%s, displayName=\"%s\", prefix=\"%s\", suffix=\"%s\", friendlyFire=%s, seeFriendlyInvisibiles=%s, playerCount=%s)", name, action.name(), ((displayName == null) ? null : displayName.getColoredMessage()), prefix, suffix, friendlyFire, seeFriendlyInvisibles, ((playerNames == null) ? "null" : playerNames.length))); + Log.protocol(String.format("Received scoreboard Team update (name=\"%s\", action=%s, displayName=\"%s\", prefix=\"%s\", suffix=\"%s\", friendlyFire=%s, seeFriendlyInvisibiles=%s, playerCount=%s)", name, action, displayName, prefix, suffix, friendlyFire, seeFriendlyInvisibles, ((playerNames == null) ? null : playerNames.length))); } @Override diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketTitle.java b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketTitle.java index 560f863f7..ca5ba8df8 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketTitle.java +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketTitle.java @@ -66,17 +66,17 @@ public class PacketTitle implements ClientboundPacket { public void log() { switch (action) { case SET_TITLE: - Log.protocol(String.format("Received title (action=%s, text=%s)", action.name(), text.getColoredMessage())); + Log.protocol(String.format("Received title (action=%s, text=%s)", action, text.getColoredMessage())); break; case SET_SUBTITLE: - Log.protocol(String.format("Received title (action=%s, subText=%s)", action.name(), subText.getColoredMessage())); + Log.protocol(String.format("Received title (action=%s, subText=%s)", action, subText.getColoredMessage())); break; case SET_TIMES_AND_DISPLAY: - Log.protocol(String.format("Received title (action=%s, fadeInTime=%d, stayTime=%d, fadeOutTime=%d)", action.name(), fadeInTime, stayTime, fadeOutTime)); + Log.protocol(String.format("Received title (action=%s, fadeInTime=%d, stayTime=%d, fadeOutTime=%d)", action, fadeInTime, stayTime, fadeOutTime)); break; case HIDE: case RESET: - Log.protocol(String.format("Received title (action=%s)", action.name())); + Log.protocol(String.format("Received title (action=%s)", action)); break; } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketUnlockRecipes.java b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketUnlockRecipes.java index 8f35b6d85..37af5211c 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketUnlockRecipes.java +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketUnlockRecipes.java @@ -71,7 +71,7 @@ public class PacketUnlockRecipes implements ClientboundPacket { @Override public void log() { - Log.protocol(String.format("Received unlock crafting recipe packet (action=%s, isCraftingBookOpen=%s, isFilteringActive=%s, isSmeltingBookOpen=%s, isSmeltingFilteringActive=%s listedLength=%d, taggedLength=%s)", action.name(), isCraftingBookOpen, isCraftingFilteringActive, isSmeltingBookOpen, isSmeltingFilteringActive, listed.length, ((tagged == null) ? 0 : tagged.length))); + Log.protocol(String.format("Received unlock crafting recipe packet (action=%s, isCraftingBookOpen=%s, isFilteringActive=%s, isSmeltingBookOpen=%s, isSmeltingFilteringActive=%s listedLength=%d, taggedLength=%s)", action, isCraftingBookOpen, isCraftingFilteringActive, isSmeltingBookOpen, isSmeltingFilteringActive, listed.length, ((tagged == null) ? 0 : tagged.length))); } @Override diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/serverbound/play/PacketAdvancementTab.java b/src/main/java/de/bixilon/minosoft/protocol/packets/serverbound/play/PacketAdvancementTab.java index 307bc3f76..4f2f61f85 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/serverbound/play/PacketAdvancementTab.java +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/serverbound/play/PacketAdvancementTab.java @@ -49,7 +49,7 @@ public class PacketAdvancementTab implements ServerboundPacket { @Override public void log() { - Log.protocol(String.format("Sending advancement tab packet (action=%s, tabToOpen=%s)", action.name(), tabToOpen)); + Log.protocol(String.format("Sending advancement tab packet (action=%s, tabToOpen=%s)", action, tabToOpen)); } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/serverbound/play/PacketAnimation.java b/src/main/java/de/bixilon/minosoft/protocol/packets/serverbound/play/PacketAnimation.java index 68a8b8e03..e4a21a584 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/serverbound/play/PacketAnimation.java +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/serverbound/play/PacketAnimation.java @@ -47,6 +47,6 @@ public class PacketAnimation implements ServerboundPacket { @Override public void log() { - Log.protocol(String.format("Sending hand animation (hand=%s)", hand.name())); + Log.protocol(String.format("Sending hand animation (hand=%s)", hand)); } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/serverbound/play/PacketClickWindow.java b/src/main/java/de/bixilon/minosoft/protocol/packets/serverbound/play/PacketClickWindow.java index 3ebad3e55..816bb4ae4 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/serverbound/play/PacketClickWindow.java +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/serverbound/play/PacketClickWindow.java @@ -61,7 +61,7 @@ public class PacketClickWindow implements ServerboundPacket { @Override public void log() { - Log.protocol(String.format("Clicking in window (windowId=%d, slot=%d, action=%s)", windowId, slot, action.name())); + Log.protocol(String.format("Clicking in window (windowId=%d, slot=%d, action=%s)", windowId, slot, action)); } } 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 394ad3b00..26a970e67 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 @@ -49,7 +49,7 @@ public class PacketClientStatus implements ServerboundPacket { @Override public void log() { - Log.protocol(String.format("Sending client status packet (status=%s)", status.name())); + Log.protocol(String.format("Sending client status packet (status=%s)", status)); } public enum ClientStatus { diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/serverbound/play/PacketCraftingBookData.java b/src/main/java/de/bixilon/minosoft/protocol/packets/serverbound/play/PacketCraftingBookData.java index 64f5a29ea..b7700b7c0 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/serverbound/play/PacketCraftingBookData.java +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/serverbound/play/PacketCraftingBookData.java @@ -65,10 +65,10 @@ public class PacketCraftingBookData implements ServerboundPacket { public void log() { switch (action) { case DISPLAY_RECIPE: - Log.protocol(String.format("Sending crafting book status (action=%s, recipeId=%d)", action.name(), recipeId)); + Log.protocol(String.format("Sending crafting book status (action=%s, recipeId=%d)", action, recipeId)); break; case CRAFTING_BOOK_STATUS: - Log.protocol(String.format("Sending crafting book status (action=%s, craftingBookOpen=%s, craftingFilter=%s)", action.name(), craftingBookOpen, craftingFilter)); + Log.protocol(String.format("Sending crafting book status (action=%s, craftingBookOpen=%s, craftingFilter=%s)", action, craftingBookOpen, craftingFilter)); break; } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/serverbound/play/PacketEntityAction.java b/src/main/java/de/bixilon/minosoft/protocol/packets/serverbound/play/PacketEntityAction.java index 6fee3d1f4..4f3fd2cc3 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/serverbound/play/PacketEntityAction.java +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/serverbound/play/PacketEntityAction.java @@ -65,7 +65,7 @@ public class PacketEntityAction implements ServerboundPacket { @Override public void log() { - Log.protocol(String.format("Sending entity action packet (entityId=%d, action=%s, parameter=%d)", entityId, action.name(), parameter)); + Log.protocol(String.format("Sending entity action packet (entityId=%d, action=%s, parameter=%d)", entityId, action, parameter)); } public enum EntityActions { diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/serverbound/play/PacketInteractEntity.java b/src/main/java/de/bixilon/minosoft/protocol/packets/serverbound/play/PacketInteractEntity.java index f9df0c3c1..97f55eabc 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/serverbound/play/PacketInteractEntity.java +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/serverbound/play/PacketInteractEntity.java @@ -97,7 +97,7 @@ public class PacketInteractEntity implements ServerboundPacket { @Override public void log() { - Log.protocol(String.format("Interacting with entity (entityId=%d, click=%s)", entityId, click.name())); + Log.protocol(String.format("Interacting with entity (entityId=%d, click=%s)", entityId, click)); } public enum Click { diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/serverbound/play/PacketPlayerBlockPlacement.java b/src/main/java/de/bixilon/minosoft/protocol/packets/serverbound/play/PacketPlayerBlockPlacement.java index 764fba928..6979df101 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/serverbound/play/PacketPlayerBlockPlacement.java +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/serverbound/play/PacketPlayerBlockPlacement.java @@ -103,6 +103,6 @@ public class PacketPlayerBlockPlacement implements ServerboundPacket { @Override public void log() { - Log.protocol(String.format("Send player block placement(position=%s, direction=%d, item=%s, cursor=%d %d %d)", position.toString(), direction, ((item == null) ? "AIR" : item.getDisplayName()), cursorX, cursorY, cursorZ)); + Log.protocol(String.format("Send player block placement(position=%s, direction=%d, item=%s, cursor=%s %s %s)", position.toString(), direction, item, cursorX, cursorY, cursorZ)); } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/serverbound/play/PacketPlayerDigging.java b/src/main/java/de/bixilon/minosoft/protocol/packets/serverbound/play/PacketPlayerDigging.java index 779a12942..21ff1026b 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/serverbound/play/PacketPlayerDigging.java +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/serverbound/play/PacketPlayerDigging.java @@ -76,7 +76,7 @@ public class PacketPlayerDigging implements ServerboundPacket { @Override public void log() { - Log.protocol(String.format("Send player digging packet (status=%s, position=%s, face=%s)", status.name(), position.toString(), face.name())); + Log.protocol(String.format("Send player digging packet (status=%s, position=%s, face=%s)", status, position.toString(), face)); } public enum DiggingStatus { diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/serverbound/play/PacketResourcePackStatus.java b/src/main/java/de/bixilon/minosoft/protocol/packets/serverbound/play/PacketResourcePackStatus.java index 41798d856..190fde712 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/serverbound/play/PacketResourcePackStatus.java +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/serverbound/play/PacketResourcePackStatus.java @@ -50,7 +50,7 @@ public class PacketResourcePackStatus implements ServerboundPacket { @Override public void log() { - Log.protocol(String.format("Sending resource pack status (status=%s, hash=%s)", status.name(), hash)); + Log.protocol(String.format("Sending resource pack status (status=%s, hash=%s)", status, hash)); } public enum ResourcePackStatus { diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/serverbound/play/PacketUpdateCommandBlock.java b/src/main/java/de/bixilon/minosoft/protocol/packets/serverbound/play/PacketUpdateCommandBlock.java index d85b37c91..9ce6d6e68 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/serverbound/play/PacketUpdateCommandBlock.java +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/serverbound/play/PacketUpdateCommandBlock.java @@ -67,7 +67,7 @@ public class PacketUpdateCommandBlock implements ServerboundPacket { @Override public void log() { - Log.protocol(String.format("Sending update command block packet at %s (command=\"%s\", type=%s, trackOutput=%s, isConditional=%s, isAutomatic=%s)", position.toString(), command, type.name(), trackOutput, isConditional, isAutomatic)); + Log.protocol(String.format("Sending update command block packet at %s (command=\"%s\", type=%s, trackOutput=%s, isConditional=%s, isAutomatic=%s)", position.toString(), command, type, trackOutput, isConditional, isAutomatic)); } public enum CommandBlockType { diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/serverbound/play/PacketUseItem.java b/src/main/java/de/bixilon/minosoft/protocol/packets/serverbound/play/PacketUseItem.java index 98446a14f..ecffe88e7 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/packets/serverbound/play/PacketUseItem.java +++ b/src/main/java/de/bixilon/minosoft/protocol/packets/serverbound/play/PacketUseItem.java @@ -45,6 +45,6 @@ public class PacketUseItem implements ServerboundPacket { @Override public void log() { - Log.protocol(String.format("Use hand (hand=%s)", hand.name())); + Log.protocol(String.format("Use hand (hand=%s)", hand)); } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/protocol/ConnectionState.java b/src/main/java/de/bixilon/minosoft/protocol/protocol/ConnectionState.java index 432ea879a..8d31ac833 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/protocol/ConnectionState.java +++ b/src/main/java/de/bixilon/minosoft/protocol/protocol/ConnectionState.java @@ -20,8 +20,7 @@ public enum ConnectionState { LOGIN(2), PLAY(3), DISCONNECTING(5), - DISCONNECTED(6), - UNKNOWN(7); + DISCONNECTED(6); final int id; @@ -33,12 +32,12 @@ public enum ConnectionState { return this.id; } - public static ConnectionState getById(int id) { + public static ConnectionState byId(int id) { for (ConnectionState state : values()) { if (state.getId() == id) { return state; } } - return ConnectionState.UNKNOWN; + return null; } } 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 771fe2ea0..d3aaa4334 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/protocol/Packets.java +++ b/src/main/java/de/bixilon/minosoft/protocol/protocol/Packets.java @@ -72,7 +72,6 @@ public class Packets { Serverbound() { this.state = ConnectionState.valueOf(name().split("_")[0]); - } public ConnectionState getState() { @@ -191,7 +190,6 @@ public class Packets { Clientbound() { this.state = ConnectionState.valueOf(name().split("_")[0]); - } public ConnectionState getState() { diff --git a/src/main/java/de/bixilon/minosoft/protocol/protocol/ProtocolVersion.java b/src/main/java/de/bixilon/minosoft/protocol/protocol/ProtocolVersion.java index b68bd5864..3a0fd331d 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/protocol/ProtocolVersion.java +++ b/src/main/java/de/bixilon/minosoft/protocol/protocol/ProtocolVersion.java @@ -80,4 +80,8 @@ public enum ProtocolVersion { return protocol.getReleaseName(); } + @Override + public String toString() { + return getVersionString(); + } } diff --git a/src/main/java/de/bixilon/minosoft/protocol/protocol/versions/Protocol_1_14_4.java b/src/main/java/de/bixilon/minosoft/protocol/protocol/versions/Protocol_1_14_4.java index 0db0ec4ed..804e6e04f 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/protocol/versions/Protocol_1_14_4.java +++ b/src/main/java/de/bixilon/minosoft/protocol/protocol/versions/Protocol_1_14_4.java @@ -50,7 +50,7 @@ public class Protocol_1_14_4 extends Protocol { registerPacket(Packets.Clientbound.PLAY_SET_COOLDOWN, 0x17); registerPacket(Packets.Clientbound.PLAY_PLUGIN_MESSAGE, 0x18); registerPacket(Packets.Clientbound.PLAY_NAMED_SOUND_EFFECT, 0x19); - registerPacket(Packets.Clientbound.PLAY_DISCONNECT, 0x1AA); + registerPacket(Packets.Clientbound.PLAY_DISCONNECT, 0x1A); registerPacket(Packets.Clientbound.PLAY_ENTITY_STATUS, 0x1B); registerPacket(Packets.Clientbound.PLAY_EXPLOSION, 0x1C); registerPacket(Packets.Clientbound.PLAY_UNLOAD_CHUNK, 0x1D);