From d0347c537d0de5c71411ac1de9140700f1d9f865 Mon Sep 17 00:00:00 2001 From: RednedEpic Date: Sun, 21 Jul 2019 16:18:20 -0500 Subject: [PATCH] Add debug option to prevent console spam --- .../java/org/geysermc/api/logger/Logger.java | 7 + .../geysermc/connector/GeyserConnector.java | 7 +- .../configuration/GeyserConfiguration.java | 3 + .../connector/console/GeyserLogger.java | 12 +- .../network/ConnectorServerEventHandler.java | 2 +- .../network/UpstreamPacketHandler.java | 271 +++++++++--------- .../network/translators/Registry.java | 2 +- connector/src/main/resources/config.yml | 3 + 8 files changed, 159 insertions(+), 148 deletions(-) diff --git a/api/src/main/java/org/geysermc/api/logger/Logger.java b/api/src/main/java/org/geysermc/api/logger/Logger.java index de836d6ad..7643f2801 100644 --- a/api/src/main/java/org/geysermc/api/logger/Logger.java +++ b/api/src/main/java/org/geysermc/api/logger/Logger.java @@ -61,4 +61,11 @@ public interface Logger { * @param message the message to log */ void debug(String message); + + /** + * Sets if the logger should print debug messages + * + * @param debug if the logger should print debug messages + */ + void setDebug(boolean debug); } diff --git a/connector/src/main/java/org/geysermc/connector/GeyserConnector.java b/connector/src/main/java/org/geysermc/connector/GeyserConnector.java index 3c4879f19..6d2735d0a 100644 --- a/connector/src/main/java/org/geysermc/connector/GeyserConnector.java +++ b/connector/src/main/java/org/geysermc/connector/GeyserConnector.java @@ -49,7 +49,6 @@ import org.geysermc.connector.plugin.GeyserPluginManager; import org.geysermc.connector.utils.Toolbox; import java.io.*; -import java.lang.reflect.Field; import java.net.InetSocketAddress; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; @@ -95,12 +94,9 @@ public class GeyserConnector implements Connector { instance = this; this.generalThreadPool = Executors.newScheduledThreadPool(32); //TODO: Make configurable value - this.logger = GeyserLogger.DEFAULT; - ConsoleCommandReader consoleReader = new ConsoleCommandReader(this); - consoleReader.startConsole(); logger.info("******************************************"); @@ -128,12 +124,13 @@ public class GeyserConnector implements Connector { shutdown(); } + logger.setDebug(config.isDebugMode()); + Toolbox.CACHED_PALLETE.array(); TranslatorsInit.start(); commandMap = new GeyserCommandMap(this); - remoteServer = new RemoteJavaServer(config.getRemote().getAddress(), config.getRemote().getPort()); Geyser.setConnector(this); diff --git a/connector/src/main/java/org/geysermc/connector/configuration/GeyserConfiguration.java b/connector/src/main/java/org/geysermc/connector/configuration/GeyserConfiguration.java index 5cdb2c7ad..fad955051 100644 --- a/connector/src/main/java/org/geysermc/connector/configuration/GeyserConfiguration.java +++ b/connector/src/main/java/org/geysermc/connector/configuration/GeyserConfiguration.java @@ -39,4 +39,7 @@ public class GeyserConfiguration { @JsonProperty("max-players") private int maxPlayers; + + @JsonProperty("debug-mode") + private boolean debugMode; } \ No newline at end of file diff --git a/connector/src/main/java/org/geysermc/connector/console/GeyserLogger.java b/connector/src/main/java/org/geysermc/connector/console/GeyserLogger.java index da76a3086..1debdedc1 100644 --- a/connector/src/main/java/org/geysermc/connector/console/GeyserLogger.java +++ b/connector/src/main/java/org/geysermc/connector/console/GeyserLogger.java @@ -37,12 +37,11 @@ import java.util.logging.*; public class GeyserLogger implements org.geysermc.api.logger.Logger { private boolean colored = true; - private boolean debug = true; + private boolean debug = false; public static final GeyserLogger DEFAULT = new GeyserLogger(); private GeyserLogger() { - ConsoleHandler consoleHandler = new ConsoleHandler(); consoleHandler.setLevel(Level.INFO); consoleHandler.setFormatter(new SimpleFormatter() { @@ -117,7 +116,9 @@ public class GeyserLogger implements org.geysermc.api.logger.Logger { @Override public void debug(String message) { waitFor(); - System.out.println(printConsole(ChatColor.GRAY + message, colored)); + + if (debug) + System.out.println(printConsole(ChatColor.GRAY + message, colored)); } private synchronized void waitFor() { @@ -130,4 +131,9 @@ public class GeyserLogger implements org.geysermc.api.logger.Logger { public static String printConsole(String message, boolean colors) { return colors ? ChatColor.toANSI(message + ChatColor.RESET) : ChatColor.stripColors(message + ChatColor.RESET); } + + @Override + public void setDebug(boolean debug) { + this.debug = debug; + } } diff --git a/connector/src/main/java/org/geysermc/connector/network/ConnectorServerEventHandler.java b/connector/src/main/java/org/geysermc/connector/network/ConnectorServerEventHandler.java index ae1b779b6..68e47447f 100644 --- a/connector/src/main/java/org/geysermc/connector/network/ConnectorServerEventHandler.java +++ b/connector/src/main/java/org/geysermc/connector/network/ConnectorServerEventHandler.java @@ -53,7 +53,7 @@ public class ConnectorServerEventHandler implements BedrockServerEventHandler { @Override public BedrockPong onQuery(InetSocketAddress inetSocketAddress) { - GeyserLogger.DEFAULT.info(inetSocketAddress + " has pinged you!"); + GeyserLogger.DEFAULT.debug(inetSocketAddress + " has pinged you!"); GeyserConfiguration config = connector.getConfig(); BedrockPong pong = new BedrockPong(); pong.setEdition("MCPE"); diff --git a/connector/src/main/java/org/geysermc/connector/network/UpstreamPacketHandler.java b/connector/src/main/java/org/geysermc/connector/network/UpstreamPacketHandler.java index 6d0a082f1..8b588e6f4 100644 --- a/connector/src/main/java/org/geysermc/connector/network/UpstreamPacketHandler.java +++ b/connector/src/main/java/org/geysermc/connector/network/UpstreamPacketHandler.java @@ -52,10 +52,9 @@ public class UpstreamPacketHandler implements BedrockPacketHandler { @Override public boolean handle(LoginPacket loginPacket) { - System.err.println("Handled " + loginPacket.getClass().getSimpleName()); // TODO: Implement support for multiple protocols if (loginPacket.getProtocolVersion() != GeyserConnector.BEDROCK_PACKET_CODEC.getProtocolVersion()) { - System.out.println("unsupported"); + connector.getLogger().debug("unsupported"); session.getUpstream().disconnect("Unsupported Bedrock version. Are you running an outdated version?"); return true; } @@ -78,12 +77,8 @@ public class UpstreamPacketHandler implements BedrockPacketHandler { return true; } - - PlayStatusPacket playStatus = new PlayStatusPacket(); - playStatus.setStatus(PlayStatusPacket.Status.LOGIN_SUCCESS); - session.getUpstream().sendPacketImmediately(playStatus); ResourcePacksInfoPacket resourcePacksInfo = new ResourcePacksInfoPacket(); @@ -93,7 +88,7 @@ public class UpstreamPacketHandler implements BedrockPacketHandler { @Override public boolean handle(ResourcePackClientResponsePacket textPacket) { - System.err.println("Handled " + textPacket.getClass().getSimpleName()); + connector.getLogger().debug("Handled " + textPacket.getClass().getSimpleName()); switch (textPacket.getStatus()) { case COMPLETED: session.connect(connector.getRemoteServer()); @@ -115,13 +110,13 @@ public class UpstreamPacketHandler implements BedrockPacketHandler { @Override public boolean handle(AdventureSettingsPacket packet) { - System.out.println("Handled packet: " + packet.getClass().getSimpleName()); + connector.getLogger().debug("Handled packet: " + packet.getClass().getSimpleName()); return false; } @Override public boolean handle(AnimatePacket packet) { - System.out.println("Handled packet: " + packet.getClass().getSimpleName()); + connector.getLogger().debug("Handled packet: " + packet.getClass().getSimpleName()); switch (packet.getAction()) { case SWING_ARM: ClientPlayerSwingArmPacket swingArmPacket = new ClientPlayerSwingArmPacket(Hand.MAIN_HAND); @@ -132,55 +127,55 @@ public class UpstreamPacketHandler implements BedrockPacketHandler { @Override public boolean handle(BlockEntityDataPacket packet) { - System.out.println("Handled packet: " + packet.getClass().getSimpleName()); + connector.getLogger().debug("Handled packet: " + packet.getClass().getSimpleName()); return false; } @Override public boolean handle(BlockPickRequestPacket packet) { - System.out.println("Handled packet: " + packet.getClass().getSimpleName()); + connector.getLogger().debug("Handled packet: " + packet.getClass().getSimpleName()); return false; } @Override public boolean handle(BookEditPacket packet) { - System.out.println("Handled packet: " + packet.getClass().getSimpleName()); + connector.getLogger().debug("Handled packet: " + packet.getClass().getSimpleName()); return false; } @Override public boolean handle(ClientCacheBlobStatusPacket packet) { - System.out.println("Handled packet: " + packet.getClass().getSimpleName()); + connector.getLogger().debug("Handled packet: " + packet.getClass().getSimpleName()); return false; } @Override public boolean handle(ClientCacheMissResponsePacket packet) { - System.out.println("Handled packet: " + packet.getClass().getSimpleName()); + connector.getLogger().debug("Handled packet: " + packet.getClass().getSimpleName()); return false; } @Override public boolean handle(ClientCacheStatusPacket packet) { - System.out.println("Handled packet: " + packet.getClass().getSimpleName()); + connector.getLogger().debug("Handled packet: " + packet.getClass().getSimpleName()); return false; } @Override public boolean handle(ClientToServerHandshakePacket packet) { - System.out.println("Handled packet: " + packet.getClass().getSimpleName()); + connector.getLogger().debug("Handled packet: " + packet.getClass().getSimpleName()); return false; } @Override public boolean handle(CommandBlockUpdatePacket packet) { - System.out.println("Handled packet: " + packet.getClass().getSimpleName()); + connector.getLogger().debug("Handled packet: " + packet.getClass().getSimpleName()); return false; } @Override public boolean handle(CommandRequestPacket packet) { - System.out.println("Handled packet: " + packet.getClass().getSimpleName()); + connector.getLogger().debug("Handled packet: " + packet.getClass().getSimpleName()); ClientChatPacket chatPacket = new ClientChatPacket(packet.getCommand()); session.getDownstream().getSession().send(chatPacket); @@ -190,229 +185,229 @@ public class UpstreamPacketHandler implements BedrockPacketHandler { @Override public boolean handle(ContainerClosePacket packet) { - System.out.println("Handled packet: " + packet.getClass().getSimpleName()); + connector.getLogger().debug("Handled packet: " + packet.getClass().getSimpleName()); return false; } @Override public boolean handle(CraftingEventPacket packet) { - System.out.println("Handled packet: " + packet.getClass().getSimpleName()); + connector.getLogger().debug("Handled packet: " + packet.getClass().getSimpleName()); return false; } @Override public boolean handle(EntityEventPacket packet) { - System.out.println("Handled packet: " + packet.getClass().getSimpleName()); + connector.getLogger().debug("Handled packet: " + packet.getClass().getSimpleName()); return false; } @Override public boolean handle(EntityFallPacket packet) { - System.out.println("Handled packet: " + packet.getClass().getSimpleName()); + connector.getLogger().debug("Handled packet: " + packet.getClass().getSimpleName()); return false; } @Override public boolean handle(EntityPickRequestPacket packet) { - System.out.println("Handled packet: " + packet.getClass().getSimpleName()); + connector.getLogger().debug("Handled packet: " + packet.getClass().getSimpleName()); return false; } @Override public boolean handle(EventPacket packet) { - System.out.println("Handled packet: " + packet.getClass().getSimpleName()); + connector.getLogger().debug("Handled packet: " + packet.getClass().getSimpleName()); return false; } @Override public boolean handle(InteractPacket packet) { - System.out.println("Handled packet: " + packet.getClass().getSimpleName()); + connector.getLogger().debug("Handled packet: " + packet.getClass().getSimpleName()); return false; } @Override public boolean handle(InventoryContentPacket packet) { - System.out.println("Handled packet: " + packet.getClass().getSimpleName()); + connector.getLogger().debug("Handled packet: " + packet.getClass().getSimpleName()); return false; } @Override public boolean handle(InventorySlotPacket packet) { - System.out.println("Handled packet: " + packet.getClass().getSimpleName()); + connector.getLogger().debug("Handled packet: " + packet.getClass().getSimpleName()); return false; } @Override public boolean handle(InventoryTransactionPacket packet) { - System.out.println("Handled packet: " + packet.getClass().getSimpleName()); + connector.getLogger().debug("Handled packet: " + packet.getClass().getSimpleName()); return false; } @Override public boolean handle(ItemFrameDropItemPacket packet) { - System.out.println("Handled packet: " + packet.getClass().getSimpleName()); + connector.getLogger().debug("Handled packet: " + packet.getClass().getSimpleName()); return false; } @Override public boolean handle(LabTablePacket packet) { - System.out.println("Handled packet: " + packet.getClass().getSimpleName()); + connector.getLogger().debug("Handled packet: " + packet.getClass().getSimpleName()); return false; } @Override public boolean handle(LecternUpdatePacket packet) { - System.out.println("Handled packet: " + packet.getClass().getSimpleName()); + connector.getLogger().debug("Handled packet: " + packet.getClass().getSimpleName()); return false; } @Override public boolean handle(LevelEventGenericPacket packet) { - System.out.println("Handled packet: " + packet.getClass().getSimpleName()); + connector.getLogger().debug("Handled packet: " + packet.getClass().getSimpleName()); return false; } @Override public boolean handle(LevelSoundEventPacket packet) { - System.out.println("Handled packet: " + packet.getClass().getSimpleName()); + connector.getLogger().debug("Handled packet: " + packet.getClass().getSimpleName()); return false; } @Override public boolean handle(LevelSoundEvent3Packet packet) { - System.out.println("Handled packet: " + packet.getClass().getSimpleName()); + connector.getLogger().debug("Handled packet: " + packet.getClass().getSimpleName()); return false; } @Override public boolean handle(MapInfoRequestPacket packet) { - System.out.println("Handled packet: " + packet.getClass().getSimpleName()); + connector.getLogger().debug("Handled packet: " + packet.getClass().getSimpleName()); return false; } @Override public boolean handle(MobArmorEquipmentPacket packet) { - System.out.println("Handled packet: " + packet.getClass().getSimpleName()); + connector.getLogger().debug("Handled packet: " + packet.getClass().getSimpleName()); return false; } @Override public boolean handle(MobEquipmentPacket packet) { - System.out.println("Handled packet: " + packet.getClass().getSimpleName()); + connector.getLogger().debug("Handled packet: " + packet.getClass().getSimpleName()); return false; } @Override public boolean handle(ModalFormResponsePacket packet) { - System.out.println("Handled packet: " + packet.getClass().getSimpleName()); + connector.getLogger().debug("Handled packet: " + packet.getClass().getSimpleName()); return false; } @Override public boolean handle(MoveEntityAbsolutePacket packet) { - System.out.println("Handled packet: " + packet.getClass().getSimpleName()); + connector.getLogger().debug("Handled packet: " + packet.getClass().getSimpleName()); return false; } @Override public boolean handle(MovePlayerPacket packet) { - System.out.println("Handled packet: " + packet.getClass().getSimpleName()); + connector.getLogger().debug("Handled packet: " + packet.getClass().getSimpleName()); return false; } @Override public boolean handle(NetworkStackLatencyPacket packet) { - System.out.println("Handled packet: " + packet.getClass().getSimpleName()); + connector.getLogger().debug("Handled packet: " + packet.getClass().getSimpleName()); return false; } @Override public boolean handle(PhotoTransferPacket packet) { - System.out.println("Handled packet: " + packet.getClass().getSimpleName()); + connector.getLogger().debug("Handled packet: " + packet.getClass().getSimpleName()); return false; } @Override public boolean handle(PlayerActionPacket packet) { - System.out.println("Handled packet: " + packet.getClass().getSimpleName()); + connector.getLogger().debug("Handled packet: " + packet.getClass().getSimpleName()); return false; } @Override public boolean handle(PlayerHotbarPacket packet) { - System.out.println("Handled packet: " + packet.getClass().getSimpleName()); + connector.getLogger().debug("Handled packet: " + packet.getClass().getSimpleName()); return false; } @Override public boolean handle(PlayerInputPacket packet) { - System.out.println("Handled packet: " + packet.getClass().getSimpleName()); + connector.getLogger().debug("Handled packet: " + packet.getClass().getSimpleName()); return false; } @Override public boolean handle(PlayerSkinPacket packet) { - System.out.println("Handled packet: " + packet.getClass().getSimpleName()); + connector.getLogger().debug("Handled packet: " + packet.getClass().getSimpleName()); return false; } @Override public boolean handle(PurchaseReceiptPacket packet) { - System.out.println("Handled packet: " + packet.getClass().getSimpleName()); + connector.getLogger().debug("Handled packet: " + packet.getClass().getSimpleName()); return false; } @Override public boolean handle(RequestChunkRadiusPacket packet) { - System.out.println("Handled packet: " + packet.getClass().getSimpleName()); + connector.getLogger().debug("Handled packet: " + packet.getClass().getSimpleName()); return false; } @Override public boolean handle(ResourcePackChunkRequestPacket packet) { - System.out.println("Handled packet: " + packet.getClass().getSimpleName()); + connector.getLogger().debug("Handled packet: " + packet.getClass().getSimpleName()); return false; } @Override public boolean handle(RiderJumpPacket packet) { - System.out.println("Handled packet: " + packet.getClass().getSimpleName()); + connector.getLogger().debug("Handled packet: " + packet.getClass().getSimpleName()); return false; } @Override public boolean handle(ServerSettingsRequestPacket packet) { - System.out.println("Handled packet: " + packet.getClass().getSimpleName()); + connector.getLogger().debug("Handled packet: " + packet.getClass().getSimpleName()); return false; } @Override public boolean handle(SetDefaultGameTypePacket packet) { - System.out.println("Handled packet: " + packet.getClass().getSimpleName()); + connector.getLogger().debug("Handled packet: " + packet.getClass().getSimpleName()); return false; } @Override public boolean handle(SetLocalPlayerAsInitializedPacket packet) { - System.out.println("Handled packet: " + packet.getClass().getSimpleName()); + connector.getLogger().debug("Handled packet: " + packet.getClass().getSimpleName()); return false; } @Override public boolean handle(SetPlayerGameTypePacket packet) { - System.out.println("Handled packet: " + packet.getClass().getSimpleName()); + connector.getLogger().debug("Handled packet: " + packet.getClass().getSimpleName()); return false; } @Override public boolean handle(SubClientLoginPacket packet) { - System.out.println("Handled packet: " + packet.getClass().getSimpleName()); + connector.getLogger().debug("Handled packet: " + packet.getClass().getSimpleName()); return false; } @Override public boolean handle(TextPacket packet) { - System.out.println("Handled packet: " + packet.getClass().getSimpleName()); + connector.getLogger().debug("Handled packet: " + packet.getClass().getSimpleName()); ClientChatPacket chatPacket = new ClientChatPacket(packet.getMessage()); session.getDownstream().getSession().send(chatPacket); @@ -422,493 +417,493 @@ public class UpstreamPacketHandler implements BedrockPacketHandler { @Override public boolean handle(AddBehaviorTreePacket packet) { - System.out.println("Handled packet: " + packet.getClass().getSimpleName()); + connector.getLogger().debug("Handled packet: " + packet.getClass().getSimpleName()); return false; } @Override public boolean handle(AddEntityPacket packet) { - System.out.println("Handled packet: " + packet.getClass().getSimpleName()); + connector.getLogger().debug("Handled packet: " + packet.getClass().getSimpleName()); return false; } @Override public boolean handle(AddHangingEntityPacket packet) { - System.out.println("Handled packet: " + packet.getClass().getSimpleName()); + connector.getLogger().debug("Handled packet: " + packet.getClass().getSimpleName()); return false; } @Override public boolean handle(AddItemEntityPacket packet) { - System.out.println("Handled packet: " + packet.getClass().getSimpleName()); + connector.getLogger().debug("Handled packet: " + packet.getClass().getSimpleName()); return false; } @Override public boolean handle(AddPaintingPacket packet) { - System.out.println("Handled packet: " + packet.getClass().getSimpleName()); + connector.getLogger().debug("Handled packet: " + packet.getClass().getSimpleName()); return false; } @Override public boolean handle(AddPlayerPacket packet) { - System.out.println("Handled packet: " + packet.getClass().getSimpleName()); + connector.getLogger().debug("Handled packet: " + packet.getClass().getSimpleName()); return false; } @Override public boolean handle(AvailableCommandsPacket packet) { - System.out.println("Handled packet: " + packet.getClass().getSimpleName()); + connector.getLogger().debug("Handled packet: " + packet.getClass().getSimpleName()); return false; } @Override public boolean handle(BlockEventPacket packet) { - System.out.println("Handled packet: " + packet.getClass().getSimpleName()); + connector.getLogger().debug("Handled packet: " + packet.getClass().getSimpleName()); return false; } @Override public boolean handle(BossEventPacket packet) { - System.out.println("Handled packet: " + packet.getClass().getSimpleName()); + connector.getLogger().debug("Handled packet: " + packet.getClass().getSimpleName()); return false; } @Override public boolean handle(CameraPacket packet) { - System.out.println("Handled packet: " + packet.getClass().getSimpleName()); + connector.getLogger().debug("Handled packet: " + packet.getClass().getSimpleName()); return false; } @Override public boolean handle(ChangeDimensionPacket packet) { - System.out.println("Handled packet: " + packet.getClass().getSimpleName()); + connector.getLogger().debug("Handled packet: " + packet.getClass().getSimpleName()); return false; } @Override public boolean handle(ChunkRadiusUpdatedPacket packet) { - System.out.println("Handled packet: " + packet.getClass().getSimpleName()); + connector.getLogger().debug("Handled packet: " + packet.getClass().getSimpleName()); return false; } @Override public boolean handle(ClientboundMapItemDataPacket packet) { - System.out.println("Handled packet: " + packet.getClass().getSimpleName()); + connector.getLogger().debug("Handled packet: " + packet.getClass().getSimpleName()); return false; } @Override public boolean handle(CommandOutputPacket packet) { - System.out.println("Handled packet: " + packet.getClass().getSimpleName()); + connector.getLogger().debug("Handled packet: " + packet.getClass().getSimpleName()); return false; } @Override public boolean handle(ContainerOpenPacket packet) { - System.out.println("Handled packet: " + packet.getClass().getSimpleName()); + connector.getLogger().debug("Handled packet: " + packet.getClass().getSimpleName()); return false; } @Override public boolean handle(ContainerSetDataPacket packet) { - System.out.println("Handled packet: " + packet.getClass().getSimpleName()); + connector.getLogger().debug("Handled packet: " + packet.getClass().getSimpleName()); return false; } @Override public boolean handle(CraftingDataPacket packet) { - System.out.println("Handled packet: " + packet.getClass().getSimpleName()); + connector.getLogger().debug("Handled packet: " + packet.getClass().getSimpleName()); return false; } @Override public boolean handle(DisconnectPacket packet) { - System.out.println("Handled packet: " + packet.getClass().getSimpleName()); + connector.getLogger().debug("Handled packet: " + packet.getClass().getSimpleName()); return false; } @Override public boolean handle(ExplodePacket packet) { - System.out.println("Handled packet: " + packet.getClass().getSimpleName()); + connector.getLogger().debug("Handled packet: " + packet.getClass().getSimpleName()); return false; } @Override public boolean handle(LevelChunkPacket packet) { - System.out.println("Handled packet: " + packet.getClass().getSimpleName()); + connector.getLogger().debug("Handled packet: " + packet.getClass().getSimpleName()); return false; } @Override public boolean handle(GameRulesChangedPacket packet) { - System.out.println("Handled packet: " + packet.getClass().getSimpleName()); + connector.getLogger().debug("Handled packet: " + packet.getClass().getSimpleName()); return false; } @Override public boolean handle(GuiDataPickItemPacket packet) { - System.out.println("Handled packet: " + packet.getClass().getSimpleName()); + connector.getLogger().debug("Handled packet: " + packet.getClass().getSimpleName()); return false; } @Override public boolean handle(HurtArmorPacket packet) { - System.out.println("Handled packet: " + packet.getClass().getSimpleName()); + connector.getLogger().debug("Handled packet: " + packet.getClass().getSimpleName()); return false; } @Override public boolean handle(AutomationClientConnectPacket packet) { - System.out.println("Handled packet: " + packet.getClass().getSimpleName()); + connector.getLogger().debug("Handled packet: " + packet.getClass().getSimpleName()); return false; } @Override public boolean handle(LevelEventPacket packet) { - System.out.println("Handled packet: " + packet.getClass().getSimpleName()); + connector.getLogger().debug("Handled packet: " + packet.getClass().getSimpleName()); return false; } @Override public boolean handle(MapCreateLockedCopyPacket packet) { - System.out.println("Handled packet: " + packet.getClass().getSimpleName()); + connector.getLogger().debug("Handled packet: " + packet.getClass().getSimpleName()); return false; } @Override public boolean handle(MobEffectPacket packet) { - System.out.println("Handled packet: " + packet.getClass().getSimpleName()); + connector.getLogger().debug("Handled packet: " + packet.getClass().getSimpleName()); return false; } @Override public boolean handle(ModalFormRequestPacket packet) { - System.out.println("Handled packet: " + packet.getClass().getSimpleName()); + connector.getLogger().debug("Handled packet: " + packet.getClass().getSimpleName()); return false; } @Override public boolean handle(MoveEntityDeltaPacket packet) { - System.out.println("Handled packet: " + packet.getClass().getSimpleName()); + connector.getLogger().debug("Handled packet: " + packet.getClass().getSimpleName()); return false; } @Override public boolean handle(NpcRequestPacket packet) { - System.out.println("Handled packet: " + packet.getClass().getSimpleName()); + connector.getLogger().debug("Handled packet: " + packet.getClass().getSimpleName()); return false; } @Override public boolean handle(OnScreenTextureAnimationPacket packet) { - System.out.println("Handled packet: " + packet.getClass().getSimpleName()); + connector.getLogger().debug("Handled packet: " + packet.getClass().getSimpleName()); return false; } @Override public boolean handle(PlayerListPacket packet) { - System.out.println("Handled packet: " + packet.getClass().getSimpleName()); + connector.getLogger().debug("Handled packet: " + packet.getClass().getSimpleName()); return false; } @Override public boolean handle(PlaySoundPacket packet) { - System.out.println("Handled packet: " + packet.getClass().getSimpleName()); + connector.getLogger().debug("Handled packet: " + packet.getClass().getSimpleName()); return false; } @Override public boolean handle(PlayStatusPacket packet) { - System.out.println("Handled packet: " + packet.getClass().getSimpleName()); + connector.getLogger().debug("Handled packet: " + packet.getClass().getSimpleName()); return false; } @Override public boolean handle(RemoveEntityPacket packet) { - System.out.println("Handled packet: " + packet.getClass().getSimpleName()); + connector.getLogger().debug("Handled packet: " + packet.getClass().getSimpleName()); return false; } @Override public boolean handle(RemoveObjectivePacket packet) { - System.out.println("Handled packet: " + packet.getClass().getSimpleName()); + connector.getLogger().debug("Handled packet: " + packet.getClass().getSimpleName()); return false; } @Override public boolean handle(ResourcePackChunkDataPacket packet) { - System.out.println("Handled packet: " + packet.getClass().getSimpleName()); + connector.getLogger().debug("Handled packet: " + packet.getClass().getSimpleName()); return false; } @Override public boolean handle(ResourcePackDataInfoPacket packet) { - System.out.println("Handled packet: " + packet.getClass().getSimpleName()); + connector.getLogger().debug("Handled packet: " + packet.getClass().getSimpleName()); return false; } @Override public boolean handle(ResourcePacksInfoPacket packet) { - System.out.println("Handled packet: " + packet.getClass().getSimpleName()); + connector.getLogger().debug("Handled packet: " + packet.getClass().getSimpleName()); return false; } @Override public boolean handle(ResourcePackStackPacket packet) { - System.out.println("Handled packet: " + packet.getClass().getSimpleName()); + connector.getLogger().debug("Handled packet: " + packet.getClass().getSimpleName()); return false; } @Override public boolean handle(RespawnPacket packet) { - System.out.println("Handled packet: " + packet.getClass().getSimpleName()); + connector.getLogger().debug("Handled packet: " + packet.getClass().getSimpleName()); return false; } @Override public boolean handle(ScriptCustomEventPacket packet) { - System.out.println("Handled packet: " + packet.getClass().getSimpleName()); + connector.getLogger().debug("Handled packet: " + packet.getClass().getSimpleName()); return false; } @Override public boolean handle(ServerSettingsResponsePacket packet) { - System.out.println("Handled packet: " + packet.getClass().getSimpleName()); + connector.getLogger().debug("Handled packet: " + packet.getClass().getSimpleName()); return false; } @Override public boolean handle(ServerToClientHandshakePacket packet) { - System.out.println("Handled packet: " + packet.getClass().getSimpleName()); + connector.getLogger().debug("Handled packet: " + packet.getClass().getSimpleName()); return false; } @Override public boolean handle(SetCommandsEnabledPacket packet) { - System.out.println("Handled packet: " + packet.getClass().getSimpleName()); + connector.getLogger().debug("Handled packet: " + packet.getClass().getSimpleName()); return false; } @Override public boolean handle(SetDifficultyPacket packet) { - System.out.println("Handled packet: " + packet.getClass().getSimpleName()); + connector.getLogger().debug("Handled packet: " + packet.getClass().getSimpleName()); return false; } @Override public boolean handle(SetDisplayObjectivePacket packet) { - System.out.println("Handled packet: " + packet.getClass().getSimpleName()); + connector.getLogger().debug("Handled packet: " + packet.getClass().getSimpleName()); return false; } @Override public boolean handle(SetEntityDataPacket packet) { - System.out.println("Handled packet: " + packet.getClass().getSimpleName()); + connector.getLogger().debug("Handled packet: " + packet.getClass().getSimpleName()); return false; } @Override public boolean handle(SetEntityLinkPacket packet) { - System.out.println("Handled packet: " + packet.getClass().getSimpleName()); + connector.getLogger().debug("Handled packet: " + packet.getClass().getSimpleName()); return false; } @Override public boolean handle(SetEntityMotionPacket packet) { - System.out.println("Handled packet: " + packet.getClass().getSimpleName()); + connector.getLogger().debug("Handled packet: " + packet.getClass().getSimpleName()); return false; } @Override public boolean handle(SetHealthPacket packet) { - System.out.println("Handled packet: " + packet.getClass().getSimpleName()); + connector.getLogger().debug("Handled packet: " + packet.getClass().getSimpleName()); return false; } @Override public boolean handle(SetLastHurtByPacket packet) { - System.out.println("Handled packet: " + packet.getClass().getSimpleName()); + connector.getLogger().debug("Handled packet: " + packet.getClass().getSimpleName()); return false; } @Override public boolean handle(SetScoreboardIdentityPacket packet) { - System.out.println("Handled packet: " + packet.getClass().getSimpleName()); + connector.getLogger().debug("Handled packet: " + packet.getClass().getSimpleName()); return false; } @Override public boolean handle(SetScorePacket packet) { - System.out.println("Handled packet: " + packet.getClass().getSimpleName()); + connector.getLogger().debug("Handled packet: " + packet.getClass().getSimpleName()); return false; } @Override public boolean handle(SetSpawnPositionPacket packet) { - System.out.println("Handled packet: " + packet.getClass().getSimpleName()); + connector.getLogger().debug("Handled packet: " + packet.getClass().getSimpleName()); return false; } @Override public boolean handle(SetTimePacket packet) { - System.out.println("Handled packet: " + packet.getClass().getSimpleName()); + connector.getLogger().debug("Handled packet: " + packet.getClass().getSimpleName()); return false; } @Override public boolean handle(SetTitlePacket packet) { - System.out.println("Handled packet: " + packet.getClass().getSimpleName()); + connector.getLogger().debug("Handled packet: " + packet.getClass().getSimpleName()); return false; } @Override public boolean handle(ShowCreditsPacket packet) { - System.out.println("Handled packet: " + packet.getClass().getSimpleName()); + connector.getLogger().debug("Handled packet: " + packet.getClass().getSimpleName()); return false; } @Override public boolean handle(ShowProfilePacket packet) { - System.out.println("Handled packet: " + packet.getClass().getSimpleName()); + connector.getLogger().debug("Handled packet: " + packet.getClass().getSimpleName()); return false; } @Override public boolean handle(ShowStoreOfferPacket packet) { - System.out.println("Handled packet: " + packet.getClass().getSimpleName()); + connector.getLogger().debug("Handled packet: " + packet.getClass().getSimpleName()); return false; } @Override public boolean handle(SimpleEventPacket packet) { - System.out.println("Handled packet: " + packet.getClass().getSimpleName()); + connector.getLogger().debug("Handled packet: " + packet.getClass().getSimpleName()); return false; } @Override public boolean handle(SpawnExperienceOrbPacket packet) { - System.out.println("Handled packet: " + packet.getClass().getSimpleName()); + connector.getLogger().debug("Handled packet: " + packet.getClass().getSimpleName()); return false; } @Override public boolean handle(StartGamePacket packet) { - System.out.println("Handled packet: " + packet.getClass().getSimpleName()); + connector.getLogger().debug("Handled packet: " + packet.getClass().getSimpleName()); return false; } @Override public boolean handle(StopSoundPacket packet) { - System.out.println("Handled packet: " + packet.getClass().getSimpleName()); + connector.getLogger().debug("Handled packet: " + packet.getClass().getSimpleName()); return false; } @Override public boolean handle(StructureBlockUpdatePacket packet) { - System.out.println("Handled packet: " + packet.getClass().getSimpleName()); + connector.getLogger().debug("Handled packet: " + packet.getClass().getSimpleName()); return false; } @Override public boolean handle(StructureTemplateDataExportRequestPacket packet) { - System.out.println("Handled packet: " + packet.getClass().getSimpleName()); + connector.getLogger().debug("Handled packet: " + packet.getClass().getSimpleName()); return false; } @Override public boolean handle(StructureTemplateDataExportResponsePacket packet) { - System.out.println("Handled packet: " + packet.getClass().getSimpleName()); + connector.getLogger().debug("Handled packet: " + packet.getClass().getSimpleName()); return false; } @Override public boolean handle(TakeItemEntityPacket packet) { - System.out.println("Handled packet: " + packet.getClass().getSimpleName()); + connector.getLogger().debug("Handled packet: " + packet.getClass().getSimpleName()); return false; } @Override public boolean handle(TransferPacket packet) { - System.out.println("Handled packet: " + packet.getClass().getSimpleName()); + connector.getLogger().debug("Handled packet: " + packet.getClass().getSimpleName()); return false; } @Override public boolean handle(UpdateAttributesPacket packet) { - System.out.println("Handled packet: " + packet.getClass().getSimpleName()); + connector.getLogger().debug("Handled packet: " + packet.getClass().getSimpleName()); return false; } @Override public boolean handle(UpdateBlockPacket packet) { - System.out.println("Handled packet: " + packet.getClass().getSimpleName()); + connector.getLogger().debug("Handled packet: " + packet.getClass().getSimpleName()); return false; } @Override public boolean handle(UpdateBlockPropertiesPacket packet) { - System.out.println("Handled packet: " + packet.getClass().getSimpleName()); + connector.getLogger().debug("Handled packet: " + packet.getClass().getSimpleName()); return false; } @Override public boolean handle(UpdateBlockSyncedPacket packet) { - System.out.println("Handled packet: " + packet.getClass().getSimpleName()); + connector.getLogger().debug("Handled packet: " + packet.getClass().getSimpleName()); return false; } @Override public boolean handle(UpdateEquipPacket packet) { - System.out.println("Handled packet: " + packet.getClass().getSimpleName()); + connector.getLogger().debug("Handled packet: " + packet.getClass().getSimpleName()); return false; } @Override public boolean handle(UpdateSoftEnumPacket packet) { - System.out.println("Handled packet: " + packet.getClass().getSimpleName()); + connector.getLogger().debug("Handled packet: " + packet.getClass().getSimpleName()); return false; } @Override public boolean handle(UpdateTradePacket packet) { - System.out.println("Handled packet: " + packet.getClass().getSimpleName()); + connector.getLogger().debug("Handled packet: " + packet.getClass().getSimpleName()); return false; } @Override public boolean handle(AvailableEntityIdentifiersPacket packet) { - System.out.println("Handled packet: " + packet.getClass().getSimpleName()); + connector.getLogger().debug("Handled packet: " + packet.getClass().getSimpleName()); return false; } @Override public boolean handle(BiomeDefinitionListPacket packet) { - System.out.println("Handled packet: " + packet.getClass().getSimpleName()); + connector.getLogger().debug("Handled packet: " + packet.getClass().getSimpleName()); return false; } @Override public boolean handle(LevelSoundEvent2Packet packet) { - System.out.println("Handled packet: " + packet.getClass().getSimpleName()); + connector.getLogger().debug("Handled packet: " + packet.getClass().getSimpleName()); return false; } @Override public boolean handle(NetworkChunkPublisherUpdatePacket packet) { - System.out.println("Handled packet: " + packet.getClass().getSimpleName()); + connector.getLogger().debug("Handled packet: " + packet.getClass().getSimpleName()); return false; } @Override public boolean handle(SpawnParticleEffectPacket packet) { - System.out.println("Handled packet: " + packet.getClass().getSimpleName()); + connector.getLogger().debug("Handled packet: " + packet.getClass().getSimpleName()); return false; } @Override public boolean handle(VideoStreamConnectPacket packet) { - System.out.println("Handled packet: " + packet.getClass().getSimpleName()); + connector.getLogger().debug("Handled packet: " + packet.getClass().getSimpleName()); return false; } } \ No newline at end of file diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/Registry.java b/connector/src/main/java/org/geysermc/connector/network/translators/Registry.java index 463453d15..082947886 100644 --- a/connector/src/main/java/org/geysermc/connector/network/translators/Registry.java +++ b/connector/src/main/java/org/geysermc/connector/network/translators/Registry.java @@ -48,7 +48,7 @@ public class Registry { try { ((BiConsumer) JAVA.MAP.get(clazz)).accept(p, s); } catch (NullPointerException e) { - GeyserLogger.DEFAULT.warning("could not translate packet " + p.getClass().getSimpleName()); + GeyserLogger.DEFAULT.debug("could not translate packet " + p.getClass().getSimpleName()); } } } diff --git a/connector/src/main/resources/config.yml b/connector/src/main/resources/config.yml index 699683ebb..885e5cf7c 100644 --- a/connector/src/main/resources/config.yml +++ b/connector/src/main/resources/config.yml @@ -27,6 +27,9 @@ ping-passthrough: false # Maximum amount of players that can connect max-players: 100 +# If debug messages should be sent through console +debug-mode: false +