From 396998c7fc9e091cc4d50ab75b277d4036069e8d Mon Sep 17 00:00:00 2001 From: Myles Date: Tue, 27 Sep 2016 17:31:10 +0100 Subject: [PATCH] Factor & Javadoc update --- .../java/us/myles/ViaVersion/ViaConfig.java | 2 +- .../us/myles/ViaVersion/ViaVersionPlugin.java | 10 ++- .../myles/ViaVersion/api/ViaVersionAPI.java | 4 +- .../BasicHandlerConstructor.java | 6 +- .../classgenerator/ClassGenerator.java | 8 +- .../classgenerator/HandlerConstructor.java | 2 +- .../{ => commands}/BukkitCommandHandler.java | 2 +- .../{ => commands}/BukkitCommandSender.java | 2 +- .../handlers/ViaDecodeHandler.java | 2 +- .../handlers/ViaEncodeHandler.java | 2 +- .../handlers/ViaPacketHandler.java | 2 +- .../handlers/ViaVersionInitializer.java | 6 +- .../listeners/UpdateListener.java | 2 +- .../listeners/ViaBukkitListener.java | 2 +- .../protocol1_9to1_8/ArmorListener.java | 4 +- .../protocol1_9to1_8/BlockListener.java | 4 +- .../CommandBlockListener.java | 6 +- .../protocol1_9to1_8/DeathListener.java | 4 +- .../protocol1_9to1_8/HandItemCache.java | 2 +- .../protocol1_9to1_8/PaperPatch.java | 4 +- .../bukkit/{ => platform}/BukkitViaAPI.java | 4 +- .../{ => platform}/BukkitViaInjector.java | 6 +- .../{ => platform}/BukkitViaLoader.java | 8 +- .../BukkitViaBulkChunkTranslator.java | 4 +- .../BukkitViaMovementTransmitter.java | 4 +- .../{ => bukkit}/util/Configuration.java | 2 +- .../ViaVersion/{ => bukkit}/util/NMSUtil.java | 2 +- .../util/ProtocolSupportUtil.java | 2 +- .../main/java/us/myles/ViaVersion/Bungee.java | 14 +-- .../{command => commands}/BungeeCommand.java | 2 +- .../BungeeCommandHandler.java | 2 +- .../BungeeCommandSender.java | 2 +- .../bungee/{ => platform}/BungeeBossBar.java | 2 +- .../{config => platform}/BungeeConfigAPI.java | 2 +- .../bungee/{ => platform}/BungeeViaAPI.java | 2 +- .../{ => platform}/BungeeViaInjector.java | 2 +- .../{ => platform}/BungeeViaLoader.java | 2 +- .../myles/ViaVersion/api/PacketWrapper.java | 8 +- .../java/us/myles/ViaVersion/api/Via.java | 15 ++++ .../us/myles/ViaVersion/api/ViaListener.java | 1 - .../us/myles/ViaVersion/api/boss/BossBar.java | 6 ++ .../api/command/ViaCommandSender.java | 29 ++++++- .../ViaVersion/api/command/ViaSubCommand.java | 12 +-- .../api/command/ViaVersionCommand.java | 2 +- .../ViaVersion/api/platform/ViaInjector.java | 29 ++++++- .../ViaVersion/api/platform/ViaPlatform.java | 87 +++++++++++++++++++ .../api/platform/ViaPlatformLoader.java | 5 +- .../api/platform/providers/ViaProviders.java | 4 +- .../ViaVersion/api/protocol/Protocol.java | 4 +- .../api/protocol/ProtocolRegistry.java | 8 +- .../api/remapper/PacketRemapper.java | 2 +- .../api/type/types/version/Types1_8.java | 4 +- .../commands/ViaCommandHandler.java | 25 +++++- .../commands/defaultsubs/PPSSubCmd.java | 2 - .../exception/InformativeException.java | 2 +- .../myles/ViaVersion/packets/PacketType.java | 4 +- .../protocols/base/BaseProtocol.java | 7 +- .../Protocol1_10To1_9_3_4.java | 4 +- .../chunks/ChunkSection1_9_3_4.java | 2 +- .../chunks/ChunkSection1_9_1_2.java | 2 +- .../chunks/FakeTileEntity.java | 2 +- .../types/Chunk1_9_1_2Type.java | 4 +- .../protocols/protocol1_9to1_8/ArmorType.java | 26 ++++++ .../protocol1_9to1_8/Protocol1_9TO1_8.java | 4 +- .../protocol1_9to1_8/chat/ChatRewriter.java | 6 ++ .../packets/EntityPackets.java | 2 +- .../packets/SpawnPackets.java | 2 +- .../BulkChunkTranslatorProvider.java | 13 +++ .../protocol1_9to1_8/sounds/Effect.java | 2 +- .../storage/EntityTracker.java | 4 +- .../storage/PlaceBlockTracker.java | 9 ++ .../us/myles/ViaVersion/update/Version.java | 23 ++++- .../myles/ViaVersion/util/PipelineUtil.java | 32 +++++++ .../us/myles/ViaVersion/SpongePlugin.java | 7 ++ .../{ => commands}/SpongeCommandHandler.java | 2 +- .../{ => commands}/SpongeCommandSender.java | 2 +- .../sponge/{ => platform}/SpongeBossBar.java | 2 +- .../{ => platform}/SpongeConfigAPI.java | 2 +- .../sponge/{ => platform}/SpongeViaAPI.java | 2 +- .../{ => platform}/SpongeViaInjector.java | 2 +- .../{ => platform}/SpongeViaLoader.java | 2 +- .../sponge/{ => util}/LoggerWrapper.java | 2 +- 82 files changed, 415 insertions(+), 139 deletions(-) rename bukkit/src/main/java/us/myles/ViaVersion/{ => bukkit}/classgenerator/BasicHandlerConstructor.java (77%) rename bukkit/src/main/java/us/myles/ViaVersion/{ => bukkit}/classgenerator/ClassGenerator.java (97%) rename bukkit/src/main/java/us/myles/ViaVersion/{ => bukkit}/classgenerator/HandlerConstructor.java (89%) rename bukkit/src/main/java/us/myles/ViaVersion/bukkit/{ => commands}/BukkitCommandHandler.java (94%) rename bukkit/src/main/java/us/myles/ViaVersion/bukkit/{ => commands}/BukkitCommandSender.java (94%) rename bukkit/src/main/java/us/myles/ViaVersion/{ => bukkit}/handlers/ViaDecodeHandler.java (98%) rename bukkit/src/main/java/us/myles/ViaVersion/{ => bukkit}/handlers/ViaEncodeHandler.java (98%) rename bukkit/src/main/java/us/myles/ViaVersion/{ => bukkit}/handlers/ViaPacketHandler.java (96%) rename bukkit/src/main/java/us/myles/ViaVersion/{ => bukkit}/handlers/ViaVersionInitializer.java (91%) rename bukkit/src/main/java/us/myles/ViaVersion/{ => bukkit}/listeners/UpdateListener.java (91%) rename bukkit/src/main/java/us/myles/ViaVersion/{ => bukkit}/listeners/ViaBukkitListener.java (96%) rename bukkit/src/main/java/us/myles/ViaVersion/{ => bukkit}/listeners/protocol1_9to1_8/ArmorListener.java (97%) rename bukkit/src/main/java/us/myles/ViaVersion/{ => bukkit}/listeners/protocol1_9to1_8/BlockListener.java (88%) rename bukkit/src/main/java/us/myles/ViaVersion/{ => bukkit}/listeners/protocol1_9to1_8/CommandBlockListener.java (96%) rename bukkit/src/main/java/us/myles/ViaVersion/{ => bukkit}/listeners/protocol1_9to1_8/DeathListener.java (94%) rename bukkit/src/main/java/us/myles/ViaVersion/{ => bukkit}/listeners/protocol1_9to1_8/HandItemCache.java (95%) rename bukkit/src/main/java/us/myles/ViaVersion/{ => bukkit}/listeners/protocol1_9to1_8/PaperPatch.java (94%) rename bukkit/src/main/java/us/myles/ViaVersion/bukkit/{ => platform}/BukkitViaAPI.java (97%) rename bukkit/src/main/java/us/myles/ViaVersion/bukkit/{ => platform}/BukkitViaInjector.java (98%) rename bukkit/src/main/java/us/myles/ViaVersion/bukkit/{ => platform}/BukkitViaLoader.java (92%) rename bukkit/src/main/java/us/myles/ViaVersion/bukkit/{ => providers}/BukkitViaBulkChunkTranslator.java (97%) rename bukkit/src/main/java/us/myles/ViaVersion/bukkit/{ => providers}/BukkitViaMovementTransmitter.java (97%) rename bukkit/src/main/java/us/myles/ViaVersion/{ => bukkit}/util/Configuration.java (99%) rename bukkit/src/main/java/us/myles/ViaVersion/{ => bukkit}/util/NMSUtil.java (93%) rename bukkit/src/main/java/us/myles/ViaVersion/{ => bukkit}/util/ProtocolSupportUtil.java (96%) rename bungee/src/main/java/us/myles/ViaVersion/bungee/{command => commands}/BungeeCommand.java (91%) rename bungee/src/main/java/us/myles/ViaVersion/bungee/{command => commands}/BungeeCommandHandler.java (73%) rename bungee/src/main/java/us/myles/ViaVersion/bungee/{command => commands}/BungeeCommandSender.java (95%) rename bungee/src/main/java/us/myles/ViaVersion/bungee/{ => platform}/BungeeBossBar.java (95%) rename bungee/src/main/java/us/myles/ViaVersion/bungee/{config => platform}/BungeeConfigAPI.java (98%) rename bungee/src/main/java/us/myles/ViaVersion/bungee/{ => platform}/BungeeViaAPI.java (98%) rename bungee/src/main/java/us/myles/ViaVersion/bungee/{ => platform}/BungeeViaInjector.java (97%) rename bungee/src/main/java/us/myles/ViaVersion/bungee/{ => platform}/BungeeViaLoader.java (78%) rename sponge/src/main/java/us/myles/ViaVersion/sponge/{ => commands}/SpongeCommandHandler.java (97%) rename sponge/src/main/java/us/myles/ViaVersion/sponge/{ => commands}/SpongeCommandSender.java (95%) rename sponge/src/main/java/us/myles/ViaVersion/sponge/{ => platform}/SpongeBossBar.java (95%) rename sponge/src/main/java/us/myles/ViaVersion/sponge/{ => platform}/SpongeConfigAPI.java (99%) rename sponge/src/main/java/us/myles/ViaVersion/sponge/{ => platform}/SpongeViaAPI.java (98%) rename sponge/src/main/java/us/myles/ViaVersion/sponge/{ => platform}/SpongeViaInjector.java (99%) rename sponge/src/main/java/us/myles/ViaVersion/sponge/{ => platform}/SpongeViaLoader.java (98%) rename sponge/src/main/java/us/myles/ViaVersion/sponge/{ => util}/LoggerWrapper.java (98%) diff --git a/bukkit/src/main/java/us/myles/ViaVersion/ViaConfig.java b/bukkit/src/main/java/us/myles/ViaVersion/ViaConfig.java index d63372589..b1e1fec38 100644 --- a/bukkit/src/main/java/us/myles/ViaVersion/ViaConfig.java +++ b/bukkit/src/main/java/us/myles/ViaVersion/ViaConfig.java @@ -2,7 +2,7 @@ package us.myles.ViaVersion; import us.myles.ViaVersion.api.ViaVersionConfig; import us.myles.ViaVersion.api.configuration.ConfigurationProvider; -import us.myles.ViaVersion.util.Configuration; +import us.myles.ViaVersion.bukkit.util.Configuration; import java.io.File; import java.util.List; diff --git a/bukkit/src/main/java/us/myles/ViaVersion/ViaVersionPlugin.java b/bukkit/src/main/java/us/myles/ViaVersion/ViaVersionPlugin.java index 51389604e..72d7cacb2 100644 --- a/bukkit/src/main/java/us/myles/ViaVersion/ViaVersionPlugin.java +++ b/bukkit/src/main/java/us/myles/ViaVersion/ViaVersionPlugin.java @@ -14,10 +14,14 @@ import us.myles.ViaVersion.api.ViaVersion; import us.myles.ViaVersion.api.command.ViaCommandSender; import us.myles.ViaVersion.api.configuration.ConfigurationProvider; import us.myles.ViaVersion.api.platform.ViaPlatform; -import us.myles.ViaVersion.bukkit.*; -import us.myles.ViaVersion.classgenerator.ClassGenerator; +import us.myles.ViaVersion.bukkit.classgenerator.ClassGenerator; +import us.myles.ViaVersion.bukkit.commands.BukkitCommandHandler; +import us.myles.ViaVersion.bukkit.commands.BukkitCommandSender; +import us.myles.ViaVersion.bukkit.platform.BukkitViaAPI; +import us.myles.ViaVersion.bukkit.platform.BukkitViaInjector; +import us.myles.ViaVersion.bukkit.platform.BukkitViaLoader; import us.myles.ViaVersion.dump.PluginInfo; -import us.myles.ViaVersion.util.NMSUtil; +import us.myles.ViaVersion.bukkit.util.NMSUtil; import java.util.ArrayList; import java.util.List; diff --git a/bukkit/src/main/java/us/myles/ViaVersion/api/ViaVersionAPI.java b/bukkit/src/main/java/us/myles/ViaVersion/api/ViaVersionAPI.java index a962fd924..a1dfcf212 100644 --- a/bukkit/src/main/java/us/myles/ViaVersion/api/ViaVersionAPI.java +++ b/bukkit/src/main/java/us/myles/ViaVersion/api/ViaVersionAPI.java @@ -103,9 +103,9 @@ public interface ViaVersionAPI extends ViaAPI { boolean isDebug(); /** - * Get ViaVersions command handler + * Get ViaVersions commands handler * - * @return command handler + * @return commands handler */ ViaVersionCommand getCommandHandler(); diff --git a/bukkit/src/main/java/us/myles/ViaVersion/classgenerator/BasicHandlerConstructor.java b/bukkit/src/main/java/us/myles/ViaVersion/bukkit/classgenerator/BasicHandlerConstructor.java similarity index 77% rename from bukkit/src/main/java/us/myles/ViaVersion/classgenerator/BasicHandlerConstructor.java rename to bukkit/src/main/java/us/myles/ViaVersion/bukkit/classgenerator/BasicHandlerConstructor.java index d94d4feaf..7ef143b6d 100644 --- a/bukkit/src/main/java/us/myles/ViaVersion/classgenerator/BasicHandlerConstructor.java +++ b/bukkit/src/main/java/us/myles/ViaVersion/bukkit/classgenerator/BasicHandlerConstructor.java @@ -1,10 +1,10 @@ -package us.myles.ViaVersion.classgenerator; +package us.myles.ViaVersion.bukkit.classgenerator; import io.netty.handler.codec.ByteToMessageDecoder; import io.netty.handler.codec.MessageToByteEncoder; import us.myles.ViaVersion.api.data.UserConnection; -import us.myles.ViaVersion.handlers.ViaDecodeHandler; -import us.myles.ViaVersion.handlers.ViaEncodeHandler; +import us.myles.ViaVersion.bukkit.handlers.ViaDecodeHandler; +import us.myles.ViaVersion.bukkit.handlers.ViaEncodeHandler; public class BasicHandlerConstructor implements HandlerConstructor { @Override diff --git a/bukkit/src/main/java/us/myles/ViaVersion/classgenerator/ClassGenerator.java b/bukkit/src/main/java/us/myles/ViaVersion/bukkit/classgenerator/ClassGenerator.java similarity index 97% rename from bukkit/src/main/java/us/myles/ViaVersion/classgenerator/ClassGenerator.java rename to bukkit/src/main/java/us/myles/ViaVersion/bukkit/classgenerator/ClassGenerator.java index 310390da5..95d25daa4 100644 --- a/bukkit/src/main/java/us/myles/ViaVersion/classgenerator/ClassGenerator.java +++ b/bukkit/src/main/java/us/myles/ViaVersion/bukkit/classgenerator/ClassGenerator.java @@ -1,4 +1,4 @@ -package us.myles.ViaVersion.classgenerator; +package us.myles.ViaVersion.bukkit.classgenerator; import javassist.*; import javassist.expr.ConstructorCall; @@ -6,9 +6,9 @@ import javassist.expr.ExprEditor; import org.bukkit.Bukkit; import org.bukkit.plugin.Plugin; import us.myles.ViaVersion.api.ViaVersion; -import us.myles.ViaVersion.handlers.ViaDecodeHandler; -import us.myles.ViaVersion.handlers.ViaEncodeHandler; -import us.myles.ViaVersion.util.NMSUtil; +import us.myles.ViaVersion.bukkit.handlers.ViaDecodeHandler; +import us.myles.ViaVersion.bukkit.handlers.ViaEncodeHandler; +import us.myles.ViaVersion.bukkit.util.NMSUtil; public class ClassGenerator { private static HandlerConstructor constructor = new BasicHandlerConstructor(); diff --git a/bukkit/src/main/java/us/myles/ViaVersion/classgenerator/HandlerConstructor.java b/bukkit/src/main/java/us/myles/ViaVersion/bukkit/classgenerator/HandlerConstructor.java similarity index 89% rename from bukkit/src/main/java/us/myles/ViaVersion/classgenerator/HandlerConstructor.java rename to bukkit/src/main/java/us/myles/ViaVersion/bukkit/classgenerator/HandlerConstructor.java index 19a5423c4..ab16e9967 100644 --- a/bukkit/src/main/java/us/myles/ViaVersion/classgenerator/HandlerConstructor.java +++ b/bukkit/src/main/java/us/myles/ViaVersion/bukkit/classgenerator/HandlerConstructor.java @@ -1,4 +1,4 @@ -package us.myles.ViaVersion.classgenerator; +package us.myles.ViaVersion.bukkit.classgenerator; import io.netty.handler.codec.ByteToMessageDecoder; import io.netty.handler.codec.MessageToByteEncoder; diff --git a/bukkit/src/main/java/us/myles/ViaVersion/bukkit/BukkitCommandHandler.java b/bukkit/src/main/java/us/myles/ViaVersion/bukkit/commands/BukkitCommandHandler.java similarity index 94% rename from bukkit/src/main/java/us/myles/ViaVersion/bukkit/BukkitCommandHandler.java rename to bukkit/src/main/java/us/myles/ViaVersion/bukkit/commands/BukkitCommandHandler.java index a5b0a6d64..11bf9771f 100644 --- a/bukkit/src/main/java/us/myles/ViaVersion/bukkit/BukkitCommandHandler.java +++ b/bukkit/src/main/java/us/myles/ViaVersion/bukkit/commands/BukkitCommandHandler.java @@ -1,4 +1,4 @@ -package us.myles.ViaVersion.bukkit; +package us.myles.ViaVersion.bukkit.commands; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; diff --git a/bukkit/src/main/java/us/myles/ViaVersion/bukkit/BukkitCommandSender.java b/bukkit/src/main/java/us/myles/ViaVersion/bukkit/commands/BukkitCommandSender.java similarity index 94% rename from bukkit/src/main/java/us/myles/ViaVersion/bukkit/BukkitCommandSender.java rename to bukkit/src/main/java/us/myles/ViaVersion/bukkit/commands/BukkitCommandSender.java index 2cc59c25b..e1288ca29 100644 --- a/bukkit/src/main/java/us/myles/ViaVersion/bukkit/BukkitCommandSender.java +++ b/bukkit/src/main/java/us/myles/ViaVersion/bukkit/commands/BukkitCommandSender.java @@ -1,4 +1,4 @@ -package us.myles.ViaVersion.bukkit; +package us.myles.ViaVersion.bukkit.commands; import lombok.AllArgsConstructor; import org.bukkit.command.CommandSender; diff --git a/bukkit/src/main/java/us/myles/ViaVersion/handlers/ViaDecodeHandler.java b/bukkit/src/main/java/us/myles/ViaVersion/bukkit/handlers/ViaDecodeHandler.java similarity index 98% rename from bukkit/src/main/java/us/myles/ViaVersion/handlers/ViaDecodeHandler.java rename to bukkit/src/main/java/us/myles/ViaVersion/bukkit/handlers/ViaDecodeHandler.java index 1d376c58d..0fe3b1d39 100644 --- a/bukkit/src/main/java/us/myles/ViaVersion/handlers/ViaDecodeHandler.java +++ b/bukkit/src/main/java/us/myles/ViaVersion/bukkit/handlers/ViaDecodeHandler.java @@ -1,4 +1,4 @@ -package us.myles.ViaVersion.handlers; +package us.myles.ViaVersion.bukkit.handlers; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; diff --git a/bukkit/src/main/java/us/myles/ViaVersion/handlers/ViaEncodeHandler.java b/bukkit/src/main/java/us/myles/ViaVersion/bukkit/handlers/ViaEncodeHandler.java similarity index 98% rename from bukkit/src/main/java/us/myles/ViaVersion/handlers/ViaEncodeHandler.java rename to bukkit/src/main/java/us/myles/ViaVersion/bukkit/handlers/ViaEncodeHandler.java index 67cac1581..edc4ec43c 100644 --- a/bukkit/src/main/java/us/myles/ViaVersion/handlers/ViaEncodeHandler.java +++ b/bukkit/src/main/java/us/myles/ViaVersion/bukkit/handlers/ViaEncodeHandler.java @@ -1,4 +1,4 @@ -package us.myles.ViaVersion.handlers; +package us.myles.ViaVersion.bukkit.handlers; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; diff --git a/bukkit/src/main/java/us/myles/ViaVersion/handlers/ViaPacketHandler.java b/bukkit/src/main/java/us/myles/ViaVersion/bukkit/handlers/ViaPacketHandler.java similarity index 96% rename from bukkit/src/main/java/us/myles/ViaVersion/handlers/ViaPacketHandler.java rename to bukkit/src/main/java/us/myles/ViaVersion/bukkit/handlers/ViaPacketHandler.java index a0205a8b5..ae09c9e01 100644 --- a/bukkit/src/main/java/us/myles/ViaVersion/handlers/ViaPacketHandler.java +++ b/bukkit/src/main/java/us/myles/ViaVersion/bukkit/handlers/ViaPacketHandler.java @@ -1,4 +1,4 @@ -package us.myles.ViaVersion.handlers; +package us.myles.ViaVersion.bukkit.handlers; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; diff --git a/bukkit/src/main/java/us/myles/ViaVersion/handlers/ViaVersionInitializer.java b/bukkit/src/main/java/us/myles/ViaVersion/bukkit/handlers/ViaVersionInitializer.java similarity index 91% rename from bukkit/src/main/java/us/myles/ViaVersion/handlers/ViaVersionInitializer.java rename to bukkit/src/main/java/us/myles/ViaVersion/bukkit/handlers/ViaVersionInitializer.java index ccd70da1e..716e38310 100644 --- a/bukkit/src/main/java/us/myles/ViaVersion/handlers/ViaVersionInitializer.java +++ b/bukkit/src/main/java/us/myles/ViaVersion/bukkit/handlers/ViaVersionInitializer.java @@ -1,4 +1,4 @@ -package us.myles.ViaVersion.handlers; +package us.myles.ViaVersion.bukkit.handlers; import io.netty.channel.Channel; import io.netty.channel.ChannelInitializer; @@ -7,8 +7,8 @@ import io.netty.handler.codec.ByteToMessageDecoder; import io.netty.handler.codec.MessageToByteEncoder; import us.myles.ViaVersion.api.data.UserConnection; import us.myles.ViaVersion.api.protocol.ProtocolPipeline; -import us.myles.ViaVersion.classgenerator.ClassGenerator; -import us.myles.ViaVersion.classgenerator.HandlerConstructor; +import us.myles.ViaVersion.bukkit.classgenerator.ClassGenerator; +import us.myles.ViaVersion.bukkit.classgenerator.HandlerConstructor; import java.lang.reflect.Method; diff --git a/bukkit/src/main/java/us/myles/ViaVersion/listeners/UpdateListener.java b/bukkit/src/main/java/us/myles/ViaVersion/bukkit/listeners/UpdateListener.java similarity index 91% rename from bukkit/src/main/java/us/myles/ViaVersion/listeners/UpdateListener.java rename to bukkit/src/main/java/us/myles/ViaVersion/bukkit/listeners/UpdateListener.java index dc0942192..3d7f74eb9 100644 --- a/bukkit/src/main/java/us/myles/ViaVersion/listeners/UpdateListener.java +++ b/bukkit/src/main/java/us/myles/ViaVersion/bukkit/listeners/UpdateListener.java @@ -1,4 +1,4 @@ -package us.myles.ViaVersion.listeners; +package us.myles.ViaVersion.bukkit.listeners; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; diff --git a/bukkit/src/main/java/us/myles/ViaVersion/listeners/ViaBukkitListener.java b/bukkit/src/main/java/us/myles/ViaVersion/bukkit/listeners/ViaBukkitListener.java similarity index 96% rename from bukkit/src/main/java/us/myles/ViaVersion/listeners/ViaBukkitListener.java rename to bukkit/src/main/java/us/myles/ViaVersion/bukkit/listeners/ViaBukkitListener.java index f76f31b71..a94bca5d3 100644 --- a/bukkit/src/main/java/us/myles/ViaVersion/listeners/ViaBukkitListener.java +++ b/bukkit/src/main/java/us/myles/ViaVersion/bukkit/listeners/ViaBukkitListener.java @@ -1,4 +1,4 @@ -package us.myles.ViaVersion.listeners; +package us.myles.ViaVersion.bukkit.listeners; import lombok.AccessLevel; import lombok.Getter; diff --git a/bukkit/src/main/java/us/myles/ViaVersion/listeners/protocol1_9to1_8/ArmorListener.java b/bukkit/src/main/java/us/myles/ViaVersion/bukkit/listeners/protocol1_9to1_8/ArmorListener.java similarity index 97% rename from bukkit/src/main/java/us/myles/ViaVersion/listeners/protocol1_9to1_8/ArmorListener.java rename to bukkit/src/main/java/us/myles/ViaVersion/bukkit/listeners/protocol1_9to1_8/ArmorListener.java index 1d55fa8d8..2880f47e4 100644 --- a/bukkit/src/main/java/us/myles/ViaVersion/listeners/protocol1_9to1_8/ArmorListener.java +++ b/bukkit/src/main/java/us/myles/ViaVersion/bukkit/listeners/protocol1_9to1_8/ArmorListener.java @@ -1,4 +1,4 @@ -package us.myles.ViaVersion.listeners.protocol1_9to1_8; +package us.myles.ViaVersion.bukkit.listeners.protocol1_9to1_8; import org.bukkit.Bukkit; import org.bukkit.entity.HumanEntity; @@ -17,7 +17,7 @@ import us.myles.ViaVersion.ViaVersionPlugin; import us.myles.ViaVersion.api.PacketWrapper; import us.myles.ViaVersion.api.Via; import us.myles.ViaVersion.api.type.Type; -import us.myles.ViaVersion.listeners.ViaBukkitListener; +import us.myles.ViaVersion.bukkit.listeners.ViaBukkitListener; import us.myles.ViaVersion.protocols.protocol1_9to1_8.ArmorType; import us.myles.ViaVersion.protocols.protocol1_9to1_8.Protocol1_9TO1_8; diff --git a/bukkit/src/main/java/us/myles/ViaVersion/listeners/protocol1_9to1_8/BlockListener.java b/bukkit/src/main/java/us/myles/ViaVersion/bukkit/listeners/protocol1_9to1_8/BlockListener.java similarity index 88% rename from bukkit/src/main/java/us/myles/ViaVersion/listeners/protocol1_9to1_8/BlockListener.java rename to bukkit/src/main/java/us/myles/ViaVersion/bukkit/listeners/protocol1_9to1_8/BlockListener.java index 964bad178..801e406cd 100644 --- a/bukkit/src/main/java/us/myles/ViaVersion/listeners/protocol1_9to1_8/BlockListener.java +++ b/bukkit/src/main/java/us/myles/ViaVersion/bukkit/listeners/protocol1_9to1_8/BlockListener.java @@ -1,4 +1,4 @@ -package us.myles.ViaVersion.listeners.protocol1_9to1_8; +package us.myles.ViaVersion.bukkit.listeners.protocol1_9to1_8; import org.bukkit.block.Block; import org.bukkit.event.EventHandler; @@ -6,7 +6,7 @@ import org.bukkit.event.EventPriority; import org.bukkit.event.block.BlockPlaceEvent; import us.myles.ViaVersion.ViaVersionPlugin; import us.myles.ViaVersion.api.minecraft.Position; -import us.myles.ViaVersion.listeners.ViaBukkitListener; +import us.myles.ViaVersion.bukkit.listeners.ViaBukkitListener; import us.myles.ViaVersion.protocols.protocol1_9to1_8.Protocol1_9TO1_8; import us.myles.ViaVersion.protocols.protocol1_9to1_8.storage.EntityTracker; diff --git a/bukkit/src/main/java/us/myles/ViaVersion/listeners/protocol1_9to1_8/CommandBlockListener.java b/bukkit/src/main/java/us/myles/ViaVersion/bukkit/listeners/protocol1_9to1_8/CommandBlockListener.java similarity index 96% rename from bukkit/src/main/java/us/myles/ViaVersion/listeners/protocol1_9to1_8/CommandBlockListener.java rename to bukkit/src/main/java/us/myles/ViaVersion/bukkit/listeners/protocol1_9to1_8/CommandBlockListener.java index b12a99f7e..7477023b1 100644 --- a/bukkit/src/main/java/us/myles/ViaVersion/listeners/protocol1_9to1_8/CommandBlockListener.java +++ b/bukkit/src/main/java/us/myles/ViaVersion/bukkit/listeners/protocol1_9to1_8/CommandBlockListener.java @@ -1,4 +1,4 @@ -package us.myles.ViaVersion.listeners.protocol1_9to1_8; +package us.myles.ViaVersion.bukkit.listeners.protocol1_9to1_8; import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBufOutputStream; @@ -21,9 +21,9 @@ import us.myles.ViaVersion.api.PacketWrapper; import us.myles.ViaVersion.api.data.UserConnection; import us.myles.ViaVersion.api.minecraft.Position; import us.myles.ViaVersion.api.type.Type; -import us.myles.ViaVersion.listeners.ViaBukkitListener; +import us.myles.ViaVersion.bukkit.listeners.ViaBukkitListener; import us.myles.ViaVersion.protocols.protocol1_9to1_8.Protocol1_9TO1_8; -import us.myles.ViaVersion.util.NMSUtil; +import us.myles.ViaVersion.bukkit.util.NMSUtil; import us.myles.ViaVersion.util.ReflectionUtil; import java.io.DataOutput; diff --git a/bukkit/src/main/java/us/myles/ViaVersion/listeners/protocol1_9to1_8/DeathListener.java b/bukkit/src/main/java/us/myles/ViaVersion/bukkit/listeners/protocol1_9to1_8/DeathListener.java similarity index 94% rename from bukkit/src/main/java/us/myles/ViaVersion/listeners/protocol1_9to1_8/DeathListener.java rename to bukkit/src/main/java/us/myles/ViaVersion/bukkit/listeners/protocol1_9to1_8/DeathListener.java index 9cb82857e..5ac730080 100644 --- a/bukkit/src/main/java/us/myles/ViaVersion/listeners/protocol1_9to1_8/DeathListener.java +++ b/bukkit/src/main/java/us/myles/ViaVersion/bukkit/listeners/protocol1_9to1_8/DeathListener.java @@ -1,4 +1,4 @@ -package us.myles.ViaVersion.listeners.protocol1_9to1_8; +package us.myles.ViaVersion.bukkit.listeners.protocol1_9to1_8; import org.bukkit.World; import org.bukkit.entity.Player; @@ -10,7 +10,7 @@ import us.myles.ViaVersion.api.PacketWrapper; import us.myles.ViaVersion.api.Via; import us.myles.ViaVersion.api.ViaVersion; import us.myles.ViaVersion.api.type.Type; -import us.myles.ViaVersion.listeners.ViaBukkitListener; +import us.myles.ViaVersion.bukkit.listeners.ViaBukkitListener; import us.myles.ViaVersion.protocols.protocol1_9to1_8.Protocol1_9TO1_8; public class DeathListener extends ViaBukkitListener { diff --git a/bukkit/src/main/java/us/myles/ViaVersion/listeners/protocol1_9to1_8/HandItemCache.java b/bukkit/src/main/java/us/myles/ViaVersion/bukkit/listeners/protocol1_9to1_8/HandItemCache.java similarity index 95% rename from bukkit/src/main/java/us/myles/ViaVersion/listeners/protocol1_9to1_8/HandItemCache.java rename to bukkit/src/main/java/us/myles/ViaVersion/bukkit/listeners/protocol1_9to1_8/HandItemCache.java index 9a05ad7b2..a7a288982 100644 --- a/bukkit/src/main/java/us/myles/ViaVersion/listeners/protocol1_9to1_8/HandItemCache.java +++ b/bukkit/src/main/java/us/myles/ViaVersion/bukkit/listeners/protocol1_9to1_8/HandItemCache.java @@ -1,4 +1,4 @@ -package us.myles.ViaVersion.listeners.protocol1_9to1_8; +package us.myles.ViaVersion.bukkit.listeners.protocol1_9to1_8; import org.bukkit.Bukkit; import org.bukkit.entity.Player; diff --git a/bukkit/src/main/java/us/myles/ViaVersion/listeners/protocol1_9to1_8/PaperPatch.java b/bukkit/src/main/java/us/myles/ViaVersion/bukkit/listeners/protocol1_9to1_8/PaperPatch.java similarity index 94% rename from bukkit/src/main/java/us/myles/ViaVersion/listeners/protocol1_9to1_8/PaperPatch.java rename to bukkit/src/main/java/us/myles/ViaVersion/bukkit/listeners/protocol1_9to1_8/PaperPatch.java index 38e24701e..5fbd1562a 100644 --- a/bukkit/src/main/java/us/myles/ViaVersion/listeners/protocol1_9to1_8/PaperPatch.java +++ b/bukkit/src/main/java/us/myles/ViaVersion/bukkit/listeners/protocol1_9to1_8/PaperPatch.java @@ -1,4 +1,4 @@ -package us.myles.ViaVersion.listeners.protocol1_9to1_8; +package us.myles.ViaVersion.bukkit.listeners.protocol1_9to1_8; import org.bukkit.Location; import org.bukkit.Material; @@ -6,7 +6,7 @@ import org.bukkit.block.BlockFace; import org.bukkit.event.EventHandler; import org.bukkit.event.block.BlockPlaceEvent; import us.myles.ViaVersion.ViaVersionPlugin; -import us.myles.ViaVersion.listeners.ViaBukkitListener; +import us.myles.ViaVersion.bukkit.listeners.ViaBukkitListener; import us.myles.ViaVersion.protocols.protocol1_9to1_8.Protocol1_9TO1_8; public class PaperPatch extends ViaBukkitListener { diff --git a/bukkit/src/main/java/us/myles/ViaVersion/bukkit/BukkitViaAPI.java b/bukkit/src/main/java/us/myles/ViaVersion/bukkit/platform/BukkitViaAPI.java similarity index 97% rename from bukkit/src/main/java/us/myles/ViaVersion/bukkit/BukkitViaAPI.java rename to bukkit/src/main/java/us/myles/ViaVersion/bukkit/platform/BukkitViaAPI.java index c2e4bf66d..9d3cff21e 100644 --- a/bukkit/src/main/java/us/myles/ViaVersion/bukkit/BukkitViaAPI.java +++ b/bukkit/src/main/java/us/myles/ViaVersion/bukkit/platform/BukkitViaAPI.java @@ -1,4 +1,4 @@ -package us.myles.ViaVersion.bukkit; +package us.myles.ViaVersion.bukkit.platform; import io.netty.buffer.ByteBuf; import lombok.AllArgsConstructor; @@ -17,7 +17,7 @@ import us.myles.ViaVersion.api.data.UserConnection; import us.myles.ViaVersion.api.protocol.ProtocolRegistry; import us.myles.ViaVersion.boss.ViaBossBar; import us.myles.ViaVersion.protocols.base.ProtocolInfo; -import us.myles.ViaVersion.util.ProtocolSupportUtil; +import us.myles.ViaVersion.bukkit.util.ProtocolSupportUtil; import java.util.Map; import java.util.SortedSet; diff --git a/bukkit/src/main/java/us/myles/ViaVersion/bukkit/BukkitViaInjector.java b/bukkit/src/main/java/us/myles/ViaVersion/bukkit/platform/BukkitViaInjector.java similarity index 98% rename from bukkit/src/main/java/us/myles/ViaVersion/bukkit/BukkitViaInjector.java rename to bukkit/src/main/java/us/myles/ViaVersion/bukkit/platform/BukkitViaInjector.java index 437997e18..769f35764 100644 --- a/bukkit/src/main/java/us/myles/ViaVersion/bukkit/BukkitViaInjector.java +++ b/bukkit/src/main/java/us/myles/ViaVersion/bukkit/platform/BukkitViaInjector.java @@ -1,4 +1,4 @@ -package us.myles.ViaVersion.bukkit; +package us.myles.ViaVersion.bukkit.platform; import io.netty.channel.ChannelFuture; import io.netty.channel.ChannelHandler; @@ -8,10 +8,10 @@ import org.bukkit.plugin.PluginDescriptionFile; import us.myles.ViaVersion.api.Pair; import us.myles.ViaVersion.api.Via; import us.myles.ViaVersion.api.platform.ViaInjector; -import us.myles.ViaVersion.handlers.ViaVersionInitializer; +import us.myles.ViaVersion.bukkit.handlers.ViaVersionInitializer; import us.myles.ViaVersion.util.ConcurrentList; import us.myles.ViaVersion.util.ListWrapper; -import us.myles.ViaVersion.util.NMSUtil; +import us.myles.ViaVersion.bukkit.util.NMSUtil; import us.myles.ViaVersion.util.ReflectionUtil; import java.lang.reflect.Field; diff --git a/bukkit/src/main/java/us/myles/ViaVersion/bukkit/BukkitViaLoader.java b/bukkit/src/main/java/us/myles/ViaVersion/bukkit/platform/BukkitViaLoader.java similarity index 92% rename from bukkit/src/main/java/us/myles/ViaVersion/bukkit/BukkitViaLoader.java rename to bukkit/src/main/java/us/myles/ViaVersion/bukkit/platform/BukkitViaLoader.java index 944dd766c..28b6f23cf 100644 --- a/bukkit/src/main/java/us/myles/ViaVersion/bukkit/BukkitViaLoader.java +++ b/bukkit/src/main/java/us/myles/ViaVersion/bukkit/platform/BukkitViaLoader.java @@ -1,4 +1,4 @@ -package us.myles.ViaVersion.bukkit; +package us.myles.ViaVersion.bukkit.platform; import lombok.AllArgsConstructor; import org.bukkit.Bukkit; @@ -10,8 +10,10 @@ import us.myles.ViaVersion.api.Via; import us.myles.ViaVersion.api.data.UserConnection; import us.myles.ViaVersion.api.minecraft.item.Item; import us.myles.ViaVersion.api.platform.ViaPlatformLoader; -import us.myles.ViaVersion.listeners.UpdateListener; -import us.myles.ViaVersion.listeners.protocol1_9to1_8.*; +import us.myles.ViaVersion.bukkit.listeners.UpdateListener; +import us.myles.ViaVersion.bukkit.listeners.protocol1_9to1_8.*; +import us.myles.ViaVersion.bukkit.providers.BukkitViaBulkChunkTranslator; +import us.myles.ViaVersion.bukkit.providers.BukkitViaMovementTransmitter; import us.myles.ViaVersion.protocols.base.ProtocolInfo; import us.myles.ViaVersion.protocols.protocol1_9to1_8.providers.BulkChunkTranslatorProvider; import us.myles.ViaVersion.protocols.protocol1_9to1_8.providers.HandItemProvider; diff --git a/bukkit/src/main/java/us/myles/ViaVersion/bukkit/BukkitViaBulkChunkTranslator.java b/bukkit/src/main/java/us/myles/ViaVersion/bukkit/providers/BukkitViaBulkChunkTranslator.java similarity index 97% rename from bukkit/src/main/java/us/myles/ViaVersion/bukkit/BukkitViaBulkChunkTranslator.java rename to bukkit/src/main/java/us/myles/ViaVersion/bukkit/providers/BukkitViaBulkChunkTranslator.java index dc57fa445..25d8370b5 100644 --- a/bukkit/src/main/java/us/myles/ViaVersion/bukkit/BukkitViaBulkChunkTranslator.java +++ b/bukkit/src/main/java/us/myles/ViaVersion/bukkit/providers/BukkitViaBulkChunkTranslator.java @@ -1,11 +1,11 @@ -package us.myles.ViaVersion.bukkit; +package us.myles.ViaVersion.bukkit.providers; import com.google.common.collect.Lists; import us.myles.ViaVersion.ViaVersionPlugin; import us.myles.ViaVersion.api.Via; import us.myles.ViaVersion.protocols.protocol1_9to1_8.providers.BulkChunkTranslatorProvider; import us.myles.ViaVersion.protocols.protocol1_9to1_8.storage.ClientChunks; -import us.myles.ViaVersion.util.NMSUtil; +import us.myles.ViaVersion.bukkit.util.NMSUtil; import us.myles.ViaVersion.util.ReflectionUtil; import java.lang.reflect.Method; diff --git a/bukkit/src/main/java/us/myles/ViaVersion/bukkit/BukkitViaMovementTransmitter.java b/bukkit/src/main/java/us/myles/ViaVersion/bukkit/providers/BukkitViaMovementTransmitter.java similarity index 97% rename from bukkit/src/main/java/us/myles/ViaVersion/bukkit/BukkitViaMovementTransmitter.java rename to bukkit/src/main/java/us/myles/ViaVersion/bukkit/providers/BukkitViaMovementTransmitter.java index f5da163d5..30bcaf1b4 100644 --- a/bukkit/src/main/java/us/myles/ViaVersion/bukkit/BukkitViaMovementTransmitter.java +++ b/bukkit/src/main/java/us/myles/ViaVersion/bukkit/providers/BukkitViaMovementTransmitter.java @@ -1,4 +1,4 @@ -package us.myles.ViaVersion.bukkit; +package us.myles.ViaVersion.bukkit.providers; import org.bukkit.Bukkit; import org.bukkit.entity.Player; @@ -7,7 +7,7 @@ import us.myles.ViaVersion.api.data.UserConnection; import us.myles.ViaVersion.protocols.base.ProtocolInfo; import us.myles.ViaVersion.protocols.protocol1_9to1_8.providers.MovementTransmitterProvider; import us.myles.ViaVersion.protocols.protocol1_9to1_8.storage.MovementTracker; -import us.myles.ViaVersion.util.NMSUtil; +import us.myles.ViaVersion.bukkit.util.NMSUtil; import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; diff --git a/bukkit/src/main/java/us/myles/ViaVersion/util/Configuration.java b/bukkit/src/main/java/us/myles/ViaVersion/bukkit/util/Configuration.java similarity index 99% rename from bukkit/src/main/java/us/myles/ViaVersion/util/Configuration.java rename to bukkit/src/main/java/us/myles/ViaVersion/bukkit/util/Configuration.java index 447f53f1e..0e3ba1797 100644 --- a/bukkit/src/main/java/us/myles/ViaVersion/util/Configuration.java +++ b/bukkit/src/main/java/us/myles/ViaVersion/bukkit/util/Configuration.java @@ -1,4 +1,4 @@ -package us.myles.ViaVersion.util; +package us.myles.ViaVersion.bukkit.util; import com.google.common.base.Joiner; import com.google.common.collect.Lists; diff --git a/bukkit/src/main/java/us/myles/ViaVersion/util/NMSUtil.java b/bukkit/src/main/java/us/myles/ViaVersion/bukkit/util/NMSUtil.java similarity index 93% rename from bukkit/src/main/java/us/myles/ViaVersion/util/NMSUtil.java rename to bukkit/src/main/java/us/myles/ViaVersion/bukkit/util/NMSUtil.java index 578ef49b5..d01884ecb 100644 --- a/bukkit/src/main/java/us/myles/ViaVersion/util/NMSUtil.java +++ b/bukkit/src/main/java/us/myles/ViaVersion/bukkit/util/NMSUtil.java @@ -1,4 +1,4 @@ -package us.myles.ViaVersion.util; +package us.myles.ViaVersion.bukkit.util; import org.bukkit.Bukkit; diff --git a/bukkit/src/main/java/us/myles/ViaVersion/util/ProtocolSupportUtil.java b/bukkit/src/main/java/us/myles/ViaVersion/bukkit/util/ProtocolSupportUtil.java similarity index 96% rename from bukkit/src/main/java/us/myles/ViaVersion/util/ProtocolSupportUtil.java rename to bukkit/src/main/java/us/myles/ViaVersion/bukkit/util/ProtocolSupportUtil.java index 66458a0a5..f740893f8 100644 --- a/bukkit/src/main/java/us/myles/ViaVersion/util/ProtocolSupportUtil.java +++ b/bukkit/src/main/java/us/myles/ViaVersion/bukkit/util/ProtocolSupportUtil.java @@ -1,4 +1,4 @@ -package us.myles.ViaVersion.util; +package us.myles.ViaVersion.bukkit.util; import org.bukkit.entity.Player; diff --git a/bungee/src/main/java/us/myles/ViaVersion/Bungee.java b/bungee/src/main/java/us/myles/ViaVersion/Bungee.java index f3a0c5e3c..b8805a582 100644 --- a/bungee/src/main/java/us/myles/ViaVersion/Bungee.java +++ b/bungee/src/main/java/us/myles/ViaVersion/Bungee.java @@ -11,13 +11,13 @@ import us.myles.ViaVersion.api.ViaVersionConfig; import us.myles.ViaVersion.api.command.ViaCommandSender; import us.myles.ViaVersion.api.configuration.ConfigurationProvider; import us.myles.ViaVersion.api.platform.ViaPlatform; -import us.myles.ViaVersion.bungee.BungeeViaAPI; -import us.myles.ViaVersion.bungee.BungeeViaInjector; -import us.myles.ViaVersion.bungee.BungeeViaLoader; -import us.myles.ViaVersion.bungee.command.BungeeCommand; -import us.myles.ViaVersion.bungee.command.BungeeCommandHandler; -import us.myles.ViaVersion.bungee.command.BungeeCommandSender; -import us.myles.ViaVersion.bungee.config.BungeeConfigAPI; +import us.myles.ViaVersion.bungee.platform.BungeeViaAPI; +import us.myles.ViaVersion.bungee.platform.BungeeViaInjector; +import us.myles.ViaVersion.bungee.platform.BungeeViaLoader; +import us.myles.ViaVersion.bungee.commands.BungeeCommand; +import us.myles.ViaVersion.bungee.commands.BungeeCommandHandler; +import us.myles.ViaVersion.bungee.commands.BungeeCommandSender; +import us.myles.ViaVersion.bungee.platform.BungeeConfigAPI; import java.util.UUID; import java.util.concurrent.TimeUnit; diff --git a/bungee/src/main/java/us/myles/ViaVersion/bungee/command/BungeeCommand.java b/bungee/src/main/java/us/myles/ViaVersion/bungee/commands/BungeeCommand.java similarity index 91% rename from bungee/src/main/java/us/myles/ViaVersion/bungee/command/BungeeCommand.java rename to bungee/src/main/java/us/myles/ViaVersion/bungee/commands/BungeeCommand.java index 19b33f211..933fe75f8 100644 --- a/bungee/src/main/java/us/myles/ViaVersion/bungee/command/BungeeCommand.java +++ b/bungee/src/main/java/us/myles/ViaVersion/bungee/commands/BungeeCommand.java @@ -1,4 +1,4 @@ -package us.myles.ViaVersion.bungee.command; +package us.myles.ViaVersion.bungee.commands; import net.md_5.bungee.api.CommandSender; import net.md_5.bungee.api.plugin.Command; diff --git a/bungee/src/main/java/us/myles/ViaVersion/bungee/command/BungeeCommandHandler.java b/bungee/src/main/java/us/myles/ViaVersion/bungee/commands/BungeeCommandHandler.java similarity index 73% rename from bungee/src/main/java/us/myles/ViaVersion/bungee/command/BungeeCommandHandler.java rename to bungee/src/main/java/us/myles/ViaVersion/bungee/commands/BungeeCommandHandler.java index f6d2b2a6d..4e1cbefd5 100644 --- a/bungee/src/main/java/us/myles/ViaVersion/bungee/command/BungeeCommandHandler.java +++ b/bungee/src/main/java/us/myles/ViaVersion/bungee/commands/BungeeCommandHandler.java @@ -1,4 +1,4 @@ -package us.myles.ViaVersion.bungee.command; +package us.myles.ViaVersion.bungee.commands; import us.myles.ViaVersion.commands.ViaCommandHandler; diff --git a/bungee/src/main/java/us/myles/ViaVersion/bungee/command/BungeeCommandSender.java b/bungee/src/main/java/us/myles/ViaVersion/bungee/commands/BungeeCommandSender.java similarity index 95% rename from bungee/src/main/java/us/myles/ViaVersion/bungee/command/BungeeCommandSender.java rename to bungee/src/main/java/us/myles/ViaVersion/bungee/commands/BungeeCommandSender.java index e5f21482c..d80a8702e 100644 --- a/bungee/src/main/java/us/myles/ViaVersion/bungee/command/BungeeCommandSender.java +++ b/bungee/src/main/java/us/myles/ViaVersion/bungee/commands/BungeeCommandSender.java @@ -1,4 +1,4 @@ -package us.myles.ViaVersion.bungee.command; +package us.myles.ViaVersion.bungee.commands; import lombok.AllArgsConstructor; import net.md_5.bungee.api.CommandSender; diff --git a/bungee/src/main/java/us/myles/ViaVersion/bungee/BungeeBossBar.java b/bungee/src/main/java/us/myles/ViaVersion/bungee/platform/BungeeBossBar.java similarity index 95% rename from bungee/src/main/java/us/myles/ViaVersion/bungee/BungeeBossBar.java rename to bungee/src/main/java/us/myles/ViaVersion/bungee/platform/BungeeBossBar.java index e377921c5..538246ec2 100644 --- a/bungee/src/main/java/us/myles/ViaVersion/bungee/BungeeBossBar.java +++ b/bungee/src/main/java/us/myles/ViaVersion/bungee/platform/BungeeBossBar.java @@ -1,4 +1,4 @@ -package us.myles.ViaVersion.bungee; +package us.myles.ViaVersion.bungee.platform; import net.md_5.bungee.api.connection.ProxiedPlayer; import us.myles.ViaVersion.api.boss.BossBar; diff --git a/bungee/src/main/java/us/myles/ViaVersion/bungee/config/BungeeConfigAPI.java b/bungee/src/main/java/us/myles/ViaVersion/bungee/platform/BungeeConfigAPI.java similarity index 98% rename from bungee/src/main/java/us/myles/ViaVersion/bungee/config/BungeeConfigAPI.java rename to bungee/src/main/java/us/myles/ViaVersion/bungee/platform/BungeeConfigAPI.java index 4b4ca1bfb..cc4e784e6 100644 --- a/bungee/src/main/java/us/myles/ViaVersion/bungee/config/BungeeConfigAPI.java +++ b/bungee/src/main/java/us/myles/ViaVersion/bungee/platform/BungeeConfigAPI.java @@ -1,4 +1,4 @@ -package us.myles.ViaVersion.bungee.config; +package us.myles.ViaVersion.bungee.platform; import us.myles.ViaVersion.api.ViaVersionConfig; import us.myles.ViaVersion.api.configuration.ConfigurationProvider; diff --git a/bungee/src/main/java/us/myles/ViaVersion/bungee/BungeeViaAPI.java b/bungee/src/main/java/us/myles/ViaVersion/bungee/platform/BungeeViaAPI.java similarity index 98% rename from bungee/src/main/java/us/myles/ViaVersion/bungee/BungeeViaAPI.java rename to bungee/src/main/java/us/myles/ViaVersion/bungee/platform/BungeeViaAPI.java index ce33fed0b..51b7a9c3e 100644 --- a/bungee/src/main/java/us/myles/ViaVersion/bungee/BungeeViaAPI.java +++ b/bungee/src/main/java/us/myles/ViaVersion/bungee/platform/BungeeViaAPI.java @@ -1,4 +1,4 @@ -package us.myles.ViaVersion.bungee; +package us.myles.ViaVersion.bungee.platform; import io.netty.buffer.ByteBuf; import lombok.NonNull; diff --git a/bungee/src/main/java/us/myles/ViaVersion/bungee/BungeeViaInjector.java b/bungee/src/main/java/us/myles/ViaVersion/bungee/platform/BungeeViaInjector.java similarity index 97% rename from bungee/src/main/java/us/myles/ViaVersion/bungee/BungeeViaInjector.java rename to bungee/src/main/java/us/myles/ViaVersion/bungee/platform/BungeeViaInjector.java index 8b3f04d3c..67ed4b3ac 100644 --- a/bungee/src/main/java/us/myles/ViaVersion/bungee/BungeeViaInjector.java +++ b/bungee/src/main/java/us/myles/ViaVersion/bungee/platform/BungeeViaInjector.java @@ -1,4 +1,4 @@ -package us.myles.ViaVersion.bungee; +package us.myles.ViaVersion.bungee.platform; import io.netty.channel.Channel; import io.netty.channel.ChannelInitializer; diff --git a/bungee/src/main/java/us/myles/ViaVersion/bungee/BungeeViaLoader.java b/bungee/src/main/java/us/myles/ViaVersion/bungee/platform/BungeeViaLoader.java similarity index 78% rename from bungee/src/main/java/us/myles/ViaVersion/bungee/BungeeViaLoader.java rename to bungee/src/main/java/us/myles/ViaVersion/bungee/platform/BungeeViaLoader.java index fd179b048..b78346e85 100644 --- a/bungee/src/main/java/us/myles/ViaVersion/bungee/BungeeViaLoader.java +++ b/bungee/src/main/java/us/myles/ViaVersion/bungee/platform/BungeeViaLoader.java @@ -1,4 +1,4 @@ -package us.myles.ViaVersion.bungee; +package us.myles.ViaVersion.bungee.platform; import us.myles.ViaVersion.api.platform.ViaPlatformLoader; 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 8322063b5..0f4d4307a 100644 --- a/common/src/main/java/us/myles/ViaVersion/api/PacketWrapper.java +++ b/common/src/main/java/us/myles/ViaVersion/api/PacketWrapper.java @@ -24,7 +24,7 @@ import java.util.LinkedList; import java.util.List; public class PacketWrapper { - public static int PASSTHROUGH_ID = 1000; + public static final int PASSTHROUGH_ID = 1000; private final ByteBuf inputBuffer; private final UserConnection userConnection; @@ -32,8 +32,8 @@ public class PacketWrapper { @Setter @Getter private int id = -1; - private LinkedList> readableObjects = new LinkedList<>(); - private List> packetValues = new ArrayList<>(); + private final LinkedList> readableObjects = new LinkedList<>(); + private final List> packetValues = new ArrayList<>(); public PacketWrapper(int packetID, ByteBuf inputBuffer, UserConnection userConnection) { this.id = packetID; @@ -404,7 +404,7 @@ public class PacketWrapper { * @param index The index to start from * @param pipeline The pipeline * @return The current packetwrapper - * @throws Exception + * @throws Exception If it fails to transform a packet, exception will be thrown */ public PacketWrapper apply(Direction direction, State state, int index, List pipeline) throws Exception { for (int i = index; i < pipeline.size(); i++) { // Copy to prevent from removal. diff --git a/common/src/main/java/us/myles/ViaVersion/api/Via.java b/common/src/main/java/us/myles/ViaVersion/api/Via.java index be852c468..62b592bad 100644 --- a/common/src/main/java/us/myles/ViaVersion/api/Via.java +++ b/common/src/main/java/us/myles/ViaVersion/api/Via.java @@ -11,6 +11,11 @@ public class Via { @Getter private static ViaManager manager; + /** + * Register the ViaManager associated with the platform. + * + * @param viaManager The ViaManager + */ public static void init(ViaManager viaManager) { Validate.isTrue(manager == null, "ViaManager is already set"); @@ -18,11 +23,21 @@ public class Via { Via.manager = viaManager; } + /** + * Get the API associated with the current platform. + * + * @return API instance + */ public static ViaAPI getAPI() { Validate.isTrue(platform != null, "ViaVersion has not loaded the Platform"); return Via.platform.getApi(); } + /** + * Get the config associated with the current platform. + * + * @return Config instance + */ public static ViaVersionConfig getConfig() { Validate.isTrue(platform != null, "ViaVersion has not loaded the Platform"); return Via.platform.getConf(); diff --git a/common/src/main/java/us/myles/ViaVersion/api/ViaListener.java b/common/src/main/java/us/myles/ViaVersion/api/ViaListener.java index 8b661ce5d..243a00212 100644 --- a/common/src/main/java/us/myles/ViaVersion/api/ViaListener.java +++ b/common/src/main/java/us/myles/ViaVersion/api/ViaListener.java @@ -21,7 +21,6 @@ public abstract class ViaListener { * @return The UserConnection */ protected UserConnection getUserConnection(@NonNull UUID uuid) { - if (!Via.getAPI().isPorted(uuid)) return null; return Via.getManager().getConnection(uuid); } diff --git a/common/src/main/java/us/myles/ViaVersion/api/boss/BossBar.java b/common/src/main/java/us/myles/ViaVersion/api/boss/BossBar.java index a7b1988e2..da4c519ad 100644 --- a/common/src/main/java/us/myles/ViaVersion/api/boss/BossBar.java +++ b/common/src/main/java/us/myles/ViaVersion/api/boss/BossBar.java @@ -111,6 +111,12 @@ public abstract class BossBar { throw new NotImplementedException("This method is not implemented for the platform " + Via.getPlatform().getPlatformName()); } + /** + * Removes the bossbar from a player + * + * @param uuid The platers YYUD + * @return The BossBar object + */ public abstract BossBar removePlayer(UUID uuid); /** diff --git a/common/src/main/java/us/myles/ViaVersion/api/command/ViaCommandSender.java b/common/src/main/java/us/myles/ViaVersion/api/command/ViaCommandSender.java index e47eec91b..78cf19f7a 100644 --- a/common/src/main/java/us/myles/ViaVersion/api/command/ViaCommandSender.java +++ b/common/src/main/java/us/myles/ViaVersion/api/command/ViaCommandSender.java @@ -3,11 +3,32 @@ package us.myles.ViaVersion.api.command; import java.util.UUID; public interface ViaCommandSender { - public boolean hasPermission(String permission); + /** + * Check if the sender has a permission. + * + * @param permission Permission string eg. viaversion.admin + * @return True if the sender has the permission + */ + boolean hasPermission(String permission); - public void sendMessage(String msg); + /** + * Send a message to the sender + * + * @param msg The message to send + */ + void sendMessage(String msg); - public UUID getUUID(); + /** + * Get the senders UUID. + * + * @return The senders UUID + */ + UUID getUUID(); - public String getName(); + /** + * Get the senders name. + * + * @return The senders name + */ + String getName(); } diff --git a/common/src/main/java/us/myles/ViaVersion/api/command/ViaSubCommand.java b/common/src/main/java/us/myles/ViaVersion/api/command/ViaSubCommand.java index 86df89e65..0c206fd10 100644 --- a/common/src/main/java/us/myles/ViaVersion/api/command/ViaSubCommand.java +++ b/common/src/main/java/us/myles/ViaVersion/api/command/ViaSubCommand.java @@ -9,14 +9,14 @@ public abstract class ViaSubCommand { /** * Subcommand name * - * @return The command name + * @return The commands name */ public abstract String name(); /** * subcommand description, this'll show in /viaversion list * - * @return The command description + * @return The commands description */ public abstract String description(); @@ -24,7 +24,7 @@ public abstract class ViaSubCommand { * Usage example: * "playerversion [name]" * - * @return The command usage + * @return The commands usage */ public String usage() { return name(); @@ -33,7 +33,7 @@ public abstract class ViaSubCommand { /** * Permission, null for everyone * - * @return The permission required to use the command + * @return The permission required to use the commands */ public String permission() { return "viaversion.admin"; @@ -44,7 +44,7 @@ public abstract class ViaSubCommand { * * @param sender Command sender * @param args Arguments - * @return command executed succesfully if false, show usage + * @return commands executed succesfully if false, show usage */ public abstract boolean execute(ViaCommandSender sender, String[] args); @@ -66,7 +66,7 @@ public abstract class ViaSubCommand { /** * Send message formatted / colored * - * @param sender command sender + * @param sender commands sender * @param message string message * @param args optional objects */ diff --git a/common/src/main/java/us/myles/ViaVersion/api/command/ViaVersionCommand.java b/common/src/main/java/us/myles/ViaVersion/api/command/ViaVersionCommand.java index 983f960cc..c60037af0 100644 --- a/common/src/main/java/us/myles/ViaVersion/api/command/ViaVersionCommand.java +++ b/common/src/main/java/us/myles/ViaVersion/api/command/ViaVersionCommand.java @@ -28,7 +28,7 @@ public interface ViaVersionCommand { ViaSubCommand getSubCommand(String name); /** - * Executed when the Command sender executes the command + * Executed when the Command sender executes the commands * * @param sender Sender object * @param args arguments provided diff --git a/common/src/main/java/us/myles/ViaVersion/api/platform/ViaInjector.java b/common/src/main/java/us/myles/ViaVersion/api/platform/ViaInjector.java index 0523e9758..86a0c3af8 100644 --- a/common/src/main/java/us/myles/ViaVersion/api/platform/ViaInjector.java +++ b/common/src/main/java/us/myles/ViaVersion/api/platform/ViaInjector.java @@ -1,11 +1,32 @@ package us.myles.ViaVersion.api.platform; public interface ViaInjector { - public void inject() throws Exception; + /** + * Inject into the current Platform + * + * @throws Exception If there is an error with injecting + */ + void inject() throws Exception; - public void uninject() throws Exception; + /** + * Uninject into the current Platform + * + * @throws Exception If there is an error with uninjecting + */ + void uninject() throws Exception; - public int getServerProtocolVersion() throws Exception; + /** + * Get the server protocol version + * + * @return The server protocol integer + * @throws Exception If there is an error with getting this info, eg. not binded. + */ + int getServerProtocolVersion() throws Exception; - public String getEncoderName(); + /** + * Get the name of the encoder for then netty pipeline for this platform. + * + * @return The name + */ + String getEncoderName(); } diff --git a/common/src/main/java/us/myles/ViaVersion/api/platform/ViaPlatform.java b/common/src/main/java/us/myles/ViaVersion/api/platform/ViaPlatform.java index 42739cf6f..84a927c0f 100644 --- a/common/src/main/java/us/myles/ViaVersion/api/platform/ViaPlatform.java +++ b/common/src/main/java/us/myles/ViaVersion/api/platform/ViaPlatform.java @@ -15,35 +15,122 @@ import java.util.logging.Logger; * @param - The player type for the platform, used for API related methods */ public interface ViaPlatform { + /** + * Get the logger for this platform + * + * @return Java Logger (may be a wrapper) + */ Logger getLogger(); + /** + * Get the platform name + * + * @return Platform Name (simply its name) + */ String getPlatformName(); + /** + * Get the plugin version + * + * @return Plugin version as a semver string + */ String getPluginVersion(); + /** + * Run a task Async + * + * @param runnable The task to run + * @return The Task ID + */ int runAsync(Runnable runnable); + /** + * Run a task Sync + * + * @param runnable The task to run + * @return The Task ID + */ int runSync(Runnable runnable); + /** + * Run a task at a repeating interval. + * Initial interval is the same as repeat. + * + * @param runnable The task to run + * @param ticks The interval to run it at + * @return The Task ID + */ int runRepeatingSync(Runnable runnable, Long ticks); + /** + * Cancel a task + * + * @param taskId The task ID to cancel + */ void cancelTask(int taskId); + /** + * Get the online players + * + * @return Array of ViaCommandSender + */ ViaCommandSender[] getOnlinePlayers(); + /** + * Send a message to a player + * + * @param uuid The player's UUID + * @param message The message to send + */ void sendMessage(UUID uuid, String message); + /** + * Kick a player for a reason + * + * @param uuid The player's UUID + * @param message The message to kick them with + * @return True if it was successful + */ boolean kickPlayer(UUID uuid, String message); + /** + * Check if the plugin is enabled. + * + * @return True if it is enabled + */ boolean isPluginEnabled(); + /** + * Get the API for this platform + * + * @return The API for the platform + */ ViaAPI getApi(); + /** + * Get the config API for this platform + * + * @return The config API + */ ViaVersionConfig getConf(); + /** + * Get the backend configuration provider for this platform. + * (On some platforms this returns the same as getConf()) + * + * @return The configuration provider + */ ConfigurationProvider getConfigurationProvider(); + /** + * Called when a reload happens + */ void onReload(); + /** + * Get the JSON data required for /viaversion dump + * + * @return The json data + */ JsonObject getDump(); } diff --git a/common/src/main/java/us/myles/ViaVersion/api/platform/ViaPlatformLoader.java b/common/src/main/java/us/myles/ViaVersion/api/platform/ViaPlatformLoader.java index c535e90cd..e8c4503bf 100644 --- a/common/src/main/java/us/myles/ViaVersion/api/platform/ViaPlatformLoader.java +++ b/common/src/main/java/us/myles/ViaVersion/api/platform/ViaPlatformLoader.java @@ -1,5 +1,8 @@ package us.myles.ViaVersion.api.platform; public interface ViaPlatformLoader { - public void load(); + /** + * Initialise the loading for a platform, eg. registering listeners / providers / events etc. + */ + void load(); } diff --git a/common/src/main/java/us/myles/ViaVersion/api/platform/providers/ViaProviders.java b/common/src/main/java/us/myles/ViaVersion/api/platform/providers/ViaProviders.java index 6c60cc4f8..6911a5217 100644 --- a/common/src/main/java/us/myles/ViaVersion/api/platform/providers/ViaProviders.java +++ b/common/src/main/java/us/myles/ViaVersion/api/platform/providers/ViaProviders.java @@ -6,8 +6,8 @@ import java.util.List; import java.util.Map; public class ViaProviders { - private Map, Provider> providers = new HashMap<>(); - private List> lonelyProviders = new ArrayList<>(); + private final Map, Provider> providers = new HashMap<>(); + private final List> lonelyProviders = new ArrayList<>(); public void require(Class provider) { lonelyProviders.add(provider); diff --git a/common/src/main/java/us/myles/ViaVersion/api/protocol/Protocol.java b/common/src/main/java/us/myles/ViaVersion/api/protocol/Protocol.java index e28c32644..c2c5a8711 100644 --- a/common/src/main/java/us/myles/ViaVersion/api/protocol/Protocol.java +++ b/common/src/main/java/us/myles/ViaVersion/api/protocol/Protocol.java @@ -16,8 +16,8 @@ import java.util.List; import java.util.Map; public abstract class Protocol { - private Map, ProtocolPacket> incoming = new HashMap<>(); - private Map, ProtocolPacket> outgoing = new HashMap<>(); + private final Map, ProtocolPacket> incoming = new HashMap<>(); + private final Map, ProtocolPacket> outgoing = new HashMap<>(); public Protocol() { registerPackets(); diff --git a/common/src/main/java/us/myles/ViaVersion/api/protocol/ProtocolRegistry.java b/common/src/main/java/us/myles/ViaVersion/api/protocol/ProtocolRegistry.java index 7c1f6c9b6..b736d88bb 100644 --- a/common/src/main/java/us/myles/ViaVersion/api/protocol/ProtocolRegistry.java +++ b/common/src/main/java/us/myles/ViaVersion/api/protocol/ProtocolRegistry.java @@ -20,10 +20,10 @@ public class ProtocolRegistry { public static final Protocol BASE_PROTOCOL = new BaseProtocol(); public static int SERVER_PROTOCOL = -1; // Input Version -> Output Version & Protocol (Allows fast lookup) - private static Map> registryMap = new ConcurrentHashMap<>(); - private static Map, List>> pathCache = new ConcurrentHashMap<>(); - private static List registerList = Lists.newCopyOnWriteArrayList(); - private static Set supportedVersions = Sets.newConcurrentHashSet(); + private static final Map> registryMap = new ConcurrentHashMap<>(); + private static final Map, List>> pathCache = new ConcurrentHashMap<>(); + private static final List registerList = Lists.newCopyOnWriteArrayList(); + private static final Set supportedVersions = Sets.newConcurrentHashSet(); static { // Base Protocol diff --git a/common/src/main/java/us/myles/ViaVersion/api/remapper/PacketRemapper.java b/common/src/main/java/us/myles/ViaVersion/api/remapper/PacketRemapper.java index c323e8aea..354f05614 100644 --- a/common/src/main/java/us/myles/ViaVersion/api/remapper/PacketRemapper.java +++ b/common/src/main/java/us/myles/ViaVersion/api/remapper/PacketRemapper.java @@ -9,7 +9,7 @@ import java.util.ArrayList; import java.util.List; public abstract class PacketRemapper { - private List> valueRemappers = new ArrayList<>(); + private final List> valueRemappers = new ArrayList<>(); public PacketRemapper() { registerMap(); diff --git a/common/src/main/java/us/myles/ViaVersion/api/type/types/version/Types1_8.java b/common/src/main/java/us/myles/ViaVersion/api/type/types/version/Types1_8.java index cb0241801..49ca88fae 100644 --- a/common/src/main/java/us/myles/ViaVersion/api/type/types/version/Types1_8.java +++ b/common/src/main/java/us/myles/ViaVersion/api/type/types/version/Types1_8.java @@ -9,10 +9,10 @@ public class Types1_8 { /** * Metadata list type for 1.8 */ - public static Type> METADATA_LIST = new MetadataList1_8Type(); + public static final Type> METADATA_LIST = new MetadataList1_8Type(); /** * Metadata type for 1.8 */ - public static Type METADATA = new Metadata1_8Type(); + public static final Type METADATA = new Metadata1_8Type(); } diff --git a/common/src/main/java/us/myles/ViaVersion/commands/ViaCommandHandler.java b/common/src/main/java/us/myles/ViaVersion/commands/ViaCommandHandler.java index ba7586cd8..1c93b3ebe 100644 --- a/common/src/main/java/us/myles/ViaVersion/commands/ViaCommandHandler.java +++ b/common/src/main/java/us/myles/ViaVersion/commands/ViaCommandHandler.java @@ -12,7 +12,7 @@ import us.myles.ViaVersion.commands.defaultsubs.*; import java.util.*; public abstract class ViaCommandHandler implements ViaVersionCommand { - private Map commandMap; + private final Map commandMap; public ViaCommandHandler() { commandMap = new HashMap<>(); @@ -49,14 +49,14 @@ public abstract class ViaCommandHandler implements ViaVersionCommand { } if (!hasSubCommand(args[0])) { - sender.sendMessage(color("&cThis command is not found")); + sender.sendMessage(color("&cThis commands is not found")); showHelp(sender); return false; } ViaSubCommand handler = getSubCommand(args[0]); if (!hasPermission(sender, handler.permission())) { - sender.sendMessage(color("&cYou are not allowed to use this command!")); + sender.sendMessage(color("&cYou are not allowed to use this commands!")); return false; } @@ -100,10 +100,14 @@ public abstract class ViaCommandHandler implements ViaVersionCommand { return output; } + /** + * Shows the ViaVersion help to a sender + * @param sender The sender to send the help to + */ public void showHelp(ViaCommandSender sender) { Set allowed = calculateAllowedCommands(sender); if (allowed.size() == 0) { - sender.sendMessage(color("&cYou are not allowed to use this command!")); + sender.sendMessage(color("&cYou are not allowed to use this commands!")); return; } sender.sendMessage(color("&aViaVersion &c" + Via.getPlatform().getPluginVersion())); @@ -137,6 +141,12 @@ public abstract class ViaCommandHandler implements ViaVersionCommand { registerSubCommand(new ReloadSubCmd()); } + /** + * Replaces colour codes in a string + * + * @param string String to replace + * @return The output String + */ public static String color(String string) { try { string = ChatColor.translateAlternateColorCodes('&', string); //Dont replace all & with $ like we did before. @@ -145,6 +155,13 @@ public abstract class ViaCommandHandler implements ViaVersionCommand { return string; } + /** + * Send a colour coded string with replacements to a user + * + * @param sender The target to send the message to + * @param message The message + * @param args The objects to replace + */ public static void sendMessage(@NonNull ViaCommandSender sender, String message, Object... args) { sender.sendMessage(color(args == null ? message : String.format(message, args))); } diff --git a/common/src/main/java/us/myles/ViaVersion/commands/defaultsubs/PPSSubCmd.java b/common/src/main/java/us/myles/ViaVersion/commands/defaultsubs/PPSSubCmd.java index c46d4ccac..69890b3b5 100644 --- a/common/src/main/java/us/myles/ViaVersion/commands/defaultsubs/PPSSubCmd.java +++ b/common/src/main/java/us/myles/ViaVersion/commands/defaultsubs/PPSSubCmd.java @@ -32,8 +32,6 @@ public class PPSSubCmd extends ViaSubCommand { long max = 0; for (ViaCommandSender p : Via.getPlatform().getOnlinePlayers()) { - if (!Via.getAPI().isPorted(p.getUUID())) - continue; int playerVersion = Via.getAPI().getPlayerVersion(p.getUUID()); if (!playerVersions.containsKey(playerVersion)) playerVersions.put(playerVersion, new HashSet()); diff --git a/common/src/main/java/us/myles/ViaVersion/exception/InformativeException.java b/common/src/main/java/us/myles/ViaVersion/exception/InformativeException.java index 6599eb0a0..3cad1f55a 100644 --- a/common/src/main/java/us/myles/ViaVersion/exception/InformativeException.java +++ b/common/src/main/java/us/myles/ViaVersion/exception/InformativeException.java @@ -4,7 +4,7 @@ import java.util.HashMap; import java.util.Map; public class InformativeException extends Exception { - Map info = new HashMap<>(); + final Map info = new HashMap<>(); int sources = 0; public InformativeException(Throwable cause) { diff --git a/common/src/main/java/us/myles/ViaVersion/packets/PacketType.java b/common/src/main/java/us/myles/ViaVersion/packets/PacketType.java index 9aade55b8..b3077806b 100644 --- a/common/src/main/java/us/myles/ViaVersion/packets/PacketType.java +++ b/common/src/main/java/us/myles/ViaVersion/packets/PacketType.java @@ -140,8 +140,8 @@ public enum PacketType { PLAY_SET_COMPRESSION(State.PLAY, Direction.OUTGOING, 0x46, -1), PLAY_UPDATE_ENTITY_NBT(State.PLAY, Direction.OUTGOING, 0x49, -1); - private static HashMap oldids = new HashMap<>(); - private static HashMap newids = new HashMap<>(); + private static final HashMap oldids = new HashMap<>(); + private static final HashMap newids = new HashMap<>(); static { for (PacketType pt : PacketType.values()) { diff --git a/common/src/main/java/us/myles/ViaVersion/protocols/base/BaseProtocol.java b/common/src/main/java/us/myles/ViaVersion/protocols/base/BaseProtocol.java index 8cab352fc..e454468bc 100644 --- a/common/src/main/java/us/myles/ViaVersion/protocols/base/BaseProtocol.java +++ b/common/src/main/java/us/myles/ViaVersion/protocols/base/BaseProtocol.java @@ -28,7 +28,7 @@ import java.util.UUID; import java.util.logging.Level; public class BaseProtocol extends Protocol { - private static Gson gson = new GsonBuilder().create(); // TODO: Possibly global gson provider? + private final static Gson gson = new GsonBuilder().create(); // TODO: Possibly global gson provider? @Override protected void registerPackets() { @@ -198,11 +198,6 @@ public class BaseProtocol extends Protocol { // Nothing gets added, ProtocolPipeline handles ProtocolInfo } - @Override - protected void registerListeners() { - - } - @Override public void transform(Direction direction, State state, PacketWrapper packetWrapper) throws Exception { super.transform(direction, state, packetWrapper); diff --git a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_10to1_9_3/Protocol1_10To1_9_3_4.java b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_10to1_9_3/Protocol1_10To1_9_3_4.java index 70fbf44df..7d05cadc6 100644 --- a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_10to1_9_3/Protocol1_10To1_9_3_4.java +++ b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_10to1_9_3/Protocol1_10To1_9_3_4.java @@ -23,13 +23,13 @@ public class Protocol1_10To1_9_3_4 extends Protocol { @Deprecated public static final Type METADATA = new Metadata1_9Type(); - public static ValueTransformer toNewPitch = new ValueTransformer(Type.FLOAT) { + public static final ValueTransformer toNewPitch = new ValueTransformer(Type.FLOAT) { @Override public Float transform(PacketWrapper wrapper, Short inputValue) throws Exception { return inputValue / 63.5F; } }; - public static ValueTransformer, List> transformMetadata = new ValueTransformer, List>(Types1_9.METADATA_LIST) { + public static final ValueTransformer, List> transformMetadata = new ValueTransformer, List>(Types1_9.METADATA_LIST) { @Override public List transform(PacketWrapper wrapper, List inputValue) throws Exception { List metaList = new CopyOnWriteArrayList<>(inputValue); diff --git a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9_1_2to1_9_3_4/chunks/ChunkSection1_9_3_4.java b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9_1_2to1_9_3_4/chunks/ChunkSection1_9_3_4.java index 4ea0b0afb..ff3d9a9a0 100644 --- a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9_1_2to1_9_3_4/chunks/ChunkSection1_9_3_4.java +++ b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9_1_2to1_9_3_4/chunks/ChunkSection1_9_3_4.java @@ -103,7 +103,7 @@ public class ChunkSection1_9_3_4 implements ChunkSection { * * * @param input The buffer to read from. - * @throws Exception + * @throws Exception If it fails to read */ public void readBlocks(ByteBuf input) throws Exception { palette.clear(); diff --git a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9_3to1_9_1_2/chunks/ChunkSection1_9_1_2.java b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9_3to1_9_1_2/chunks/ChunkSection1_9_1_2.java index 17993598f..0e7ed30d9 100644 --- a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9_3to1_9_1_2/chunks/ChunkSection1_9_1_2.java +++ b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9_3to1_9_1_2/chunks/ChunkSection1_9_1_2.java @@ -103,7 +103,7 @@ public class ChunkSection1_9_1_2 implements ChunkSection { * * * @param input The buffer to read from. - * @throws Exception + * @throws Exception If it failed to read properly */ public void readBlocks(ByteBuf input) throws Exception { palette.clear(); diff --git a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9_3to1_9_1_2/chunks/FakeTileEntity.java b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9_3to1_9_1_2/chunks/FakeTileEntity.java index 620ab1e6a..62250aff1 100644 --- a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9_3to1_9_1_2/chunks/FakeTileEntity.java +++ b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9_3to1_9_1_2/chunks/FakeTileEntity.java @@ -14,7 +14,7 @@ import java.util.concurrent.ConcurrentHashMap; * It requires now to have all tile entity data included in the chunk packet, otherwise it'll crash. */ public class FakeTileEntity { - private static Map tileEntities = new ConcurrentHashMap<>(); + private static final Map tileEntities = new ConcurrentHashMap<>(); static { register(Arrays.asList(61, 62), "Furnace"); diff --git a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9_3to1_9_1_2/types/Chunk1_9_1_2Type.java b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9_3to1_9_1_2/types/Chunk1_9_1_2Type.java index 01dcd75db..a1459db83 100644 --- a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9_3to1_9_1_2/types/Chunk1_9_1_2Type.java +++ b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9_3to1_9_1_2/types/Chunk1_9_1_2Type.java @@ -72,9 +72,7 @@ public class Chunk1_9_1_2Type extends PartialType { } @Override - public void write(ByteBuf output, ClientWorld world, Chunk input) throws Exception { - Chunk chunk = input; - + public void write(ByteBuf output, ClientWorld world, Chunk chunk) throws Exception { output.writeInt(chunk.getX()); output.writeInt(chunk.getZ()); diff --git a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/ArmorType.java b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/ArmorType.java index b99a8e433..9f3e30508 100644 --- a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/ArmorType.java +++ b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/ArmorType.java @@ -44,6 +44,12 @@ public enum ArmorType { private final int id; private final String type; + /** + * Find an armour type by the item id + * @param id ID of the item + * + * @return Return the ArmourType, ArmourType.NONE if not found + */ public static ArmorType findById(int id) { for (ArmorType a : ArmorType.values()) if (a.getId() == id) @@ -51,6 +57,12 @@ public enum ArmorType { return ArmorType.NONE; } + /** + * Find an armour type by the item string + * @param type String name for the item + * + * @return Return the ArmourType, ArmourType.NONE if not found + */ public static ArmorType findByType(String type) { for (ArmorType a : ArmorType.values()) if (a.getType().equals(type)) @@ -58,6 +70,11 @@ public enum ArmorType { return NONE; } + /** + * Check if an item id is armour + * @param id The item ID + * @return True if the item is a piece of armour + */ public static boolean isArmor(int id) { for (ArmorType a : ArmorType.values()) if (a.getId() == id) @@ -65,6 +82,11 @@ public enum ArmorType { return false; } + /** + * Check if an item id is armour + * @param type The item material name + * @return True if the item is a piece of armour + */ public static boolean isArmor(String type) { for (ArmorType a : ArmorType.values()) if (a.getType().equals(type)) @@ -72,6 +94,10 @@ public enum ArmorType { return false; } + /** + * Get the Minecraft ID for the Armour Type + * @return The ID + */ public int getId() { return this.id; } 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 517ab5acb..4f4d33dda 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 @@ -28,8 +28,8 @@ public class Protocol1_9TO1_8 extends Protocol { @Deprecated public static Type METADATA = new Metadata1_8Type(); - private static Gson gson = new GsonBuilder().create(); - public static ValueTransformer FIX_JSON = new ValueTransformer(Type.STRING) { + private static final Gson gson = new GsonBuilder().create(); + public static final ValueTransformer FIX_JSON = new ValueTransformer(Type.STRING) { @Override public String transform(PacketWrapper wrapper, String line) { return fixJson(line); diff --git a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/chat/ChatRewriter.java b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/chat/ChatRewriter.java index ad757c201..c26b460ef 100644 --- a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/chat/ChatRewriter.java +++ b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/chat/ChatRewriter.java @@ -6,6 +6,12 @@ import us.myles.ViaVersion.api.data.UserConnection; import us.myles.ViaVersion.protocols.protocol1_9to1_8.storage.EntityTracker; public class ChatRewriter { + /** + * Rewrite chat being sent to the client so that gamemode issues don't occur. + * + * @param obj The json object being sent by the server + * @param user The player involved. (Required for Gamemode info) + */ public static void toClient(JsonObject obj, UserConnection user) { //Check gamemode change if (obj.get("translate") != null && obj.get("translate").getAsString().equals("gameMode.changed")) { diff --git a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/packets/EntityPackets.java b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/packets/EntityPackets.java index 79235611a..e36317a60 100644 --- a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/packets/EntityPackets.java +++ b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/packets/EntityPackets.java @@ -20,7 +20,7 @@ import us.myles.ViaVersion.protocols.protocol1_9to1_8.storage.EntityTracker; import java.util.List; public class EntityPackets { - public static ValueTransformer toNewShort = new ValueTransformer(Type.SHORT) { + public static final ValueTransformer toNewShort = new ValueTransformer(Type.SHORT) { @Override public Short transform(PacketWrapper wrapper, Byte inputValue) { return (short) (inputValue * 128); 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 5274c11f6..d3d905255 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 @@ -23,7 +23,7 @@ import java.util.ArrayList; import java.util.List; public class SpawnPackets { - public static ValueTransformer toNewDouble = new ValueTransformer(Type.DOUBLE) { + public static final ValueTransformer toNewDouble = new ValueTransformer(Type.DOUBLE) { @Override public Double transform(PacketWrapper wrapper, Integer inputValue) { return inputValue / 32D; diff --git a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/providers/BulkChunkTranslatorProvider.java b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/providers/BulkChunkTranslatorProvider.java index aa8982a27..8a4ff5647 100644 --- a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/providers/BulkChunkTranslatorProvider.java +++ b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/providers/BulkChunkTranslatorProvider.java @@ -7,10 +7,23 @@ import java.util.Arrays; import java.util.List; public class BulkChunkTranslatorProvider implements Provider { + /** + * Transforms a Bulk Chunk packet into Chunk Packets + * + * @param packet The NMS Packet + * @param clientChunks The ClientChunks object for the current player + * @return A List of all the output packets + */ public List transformMapChunkBulk(Object packet, ClientChunks clientChunks) { return Arrays.asList(packet); } + /** + * Check if a packet of a class should be filtered + * + * @param packet NMS Packet + * @return True if it should be filtered into transformmapChunkBulk + */ public boolean isFiltered(Class packet) { return false; } diff --git a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/sounds/Effect.java b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/sounds/Effect.java index b6a348e57..964ef9611 100644 --- a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/sounds/Effect.java +++ b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/sounds/Effect.java @@ -4,7 +4,7 @@ import java.util.HashMap; public class Effect { - private static HashMap effects; + private final static HashMap effects; static { effects = new HashMap<>(); diff --git a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/storage/EntityTracker.java b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/storage/EntityTracker.java index 9fc8f18fb..294d7eee2 100644 --- a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/storage/EntityTracker.java +++ b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/storage/EntityTracker.java @@ -98,9 +98,7 @@ public class EntityTracker extends StoredObject { public boolean interactedBlockRecently(int x, int y, int z) { if (blockInteractions.size() == 0) return false; - Iterator it = blockInteractions.asMap().keySet().iterator(); - while (it.hasNext()) { - Position p = it.next(); + for (Position p : blockInteractions.asMap().keySet()) { if (p.getX() == x) if (p.getY() == y) if (p.getZ() == z) diff --git a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/storage/PlaceBlockTracker.java b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/storage/PlaceBlockTracker.java index a8ea3fe73..d3e5d718f 100644 --- a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/storage/PlaceBlockTracker.java +++ b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/storage/PlaceBlockTracker.java @@ -16,10 +16,19 @@ public class PlaceBlockTracker extends StoredObject { super(user); } + /** + * Check if a certain amount of time has passed + * + * @param ms The amount of time in MS + * @return True if it has passed + */ public boolean isExpired(int ms) { return System.currentTimeMillis() > (lastPlaceTimestamp + ms); } + /** + * Set the last place time to the current time + */ public void updateTime() { lastPlaceTimestamp = System.currentTimeMillis(); } diff --git a/common/src/main/java/us/myles/ViaVersion/update/Version.java b/common/src/main/java/us/myles/ViaVersion/update/Version.java index f31784495..6ab1c0e3f 100644 --- a/common/src/main/java/us/myles/ViaVersion/update/Version.java +++ b/common/src/main/java/us/myles/ViaVersion/update/Version.java @@ -6,8 +6,8 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; public class Version implements Comparable { - private static Pattern semVer = Pattern.compile("(?0|[1-9]\\d*)\\.(?0|[1-9]\\d*)(?:\\.(?0|[1-9]\\d*))?(?:-(?[A-z0-9.-]*))?"); - private int[] parts = new int[3]; + private static final Pattern semVer = Pattern.compile("(?0|[1-9]\\d*)\\.(?0|[1-9]\\d*)(?:\\.(?0|[1-9]\\d*))?(?:-(?[A-z0-9.-]*))?"); + private final int[] parts = new int[3]; private String tag; public Version(String value) { @@ -24,6 +24,13 @@ public class Version implements Comparable { tag = matcher.group("tag") == null ? "" : matcher.group("tag"); } + /** + * Compare two versions + * + * @param verA The first version + * @param verB The second + * @return 0 if they are the same, 1 if versionA is newer, -1 if versionA is older + */ public static int compare(Version verA, Version verB) { if (verA == verB) return 0; if (verA == null) return -1; @@ -47,6 +54,13 @@ public class Version implements Comparable { return 0; } + /** + * Check if a version is the same + * + * @param verA The first + * @param verB The second + * @return True if they are the same + */ public static boolean equals(Version verA, Version verB) { return verA == verB || verA != null && verB != null && compare(verA, verB) == 0; } @@ -71,6 +85,11 @@ public class Version implements Comparable { return that instanceof Version && equals(this, (Version) that); } + /** + * Get the tag, eg. -ALPHA + * + * @return The version tag + */ public String getTag() { return tag; } 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 84449596c..05b92e9d5 100644 --- a/common/src/main/java/us/myles/ViaVersion/util/PipelineUtil.java +++ b/common/src/main/java/us/myles/ViaVersion/util/PipelineUtil.java @@ -32,6 +32,15 @@ public class PipelineUtil { } } + /** + * Call the decode method on a netty ByteToMessageDecoder + * + * @param decoder The decoder + * @param ctx The current context + * @param input The packet to decode + * @return A list of the decoders output + * @throws InvocationTargetException If an exception happens while executing + */ public static List callDecode(ByteToMessageDecoder decoder, ChannelHandlerContext ctx, Object input) throws InvocationTargetException { List output = new ArrayList<>(); try { @@ -42,6 +51,15 @@ public class PipelineUtil { return output; } + /** + * Call the encode method on a netty MessageToByteEncoder + * + * @param encoder The encoder + * @param ctx The current context + * @param msg The packet to encode + * @param output The bytebuf to write the output to + * @throws InvocationTargetException If an exception happens while executing + */ public static void callEncode(MessageToByteEncoder encoder, ChannelHandlerContext ctx, Object msg, ByteBuf output) throws InvocationTargetException { try { PipelineUtil.ENCODE_METHOD.invoke(encoder, ctx, msg, output); @@ -50,6 +68,13 @@ public class PipelineUtil { } } + /** + * Check if a stack trace contains a certain exception + * + * @param t The throwable + * @param c The exception to look for + * @return True if the stack trace contained it as its cause. + */ public static boolean containsCause(Throwable t, Class c) { while (t != null) { t = t.getCause(); @@ -59,6 +84,13 @@ public class PipelineUtil { return false; } + /** + * Get the context for a the channel handler before a certain name. + * + * @param name The name of the channel handler + * @param pipeline The pipeline to target + * @return The ChannelHandler before the one requested. + */ public static ChannelHandlerContext getContextBefore(String name, ChannelPipeline pipeline) { boolean mark = false; for (String s : pipeline.names()) { diff --git a/sponge/src/main/java/us/myles/ViaVersion/SpongePlugin.java b/sponge/src/main/java/us/myles/ViaVersion/SpongePlugin.java index 11854ee83..fb52fb9c1 100644 --- a/sponge/src/main/java/us/myles/ViaVersion/SpongePlugin.java +++ b/sponge/src/main/java/us/myles/ViaVersion/SpongePlugin.java @@ -20,6 +20,13 @@ import us.myles.ViaVersion.api.configuration.ConfigurationProvider; import us.myles.ViaVersion.api.platform.ViaPlatform; import us.myles.ViaVersion.dump.PluginInfo; import us.myles.ViaVersion.sponge.*; +import us.myles.ViaVersion.sponge.commands.SpongeCommandHandler; +import us.myles.ViaVersion.sponge.commands.SpongeCommandSender; +import us.myles.ViaVersion.sponge.platform.SpongeConfigAPI; +import us.myles.ViaVersion.sponge.platform.SpongeViaAPI; +import us.myles.ViaVersion.sponge.platform.SpongeViaInjector; +import us.myles.ViaVersion.sponge.platform.SpongeViaLoader; +import us.myles.ViaVersion.sponge.util.LoggerWrapper; import java.io.File; import java.util.ArrayList; diff --git a/sponge/src/main/java/us/myles/ViaVersion/sponge/SpongeCommandHandler.java b/sponge/src/main/java/us/myles/ViaVersion/sponge/commands/SpongeCommandHandler.java similarity index 97% rename from sponge/src/main/java/us/myles/ViaVersion/sponge/SpongeCommandHandler.java rename to sponge/src/main/java/us/myles/ViaVersion/sponge/commands/SpongeCommandHandler.java index a87c03805..a28bcef55 100644 --- a/sponge/src/main/java/us/myles/ViaVersion/sponge/SpongeCommandHandler.java +++ b/sponge/src/main/java/us/myles/ViaVersion/sponge/commands/SpongeCommandHandler.java @@ -1,4 +1,4 @@ -package us.myles.ViaVersion.sponge; +package us.myles.ViaVersion.sponge.commands; import org.spongepowered.api.command.CommandCallable; import org.spongepowered.api.command.CommandException; diff --git a/sponge/src/main/java/us/myles/ViaVersion/sponge/SpongeCommandSender.java b/sponge/src/main/java/us/myles/ViaVersion/sponge/commands/SpongeCommandSender.java similarity index 95% rename from sponge/src/main/java/us/myles/ViaVersion/sponge/SpongeCommandSender.java rename to sponge/src/main/java/us/myles/ViaVersion/sponge/commands/SpongeCommandSender.java index 68e66cb37..b095c90bf 100644 --- a/sponge/src/main/java/us/myles/ViaVersion/sponge/SpongeCommandSender.java +++ b/sponge/src/main/java/us/myles/ViaVersion/sponge/commands/SpongeCommandSender.java @@ -1,4 +1,4 @@ -package us.myles.ViaVersion.sponge; +package us.myles.ViaVersion.sponge.commands; import lombok.AllArgsConstructor; import org.spongepowered.api.command.CommandSource; diff --git a/sponge/src/main/java/us/myles/ViaVersion/sponge/SpongeBossBar.java b/sponge/src/main/java/us/myles/ViaVersion/sponge/platform/SpongeBossBar.java similarity index 95% rename from sponge/src/main/java/us/myles/ViaVersion/sponge/SpongeBossBar.java rename to sponge/src/main/java/us/myles/ViaVersion/sponge/platform/SpongeBossBar.java index ae29531c7..df03b6d31 100644 --- a/sponge/src/main/java/us/myles/ViaVersion/sponge/SpongeBossBar.java +++ b/sponge/src/main/java/us/myles/ViaVersion/sponge/platform/SpongeBossBar.java @@ -1,4 +1,4 @@ -package us.myles.ViaVersion.sponge; +package us.myles.ViaVersion.sponge.platform; import lombok.Getter; import org.spongepowered.api.entity.living.player.Player; diff --git a/sponge/src/main/java/us/myles/ViaVersion/sponge/SpongeConfigAPI.java b/sponge/src/main/java/us/myles/ViaVersion/sponge/platform/SpongeConfigAPI.java similarity index 99% rename from sponge/src/main/java/us/myles/ViaVersion/sponge/SpongeConfigAPI.java rename to sponge/src/main/java/us/myles/ViaVersion/sponge/platform/SpongeConfigAPI.java index e94282226..e2ad17622 100644 --- a/sponge/src/main/java/us/myles/ViaVersion/sponge/SpongeConfigAPI.java +++ b/sponge/src/main/java/us/myles/ViaVersion/sponge/platform/SpongeConfigAPI.java @@ -1,4 +1,4 @@ -package us.myles.ViaVersion.sponge; +package us.myles.ViaVersion.sponge.platform; import org.yaml.snakeyaml.Yaml; import us.myles.ViaVersion.api.ViaVersionConfig; diff --git a/sponge/src/main/java/us/myles/ViaVersion/sponge/SpongeViaAPI.java b/sponge/src/main/java/us/myles/ViaVersion/sponge/platform/SpongeViaAPI.java similarity index 98% rename from sponge/src/main/java/us/myles/ViaVersion/sponge/SpongeViaAPI.java rename to sponge/src/main/java/us/myles/ViaVersion/sponge/platform/SpongeViaAPI.java index 769081be2..c23452b80 100644 --- a/sponge/src/main/java/us/myles/ViaVersion/sponge/SpongeViaAPI.java +++ b/sponge/src/main/java/us/myles/ViaVersion/sponge/platform/SpongeViaAPI.java @@ -1,4 +1,4 @@ -package us.myles.ViaVersion.sponge; +package us.myles.ViaVersion.sponge.platform; import io.netty.buffer.ByteBuf; import lombok.NonNull; diff --git a/sponge/src/main/java/us/myles/ViaVersion/sponge/SpongeViaInjector.java b/sponge/src/main/java/us/myles/ViaVersion/sponge/platform/SpongeViaInjector.java similarity index 99% rename from sponge/src/main/java/us/myles/ViaVersion/sponge/SpongeViaInjector.java rename to sponge/src/main/java/us/myles/ViaVersion/sponge/platform/SpongeViaInjector.java index cfedde3a3..819248415 100644 --- a/sponge/src/main/java/us/myles/ViaVersion/sponge/SpongeViaInjector.java +++ b/sponge/src/main/java/us/myles/ViaVersion/sponge/platform/SpongeViaInjector.java @@ -1,4 +1,4 @@ -package us.myles.ViaVersion.sponge; +package us.myles.ViaVersion.sponge.platform; import io.netty.channel.ChannelFuture; import io.netty.channel.ChannelHandler; diff --git a/sponge/src/main/java/us/myles/ViaVersion/sponge/SpongeViaLoader.java b/sponge/src/main/java/us/myles/ViaVersion/sponge/platform/SpongeViaLoader.java similarity index 98% rename from sponge/src/main/java/us/myles/ViaVersion/sponge/SpongeViaLoader.java rename to sponge/src/main/java/us/myles/ViaVersion/sponge/platform/SpongeViaLoader.java index deb5e97de..ae6e123cd 100644 --- a/sponge/src/main/java/us/myles/ViaVersion/sponge/SpongeViaLoader.java +++ b/sponge/src/main/java/us/myles/ViaVersion/sponge/platform/SpongeViaLoader.java @@ -1,4 +1,4 @@ -package us.myles.ViaVersion.sponge; +package us.myles.ViaVersion.sponge.platform; import lombok.AllArgsConstructor; import org.spongepowered.api.Sponge; diff --git a/sponge/src/main/java/us/myles/ViaVersion/sponge/LoggerWrapper.java b/sponge/src/main/java/us/myles/ViaVersion/sponge/util/LoggerWrapper.java similarity index 98% rename from sponge/src/main/java/us/myles/ViaVersion/sponge/LoggerWrapper.java rename to sponge/src/main/java/us/myles/ViaVersion/sponge/util/LoggerWrapper.java index 63050bf9a..8c69bf2d4 100644 --- a/sponge/src/main/java/us/myles/ViaVersion/sponge/LoggerWrapper.java +++ b/sponge/src/main/java/us/myles/ViaVersion/sponge/util/LoggerWrapper.java @@ -1,4 +1,4 @@ -package us.myles.ViaVersion.sponge; +package us.myles.ViaVersion.sponge.util; import org.slf4j.Logger;