diff --git a/bukkit/src/main/java/us/myles/ViaVersion/bukkit/platform/BukkitViaInjector.java b/bukkit/src/main/java/us/myles/ViaVersion/bukkit/platform/BukkitViaInjector.java index 0140d28ee..c52b4452e 100644 --- a/bukkit/src/main/java/us/myles/ViaVersion/bukkit/platform/BukkitViaInjector.java +++ b/bukkit/src/main/java/us/myles/ViaVersion/bukkit/platform/BukkitViaInjector.java @@ -122,7 +122,7 @@ public class BukkitViaInjector implements ViaInjector { ReflectionUtil.set(bootstrapAcceptor, "childHandler", ((BukkitChannelInitializer) oldInit).getOriginal()); } } catch (Exception e) { - System.out.println("Failed to remove injection handler, reload won't work with connections, please reboot!"); + Via.getPlatform().getLogger().severe("Failed to remove injection handler, reload won't work with connections, please reboot!"); } } injectedFutures.clear(); @@ -134,7 +134,7 @@ public class BukkitViaInjector implements ViaInjector { pair.getKey().set(pair.getValue(), ((ListWrapper) o).getOriginalList()); } } catch (IllegalAccessException e) { - System.out.println("Failed to remove injection, reload won't work with connections, please reboot!"); + Via.getPlatform().getLogger().severe("Failed to remove injection, reload won't work with connections, please reboot!"); } } diff --git a/bukkit/src/main/java/us/myles/ViaVersion/bukkit/platform/BukkitViaLoader.java b/bukkit/src/main/java/us/myles/ViaVersion/bukkit/platform/BukkitViaLoader.java index dcfed6383..49bf0aa91 100644 --- a/bukkit/src/main/java/us/myles/ViaVersion/bukkit/platform/BukkitViaLoader.java +++ b/bukkit/src/main/java/us/myles/ViaVersion/bukkit/platform/BukkitViaLoader.java @@ -78,7 +78,7 @@ public class BukkitViaLoader implements ViaPlatformLoader { } }).get(10, TimeUnit.SECONDS); } catch (Exception e) { - System.out.println("Error fetching hand item: " + e.getClass().getName()); + Via.getPlatform().getLogger().severe("Error fetching hand item: " + e.getClass().getName()); if (Via.getManager().isDebug()) e.printStackTrace(); return null; diff --git a/bungee/src/main/java/us/myles/ViaVersion/bungee/commands/BungeeCommandHandler.java b/bungee/src/main/java/us/myles/ViaVersion/bungee/commands/BungeeCommandHandler.java index 44c7c5eb0..8209a371b 100644 --- a/bungee/src/main/java/us/myles/ViaVersion/bungee/commands/BungeeCommandHandler.java +++ b/bungee/src/main/java/us/myles/ViaVersion/bungee/commands/BungeeCommandHandler.java @@ -1,5 +1,6 @@ package us.myles.ViaVersion.bungee.commands; +import us.myles.ViaVersion.api.Via; import us.myles.ViaVersion.bungee.commands.subs.ProbeSubCmd; import us.myles.ViaVersion.commands.ViaCommandHandler; @@ -8,7 +9,7 @@ public class BungeeCommandHandler extends ViaCommandHandler { try { registerSubCommand(new ProbeSubCmd()); } catch (Exception e) { - System.out.println("Failed to register Bungee subcommands"); + Via.getPlatform().getLogger().severe("Failed to register Bungee subcommands"); e.printStackTrace(); } } diff --git a/bungee/src/main/java/us/myles/ViaVersion/bungee/providers/BungeeVersionProvider.java b/bungee/src/main/java/us/myles/ViaVersion/bungee/providers/BungeeVersionProvider.java index 3dc9be3a1..674b6a367 100644 --- a/bungee/src/main/java/us/myles/ViaVersion/bungee/providers/BungeeVersionProvider.java +++ b/bungee/src/main/java/us/myles/ViaVersion/bungee/providers/BungeeVersionProvider.java @@ -2,6 +2,7 @@ package us.myles.ViaVersion.bungee.providers; import com.google.common.collect.Lists; import net.md_5.bungee.api.ProxyServer; +import us.myles.ViaVersion.api.Via; import us.myles.ViaVersion.api.data.UserConnection; import us.myles.ViaVersion.protocols.base.ProtocolInfo; import us.myles.ViaVersion.protocols.base.VersionProvider; @@ -16,7 +17,7 @@ public class BungeeVersionProvider extends VersionProvider { try { ref = Class.forName("net.md_5.bungee.protocol.ProtocolConstants"); } catch (Exception e) { - System.out.println("Could not detect the ProtocolConstants class"); + Via.getPlatform().getLogger().severe("Could not detect the ProtocolConstants class"); e.printStackTrace(); } } @@ -45,7 +46,7 @@ public class BungeeVersionProvider extends VersionProvider { return protocol; } - System.out.println("Panic, no protocol id found for " + info.getProtocolVersion()); + Via.getPlatform().getLogger().severe("Panic, no protocol id found for " + info.getProtocolVersion()); return info.getProtocolVersion(); } diff --git a/bungee/src/main/java/us/myles/ViaVersion/bungee/util/BungeePipelineUtil.java b/bungee/src/main/java/us/myles/ViaVersion/bungee/util/BungeePipelineUtil.java index 5d81f876a..d6218cc2d 100644 --- a/bungee/src/main/java/us/myles/ViaVersion/bungee/util/BungeePipelineUtil.java +++ b/bungee/src/main/java/us/myles/ViaVersion/bungee/util/BungeePipelineUtil.java @@ -4,6 +4,7 @@ import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; import io.netty.handler.codec.MessageToByteEncoder; import io.netty.handler.codec.MessageToMessageDecoder; +import us.myles.ViaVersion.api.Via; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; @@ -20,14 +21,12 @@ public class BungeePipelineUtil { DECODE_METHOD.setAccessible(true); } catch (NoSuchMethodException e) { e.printStackTrace(); - System.out.println("Netty issue?"); } try { ENCODE_METHOD = MessageToByteEncoder.class.getDeclaredMethod("encode", ChannelHandlerContext.class, Object.class, ByteBuf.class); ENCODE_METHOD.setAccessible(true); } catch (NoSuchMethodException e) { e.printStackTrace(); - System.out.println("Netty issue?"); } } diff --git a/common/src/main/java/us/myles/ViaVersion/api/PacketWrapper.java b/common/src/main/java/us/myles/ViaVersion/api/PacketWrapper.java index f5c7cb1fd..b12ada092 100644 --- a/common/src/main/java/us/myles/ViaVersion/api/PacketWrapper.java +++ b/common/src/main/java/us/myles/ViaVersion/api/PacketWrapper.java @@ -176,7 +176,7 @@ public class PacketWrapper { if (type instanceof TypeConverter) { value = (T) ((TypeConverter) type).from(value); } else { - System.out.println("Possible type mismatch: " + value.getClass().getName() + " -> " + type.getOutputClass()); + Via.getPlatform().getLogger().warning("Possible type mismatch: " + value.getClass().getName() + " -> " + type.getOutputClass()); } } } @@ -237,7 +237,7 @@ public class PacketWrapper { if (packetValue.getKey() instanceof TypeConverter) { value = ((TypeConverter) packetValue.getKey()).from(value); } else { - System.out.println("Possible type mismatch: " + value.getClass().getName() + " -> " + packetValue.getKey().getOutputClass()); + Via.getPlatform().getLogger().warning("Possible type mismatch: " + value.getClass().getName() + " -> " + packetValue.getKey().getOutputClass()); } } } diff --git a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_11to1_10/MetadataRewriter.java b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_11to1_10/MetadataRewriter.java index 76ab9bfb2..a1b060519 100644 --- a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_11to1_10/MetadataRewriter.java +++ b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_11to1_10/MetadataRewriter.java @@ -87,8 +87,8 @@ public class MetadataRewriter { } } catch (Exception e) { if (!Via.getConfig().isSuppressMetadataErrors() || Via.getManager().isDebug()) { - System.out.println("An error occurred with entity type rewriter"); - System.out.println("Metadata: " + metadata); + Via.getPlatform().getLogger().warning("An error occurred with entity type rewriter"); + Via.getPlatform().getLogger().warning("Metadata: " + metadata); e.printStackTrace(); } } @@ -195,8 +195,8 @@ public class MetadataRewriter { } catch (Exception e) { metadatas.remove(metadata); if (!Via.getConfig().isSuppressMetadataErrors() || Via.getManager().isDebug()) { - System.out.println("An error occurred with entity metadata handler"); - System.out.println("Metadata: " + metadata); + Via.getPlatform().getLogger().warning("An error occurred with entity metadata handler"); + Via.getPlatform().getLogger().warning("Metadata: " + metadata); e.printStackTrace(); } } diff --git a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9_1_2to1_9_3_4/chunks/BlockEntity.java b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9_1_2to1_9_3_4/chunks/BlockEntity.java index bda4b1731..5aa9f4f46 100644 --- a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9_1_2to1_9_3_4/chunks/BlockEntity.java +++ b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9_1_2to1_9_3_4/chunks/BlockEntity.java @@ -52,7 +52,7 @@ public class BlockEntity { updateBlockEntity(pos, (short) newId, tag, connection); } catch (Exception e) { if (Via.getManager().isDebug()) { - System.out.println("Block Entity: " + e.getMessage() + ": " + tag); + Via.getPlatform().getLogger().warning("Block Entity: " + e.getMessage() + ": " + tag); } } } diff --git a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/Protocol1_9TO1_8.java b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/Protocol1_9TO1_8.java index 7ca26205e..22b5bf4c0 100644 --- a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/Protocol1_9TO1_8.java +++ b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/Protocol1_9TO1_8.java @@ -43,7 +43,7 @@ public class Protocol1_9TO1_8 extends Protocol { if (Via.getConfig().isForceJsonTransform()) { return constructJson(line); } else { - System.out.println("Invalid JSON String: \"" + line + "\" Please report this issue to the ViaVersion Github: " + e.getMessage()); + Via.getPlatform().getLogger().warning("Invalid JSON String: \"" + line + "\" Please report this issue to the ViaVersion Github: " + e.getMessage()); return "{\"text\":\"\"}"; } } diff --git a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/metadata/MetadataRewriter.java b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/metadata/MetadataRewriter.java index 39f9adecb..602a20aa2 100644 --- a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/metadata/MetadataRewriter.java +++ b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/metadata/MetadataRewriter.java @@ -121,7 +121,7 @@ public class MetadataRewriter { entry.setValue(value); break; default: - System.out.println("[Out] Unhandled MetaDataType: " + metaIndex.getNewType()); + Via.getPlatform().getLogger().warning("[Out] Unhandled MetaDataType: " + metaIndex.getNewType()); list.remove(entry); break; } diff --git a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/packets/SpawnPackets.java b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/packets/SpawnPackets.java index e868c427a..2a0857126 100644 --- a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/packets/SpawnPackets.java +++ b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/packets/SpawnPackets.java @@ -1,6 +1,7 @@ package us.myles.ViaVersion.protocols.protocol1_9to1_8.packets; import us.myles.ViaVersion.api.PacketWrapper; +import us.myles.ViaVersion.api.Via; import us.myles.ViaVersion.api.entities.Entity1_10Types; import us.myles.ViaVersion.api.minecraft.item.Item; import us.myles.ViaVersion.api.minecraft.metadata.Metadata; @@ -216,7 +217,7 @@ public class SpawnPackets { if (tracker.getClientEntityTypes().containsKey(entityID)) { MetadataRewriter.transform(tracker.getClientEntityTypes().get(entityID), metadataList); } else { - System.out.println("Unable to find entity for metadata, entity ID: " + entityID); + Via.getPlatform().getLogger().warning("Unable to find entity for metadata, entity ID: " + entityID); metadataList.clear(); } } @@ -296,7 +297,6 @@ public class SpawnPackets { @Override public void handle(PacketWrapper wrapper) throws Exception { short item = wrapper.read(Type.SHORT); -// System.out.println(item); if (item != 0) { PacketWrapper packet = new PacketWrapper(0x3C, null, wrapper.user()); packet.write(Type.VAR_INT, wrapper.get(Type.VAR_INT, 0)); @@ -322,7 +322,7 @@ public class SpawnPackets { if (tracker.getClientEntityTypes().containsKey(entityID)) { MetadataRewriter.transform(tracker.getClientEntityTypes().get(entityID), metadataList); } else { - System.out.println("Unable to find entity for metadata, entity ID: " + entityID); + Via.getPlatform().getLogger().warning("Unable to find entity for metadata, entity ID: " + entityID); metadataList.clear(); } } diff --git a/common/src/main/java/us/myles/ViaVersion/util/PipelineUtil.java b/common/src/main/java/us/myles/ViaVersion/util/PipelineUtil.java index 05b92e9d5..e5d964f30 100644 --- a/common/src/main/java/us/myles/ViaVersion/util/PipelineUtil.java +++ b/common/src/main/java/us/myles/ViaVersion/util/PipelineUtil.java @@ -21,14 +21,12 @@ public class PipelineUtil { DECODE_METHOD.setAccessible(true); } catch (NoSuchMethodException e) { e.printStackTrace(); - System.out.println("Netty issue?"); } try { ENCODE_METHOD = MessageToByteEncoder.class.getDeclaredMethod("encode", ChannelHandlerContext.class, Object.class, ByteBuf.class); ENCODE_METHOD.setAccessible(true); } catch (NoSuchMethodException e) { e.printStackTrace(); - System.out.println("Netty issue?"); } } diff --git a/sponge/src/main/java/us/myles/ViaVersion/sponge/platform/SpongeViaInjector.java b/sponge/src/main/java/us/myles/ViaVersion/sponge/platform/SpongeViaInjector.java index da86deb48..04b5a329e 100644 --- a/sponge/src/main/java/us/myles/ViaVersion/sponge/platform/SpongeViaInjector.java +++ b/sponge/src/main/java/us/myles/ViaVersion/sponge/platform/SpongeViaInjector.java @@ -114,7 +114,7 @@ public class SpongeViaInjector implements ViaInjector { ReflectionUtil.set(bootstrapAcceptor, "childHandler", ((SpongeChannelInitializer) oldInit).getOriginal()); } } catch (Exception e) { - System.out.println("Failed to remove injection handler, reload won't work with connections, please reboot!"); + Via.getPlatform().getLogger().severe("Failed to remove injection handler, reload won't work with connections, please reboot!"); } } injectedFutures.clear(); @@ -126,7 +126,7 @@ public class SpongeViaInjector implements ViaInjector { pair.getKey().set(pair.getValue(), ((ListWrapper) o).getOriginalList()); } } catch (IllegalAccessException e) { - System.out.println("Failed to remove injection, reload won't work with connections, please reboot!"); + Via.getPlatform().getLogger().severe("Failed to remove injection, reload won't work with connections, please reboot!"); } }