From 7b7449ee1501fff1b179060d3a880a348eeafdb2 Mon Sep 17 00:00:00 2001 From: Dan Mulloy Date: Sat, 22 Sep 2018 17:48:05 -0400 Subject: [PATCH] Migrate to Gradle with a single module --- .gitignore | 4 + .travis.yml | 3 +- Readme.md | 338 +++++++++--------- .../TinyProtocol => TinyProtocol}/pom.xml | 0 .../comphenix/tinyprotocol/ExamplePlugin.java | 0 .../comphenix/tinyprotocol/Reflection.java | 0 .../comphenix/tinyprotocol/TinyProtocol.java | 0 .../src/main/resources/plugin.yml | 0 build.gradle | 74 ++++ gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 54413 bytes gradle/wrapper/gradle-wrapper.properties | 6 + gradlew | 172 +++++++++ gradlew.bat | 84 +++++ modules/API/pom.xml | 193 ---------- modules/ProtocolLib/pom.xml | 265 -------------- pom.xml | 129 ------- settings.gradle | 2 + .../protocol/AsynchronousManager.java | 0 .../protocol/CleanupStaticMembers.java | 0 .../com/comphenix/protocol/CommandBase.java | 0 .../com/comphenix/protocol/CommandFilter.java | 0 .../com/comphenix/protocol/CommandPacket.java | 0 .../comphenix/protocol/CommandProtocol.java | 0 .../protocol/MultipleLinesPrompt.java | 0 .../com/comphenix/protocol/PacketLogging.java | 0 .../com/comphenix/protocol/PacketStream.java | 0 .../com/comphenix/protocol/PacketType.java | 0 .../comphenix/protocol/PacketTypeEnum.java | 0 .../comphenix/protocol/PacketTypeLookup.java | 0 .../comphenix/protocol/PacketTypeParser.java | 0 .../java/com/comphenix/protocol/Packets.java | 0 .../comphenix/protocol/ProtocolConfig.java | 0 .../com/comphenix/protocol/ProtocolLib.java | 0 .../comphenix/protocol/ProtocolLibrary.java | 0 .../comphenix/protocol/ProtocolLogger.java | 0 .../comphenix/protocol/ProtocolManager.java | 0 .../com/comphenix/protocol/RangeParser.java | 0 .../protocol/async/AsyncFilterManager.java | 0 .../protocol/async/AsyncListenerHandler.java | 0 .../comphenix/protocol/async/AsyncMarker.java | 0 .../protocol/async/AsyncRunnable.java | 0 .../protocol/async/NullPacketListener.java | 0 .../protocol/async/PacketEventHolder.java | 0 .../protocol/async/PacketProcessingQueue.java | 0 .../protocol/async/PacketSendingQueue.java | 0 .../protocol/async/PlayerSendingHandler.java | 0 .../protocol/async/Synchronization.java | 0 .../protocol/collections/ExpireHashMap.java | 0 .../protocol/collections/IntegerMap.java | 0 .../AbstractConcurrentListenerMultimap.java | 0 .../concurrency/AbstractIntervalTree.java | 0 .../protocol/concurrency/BlockingHashMap.java | 0 .../concurrency/ConcurrentPlayerMap.java | 0 .../protocol/concurrency/IntegerSet.java | 0 .../protocol/concurrency/PacketTypeSet.java | 0 .../concurrency/SortedCopyOnWriteArray.java | 0 .../protocol/error/BasicErrorReporter.java | 0 .../error/DelegatedErrorReporter.java | 0 .../protocol/error/DetailedErrorReporter.java | 0 .../protocol/error/ErrorReporter.java | 0 .../protocol/error/PluginContext.java | 0 .../com/comphenix/protocol/error/Report.java | 0 .../comphenix/protocol/error/ReportType.java | 0 .../protocol/error/RethrowErrorReporter.java | 0 .../protocol/events/ConnectionSide.java | 0 .../protocol/events/ListenerOptions.java | 0 .../protocol/events/ListenerPriority.java | 0 .../protocol/events/ListeningWhitelist.java | 0 .../protocol/events/MonitorAdapter.java | 0 .../protocol/events/NetworkMarker.java | 0 .../protocol/events/PacketAdapter.java | 0 .../protocol/events/PacketContainer.java | 0 .../protocol/events/PacketEvent.java | 0 .../protocol/events/PacketListener.java | 0 .../protocol/events/PacketMetadata.java | 0 .../protocol/events/PacketOutputAdapter.java | 0 .../protocol/events/PacketOutputHandler.java | 0 .../protocol/events/PacketPostAdapter.java | 0 .../protocol/events/PacketPostListener.java | 0 .../protocol/events/ScheduledPacket.java | 0 .../events/SerializedOfflinePlayer.java | 0 .../protocol/injector/BukkitUnwrapper.java | 0 .../injector/DelayedPacketManager.java | 0 .../protocol/injector/DelayedSingleTask.java | 0 .../protocol/injector/EntityUtilities.java | 0 .../protocol/injector/GamePhase.java | 0 .../protocol/injector/InternalManager.java | 0 .../protocol/injector/ListenerInvoker.java | 0 .../protocol/injector/LoginPackets.java | 0 .../protocol/injector/NetworkProcessor.java | 0 .../protocol/injector/PacketConstructor.java | 0 .../injector/PacketFilterBuilder.java | 0 .../injector/PacketFilterManager.java | 0 .../protocol/injector/PlayerInjectHooks.java | 0 .../injector/PlayerLoggedOutException.java | 0 .../protocol/injector/PluginVerifier.java | 0 .../injector/PrioritizedListener.java | 0 .../injector/SortedPacketListenerList.java | 0 .../protocol/injector/StructureCache.java | 0 .../injector/netty/BootstrapList.java | 0 .../injector/netty/ChannelInjector.java | 0 .../injector/netty/ChannelListener.java | 0 .../protocol/injector/netty/ChannelProxy.java | 0 .../injector/netty/ClosedInjector.java | 0 .../injector/netty/EventLoopProxy.java | 0 .../injector/netty/InjectionFactory.java | 0 .../protocol/injector/netty/Injector.java | 0 .../injector/netty/NettyByteBufAdapter.java | 0 .../injector/netty/NettyNetworkMarker.java | 0 .../injector/netty/NettyProtocolRegistry.java | 0 .../injector/netty/PipelineProxy.java | 0 .../injector/netty/ProtocolInjector.java | 0 .../injector/netty/ProtocolRegistry.java | 0 .../injector/netty/SocketAdapter.java | 0 .../protocol/injector/netty/WirePacket.java | 0 .../injector/packet/CaptureInputStream.java | 0 .../injector/packet/InterceptWritePacket.java | 0 .../protocol/injector/packet/InverseMaps.java | 0 .../injector/packet/LegacyNetworkMarker.java | 0 .../injector/packet/LegacyPacketRegistry.java | 0 .../injector/packet/MapContainer.java | 0 .../injector/packet/PacketInjector.java | 0 .../packet/PacketInjectorBuilder.java | 0 .../injector/packet/PacketRegistry.java | 0 .../injector/packet/ProxyPacketInjector.java | 0 .../injector/packet/ReadPacketModifier.java | 0 .../injector/packet/WritePacketModifier.java | 0 .../injector/player/InjectedArrayList.java | 0 .../player/InjectedServerConnection.java | 0 .../injector/player/NetLoginInjector.java | 0 .../injector/player/NetworkFieldInjector.java | 0 .../player/NetworkObjectInjector.java | 0 .../player/NetworkServerInjector.java | 0 .../player/PlayerInjectionHandler.java | 0 .../injector/player/PlayerInjector.java | 0 .../player/PlayerInjectorBuilder.java | 0 .../player/ProxyPlayerInjectionHandler.java | 0 .../injector/player/ReplacedArrayList.java | 0 .../injector/player/UnsupportedListener.java | 0 .../server/AbstractInputStreamLookup.java | 0 .../injector/server/BukkitSocketInjector.java | 0 .../server/InputStreamLookupBuilder.java | 0 .../server/InputStreamReflectLookup.java | 0 .../injector/server/QueuedSendPacket.java | 0 .../injector/server/SocketInjector.java | 0 .../injector/server/TemporaryPlayer.java | 0 .../server/TemporaryPlayerFactory.java | 0 .../spigot/AbstractPacketInjector.java | 0 .../spigot/AbstractPlayerHandler.java | 0 .../injector/spigot/DummyPacketInjector.java | 0 .../injector/spigot/DummyPlayerHandler.java | 0 .../injector/spigot/SpigotPacketInjector.java | 0 .../injector/spigot/SpigotPacketListener.java | 0 .../comphenix/protocol/metrics/Metrics.java | 0 .../protocol/metrics/Statistics.java | 0 .../com/comphenix/protocol/package-info.java | 0 .../protocol/reflect/ClassAnalyser.java | 0 .../protocol/reflect/EquivalentConverter.java | 0 .../protocol/reflect/ExactReflection.java | 0 .../reflect/FieldAccessException.java | 0 .../protocol/reflect/FieldUtils.java | 0 .../protocol/reflect/FuzzyReflection.java | 0 .../comphenix/protocol/reflect/IntEnum.java | 0 .../protocol/reflect/MethodInfo.java | 0 .../protocol/reflect/MethodUtils.java | 0 .../protocol/reflect/ObjectWriter.java | 0 .../protocol/reflect/PrettyPrinter.java | 0 .../protocol/reflect/StructureModifier.java | 0 .../protocol/reflect/VolatileField.java | 0 .../protocol/reflect/accessors/Accessors.java | 0 .../accessors/ConstructorAccessor.java | 0 .../accessors/DefaultConstrutorAccessor.java | 0 .../accessors/DefaultFieldAccessor.java | 0 .../accessors/DefaultMethodAccessor.java | 0 .../reflect/accessors/FieldAccessor.java | 0 .../reflect/accessors/MethodAccessor.java | 0 .../accessors/ReadOnlyFieldAccessor.java | 0 .../reflect/cloning/AggregateCloner.java | 0 .../reflect/cloning/BukkitCloner.java | 0 .../protocol/reflect/cloning/Cloner.java | 0 .../reflect/cloning/CollectionCloner.java | 0 .../protocol/reflect/cloning/FieldCloner.java | 0 .../reflect/cloning/GuavaOptionalCloner.java | 0 .../reflect/cloning/ImmutableDetector.java | 0 .../reflect/cloning/JavaOptionalCloner.java | 0 .../reflect/cloning/NullableCloner.java | 0 .../reflect/cloning/SerializableCloner.java | 0 .../reflect/compiler/BackgroundCompiler.java | 0 .../reflect/compiler/BoxingHelper.java | 0 .../reflect/compiler/CompileListener.java | 0 .../compiler/CompiledStructureModifier.java | 0 .../reflect/compiler/MethodDescriptor.java | 0 .../reflect/compiler/StructureCompiler.java | 0 .../reflect/fuzzy/AbstractFuzzyMatcher.java | 0 .../reflect/fuzzy/AbstractFuzzyMember.java | 0 .../reflect/fuzzy/ClassExactMatcher.java | 0 .../reflect/fuzzy/ClassRegexMatcher.java | 0 .../reflect/fuzzy/ClassSetMatcher.java | 0 .../reflect/fuzzy/FuzzyClassContract.java | 0 .../reflect/fuzzy/FuzzyFieldContract.java | 0 .../protocol/reflect/fuzzy/FuzzyMatchers.java | 0 .../reflect/fuzzy/FuzzyMethodContract.java | 0 .../reflect/instances/BannedGenerator.java | 0 .../instances/CollectionGenerator.java | 0 .../reflect/instances/DefaultInstances.java | 0 .../reflect/instances/ExistingGenerator.java | 0 .../reflect/instances/InstanceProvider.java | 0 .../instances/NotConstructableException.java | 0 .../reflect/instances/PrimitiveGenerator.java | 0 .../protocol/timing/HistogramStream.java | 0 .../protocol/timing/OnlineComputation.java | 0 .../protocol/timing/StatisticsStream.java | 0 .../protocol/timing/TimedListenerManager.java | 0 .../protocol/timing/TimedTracker.java | 0 .../timing/TimingReportGenerator.java | 0 .../protocol/updater/BukkitUpdater.java | 0 .../protocol/updater/SpigotUpdater.java | 0 .../comphenix/protocol/updater/Updater.java | 0 .../utility/ByteBufferInputStream.java | 0 .../utility/ByteBufferOutputStream.java | 0 .../protocol/utility/CachedPackage.java | 0 .../protocol/utility/ChatExtensions.java | 0 .../protocol/utility/ClassSource.java | 0 .../comphenix/protocol/utility/Closer.java | 0 .../comphenix/protocol/utility/Constants.java | 0 .../protocol/utility/EnhancerFactory.java | 0 .../comphenix/protocol/utility/HexDumper.java | 0 .../protocol/utility/MinecraftFields.java | 0 .../protocol/utility/MinecraftMethods.java | 0 .../utility/MinecraftProtocolVersion.java | 0 .../protocol/utility/MinecraftReflection.java | 0 .../protocol/utility/MinecraftVersion.java | 0 .../protocol/utility/RemappedClassSource.java | 0 .../protocol/utility/SafeCacheBuilder.java | 0 .../protocol/utility/SnapshotVersion.java | 0 .../protocol/utility/StreamSerializer.java | 0 .../com/comphenix/protocol/utility/Util.java | 0 .../protocol/wrappers/AbstractWrapper.java | 0 .../protocol/wrappers/AutoWrapper.java | 0 .../protocol/wrappers/BlockPosition.java | 0 .../protocol/wrappers/BukkitConverters.java | 0 .../protocol/wrappers/ChunkCoordIntPair.java | 0 .../protocol/wrappers/ChunkPosition.java | 0 .../protocol/wrappers/ClonableWrapper.java | 0 .../protocol/wrappers/ComponentConverter.java | 0 .../protocol/wrappers/ComponentParser.java | 0 .../protocol/wrappers/Converters.java | 0 .../protocol/wrappers/EnumWrappers.java | 0 .../protocol/wrappers/GuavaReflection.java | 0 .../protocol/wrappers/GuavaWrappers.java | 0 .../protocol/wrappers/MinecraftKey.java | 0 .../wrappers/MultiBlockChangeInfo.java | 0 .../protocol/wrappers/PlayerInfoData.java | 0 .../protocol/wrappers/TroveWrapper.java | 0 .../comphenix/protocol/wrappers/Vector3F.java | 0 .../protocol/wrappers/WrappedAttribute.java | 0 .../wrappers/WrappedAttributeModifier.java | 0 .../protocol/wrappers/WrappedBlockData.java | 0 .../wrappers/WrappedChatComponent.java | 0 .../wrappers/WrappedChunkCoordinate.java | 0 .../protocol/wrappers/WrappedDataWatcher.java | 0 .../protocol/wrappers/WrappedGameProfile.java | 0 .../protocol/wrappers/WrappedIntHashMap.java | 0 .../protocol/wrappers/WrappedParticle.java | 0 .../protocol/wrappers/WrappedServerPing.java | 0 .../wrappers/WrappedSignedProperty.java | 0 .../protocol/wrappers/WrappedStatistic.java | 0 .../wrappers/WrappedWatchableObject.java | 0 .../collection/AbstractConverted.java | 0 .../wrappers/collection/BiFunction.java | 0 .../wrappers/collection/CachedCollection.java | 0 .../wrappers/collection/CachedSet.java | 0 .../collection/ConvertedCollection.java | 0 .../wrappers/collection/ConvertedList.java | 0 .../wrappers/collection/ConvertedMap.java | 0 .../collection/ConvertedMultimap.java | 0 .../wrappers/collection/ConvertedSet.java | 0 .../protocol/wrappers/nbt/MemoryElement.java | 0 .../protocol/wrappers/nbt/NameProperty.java | 0 .../protocol/wrappers/nbt/NbtBase.java | 0 .../protocol/wrappers/nbt/NbtCompound.java | 0 .../protocol/wrappers/nbt/NbtFactory.java | 0 .../protocol/wrappers/nbt/NbtList.java | 0 .../protocol/wrappers/nbt/NbtType.java | 0 .../protocol/wrappers/nbt/NbtVisitor.java | 0 .../protocol/wrappers/nbt/NbtWrapper.java | 0 .../wrappers/nbt/TileEntityAccessor.java | 0 .../wrappers/nbt/WrappedCompound.java | 0 .../protocol/wrappers/nbt/WrappedElement.java | 0 .../protocol/wrappers/nbt/WrappedList.java | 0 .../wrappers/nbt/io/NbtBinarySerializer.java | 0 .../nbt/io/NbtConfigurationSerializer.java | 0 .../wrappers/nbt/io/NbtTextSerializer.java | 0 .../src => src}/main/resources/config.yml | 0 .../src => src}/main/resources/plugin.yml | 0 .../protocol/SimpleCraftBukkitITCase.java | 7 +- .../protocol/SimpleMinecraftClient.java | 0 .../integration/protocol/TestPingPacket.java | 0 .../protocol/BukkitInitialization.java | 0 .../protocol/MinecraftVersionTest.java | 0 .../comphenix/protocol/PacketTypeTest.java | 0 .../concurrency/BlockingHashMapTest.java | 0 .../protocol/events/PacketContainerTest.java | 0 .../protocol/injector/PluginVerifierTest.java | 0 .../injector/SortedCopyOnWriteArrayTest.java | 0 .../protocol/injector/WirePacketTest.java | 0 .../reflect/accessors/AccessorsTest.java | 0 .../reflect/cloning/AggregateClonerTest.java | 0 .../protocol/updater/UpdaterTest.java | 0 .../utility/MinecraftMethodsTest.java | 0 .../utility/MinecraftReflectionTest.java | 0 .../protocol/utility/SnapshotVersionTest.java | 0 .../utility/StreamSerializerTest.java | 0 .../comphenix/protocol/utility/TestUtils.java | 0 .../wrappers/BukkitConvertersTest.java | 0 .../wrappers/ChunkCoordIntPairTest.java | 0 .../protocol/wrappers/CloningTest.java | 0 .../protocol/wrappers/EnumWrappersTest.java | 0 .../wrappers/MultiBlockChangeTest.java | 0 .../protocol/wrappers/PlayerInfoDataTest.java | 0 .../wrappers/WrappedAttributeTest.java | 0 .../wrappers/WrappedBlockDataTest.java | 0 .../wrappers/WrappedChatComponentTest.java | 0 .../wrappers/WrappedDataWatcherTest.java | 0 .../wrappers/WrappedGameProfileTest.java | 0 .../wrappers/WrappedIntHashMapTest.java | 0 .../wrappers/WrappedParticleTest.java | 0 .../wrappers/WrappedServerPingTest.java | 0 .../wrappers/nbt/NbtCompoundTest.java | 0 .../protocol/wrappers/nbt/NbtFactoryTest.java | 0 .../protocol/wrappers/nbt/TileEntityTest.java | 0 .../io/NbtConfigurationSerializerTest.java | 0 .../src => src}/test/resources/tux.png | Bin 333 files changed, 516 insertions(+), 761 deletions(-) rename {modules/TinyProtocol => TinyProtocol}/pom.xml (100%) rename {modules/TinyProtocol => TinyProtocol}/src/main/java/com/comphenix/tinyprotocol/ExamplePlugin.java (100%) rename {modules/TinyProtocol => TinyProtocol}/src/main/java/com/comphenix/tinyprotocol/Reflection.java (100%) rename {modules/TinyProtocol => TinyProtocol}/src/main/java/com/comphenix/tinyprotocol/TinyProtocol.java (100%) rename {modules/TinyProtocol => TinyProtocol}/src/main/resources/plugin.yml (100%) create mode 100644 build.gradle create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100644 gradlew create mode 100644 gradlew.bat delete mode 100644 modules/API/pom.xml delete mode 100644 modules/ProtocolLib/pom.xml delete mode 100644 pom.xml create mode 100644 settings.gradle rename {modules/API/src => src}/main/java/com/comphenix/protocol/AsynchronousManager.java (100%) rename {modules/ProtocolLib/src => src}/main/java/com/comphenix/protocol/CleanupStaticMembers.java (100%) rename {modules/ProtocolLib/src => src}/main/java/com/comphenix/protocol/CommandBase.java (100%) rename {modules/ProtocolLib/src => src}/main/java/com/comphenix/protocol/CommandFilter.java (100%) rename {modules/ProtocolLib/src => src}/main/java/com/comphenix/protocol/CommandPacket.java (100%) rename {modules/ProtocolLib/src => src}/main/java/com/comphenix/protocol/CommandProtocol.java (100%) rename {modules/ProtocolLib/src => src}/main/java/com/comphenix/protocol/MultipleLinesPrompt.java (100%) rename {modules/ProtocolLib/src => src}/main/java/com/comphenix/protocol/PacketLogging.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/PacketStream.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/PacketType.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/PacketTypeEnum.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/PacketTypeLookup.java (100%) rename {modules/ProtocolLib/src => src}/main/java/com/comphenix/protocol/PacketTypeParser.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/Packets.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/ProtocolConfig.java (100%) rename {modules/ProtocolLib/src => src}/main/java/com/comphenix/protocol/ProtocolLib.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/ProtocolLibrary.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/ProtocolLogger.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/ProtocolManager.java (100%) rename {modules/ProtocolLib/src => src}/main/java/com/comphenix/protocol/RangeParser.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/async/AsyncFilterManager.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/async/AsyncListenerHandler.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/async/AsyncMarker.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/async/AsyncRunnable.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/async/NullPacketListener.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/async/PacketEventHolder.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/async/PacketProcessingQueue.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/async/PacketSendingQueue.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/async/PlayerSendingHandler.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/async/Synchronization.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/collections/ExpireHashMap.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/collections/IntegerMap.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/concurrency/AbstractConcurrentListenerMultimap.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/concurrency/AbstractIntervalTree.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/concurrency/BlockingHashMap.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/concurrency/ConcurrentPlayerMap.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/concurrency/IntegerSet.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/concurrency/PacketTypeSet.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/concurrency/SortedCopyOnWriteArray.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/error/BasicErrorReporter.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/error/DelegatedErrorReporter.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/error/DetailedErrorReporter.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/error/ErrorReporter.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/error/PluginContext.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/error/Report.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/error/ReportType.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/error/RethrowErrorReporter.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/events/ConnectionSide.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/events/ListenerOptions.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/events/ListenerPriority.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/events/ListeningWhitelist.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/events/MonitorAdapter.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/events/NetworkMarker.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/events/PacketAdapter.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/events/PacketContainer.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/events/PacketEvent.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/events/PacketListener.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/events/PacketMetadata.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/events/PacketOutputAdapter.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/events/PacketOutputHandler.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/events/PacketPostAdapter.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/events/PacketPostListener.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/events/ScheduledPacket.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/events/SerializedOfflinePlayer.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/injector/BukkitUnwrapper.java (100%) rename {modules/ProtocolLib/src => src}/main/java/com/comphenix/protocol/injector/DelayedPacketManager.java (100%) rename {modules/ProtocolLib/src => src}/main/java/com/comphenix/protocol/injector/DelayedSingleTask.java (100%) rename {modules/ProtocolLib/src => src}/main/java/com/comphenix/protocol/injector/EntityUtilities.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/injector/GamePhase.java (100%) rename {modules/ProtocolLib/src => src}/main/java/com/comphenix/protocol/injector/InternalManager.java (100%) rename {modules/ProtocolLib/src => src}/main/java/com/comphenix/protocol/injector/ListenerInvoker.java (100%) rename {modules/ProtocolLib/src => src}/main/java/com/comphenix/protocol/injector/LoginPackets.java (100%) rename {modules/ProtocolLib/src => src}/main/java/com/comphenix/protocol/injector/NetworkProcessor.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/injector/PacketConstructor.java (100%) rename {modules/ProtocolLib/src => src}/main/java/com/comphenix/protocol/injector/PacketFilterBuilder.java (100%) rename {modules/ProtocolLib/src => src}/main/java/com/comphenix/protocol/injector/PacketFilterManager.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/injector/PlayerInjectHooks.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/injector/PlayerLoggedOutException.java (100%) rename {modules/ProtocolLib/src => src}/main/java/com/comphenix/protocol/injector/PluginVerifier.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/injector/PrioritizedListener.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/injector/SortedPacketListenerList.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/injector/StructureCache.java (100%) rename {modules/ProtocolLib/src => src}/main/java/com/comphenix/protocol/injector/netty/BootstrapList.java (100%) rename {modules/ProtocolLib/src => src}/main/java/com/comphenix/protocol/injector/netty/ChannelInjector.java (100%) rename {modules/ProtocolLib/src => src}/main/java/com/comphenix/protocol/injector/netty/ChannelListener.java (100%) rename {modules/ProtocolLib/src => src}/main/java/com/comphenix/protocol/injector/netty/ChannelProxy.java (100%) rename {modules/ProtocolLib/src => src}/main/java/com/comphenix/protocol/injector/netty/ClosedInjector.java (100%) rename {modules/ProtocolLib/src => src}/main/java/com/comphenix/protocol/injector/netty/EventLoopProxy.java (100%) rename {modules/ProtocolLib/src => src}/main/java/com/comphenix/protocol/injector/netty/InjectionFactory.java (100%) rename {modules/ProtocolLib/src => src}/main/java/com/comphenix/protocol/injector/netty/Injector.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/injector/netty/NettyByteBufAdapter.java (100%) rename {modules/ProtocolLib/src => src}/main/java/com/comphenix/protocol/injector/netty/NettyNetworkMarker.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/injector/netty/NettyProtocolRegistry.java (100%) rename {modules/ProtocolLib/src => src}/main/java/com/comphenix/protocol/injector/netty/PipelineProxy.java (100%) rename {modules/ProtocolLib/src => src}/main/java/com/comphenix/protocol/injector/netty/ProtocolInjector.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/injector/netty/ProtocolRegistry.java (100%) rename {modules/ProtocolLib/src => src}/main/java/com/comphenix/protocol/injector/netty/SocketAdapter.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/injector/netty/WirePacket.java (100%) rename {modules/ProtocolLib/src => src}/main/java/com/comphenix/protocol/injector/packet/CaptureInputStream.java (100%) rename {modules/ProtocolLib/src => src}/main/java/com/comphenix/protocol/injector/packet/InterceptWritePacket.java (100%) rename {modules/ProtocolLib/src => src}/main/java/com/comphenix/protocol/injector/packet/InverseMaps.java (100%) rename {modules/ProtocolLib/src => src}/main/java/com/comphenix/protocol/injector/packet/LegacyNetworkMarker.java (100%) rename {modules/ProtocolLib/src => src}/main/java/com/comphenix/protocol/injector/packet/LegacyPacketRegistry.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/injector/packet/MapContainer.java (100%) rename {modules/ProtocolLib/src => src}/main/java/com/comphenix/protocol/injector/packet/PacketInjector.java (100%) rename {modules/ProtocolLib/src => src}/main/java/com/comphenix/protocol/injector/packet/PacketInjectorBuilder.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/injector/packet/PacketRegistry.java (100%) rename {modules/ProtocolLib/src => src}/main/java/com/comphenix/protocol/injector/packet/ProxyPacketInjector.java (100%) rename {modules/ProtocolLib/src => src}/main/java/com/comphenix/protocol/injector/packet/ReadPacketModifier.java (100%) rename {modules/ProtocolLib/src => src}/main/java/com/comphenix/protocol/injector/packet/WritePacketModifier.java (100%) rename {modules/ProtocolLib/src => src}/main/java/com/comphenix/protocol/injector/player/InjectedArrayList.java (100%) rename {modules/ProtocolLib/src => src}/main/java/com/comphenix/protocol/injector/player/InjectedServerConnection.java (100%) rename {modules/ProtocolLib/src => src}/main/java/com/comphenix/protocol/injector/player/NetLoginInjector.java (100%) rename {modules/ProtocolLib/src => src}/main/java/com/comphenix/protocol/injector/player/NetworkFieldInjector.java (100%) rename {modules/ProtocolLib/src => src}/main/java/com/comphenix/protocol/injector/player/NetworkObjectInjector.java (100%) rename {modules/ProtocolLib/src => src}/main/java/com/comphenix/protocol/injector/player/NetworkServerInjector.java (100%) rename {modules/ProtocolLib/src => src}/main/java/com/comphenix/protocol/injector/player/PlayerInjectionHandler.java (100%) rename {modules/ProtocolLib/src => src}/main/java/com/comphenix/protocol/injector/player/PlayerInjector.java (100%) rename {modules/ProtocolLib/src => src}/main/java/com/comphenix/protocol/injector/player/PlayerInjectorBuilder.java (100%) rename {modules/ProtocolLib/src => src}/main/java/com/comphenix/protocol/injector/player/ProxyPlayerInjectionHandler.java (100%) rename {modules/ProtocolLib/src => src}/main/java/com/comphenix/protocol/injector/player/ReplacedArrayList.java (100%) rename {modules/ProtocolLib/src => src}/main/java/com/comphenix/protocol/injector/player/UnsupportedListener.java (100%) rename {modules/ProtocolLib/src => src}/main/java/com/comphenix/protocol/injector/server/AbstractInputStreamLookup.java (100%) rename {modules/ProtocolLib/src => src}/main/java/com/comphenix/protocol/injector/server/BukkitSocketInjector.java (100%) rename {modules/ProtocolLib/src => src}/main/java/com/comphenix/protocol/injector/server/InputStreamLookupBuilder.java (100%) rename {modules/ProtocolLib/src => src}/main/java/com/comphenix/protocol/injector/server/InputStreamReflectLookup.java (100%) rename {modules/ProtocolLib/src => src}/main/java/com/comphenix/protocol/injector/server/QueuedSendPacket.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/injector/server/SocketInjector.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/injector/server/TemporaryPlayer.java (100%) rename {modules/ProtocolLib/src => src}/main/java/com/comphenix/protocol/injector/server/TemporaryPlayerFactory.java (100%) rename {modules/ProtocolLib/src => src}/main/java/com/comphenix/protocol/injector/spigot/AbstractPacketInjector.java (100%) rename {modules/ProtocolLib/src => src}/main/java/com/comphenix/protocol/injector/spigot/AbstractPlayerHandler.java (100%) rename {modules/ProtocolLib/src => src}/main/java/com/comphenix/protocol/injector/spigot/DummyPacketInjector.java (100%) rename {modules/ProtocolLib/src => src}/main/java/com/comphenix/protocol/injector/spigot/DummyPlayerHandler.java (100%) rename {modules/ProtocolLib/src => src}/main/java/com/comphenix/protocol/injector/spigot/SpigotPacketInjector.java (100%) rename {modules/ProtocolLib/src => src}/main/java/com/comphenix/protocol/injector/spigot/SpigotPacketListener.java (100%) rename {modules/ProtocolLib/src => src}/main/java/com/comphenix/protocol/metrics/Metrics.java (100%) rename {modules/ProtocolLib/src => src}/main/java/com/comphenix/protocol/metrics/Statistics.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/package-info.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/reflect/ClassAnalyser.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/reflect/EquivalentConverter.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/reflect/ExactReflection.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/reflect/FieldAccessException.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/reflect/FieldUtils.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/reflect/FuzzyReflection.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/reflect/IntEnum.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/reflect/MethodInfo.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/reflect/MethodUtils.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/reflect/ObjectWriter.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/reflect/PrettyPrinter.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/reflect/StructureModifier.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/reflect/VolatileField.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/reflect/accessors/Accessors.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/reflect/accessors/ConstructorAccessor.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/reflect/accessors/DefaultConstrutorAccessor.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/reflect/accessors/DefaultFieldAccessor.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/reflect/accessors/DefaultMethodAccessor.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/reflect/accessors/FieldAccessor.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/reflect/accessors/MethodAccessor.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/reflect/accessors/ReadOnlyFieldAccessor.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/reflect/cloning/AggregateCloner.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/reflect/cloning/BukkitCloner.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/reflect/cloning/Cloner.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/reflect/cloning/CollectionCloner.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/reflect/cloning/FieldCloner.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/reflect/cloning/GuavaOptionalCloner.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/reflect/cloning/ImmutableDetector.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/reflect/cloning/JavaOptionalCloner.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/reflect/cloning/NullableCloner.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/reflect/cloning/SerializableCloner.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/reflect/compiler/BackgroundCompiler.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/reflect/compiler/BoxingHelper.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/reflect/compiler/CompileListener.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/reflect/compiler/CompiledStructureModifier.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/reflect/compiler/MethodDescriptor.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/reflect/compiler/StructureCompiler.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/reflect/fuzzy/AbstractFuzzyMatcher.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/reflect/fuzzy/AbstractFuzzyMember.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/reflect/fuzzy/ClassExactMatcher.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/reflect/fuzzy/ClassRegexMatcher.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/reflect/fuzzy/ClassSetMatcher.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/reflect/fuzzy/FuzzyClassContract.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/reflect/fuzzy/FuzzyFieldContract.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/reflect/fuzzy/FuzzyMatchers.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/reflect/fuzzy/FuzzyMethodContract.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/reflect/instances/BannedGenerator.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/reflect/instances/CollectionGenerator.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/reflect/instances/DefaultInstances.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/reflect/instances/ExistingGenerator.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/reflect/instances/InstanceProvider.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/reflect/instances/NotConstructableException.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/reflect/instances/PrimitiveGenerator.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/timing/HistogramStream.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/timing/OnlineComputation.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/timing/StatisticsStream.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/timing/TimedListenerManager.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/timing/TimedTracker.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/timing/TimingReportGenerator.java (100%) rename {modules/ProtocolLib/src => src}/main/java/com/comphenix/protocol/updater/BukkitUpdater.java (100%) rename {modules/ProtocolLib/src => src}/main/java/com/comphenix/protocol/updater/SpigotUpdater.java (100%) rename {modules/ProtocolLib/src => src}/main/java/com/comphenix/protocol/updater/Updater.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/utility/ByteBufferInputStream.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/utility/ByteBufferOutputStream.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/utility/CachedPackage.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/utility/ChatExtensions.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/utility/ClassSource.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/utility/Closer.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/utility/Constants.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/utility/EnhancerFactory.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/utility/HexDumper.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/utility/MinecraftFields.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/utility/MinecraftMethods.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/utility/MinecraftProtocolVersion.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/utility/MinecraftReflection.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/utility/MinecraftVersion.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/utility/RemappedClassSource.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/utility/SafeCacheBuilder.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/utility/SnapshotVersion.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/utility/StreamSerializer.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/utility/Util.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/wrappers/AbstractWrapper.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/wrappers/AutoWrapper.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/wrappers/BlockPosition.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/wrappers/BukkitConverters.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/wrappers/ChunkCoordIntPair.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/wrappers/ChunkPosition.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/wrappers/ClonableWrapper.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/wrappers/ComponentConverter.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/wrappers/ComponentParser.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/wrappers/Converters.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/wrappers/EnumWrappers.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/wrappers/GuavaReflection.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/wrappers/GuavaWrappers.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/wrappers/MinecraftKey.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/wrappers/MultiBlockChangeInfo.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/wrappers/PlayerInfoData.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/wrappers/TroveWrapper.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/wrappers/Vector3F.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/wrappers/WrappedAttribute.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/wrappers/WrappedAttributeModifier.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/wrappers/WrappedBlockData.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/wrappers/WrappedChatComponent.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/wrappers/WrappedChunkCoordinate.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/wrappers/WrappedDataWatcher.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/wrappers/WrappedGameProfile.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/wrappers/WrappedIntHashMap.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/wrappers/WrappedParticle.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/wrappers/WrappedServerPing.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/wrappers/WrappedSignedProperty.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/wrappers/WrappedStatistic.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/wrappers/WrappedWatchableObject.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/wrappers/collection/AbstractConverted.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/wrappers/collection/BiFunction.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/wrappers/collection/CachedCollection.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/wrappers/collection/CachedSet.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/wrappers/collection/ConvertedCollection.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/wrappers/collection/ConvertedList.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/wrappers/collection/ConvertedMap.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/wrappers/collection/ConvertedMultimap.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/wrappers/collection/ConvertedSet.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/wrappers/nbt/MemoryElement.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/wrappers/nbt/NameProperty.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/wrappers/nbt/NbtBase.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/wrappers/nbt/NbtCompound.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/wrappers/nbt/NbtFactory.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/wrappers/nbt/NbtList.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/wrappers/nbt/NbtType.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/wrappers/nbt/NbtVisitor.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/wrappers/nbt/NbtWrapper.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/wrappers/nbt/TileEntityAccessor.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/wrappers/nbt/WrappedCompound.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/wrappers/nbt/WrappedElement.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/wrappers/nbt/WrappedList.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/wrappers/nbt/io/NbtBinarySerializer.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/wrappers/nbt/io/NbtConfigurationSerializer.java (100%) rename {modules/API/src => src}/main/java/com/comphenix/protocol/wrappers/nbt/io/NbtTextSerializer.java (100%) rename {modules/ProtocolLib/src => src}/main/resources/config.yml (100%) rename {modules/ProtocolLib/src => src}/main/resources/plugin.yml (100%) rename {modules/ProtocolLib/src => src}/test/java/com/comphenix/integration/protocol/SimpleCraftBukkitITCase.java (98%) rename {modules/ProtocolLib/src => src}/test/java/com/comphenix/integration/protocol/SimpleMinecraftClient.java (100%) rename {modules/ProtocolLib/src => src}/test/java/com/comphenix/integration/protocol/TestPingPacket.java (100%) rename {modules/ProtocolLib/src => src}/test/java/com/comphenix/protocol/BukkitInitialization.java (100%) rename {modules/ProtocolLib/src => src}/test/java/com/comphenix/protocol/MinecraftVersionTest.java (100%) rename {modules/ProtocolLib/src => src}/test/java/com/comphenix/protocol/PacketTypeTest.java (100%) rename {modules/ProtocolLib/src => src}/test/java/com/comphenix/protocol/concurrency/BlockingHashMapTest.java (100%) rename {modules/ProtocolLib/src => src}/test/java/com/comphenix/protocol/events/PacketContainerTest.java (100%) rename {modules/ProtocolLib/src => src}/test/java/com/comphenix/protocol/injector/PluginVerifierTest.java (100%) rename {modules/ProtocolLib/src => src}/test/java/com/comphenix/protocol/injector/SortedCopyOnWriteArrayTest.java (100%) rename {modules/ProtocolLib/src => src}/test/java/com/comphenix/protocol/injector/WirePacketTest.java (100%) rename {modules/ProtocolLib/src => src}/test/java/com/comphenix/protocol/reflect/accessors/AccessorsTest.java (100%) rename {modules/ProtocolLib/src => src}/test/java/com/comphenix/protocol/reflect/cloning/AggregateClonerTest.java (100%) rename {modules/ProtocolLib/src => src}/test/java/com/comphenix/protocol/updater/UpdaterTest.java (100%) rename {modules/ProtocolLib/src => src}/test/java/com/comphenix/protocol/utility/MinecraftMethodsTest.java (100%) rename {modules/ProtocolLib/src => src}/test/java/com/comphenix/protocol/utility/MinecraftReflectionTest.java (100%) rename {modules/ProtocolLib/src => src}/test/java/com/comphenix/protocol/utility/SnapshotVersionTest.java (100%) rename {modules/ProtocolLib/src => src}/test/java/com/comphenix/protocol/utility/StreamSerializerTest.java (100%) rename {modules/ProtocolLib/src => src}/test/java/com/comphenix/protocol/utility/TestUtils.java (100%) rename {modules/ProtocolLib/src => src}/test/java/com/comphenix/protocol/wrappers/BukkitConvertersTest.java (100%) rename {modules/ProtocolLib/src => src}/test/java/com/comphenix/protocol/wrappers/ChunkCoordIntPairTest.java (100%) rename {modules/ProtocolLib/src => src}/test/java/com/comphenix/protocol/wrappers/CloningTest.java (100%) rename {modules/ProtocolLib/src => src}/test/java/com/comphenix/protocol/wrappers/EnumWrappersTest.java (100%) rename {modules/ProtocolLib/src => src}/test/java/com/comphenix/protocol/wrappers/MultiBlockChangeTest.java (100%) rename {modules/ProtocolLib/src => src}/test/java/com/comphenix/protocol/wrappers/PlayerInfoDataTest.java (100%) rename {modules/ProtocolLib/src => src}/test/java/com/comphenix/protocol/wrappers/WrappedAttributeTest.java (100%) rename {modules/ProtocolLib/src => src}/test/java/com/comphenix/protocol/wrappers/WrappedBlockDataTest.java (100%) rename {modules/ProtocolLib/src => src}/test/java/com/comphenix/protocol/wrappers/WrappedChatComponentTest.java (100%) rename {modules/ProtocolLib/src => src}/test/java/com/comphenix/protocol/wrappers/WrappedDataWatcherTest.java (100%) rename {modules/ProtocolLib/src => src}/test/java/com/comphenix/protocol/wrappers/WrappedGameProfileTest.java (100%) rename {modules/ProtocolLib/src => src}/test/java/com/comphenix/protocol/wrappers/WrappedIntHashMapTest.java (100%) rename {modules/ProtocolLib/src => src}/test/java/com/comphenix/protocol/wrappers/WrappedParticleTest.java (100%) rename {modules/ProtocolLib/src => src}/test/java/com/comphenix/protocol/wrappers/WrappedServerPingTest.java (100%) rename {modules/ProtocolLib/src => src}/test/java/com/comphenix/protocol/wrappers/nbt/NbtCompoundTest.java (100%) rename {modules/ProtocolLib/src => src}/test/java/com/comphenix/protocol/wrappers/nbt/NbtFactoryTest.java (100%) rename {modules/ProtocolLib/src => src}/test/java/com/comphenix/protocol/wrappers/nbt/TileEntityTest.java (100%) rename {modules/ProtocolLib/src => src}/test/java/com/comphenix/protocol/wrappers/nbt/io/NbtConfigurationSerializerTest.java (100%) rename {modules/ProtocolLib/src => src}/test/resources/tux.png (100%) diff --git a/.gitignore b/.gitignore index cec61a97..d4414a71 100644 --- a/.gitignore +++ b/.gitignore @@ -175,4 +175,8 @@ pip-log.txt .DS_Store # Log4J files +logs/ + +.gradle/ +build/ logs/ \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index 53ce18e4..55785c82 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,7 @@ language: java jdk: - oraclejdk8 -script: mvn clean test -#before_install: cd ProtocolLib +script: gradle clean compileJava compileTestJava test install: true notifications: email: diff --git a/Readme.md b/Readme.md index 8470eb77..2214356c 100644 --- a/Readme.md +++ b/Readme.md @@ -1,169 +1,169 @@ -# ProtocolLib [![Travis Status](https://travis-ci.org/dmulloy2/ProtocolLib.svg?branch=master)](https://travis-ci.org/dmulloy2/ProtocolLib) - -Certain tasks are impossible to perform with the standard Bukkit API, and may require -working with and even modify Minecraft directly. A common technique is to modify incoming -and outgoing [packets](http://www.wiki.vg/Protocol), or inject custom packets into the -stream. This is quite cumbersome to do, however, and most implementations will break -as soon as a new version of Minecraft has been released, mostly due to obfuscation. - -Critically, different plugins that use this approach may _hook_ into the same classes, -with unpredictable outcomes. More than often this causes plugins to crash, but it may also -lead to more subtle bugs. - -Currently maintained by dmulloy2 on behalf of [Spigot](http://www.spigotmc.org/). - -### Resources - -* [Resource Page](http://www.spigotmc.org/resources/protocollib.1997/) -* [Dev Builds](http://ci.dmulloy2.net/job/ProtocolLib) -* [JavaDoc](http://ci.dmulloy2.net/job/ProtocolLib/javadoc) - -### Compilation - -ProtocolLib is built with Maven and requires Spigot and SpigotAPI, which can be found [here](http://www.spigotmc.org/wiki/buildtools/). - -### A new API - -__ProtocolLib__ attempts to solve this problem by providing a event API, much like Bukkit, -that allows plugins to monitor, modify, or cancel packets sent and received. But, more importantly, -the API also hides all the gritty, obfuscated classes with a simple index based read/write system. -You no longer have to reference CraftBukkit! - -### Using ProtocolLib - -To use this library, first add ProtocolLib.jar to your Java build path. Then, add ProtocolLib -as a dependency or soft dependency to your plugin.yml file like any other plugin: - -````yml -depend: [ProtocolLib] -```` - -You can also add ProtocolLib as a Maven dependency: - -````xml - - - dmulloy2-repo - http://repo.dmulloy2.net/nexus/repository/public/ - - ... - - - - - com.comphenix.protocol - ProtocolLib-API - 4.4.0 - - -```` - -Or use the maven dependency with gradle: - -```gradle -repositories { - maven { url "http://repo.dmulloy2.net/nexus/repository/public/" } -} - -dependencies { - compileOnly group: "com.comphenix.protocol", name: "ProtocolLib", version: "4.4.0"; -} -``` - -Then get a reference to ProtocolManager in onLoad() or onEnable() and you're good to go. - -````java -private ProtocolManager protocolManager; - -public void onLoad() { - protocolManager = ProtocolLibrary.getProtocolManager(); -} -```` - -To listen for packets sent by the server to a client, add a server-side listener: - -````java -// Disable all sound effects -protocolManager.addPacketListener( - new PacketAdapter(this, ListenerPriority.NORMAL, - PacketType.Play.Server.NAMED_SOUND_EFFECT) { - @Override - public void onPacketSending(PacketEvent event) { - // Item packets (id: 0x29) - if (event.getPacketType() == - PacketType.Play.Server.NAMED_SOUND_EFFECT) { - event.setCancelled(true); - } - } -}); -```` - -It's also possible to read and modify the content of these packets. For instance, you can create a global -censor by listening for Packet3Chat events: - -````java -// Censor -protocolManager.addPacketListener(new PacketAdapter(this, - ListenerPriority.NORMAL, - PacketType.Play.Client.CHAT) { - @Override - public void onPacketReceiving(PacketEvent event) { - if (event.getPacketType() == PacketType.Play.Client.CHAT) { - PacketContainer packet = event.getPacket(); - String message = packet.getStrings().read(0); - - if (message.contains("shit") - || message.contains("damn")) { - event.setCancelled(true); - event.getPlayer().sendMessage("Bad manners!"); - } - } - } -}); -```` - -### Sending packets - -Normally, you might have to do something ugly like the following: - -````java -Packet60Explosion fakeExplosion = new Packet60Explosion(); - -fakeExplosion.a = player.getLocation().getX(); -fakeExplosion.b = player.getLocation().getY(); -fakeExplosion.c = player.getLocation().getZ(); -fakeExplosion.d = 3.0F; -fakeExplosion.e = new ArrayList(); - -((CraftPlayer) player).getHandle().netServerHandler.sendPacket(fakeExplosion); -```` - -But with ProtocolLib, you can turn that into something more manageable. Notice that -you don't have to create an ArrayList with this version: - -````java - -PacketContainer fakeExplosion = new PacketContainer(PacketType.Play.Server.EXPLOSION); -fakeExplosion.getDoubles(). - write(0, player.getLocation().getX()). - write(1, player.getLocation().getY()). - write(2, player.getLocation().getZ()); -fakeExplosion.getFloat().write(0, 3.0F); - -try { - protocolManager.sendServerPacket(player, fakeExplosion); -} catch (InvocationTargetException e) { - throw new RuntimeException( - "Cannot send packet " + fakeExplosion, e); -} -```` - -### Compatibility - -One of the main goals of this project was to achieve maximum compatibility with CraftBukkit. And the end -result is quite flexible. Aside from netty package changes, it should be resilient against future changes. -It's likely that I won't have to update ProtocolLib for anything but bug fixes and new features. - -How is this possible? It all comes down to reflection in the end. Essentially, no name is hard coded - -every field, method and class is deduced by looking at field types, package names or parameter -types. It's remarkably consistent across different versions. +# ProtocolLib [![Travis Status](https://travis-ci.org/dmulloy2/ProtocolLib.svg?branch=master)](https://travis-ci.org/dmulloy2/ProtocolLib) + +Certain tasks are impossible to perform with the standard Bukkit API, and may require +working with and even modify Minecraft directly. A common technique is to modify incoming +and outgoing [packets](http://www.wiki.vg/Protocol), or inject custom packets into the +stream. This is quite cumbersome to do, however, and most implementations will break +as soon as a new version of Minecraft has been released, mostly due to obfuscation. + +Critically, different plugins that use this approach may _hook_ into the same classes, +with unpredictable outcomes. More than often this causes plugins to crash, but it may also +lead to more subtle bugs. + +Currently maintained by dmulloy2 on behalf of [Spigot](http://www.spigotmc.org/). + +### Resources + +* [Resource Page](http://www.spigotmc.org/resources/protocollib.1997/) +* [Dev Builds](http://ci.dmulloy2.net/job/ProtocolLib) +* [JavaDoc](http://ci.dmulloy2.net/job/ProtocolLib/javadoc) + +### Compilation + +ProtocolLib is built with Maven and requires Spigot and SpigotAPI, which can be found [here](http://www.spigotmc.org/wiki/buildtools/). + +### A new API + +__ProtocolLib__ attempts to solve this problem by providing a event API, much like Bukkit, +that allows plugins to monitor, modify, or cancel packets sent and received. But, more importantly, +the API also hides all the gritty, obfuscated classes with a simple index based read/write system. +You no longer have to reference CraftBukkit! + +### Using ProtocolLib + +To use this library, first add ProtocolLib.jar to your Java build path. Then, add ProtocolLib +as a dependency or soft dependency to your plugin.yml file like any other plugin: + +````yml +depend: [ProtocolLib] +```` + +You can also add ProtocolLib as a Maven dependency: + +````xml + + + dmulloy2-repo + http://repo.dmulloy2.net/nexus/repository/public/ + + ... + + + + + com.comphenix.protocol + ProtocolLib-API + 4.4.0 + + +```` + +Or use the maven dependency with gradle: + +```gradle +repositories { + maven { url "http://repo.dmulloy2.net/nexus/repository/public/" } +} + +dependencies { + compileOnly group: "com.comphenix.protocol", name: "ProtocolLib", version: "4.4.0"; +} +``` + +Then get a reference to ProtocolManager in onLoad() or onEnable() and you're good to go. + +````java +private ProtocolManager protocolManager; + +public void onLoad() { + protocolManager = ProtocolLibrary.getProtocolManager(); +} +```` + +To listen for packets sent by the server to a client, add a server-side listener: + +````java +// Disable all sound effects +protocolManager.addPacketListener( + new PacketAdapter(this, ListenerPriority.NORMAL, + PacketType.Play.Server.NAMED_SOUND_EFFECT) { + @Override + public void onPacketSending(PacketEvent event) { + // Item packets (id: 0x29) + if (event.getPacketType() == + PacketType.Play.Server.NAMED_SOUND_EFFECT) { + event.setCancelled(true); + } + } +}); +```` + +It's also possible to read and modify the content of these packets. For instance, you can create a global +censor by listening for Packet3Chat events: + +````java +// Censor +protocolManager.addPacketListener(new PacketAdapter(this, + ListenerPriority.NORMAL, + PacketType.Play.Client.CHAT) { + @Override + public void onPacketReceiving(PacketEvent event) { + if (event.getPacketType() == PacketType.Play.Client.CHAT) { + PacketContainer packet = event.getPacket(); + String message = packet.getStrings().read(0); + + if (message.contains("shit") + || message.contains("damn")) { + event.setCancelled(true); + event.getPlayer().sendMessage("Bad manners!"); + } + } + } +}); +```` + +### Sending packets + +Normally, you might have to do something ugly like the following: + +````java +Packet60Explosion fakeExplosion = new Packet60Explosion(); + +fakeExplosion.a = player.getLocation().getX(); +fakeExplosion.b = player.getLocation().getY(); +fakeExplosion.c = player.getLocation().getZ(); +fakeExplosion.d = 3.0F; +fakeExplosion.e = new ArrayList(); + +((CraftPlayer) player).getHandle().netServerHandler.sendPacket(fakeExplosion); +```` + +But with ProtocolLib, you can turn that into something more manageable. Notice that +you don't have to create an ArrayList with this version: + +````java + +PacketContainer fakeExplosion = new PacketContainer(PacketType.Play.Server.EXPLOSION); +fakeExplosion.getDoubles(). + write(0, player.getLocation().getX()). + write(1, player.getLocation().getY()). + write(2, player.getLocation().getZ()); +fakeExplosion.getFloat().write(0, 3.0F); + +try { + protocolManager.sendServerPacket(player, fakeExplosion); +} catch (InvocationTargetException e) { + throw new RuntimeException( + "Cannot send packet " + fakeExplosion, e); +} +```` + +### Compatibility + +One of the main goals of this project was to achieve maximum compatibility with CraftBukkit. And the end +result is quite flexible. Aside from netty package changes, it should be resilient against future changes. +It's likely that I won't have to update ProtocolLib for anything but bug fixes and new features. + +How is this possible? It all comes down to reflection in the end. Essentially, no name is hard coded - +every field, method and class is deduced by looking at field types, package names or parameter +types. It's remarkably consistent across different versions. diff --git a/modules/TinyProtocol/pom.xml b/TinyProtocol/pom.xml similarity index 100% rename from modules/TinyProtocol/pom.xml rename to TinyProtocol/pom.xml diff --git a/modules/TinyProtocol/src/main/java/com/comphenix/tinyprotocol/ExamplePlugin.java b/TinyProtocol/src/main/java/com/comphenix/tinyprotocol/ExamplePlugin.java similarity index 100% rename from modules/TinyProtocol/src/main/java/com/comphenix/tinyprotocol/ExamplePlugin.java rename to TinyProtocol/src/main/java/com/comphenix/tinyprotocol/ExamplePlugin.java diff --git a/modules/TinyProtocol/src/main/java/com/comphenix/tinyprotocol/Reflection.java b/TinyProtocol/src/main/java/com/comphenix/tinyprotocol/Reflection.java similarity index 100% rename from modules/TinyProtocol/src/main/java/com/comphenix/tinyprotocol/Reflection.java rename to TinyProtocol/src/main/java/com/comphenix/tinyprotocol/Reflection.java diff --git a/modules/TinyProtocol/src/main/java/com/comphenix/tinyprotocol/TinyProtocol.java b/TinyProtocol/src/main/java/com/comphenix/tinyprotocol/TinyProtocol.java similarity index 100% rename from modules/TinyProtocol/src/main/java/com/comphenix/tinyprotocol/TinyProtocol.java rename to TinyProtocol/src/main/java/com/comphenix/tinyprotocol/TinyProtocol.java diff --git a/modules/TinyProtocol/src/main/resources/plugin.yml b/TinyProtocol/src/main/resources/plugin.yml similarity index 100% rename from modules/TinyProtocol/src/main/resources/plugin.yml rename to TinyProtocol/src/main/resources/plugin.yml diff --git a/build.gradle b/build.gradle new file mode 100644 index 00000000..8121763e --- /dev/null +++ b/build.gradle @@ -0,0 +1,74 @@ +import shadow.org.apache.tools.ant.filters.ReplaceTokens + +plugins { + id 'com.github.johnrengelman.shadow' version '2.0.4' + id 'maven-publish' + id 'java' +} + +group 'com.comphenix.protocol' +version '4.5.0-SNAPSHOT' + +sourceCompatibility = 1.8 + +repositories { + mavenCentral() + jcenter() + maven { url 'http://repo.dmulloy2.net/nexus/repository/public/' } + maven { url 'https://hub.spigotmc.org/nexus/content/groups/public/' } +} + +dependencies { + compile group: 'com.github.jengelman.gradle.plugins', name: 'shadow', version: '2.0.4' + compile group: 'io.netty', name: 'netty-all', version: '4.0.23.Final' + compile group: 'org.spigotmc', name: 'spigot-api', version: '1.13.1-R0.1-SNAPSHOT' + compile group: 'org.spigotmc', name: 'spigot', version: '1.13.1-R0.1-SNAPSHOT' + compile group: 'cglib', name: 'cglib-nodep', version: '3.2.5' + compile group: 'com.comphenix.executors', name: 'BukkitExecutors', version: '1.1-SNAPSHOT' + testCompile group: 'junit', name: 'junit', version: '4.12' + testCompile group: 'org.mockito', name: 'mockito-core', version: '2.21.0' + testCompile group: 'org.powermock', name: 'powermock-module-junit4', version: '1.7.4' + testCompile group: 'org.powermock', name: 'powermock-api-mockito2', version: '1.7.4' +} + +shadowJar { + dependencies { + include(dependency('cglib:.*')) + include(dependency('com.comphenix.executors:.*')) + } + relocate 'net.sf.cglib', 'com.comphenix.net.sf.cglib' + archiveName = 'ProtocolLib.jar' +} + +javadoc { + failOnError = false +} + +processResources { + def fullVersion = version + if (System.getenv('BUILD_NUMBER')) { + fullVersion = version + '-' + System.getenv('BUILD_NUMBER') + } + + with copySpec { + from 'src/main/resources' + filter(ReplaceTokens, tokens: ['fullVersion': fullVersion]) + } +} + +publishing { + publications { + mavenJava(MavenPublication) { + from components.java + afterEvaluate { + artifactId = 'ProtocolLib' + } + } + } + repositories { + maven { + url = version.endsWith('SNAPSHOT') ? 'http://repo.dmulloy2.net/nexus/repository/snapshots/' : + 'http://repo.dmulloy2.net/nexus/repository/releases/' + } + } +} diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..1948b9074f1016d15d505d185bc3f73deb82d8c8 GIT binary patch literal 54413 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 \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=$(save "$@") + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then + cd "$(dirname "$0")" +fi + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 00000000..e95643d6 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,84 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/modules/API/pom.xml b/modules/API/pom.xml deleted file mode 100644 index 6fe71f47..00000000 --- a/modules/API/pom.xml +++ /dev/null @@ -1,193 +0,0 @@ - - 4.0.0 - ProtocolLib-API - ProtocolLib-API - 4.4.0 - - Provides read/write access to the Minecraft protocol. - http://www.spigotmc.org/resources/protocollib.1997/ - jar - - - com.comphenix.protocol - ProtocolLib-Parent - 4.4.0 - ../../ - - - - UTF-8 - - ${project.version} - - - - clean install - src/main/java - - - src/main/resources - true - - **/*.java - - - - - - - maven-compiler-plugin - 3.7.0 - - 1.8 - 1.8 - - - - - org.apache.maven.plugins - maven-jar-plugin - 3.1.0 - - - - com.comphenix.protocol.Application - ProtocolLib - ${project.fullVersion} - dmulloy2 - - - ProtocolLib - - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.22.0 - - - - projectVersion - ${project.version} - - - - - - - - - - jenkins - - - env.BUILD_NUMBER - - - - -b${env.BUILD_NUMBER} - ${project.version}${project.build.number} - - - - - release-sign-artifacts - - - performRelease - true - - - - ${project.version} - - - - - org.apache.maven.plugins - maven-source-plugin - 3.0.0 - - - attach-sources - - jar - - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.10.3 - - - attach-javadocs - - jar - - - - - - - - - - - - - - scm:git:git://github.com/dmulloy2/ProtocolLib.git - scm:git:git@github.com:dmulloy2/ProtocolLib.git - https://github.com/dmulloy2/ProtocolLib - - - - - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - http://www.gnu.org/licenses/gpl-2.0.txt - repo - - - - - - dmulloy2 - Dan Mulloy - http://dmulloy2.net/ - - developer - maintainer - - - - aadnk - Kristian S. Stangeland - kr_stang@hotmail.com - http://comphenix.net/ - - former author - - 1 - - - \ No newline at end of file diff --git a/modules/ProtocolLib/pom.xml b/modules/ProtocolLib/pom.xml deleted file mode 100644 index 62d7dc16..00000000 --- a/modules/ProtocolLib/pom.xml +++ /dev/null @@ -1,265 +0,0 @@ - - 4.0.0 - ProtocolLib - ProtocolLib - 4.4.0 - - Provides read/write access to the Minecraft protocol. - http://www.spigotmc.org/resources/protocollib.1997/ - jar - - - com.comphenix.protocol - ProtocolLib-Parent - 4.4.0 - ../../ - - - - UTF-8 - - ${project.version} - - 1.7.4 - - - - clean install - src/main/java - src/test/java - - - src/main/resources - true - - **/*.java - - - - - - - org.apache.maven.plugins - maven-shade-plugin - 3.1.1 - - - package - - shade - - - false - false - - - - net.sf - com.comphenix.net.sf - - - - - - org.spigotmc:spigot - org.spigotmc:spigot-api - junit:junit - io.netty:* - - - - - - - - - maven-compiler-plugin - 3.7.0 - - 1.8 - 1.8 - - - - - org.apache.maven.plugins - maven-jar-plugin - 3.1.0 - - - - com.comphenix.protocol.Application - ProtocolLib - ${project.fullVersion} - dmulloy2 - - - ${project.name} - - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.22.0 - - - - projectVersion - ${project.version} - - - - - - - - - - jenkins - - - env.BUILD_NUMBER - - - - -b${env.BUILD_NUMBER} - ${project.version}${project.build.number} - - - - - release-sign-artifacts - - - performRelease - true - - - - ${project.version} - - - - - org.apache.maven.plugins - maven-source-plugin - 3.0.0 - - - attach-sources - - jar - - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.10.3 - - - attach-javadocs - - jar - - - - - - - - - - - - - - scm:git:git://github.com/dmulloy2/ProtocolLib.git - scm:git:git@github.com:dmulloy2/ProtocolLib.git - https://github.com/dmulloy2/ProtocolLib - - - - - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - http://www.gnu.org/licenses/gpl-2.0.txt - repo - - - - - - dmulloy2 - Dan Mulloy - http://dmulloy2.net/ - - developer - maintainer - - - - aadnk - Kristian S. Stangeland - kr_stang@hotmail.com - http://comphenix.net/ - - former author - - 1 - - - - - - com.comphenix.protocol - ProtocolLib-API - ${project.version} - compile - - - - - junit - junit - 4.12 - test - - - org.mockito - mockito-core - 2.21.0 - test - - - org.powermock - powermock-module-junit4 - ${powermock.version} - test - - - org.powermock - powermock-api-mockito2 - ${powermock.version} - test - - - \ No newline at end of file diff --git a/pom.xml b/pom.xml deleted file mode 100644 index af28c475..00000000 --- a/pom.xml +++ /dev/null @@ -1,129 +0,0 @@ - - 4.0.0 - com.comphenix.protocol - ProtocolLib-Parent - 4.4.0 - ProtocolLib-Parent - - - UTF-8 - 1.13.1-R0.1-SNAPSHOT - - - - modules/API - modules/ProtocolLib - - - Provides read/write access to the Minecraft protocol. - http://www.spigotmc.org/resources/protocollib.1997/ - pom - 2012 - - - - dmulloy2-releases - http://repo.dmulloy2.net/nexus/repository/releases/ - - - dmulloy2-snapshots - http://repo.dmulloy2.net/nexus/repository/snapshots/ - - - - - - dmulloy2-repo - http://repo.dmulloy2.net/nexus/repository/public/ - - - spigot-repo - https://hub.spigotmc.org/nexus/content/groups/public/ - - - - - - - io.netty - netty-all - 4.0.23.Final - provided - - - org.spigotmc - spigot-api - ${spigotVersion} - provided - - - org.spigotmc - spigot - ${spigotVersion} - provided - - - cglib - cglib-nodep - 3.2.5 - compile - - - com.comphenix.executors - BukkitExecutors - 1.1-SNAPSHOT - compile - - - - - clean package install - ${project.name} - src/main/java - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.7.0 - - - org.apache.maven.plugins - maven-jar-plugin - 3.1.0 - - - maven-javadoc-plugin - 3.0.1 - - false - ISO-8859-1 - ProtocolLib JavaDocs - ProtocolLib JavaDocs - Copyright © {inceptionYear}–{currentYear} - Comphenix and dmulloy2. Licensed under the GNU GPL v2. - - - - install - - aggregate - - - - - - - \ No newline at end of file diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 00000000..a6a8fbfd --- /dev/null +++ b/settings.gradle @@ -0,0 +1,2 @@ +rootProject.name = 'ProtocolLib' + diff --git a/modules/API/src/main/java/com/comphenix/protocol/AsynchronousManager.java b/src/main/java/com/comphenix/protocol/AsynchronousManager.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/AsynchronousManager.java rename to src/main/java/com/comphenix/protocol/AsynchronousManager.java diff --git a/modules/ProtocolLib/src/main/java/com/comphenix/protocol/CleanupStaticMembers.java b/src/main/java/com/comphenix/protocol/CleanupStaticMembers.java similarity index 100% rename from modules/ProtocolLib/src/main/java/com/comphenix/protocol/CleanupStaticMembers.java rename to src/main/java/com/comphenix/protocol/CleanupStaticMembers.java diff --git a/modules/ProtocolLib/src/main/java/com/comphenix/protocol/CommandBase.java b/src/main/java/com/comphenix/protocol/CommandBase.java similarity index 100% rename from modules/ProtocolLib/src/main/java/com/comphenix/protocol/CommandBase.java rename to src/main/java/com/comphenix/protocol/CommandBase.java diff --git a/modules/ProtocolLib/src/main/java/com/comphenix/protocol/CommandFilter.java b/src/main/java/com/comphenix/protocol/CommandFilter.java similarity index 100% rename from modules/ProtocolLib/src/main/java/com/comphenix/protocol/CommandFilter.java rename to src/main/java/com/comphenix/protocol/CommandFilter.java diff --git a/modules/ProtocolLib/src/main/java/com/comphenix/protocol/CommandPacket.java b/src/main/java/com/comphenix/protocol/CommandPacket.java similarity index 100% rename from modules/ProtocolLib/src/main/java/com/comphenix/protocol/CommandPacket.java rename to src/main/java/com/comphenix/protocol/CommandPacket.java diff --git a/modules/ProtocolLib/src/main/java/com/comphenix/protocol/CommandProtocol.java b/src/main/java/com/comphenix/protocol/CommandProtocol.java similarity index 100% rename from modules/ProtocolLib/src/main/java/com/comphenix/protocol/CommandProtocol.java rename to src/main/java/com/comphenix/protocol/CommandProtocol.java diff --git a/modules/ProtocolLib/src/main/java/com/comphenix/protocol/MultipleLinesPrompt.java b/src/main/java/com/comphenix/protocol/MultipleLinesPrompt.java similarity index 100% rename from modules/ProtocolLib/src/main/java/com/comphenix/protocol/MultipleLinesPrompt.java rename to src/main/java/com/comphenix/protocol/MultipleLinesPrompt.java diff --git a/modules/ProtocolLib/src/main/java/com/comphenix/protocol/PacketLogging.java b/src/main/java/com/comphenix/protocol/PacketLogging.java similarity index 100% rename from modules/ProtocolLib/src/main/java/com/comphenix/protocol/PacketLogging.java rename to src/main/java/com/comphenix/protocol/PacketLogging.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/PacketStream.java b/src/main/java/com/comphenix/protocol/PacketStream.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/PacketStream.java rename to src/main/java/com/comphenix/protocol/PacketStream.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/PacketType.java b/src/main/java/com/comphenix/protocol/PacketType.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/PacketType.java rename to src/main/java/com/comphenix/protocol/PacketType.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/PacketTypeEnum.java b/src/main/java/com/comphenix/protocol/PacketTypeEnum.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/PacketTypeEnum.java rename to src/main/java/com/comphenix/protocol/PacketTypeEnum.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/PacketTypeLookup.java b/src/main/java/com/comphenix/protocol/PacketTypeLookup.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/PacketTypeLookup.java rename to src/main/java/com/comphenix/protocol/PacketTypeLookup.java diff --git a/modules/ProtocolLib/src/main/java/com/comphenix/protocol/PacketTypeParser.java b/src/main/java/com/comphenix/protocol/PacketTypeParser.java similarity index 100% rename from modules/ProtocolLib/src/main/java/com/comphenix/protocol/PacketTypeParser.java rename to src/main/java/com/comphenix/protocol/PacketTypeParser.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/Packets.java b/src/main/java/com/comphenix/protocol/Packets.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/Packets.java rename to src/main/java/com/comphenix/protocol/Packets.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/ProtocolConfig.java b/src/main/java/com/comphenix/protocol/ProtocolConfig.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/ProtocolConfig.java rename to src/main/java/com/comphenix/protocol/ProtocolConfig.java diff --git a/modules/ProtocolLib/src/main/java/com/comphenix/protocol/ProtocolLib.java b/src/main/java/com/comphenix/protocol/ProtocolLib.java similarity index 100% rename from modules/ProtocolLib/src/main/java/com/comphenix/protocol/ProtocolLib.java rename to src/main/java/com/comphenix/protocol/ProtocolLib.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/ProtocolLibrary.java b/src/main/java/com/comphenix/protocol/ProtocolLibrary.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/ProtocolLibrary.java rename to src/main/java/com/comphenix/protocol/ProtocolLibrary.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/ProtocolLogger.java b/src/main/java/com/comphenix/protocol/ProtocolLogger.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/ProtocolLogger.java rename to src/main/java/com/comphenix/protocol/ProtocolLogger.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/ProtocolManager.java b/src/main/java/com/comphenix/protocol/ProtocolManager.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/ProtocolManager.java rename to src/main/java/com/comphenix/protocol/ProtocolManager.java diff --git a/modules/ProtocolLib/src/main/java/com/comphenix/protocol/RangeParser.java b/src/main/java/com/comphenix/protocol/RangeParser.java similarity index 100% rename from modules/ProtocolLib/src/main/java/com/comphenix/protocol/RangeParser.java rename to src/main/java/com/comphenix/protocol/RangeParser.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/async/AsyncFilterManager.java b/src/main/java/com/comphenix/protocol/async/AsyncFilterManager.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/async/AsyncFilterManager.java rename to src/main/java/com/comphenix/protocol/async/AsyncFilterManager.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/async/AsyncListenerHandler.java b/src/main/java/com/comphenix/protocol/async/AsyncListenerHandler.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/async/AsyncListenerHandler.java rename to src/main/java/com/comphenix/protocol/async/AsyncListenerHandler.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/async/AsyncMarker.java b/src/main/java/com/comphenix/protocol/async/AsyncMarker.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/async/AsyncMarker.java rename to src/main/java/com/comphenix/protocol/async/AsyncMarker.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/async/AsyncRunnable.java b/src/main/java/com/comphenix/protocol/async/AsyncRunnable.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/async/AsyncRunnable.java rename to src/main/java/com/comphenix/protocol/async/AsyncRunnable.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/async/NullPacketListener.java b/src/main/java/com/comphenix/protocol/async/NullPacketListener.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/async/NullPacketListener.java rename to src/main/java/com/comphenix/protocol/async/NullPacketListener.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/async/PacketEventHolder.java b/src/main/java/com/comphenix/protocol/async/PacketEventHolder.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/async/PacketEventHolder.java rename to src/main/java/com/comphenix/protocol/async/PacketEventHolder.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/async/PacketProcessingQueue.java b/src/main/java/com/comphenix/protocol/async/PacketProcessingQueue.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/async/PacketProcessingQueue.java rename to src/main/java/com/comphenix/protocol/async/PacketProcessingQueue.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/async/PacketSendingQueue.java b/src/main/java/com/comphenix/protocol/async/PacketSendingQueue.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/async/PacketSendingQueue.java rename to src/main/java/com/comphenix/protocol/async/PacketSendingQueue.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/async/PlayerSendingHandler.java b/src/main/java/com/comphenix/protocol/async/PlayerSendingHandler.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/async/PlayerSendingHandler.java rename to src/main/java/com/comphenix/protocol/async/PlayerSendingHandler.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/async/Synchronization.java b/src/main/java/com/comphenix/protocol/async/Synchronization.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/async/Synchronization.java rename to src/main/java/com/comphenix/protocol/async/Synchronization.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/collections/ExpireHashMap.java b/src/main/java/com/comphenix/protocol/collections/ExpireHashMap.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/collections/ExpireHashMap.java rename to src/main/java/com/comphenix/protocol/collections/ExpireHashMap.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/collections/IntegerMap.java b/src/main/java/com/comphenix/protocol/collections/IntegerMap.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/collections/IntegerMap.java rename to src/main/java/com/comphenix/protocol/collections/IntegerMap.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/concurrency/AbstractConcurrentListenerMultimap.java b/src/main/java/com/comphenix/protocol/concurrency/AbstractConcurrentListenerMultimap.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/concurrency/AbstractConcurrentListenerMultimap.java rename to src/main/java/com/comphenix/protocol/concurrency/AbstractConcurrentListenerMultimap.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/concurrency/AbstractIntervalTree.java b/src/main/java/com/comphenix/protocol/concurrency/AbstractIntervalTree.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/concurrency/AbstractIntervalTree.java rename to src/main/java/com/comphenix/protocol/concurrency/AbstractIntervalTree.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/concurrency/BlockingHashMap.java b/src/main/java/com/comphenix/protocol/concurrency/BlockingHashMap.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/concurrency/BlockingHashMap.java rename to src/main/java/com/comphenix/protocol/concurrency/BlockingHashMap.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/concurrency/ConcurrentPlayerMap.java b/src/main/java/com/comphenix/protocol/concurrency/ConcurrentPlayerMap.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/concurrency/ConcurrentPlayerMap.java rename to src/main/java/com/comphenix/protocol/concurrency/ConcurrentPlayerMap.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/concurrency/IntegerSet.java b/src/main/java/com/comphenix/protocol/concurrency/IntegerSet.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/concurrency/IntegerSet.java rename to src/main/java/com/comphenix/protocol/concurrency/IntegerSet.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/concurrency/PacketTypeSet.java b/src/main/java/com/comphenix/protocol/concurrency/PacketTypeSet.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/concurrency/PacketTypeSet.java rename to src/main/java/com/comphenix/protocol/concurrency/PacketTypeSet.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/concurrency/SortedCopyOnWriteArray.java b/src/main/java/com/comphenix/protocol/concurrency/SortedCopyOnWriteArray.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/concurrency/SortedCopyOnWriteArray.java rename to src/main/java/com/comphenix/protocol/concurrency/SortedCopyOnWriteArray.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/error/BasicErrorReporter.java b/src/main/java/com/comphenix/protocol/error/BasicErrorReporter.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/error/BasicErrorReporter.java rename to src/main/java/com/comphenix/protocol/error/BasicErrorReporter.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/error/DelegatedErrorReporter.java b/src/main/java/com/comphenix/protocol/error/DelegatedErrorReporter.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/error/DelegatedErrorReporter.java rename to src/main/java/com/comphenix/protocol/error/DelegatedErrorReporter.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/error/DetailedErrorReporter.java b/src/main/java/com/comphenix/protocol/error/DetailedErrorReporter.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/error/DetailedErrorReporter.java rename to src/main/java/com/comphenix/protocol/error/DetailedErrorReporter.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/error/ErrorReporter.java b/src/main/java/com/comphenix/protocol/error/ErrorReporter.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/error/ErrorReporter.java rename to src/main/java/com/comphenix/protocol/error/ErrorReporter.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/error/PluginContext.java b/src/main/java/com/comphenix/protocol/error/PluginContext.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/error/PluginContext.java rename to src/main/java/com/comphenix/protocol/error/PluginContext.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/error/Report.java b/src/main/java/com/comphenix/protocol/error/Report.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/error/Report.java rename to src/main/java/com/comphenix/protocol/error/Report.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/error/ReportType.java b/src/main/java/com/comphenix/protocol/error/ReportType.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/error/ReportType.java rename to src/main/java/com/comphenix/protocol/error/ReportType.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/error/RethrowErrorReporter.java b/src/main/java/com/comphenix/protocol/error/RethrowErrorReporter.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/error/RethrowErrorReporter.java rename to src/main/java/com/comphenix/protocol/error/RethrowErrorReporter.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/events/ConnectionSide.java b/src/main/java/com/comphenix/protocol/events/ConnectionSide.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/events/ConnectionSide.java rename to src/main/java/com/comphenix/protocol/events/ConnectionSide.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/events/ListenerOptions.java b/src/main/java/com/comphenix/protocol/events/ListenerOptions.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/events/ListenerOptions.java rename to src/main/java/com/comphenix/protocol/events/ListenerOptions.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/events/ListenerPriority.java b/src/main/java/com/comphenix/protocol/events/ListenerPriority.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/events/ListenerPriority.java rename to src/main/java/com/comphenix/protocol/events/ListenerPriority.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/events/ListeningWhitelist.java b/src/main/java/com/comphenix/protocol/events/ListeningWhitelist.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/events/ListeningWhitelist.java rename to src/main/java/com/comphenix/protocol/events/ListeningWhitelist.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/events/MonitorAdapter.java b/src/main/java/com/comphenix/protocol/events/MonitorAdapter.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/events/MonitorAdapter.java rename to src/main/java/com/comphenix/protocol/events/MonitorAdapter.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/events/NetworkMarker.java b/src/main/java/com/comphenix/protocol/events/NetworkMarker.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/events/NetworkMarker.java rename to src/main/java/com/comphenix/protocol/events/NetworkMarker.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/events/PacketAdapter.java b/src/main/java/com/comphenix/protocol/events/PacketAdapter.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/events/PacketAdapter.java rename to src/main/java/com/comphenix/protocol/events/PacketAdapter.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/events/PacketContainer.java b/src/main/java/com/comphenix/protocol/events/PacketContainer.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/events/PacketContainer.java rename to src/main/java/com/comphenix/protocol/events/PacketContainer.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/events/PacketEvent.java b/src/main/java/com/comphenix/protocol/events/PacketEvent.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/events/PacketEvent.java rename to src/main/java/com/comphenix/protocol/events/PacketEvent.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/events/PacketListener.java b/src/main/java/com/comphenix/protocol/events/PacketListener.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/events/PacketListener.java rename to src/main/java/com/comphenix/protocol/events/PacketListener.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/events/PacketMetadata.java b/src/main/java/com/comphenix/protocol/events/PacketMetadata.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/events/PacketMetadata.java rename to src/main/java/com/comphenix/protocol/events/PacketMetadata.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/events/PacketOutputAdapter.java b/src/main/java/com/comphenix/protocol/events/PacketOutputAdapter.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/events/PacketOutputAdapter.java rename to src/main/java/com/comphenix/protocol/events/PacketOutputAdapter.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/events/PacketOutputHandler.java b/src/main/java/com/comphenix/protocol/events/PacketOutputHandler.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/events/PacketOutputHandler.java rename to src/main/java/com/comphenix/protocol/events/PacketOutputHandler.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/events/PacketPostAdapter.java b/src/main/java/com/comphenix/protocol/events/PacketPostAdapter.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/events/PacketPostAdapter.java rename to src/main/java/com/comphenix/protocol/events/PacketPostAdapter.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/events/PacketPostListener.java b/src/main/java/com/comphenix/protocol/events/PacketPostListener.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/events/PacketPostListener.java rename to src/main/java/com/comphenix/protocol/events/PacketPostListener.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/events/ScheduledPacket.java b/src/main/java/com/comphenix/protocol/events/ScheduledPacket.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/events/ScheduledPacket.java rename to src/main/java/com/comphenix/protocol/events/ScheduledPacket.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/events/SerializedOfflinePlayer.java b/src/main/java/com/comphenix/protocol/events/SerializedOfflinePlayer.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/events/SerializedOfflinePlayer.java rename to src/main/java/com/comphenix/protocol/events/SerializedOfflinePlayer.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/injector/BukkitUnwrapper.java b/src/main/java/com/comphenix/protocol/injector/BukkitUnwrapper.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/injector/BukkitUnwrapper.java rename to src/main/java/com/comphenix/protocol/injector/BukkitUnwrapper.java diff --git a/modules/ProtocolLib/src/main/java/com/comphenix/protocol/injector/DelayedPacketManager.java b/src/main/java/com/comphenix/protocol/injector/DelayedPacketManager.java similarity index 100% rename from modules/ProtocolLib/src/main/java/com/comphenix/protocol/injector/DelayedPacketManager.java rename to src/main/java/com/comphenix/protocol/injector/DelayedPacketManager.java diff --git a/modules/ProtocolLib/src/main/java/com/comphenix/protocol/injector/DelayedSingleTask.java b/src/main/java/com/comphenix/protocol/injector/DelayedSingleTask.java similarity index 100% rename from modules/ProtocolLib/src/main/java/com/comphenix/protocol/injector/DelayedSingleTask.java rename to src/main/java/com/comphenix/protocol/injector/DelayedSingleTask.java diff --git a/modules/ProtocolLib/src/main/java/com/comphenix/protocol/injector/EntityUtilities.java b/src/main/java/com/comphenix/protocol/injector/EntityUtilities.java similarity index 100% rename from modules/ProtocolLib/src/main/java/com/comphenix/protocol/injector/EntityUtilities.java rename to src/main/java/com/comphenix/protocol/injector/EntityUtilities.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/injector/GamePhase.java b/src/main/java/com/comphenix/protocol/injector/GamePhase.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/injector/GamePhase.java rename to src/main/java/com/comphenix/protocol/injector/GamePhase.java diff --git a/modules/ProtocolLib/src/main/java/com/comphenix/protocol/injector/InternalManager.java b/src/main/java/com/comphenix/protocol/injector/InternalManager.java similarity index 100% rename from modules/ProtocolLib/src/main/java/com/comphenix/protocol/injector/InternalManager.java rename to src/main/java/com/comphenix/protocol/injector/InternalManager.java diff --git a/modules/ProtocolLib/src/main/java/com/comphenix/protocol/injector/ListenerInvoker.java b/src/main/java/com/comphenix/protocol/injector/ListenerInvoker.java similarity index 100% rename from modules/ProtocolLib/src/main/java/com/comphenix/protocol/injector/ListenerInvoker.java rename to src/main/java/com/comphenix/protocol/injector/ListenerInvoker.java diff --git a/modules/ProtocolLib/src/main/java/com/comphenix/protocol/injector/LoginPackets.java b/src/main/java/com/comphenix/protocol/injector/LoginPackets.java similarity index 100% rename from modules/ProtocolLib/src/main/java/com/comphenix/protocol/injector/LoginPackets.java rename to src/main/java/com/comphenix/protocol/injector/LoginPackets.java diff --git a/modules/ProtocolLib/src/main/java/com/comphenix/protocol/injector/NetworkProcessor.java b/src/main/java/com/comphenix/protocol/injector/NetworkProcessor.java similarity index 100% rename from modules/ProtocolLib/src/main/java/com/comphenix/protocol/injector/NetworkProcessor.java rename to src/main/java/com/comphenix/protocol/injector/NetworkProcessor.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/injector/PacketConstructor.java b/src/main/java/com/comphenix/protocol/injector/PacketConstructor.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/injector/PacketConstructor.java rename to src/main/java/com/comphenix/protocol/injector/PacketConstructor.java diff --git a/modules/ProtocolLib/src/main/java/com/comphenix/protocol/injector/PacketFilterBuilder.java b/src/main/java/com/comphenix/protocol/injector/PacketFilterBuilder.java similarity index 100% rename from modules/ProtocolLib/src/main/java/com/comphenix/protocol/injector/PacketFilterBuilder.java rename to src/main/java/com/comphenix/protocol/injector/PacketFilterBuilder.java diff --git a/modules/ProtocolLib/src/main/java/com/comphenix/protocol/injector/PacketFilterManager.java b/src/main/java/com/comphenix/protocol/injector/PacketFilterManager.java similarity index 100% rename from modules/ProtocolLib/src/main/java/com/comphenix/protocol/injector/PacketFilterManager.java rename to src/main/java/com/comphenix/protocol/injector/PacketFilterManager.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/injector/PlayerInjectHooks.java b/src/main/java/com/comphenix/protocol/injector/PlayerInjectHooks.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/injector/PlayerInjectHooks.java rename to src/main/java/com/comphenix/protocol/injector/PlayerInjectHooks.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/injector/PlayerLoggedOutException.java b/src/main/java/com/comphenix/protocol/injector/PlayerLoggedOutException.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/injector/PlayerLoggedOutException.java rename to src/main/java/com/comphenix/protocol/injector/PlayerLoggedOutException.java diff --git a/modules/ProtocolLib/src/main/java/com/comphenix/protocol/injector/PluginVerifier.java b/src/main/java/com/comphenix/protocol/injector/PluginVerifier.java similarity index 100% rename from modules/ProtocolLib/src/main/java/com/comphenix/protocol/injector/PluginVerifier.java rename to src/main/java/com/comphenix/protocol/injector/PluginVerifier.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/injector/PrioritizedListener.java b/src/main/java/com/comphenix/protocol/injector/PrioritizedListener.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/injector/PrioritizedListener.java rename to src/main/java/com/comphenix/protocol/injector/PrioritizedListener.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/injector/SortedPacketListenerList.java b/src/main/java/com/comphenix/protocol/injector/SortedPacketListenerList.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/injector/SortedPacketListenerList.java rename to src/main/java/com/comphenix/protocol/injector/SortedPacketListenerList.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/injector/StructureCache.java b/src/main/java/com/comphenix/protocol/injector/StructureCache.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/injector/StructureCache.java rename to src/main/java/com/comphenix/protocol/injector/StructureCache.java diff --git a/modules/ProtocolLib/src/main/java/com/comphenix/protocol/injector/netty/BootstrapList.java b/src/main/java/com/comphenix/protocol/injector/netty/BootstrapList.java similarity index 100% rename from modules/ProtocolLib/src/main/java/com/comphenix/protocol/injector/netty/BootstrapList.java rename to src/main/java/com/comphenix/protocol/injector/netty/BootstrapList.java diff --git a/modules/ProtocolLib/src/main/java/com/comphenix/protocol/injector/netty/ChannelInjector.java b/src/main/java/com/comphenix/protocol/injector/netty/ChannelInjector.java similarity index 100% rename from modules/ProtocolLib/src/main/java/com/comphenix/protocol/injector/netty/ChannelInjector.java rename to src/main/java/com/comphenix/protocol/injector/netty/ChannelInjector.java diff --git a/modules/ProtocolLib/src/main/java/com/comphenix/protocol/injector/netty/ChannelListener.java b/src/main/java/com/comphenix/protocol/injector/netty/ChannelListener.java similarity index 100% rename from modules/ProtocolLib/src/main/java/com/comphenix/protocol/injector/netty/ChannelListener.java rename to src/main/java/com/comphenix/protocol/injector/netty/ChannelListener.java diff --git a/modules/ProtocolLib/src/main/java/com/comphenix/protocol/injector/netty/ChannelProxy.java b/src/main/java/com/comphenix/protocol/injector/netty/ChannelProxy.java similarity index 100% rename from modules/ProtocolLib/src/main/java/com/comphenix/protocol/injector/netty/ChannelProxy.java rename to src/main/java/com/comphenix/protocol/injector/netty/ChannelProxy.java diff --git a/modules/ProtocolLib/src/main/java/com/comphenix/protocol/injector/netty/ClosedInjector.java b/src/main/java/com/comphenix/protocol/injector/netty/ClosedInjector.java similarity index 100% rename from modules/ProtocolLib/src/main/java/com/comphenix/protocol/injector/netty/ClosedInjector.java rename to src/main/java/com/comphenix/protocol/injector/netty/ClosedInjector.java diff --git a/modules/ProtocolLib/src/main/java/com/comphenix/protocol/injector/netty/EventLoopProxy.java b/src/main/java/com/comphenix/protocol/injector/netty/EventLoopProxy.java similarity index 100% rename from modules/ProtocolLib/src/main/java/com/comphenix/protocol/injector/netty/EventLoopProxy.java rename to src/main/java/com/comphenix/protocol/injector/netty/EventLoopProxy.java diff --git a/modules/ProtocolLib/src/main/java/com/comphenix/protocol/injector/netty/InjectionFactory.java b/src/main/java/com/comphenix/protocol/injector/netty/InjectionFactory.java similarity index 100% rename from modules/ProtocolLib/src/main/java/com/comphenix/protocol/injector/netty/InjectionFactory.java rename to src/main/java/com/comphenix/protocol/injector/netty/InjectionFactory.java diff --git a/modules/ProtocolLib/src/main/java/com/comphenix/protocol/injector/netty/Injector.java b/src/main/java/com/comphenix/protocol/injector/netty/Injector.java similarity index 100% rename from modules/ProtocolLib/src/main/java/com/comphenix/protocol/injector/netty/Injector.java rename to src/main/java/com/comphenix/protocol/injector/netty/Injector.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/injector/netty/NettyByteBufAdapter.java b/src/main/java/com/comphenix/protocol/injector/netty/NettyByteBufAdapter.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/injector/netty/NettyByteBufAdapter.java rename to src/main/java/com/comphenix/protocol/injector/netty/NettyByteBufAdapter.java diff --git a/modules/ProtocolLib/src/main/java/com/comphenix/protocol/injector/netty/NettyNetworkMarker.java b/src/main/java/com/comphenix/protocol/injector/netty/NettyNetworkMarker.java similarity index 100% rename from modules/ProtocolLib/src/main/java/com/comphenix/protocol/injector/netty/NettyNetworkMarker.java rename to src/main/java/com/comphenix/protocol/injector/netty/NettyNetworkMarker.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/injector/netty/NettyProtocolRegistry.java b/src/main/java/com/comphenix/protocol/injector/netty/NettyProtocolRegistry.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/injector/netty/NettyProtocolRegistry.java rename to src/main/java/com/comphenix/protocol/injector/netty/NettyProtocolRegistry.java diff --git a/modules/ProtocolLib/src/main/java/com/comphenix/protocol/injector/netty/PipelineProxy.java b/src/main/java/com/comphenix/protocol/injector/netty/PipelineProxy.java similarity index 100% rename from modules/ProtocolLib/src/main/java/com/comphenix/protocol/injector/netty/PipelineProxy.java rename to src/main/java/com/comphenix/protocol/injector/netty/PipelineProxy.java diff --git a/modules/ProtocolLib/src/main/java/com/comphenix/protocol/injector/netty/ProtocolInjector.java b/src/main/java/com/comphenix/protocol/injector/netty/ProtocolInjector.java similarity index 100% rename from modules/ProtocolLib/src/main/java/com/comphenix/protocol/injector/netty/ProtocolInjector.java rename to src/main/java/com/comphenix/protocol/injector/netty/ProtocolInjector.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/injector/netty/ProtocolRegistry.java b/src/main/java/com/comphenix/protocol/injector/netty/ProtocolRegistry.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/injector/netty/ProtocolRegistry.java rename to src/main/java/com/comphenix/protocol/injector/netty/ProtocolRegistry.java diff --git a/modules/ProtocolLib/src/main/java/com/comphenix/protocol/injector/netty/SocketAdapter.java b/src/main/java/com/comphenix/protocol/injector/netty/SocketAdapter.java similarity index 100% rename from modules/ProtocolLib/src/main/java/com/comphenix/protocol/injector/netty/SocketAdapter.java rename to src/main/java/com/comphenix/protocol/injector/netty/SocketAdapter.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/injector/netty/WirePacket.java b/src/main/java/com/comphenix/protocol/injector/netty/WirePacket.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/injector/netty/WirePacket.java rename to src/main/java/com/comphenix/protocol/injector/netty/WirePacket.java diff --git a/modules/ProtocolLib/src/main/java/com/comphenix/protocol/injector/packet/CaptureInputStream.java b/src/main/java/com/comphenix/protocol/injector/packet/CaptureInputStream.java similarity index 100% rename from modules/ProtocolLib/src/main/java/com/comphenix/protocol/injector/packet/CaptureInputStream.java rename to src/main/java/com/comphenix/protocol/injector/packet/CaptureInputStream.java diff --git a/modules/ProtocolLib/src/main/java/com/comphenix/protocol/injector/packet/InterceptWritePacket.java b/src/main/java/com/comphenix/protocol/injector/packet/InterceptWritePacket.java similarity index 100% rename from modules/ProtocolLib/src/main/java/com/comphenix/protocol/injector/packet/InterceptWritePacket.java rename to src/main/java/com/comphenix/protocol/injector/packet/InterceptWritePacket.java diff --git a/modules/ProtocolLib/src/main/java/com/comphenix/protocol/injector/packet/InverseMaps.java b/src/main/java/com/comphenix/protocol/injector/packet/InverseMaps.java similarity index 100% rename from modules/ProtocolLib/src/main/java/com/comphenix/protocol/injector/packet/InverseMaps.java rename to src/main/java/com/comphenix/protocol/injector/packet/InverseMaps.java diff --git a/modules/ProtocolLib/src/main/java/com/comphenix/protocol/injector/packet/LegacyNetworkMarker.java b/src/main/java/com/comphenix/protocol/injector/packet/LegacyNetworkMarker.java similarity index 100% rename from modules/ProtocolLib/src/main/java/com/comphenix/protocol/injector/packet/LegacyNetworkMarker.java rename to src/main/java/com/comphenix/protocol/injector/packet/LegacyNetworkMarker.java diff --git a/modules/ProtocolLib/src/main/java/com/comphenix/protocol/injector/packet/LegacyPacketRegistry.java b/src/main/java/com/comphenix/protocol/injector/packet/LegacyPacketRegistry.java similarity index 100% rename from modules/ProtocolLib/src/main/java/com/comphenix/protocol/injector/packet/LegacyPacketRegistry.java rename to src/main/java/com/comphenix/protocol/injector/packet/LegacyPacketRegistry.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/injector/packet/MapContainer.java b/src/main/java/com/comphenix/protocol/injector/packet/MapContainer.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/injector/packet/MapContainer.java rename to src/main/java/com/comphenix/protocol/injector/packet/MapContainer.java diff --git a/modules/ProtocolLib/src/main/java/com/comphenix/protocol/injector/packet/PacketInjector.java b/src/main/java/com/comphenix/protocol/injector/packet/PacketInjector.java similarity index 100% rename from modules/ProtocolLib/src/main/java/com/comphenix/protocol/injector/packet/PacketInjector.java rename to src/main/java/com/comphenix/protocol/injector/packet/PacketInjector.java diff --git a/modules/ProtocolLib/src/main/java/com/comphenix/protocol/injector/packet/PacketInjectorBuilder.java b/src/main/java/com/comphenix/protocol/injector/packet/PacketInjectorBuilder.java similarity index 100% rename from modules/ProtocolLib/src/main/java/com/comphenix/protocol/injector/packet/PacketInjectorBuilder.java rename to src/main/java/com/comphenix/protocol/injector/packet/PacketInjectorBuilder.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/injector/packet/PacketRegistry.java b/src/main/java/com/comphenix/protocol/injector/packet/PacketRegistry.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/injector/packet/PacketRegistry.java rename to src/main/java/com/comphenix/protocol/injector/packet/PacketRegistry.java diff --git a/modules/ProtocolLib/src/main/java/com/comphenix/protocol/injector/packet/ProxyPacketInjector.java b/src/main/java/com/comphenix/protocol/injector/packet/ProxyPacketInjector.java similarity index 100% rename from modules/ProtocolLib/src/main/java/com/comphenix/protocol/injector/packet/ProxyPacketInjector.java rename to src/main/java/com/comphenix/protocol/injector/packet/ProxyPacketInjector.java diff --git a/modules/ProtocolLib/src/main/java/com/comphenix/protocol/injector/packet/ReadPacketModifier.java b/src/main/java/com/comphenix/protocol/injector/packet/ReadPacketModifier.java similarity index 100% rename from modules/ProtocolLib/src/main/java/com/comphenix/protocol/injector/packet/ReadPacketModifier.java rename to src/main/java/com/comphenix/protocol/injector/packet/ReadPacketModifier.java diff --git a/modules/ProtocolLib/src/main/java/com/comphenix/protocol/injector/packet/WritePacketModifier.java b/src/main/java/com/comphenix/protocol/injector/packet/WritePacketModifier.java similarity index 100% rename from modules/ProtocolLib/src/main/java/com/comphenix/protocol/injector/packet/WritePacketModifier.java rename to src/main/java/com/comphenix/protocol/injector/packet/WritePacketModifier.java diff --git a/modules/ProtocolLib/src/main/java/com/comphenix/protocol/injector/player/InjectedArrayList.java b/src/main/java/com/comphenix/protocol/injector/player/InjectedArrayList.java similarity index 100% rename from modules/ProtocolLib/src/main/java/com/comphenix/protocol/injector/player/InjectedArrayList.java rename to src/main/java/com/comphenix/protocol/injector/player/InjectedArrayList.java diff --git a/modules/ProtocolLib/src/main/java/com/comphenix/protocol/injector/player/InjectedServerConnection.java b/src/main/java/com/comphenix/protocol/injector/player/InjectedServerConnection.java similarity index 100% rename from modules/ProtocolLib/src/main/java/com/comphenix/protocol/injector/player/InjectedServerConnection.java rename to src/main/java/com/comphenix/protocol/injector/player/InjectedServerConnection.java diff --git a/modules/ProtocolLib/src/main/java/com/comphenix/protocol/injector/player/NetLoginInjector.java b/src/main/java/com/comphenix/protocol/injector/player/NetLoginInjector.java similarity index 100% rename from modules/ProtocolLib/src/main/java/com/comphenix/protocol/injector/player/NetLoginInjector.java rename to src/main/java/com/comphenix/protocol/injector/player/NetLoginInjector.java diff --git a/modules/ProtocolLib/src/main/java/com/comphenix/protocol/injector/player/NetworkFieldInjector.java b/src/main/java/com/comphenix/protocol/injector/player/NetworkFieldInjector.java similarity index 100% rename from modules/ProtocolLib/src/main/java/com/comphenix/protocol/injector/player/NetworkFieldInjector.java rename to src/main/java/com/comphenix/protocol/injector/player/NetworkFieldInjector.java diff --git a/modules/ProtocolLib/src/main/java/com/comphenix/protocol/injector/player/NetworkObjectInjector.java b/src/main/java/com/comphenix/protocol/injector/player/NetworkObjectInjector.java similarity index 100% rename from modules/ProtocolLib/src/main/java/com/comphenix/protocol/injector/player/NetworkObjectInjector.java rename to src/main/java/com/comphenix/protocol/injector/player/NetworkObjectInjector.java diff --git a/modules/ProtocolLib/src/main/java/com/comphenix/protocol/injector/player/NetworkServerInjector.java b/src/main/java/com/comphenix/protocol/injector/player/NetworkServerInjector.java similarity index 100% rename from modules/ProtocolLib/src/main/java/com/comphenix/protocol/injector/player/NetworkServerInjector.java rename to src/main/java/com/comphenix/protocol/injector/player/NetworkServerInjector.java diff --git a/modules/ProtocolLib/src/main/java/com/comphenix/protocol/injector/player/PlayerInjectionHandler.java b/src/main/java/com/comphenix/protocol/injector/player/PlayerInjectionHandler.java similarity index 100% rename from modules/ProtocolLib/src/main/java/com/comphenix/protocol/injector/player/PlayerInjectionHandler.java rename to src/main/java/com/comphenix/protocol/injector/player/PlayerInjectionHandler.java diff --git a/modules/ProtocolLib/src/main/java/com/comphenix/protocol/injector/player/PlayerInjector.java b/src/main/java/com/comphenix/protocol/injector/player/PlayerInjector.java similarity index 100% rename from modules/ProtocolLib/src/main/java/com/comphenix/protocol/injector/player/PlayerInjector.java rename to src/main/java/com/comphenix/protocol/injector/player/PlayerInjector.java diff --git a/modules/ProtocolLib/src/main/java/com/comphenix/protocol/injector/player/PlayerInjectorBuilder.java b/src/main/java/com/comphenix/protocol/injector/player/PlayerInjectorBuilder.java similarity index 100% rename from modules/ProtocolLib/src/main/java/com/comphenix/protocol/injector/player/PlayerInjectorBuilder.java rename to src/main/java/com/comphenix/protocol/injector/player/PlayerInjectorBuilder.java diff --git a/modules/ProtocolLib/src/main/java/com/comphenix/protocol/injector/player/ProxyPlayerInjectionHandler.java b/src/main/java/com/comphenix/protocol/injector/player/ProxyPlayerInjectionHandler.java similarity index 100% rename from modules/ProtocolLib/src/main/java/com/comphenix/protocol/injector/player/ProxyPlayerInjectionHandler.java rename to src/main/java/com/comphenix/protocol/injector/player/ProxyPlayerInjectionHandler.java diff --git a/modules/ProtocolLib/src/main/java/com/comphenix/protocol/injector/player/ReplacedArrayList.java b/src/main/java/com/comphenix/protocol/injector/player/ReplacedArrayList.java similarity index 100% rename from modules/ProtocolLib/src/main/java/com/comphenix/protocol/injector/player/ReplacedArrayList.java rename to src/main/java/com/comphenix/protocol/injector/player/ReplacedArrayList.java diff --git a/modules/ProtocolLib/src/main/java/com/comphenix/protocol/injector/player/UnsupportedListener.java b/src/main/java/com/comphenix/protocol/injector/player/UnsupportedListener.java similarity index 100% rename from modules/ProtocolLib/src/main/java/com/comphenix/protocol/injector/player/UnsupportedListener.java rename to src/main/java/com/comphenix/protocol/injector/player/UnsupportedListener.java diff --git a/modules/ProtocolLib/src/main/java/com/comphenix/protocol/injector/server/AbstractInputStreamLookup.java b/src/main/java/com/comphenix/protocol/injector/server/AbstractInputStreamLookup.java similarity index 100% rename from modules/ProtocolLib/src/main/java/com/comphenix/protocol/injector/server/AbstractInputStreamLookup.java rename to src/main/java/com/comphenix/protocol/injector/server/AbstractInputStreamLookup.java diff --git a/modules/ProtocolLib/src/main/java/com/comphenix/protocol/injector/server/BukkitSocketInjector.java b/src/main/java/com/comphenix/protocol/injector/server/BukkitSocketInjector.java similarity index 100% rename from modules/ProtocolLib/src/main/java/com/comphenix/protocol/injector/server/BukkitSocketInjector.java rename to src/main/java/com/comphenix/protocol/injector/server/BukkitSocketInjector.java diff --git a/modules/ProtocolLib/src/main/java/com/comphenix/protocol/injector/server/InputStreamLookupBuilder.java b/src/main/java/com/comphenix/protocol/injector/server/InputStreamLookupBuilder.java similarity index 100% rename from modules/ProtocolLib/src/main/java/com/comphenix/protocol/injector/server/InputStreamLookupBuilder.java rename to src/main/java/com/comphenix/protocol/injector/server/InputStreamLookupBuilder.java diff --git a/modules/ProtocolLib/src/main/java/com/comphenix/protocol/injector/server/InputStreamReflectLookup.java b/src/main/java/com/comphenix/protocol/injector/server/InputStreamReflectLookup.java similarity index 100% rename from modules/ProtocolLib/src/main/java/com/comphenix/protocol/injector/server/InputStreamReflectLookup.java rename to src/main/java/com/comphenix/protocol/injector/server/InputStreamReflectLookup.java diff --git a/modules/ProtocolLib/src/main/java/com/comphenix/protocol/injector/server/QueuedSendPacket.java b/src/main/java/com/comphenix/protocol/injector/server/QueuedSendPacket.java similarity index 100% rename from modules/ProtocolLib/src/main/java/com/comphenix/protocol/injector/server/QueuedSendPacket.java rename to src/main/java/com/comphenix/protocol/injector/server/QueuedSendPacket.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/injector/server/SocketInjector.java b/src/main/java/com/comphenix/protocol/injector/server/SocketInjector.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/injector/server/SocketInjector.java rename to src/main/java/com/comphenix/protocol/injector/server/SocketInjector.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/injector/server/TemporaryPlayer.java b/src/main/java/com/comphenix/protocol/injector/server/TemporaryPlayer.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/injector/server/TemporaryPlayer.java rename to src/main/java/com/comphenix/protocol/injector/server/TemporaryPlayer.java diff --git a/modules/ProtocolLib/src/main/java/com/comphenix/protocol/injector/server/TemporaryPlayerFactory.java b/src/main/java/com/comphenix/protocol/injector/server/TemporaryPlayerFactory.java similarity index 100% rename from modules/ProtocolLib/src/main/java/com/comphenix/protocol/injector/server/TemporaryPlayerFactory.java rename to src/main/java/com/comphenix/protocol/injector/server/TemporaryPlayerFactory.java diff --git a/modules/ProtocolLib/src/main/java/com/comphenix/protocol/injector/spigot/AbstractPacketInjector.java b/src/main/java/com/comphenix/protocol/injector/spigot/AbstractPacketInjector.java similarity index 100% rename from modules/ProtocolLib/src/main/java/com/comphenix/protocol/injector/spigot/AbstractPacketInjector.java rename to src/main/java/com/comphenix/protocol/injector/spigot/AbstractPacketInjector.java diff --git a/modules/ProtocolLib/src/main/java/com/comphenix/protocol/injector/spigot/AbstractPlayerHandler.java b/src/main/java/com/comphenix/protocol/injector/spigot/AbstractPlayerHandler.java similarity index 100% rename from modules/ProtocolLib/src/main/java/com/comphenix/protocol/injector/spigot/AbstractPlayerHandler.java rename to src/main/java/com/comphenix/protocol/injector/spigot/AbstractPlayerHandler.java diff --git a/modules/ProtocolLib/src/main/java/com/comphenix/protocol/injector/spigot/DummyPacketInjector.java b/src/main/java/com/comphenix/protocol/injector/spigot/DummyPacketInjector.java similarity index 100% rename from modules/ProtocolLib/src/main/java/com/comphenix/protocol/injector/spigot/DummyPacketInjector.java rename to src/main/java/com/comphenix/protocol/injector/spigot/DummyPacketInjector.java diff --git a/modules/ProtocolLib/src/main/java/com/comphenix/protocol/injector/spigot/DummyPlayerHandler.java b/src/main/java/com/comphenix/protocol/injector/spigot/DummyPlayerHandler.java similarity index 100% rename from modules/ProtocolLib/src/main/java/com/comphenix/protocol/injector/spigot/DummyPlayerHandler.java rename to src/main/java/com/comphenix/protocol/injector/spigot/DummyPlayerHandler.java diff --git a/modules/ProtocolLib/src/main/java/com/comphenix/protocol/injector/spigot/SpigotPacketInjector.java b/src/main/java/com/comphenix/protocol/injector/spigot/SpigotPacketInjector.java similarity index 100% rename from modules/ProtocolLib/src/main/java/com/comphenix/protocol/injector/spigot/SpigotPacketInjector.java rename to src/main/java/com/comphenix/protocol/injector/spigot/SpigotPacketInjector.java diff --git a/modules/ProtocolLib/src/main/java/com/comphenix/protocol/injector/spigot/SpigotPacketListener.java b/src/main/java/com/comphenix/protocol/injector/spigot/SpigotPacketListener.java similarity index 100% rename from modules/ProtocolLib/src/main/java/com/comphenix/protocol/injector/spigot/SpigotPacketListener.java rename to src/main/java/com/comphenix/protocol/injector/spigot/SpigotPacketListener.java diff --git a/modules/ProtocolLib/src/main/java/com/comphenix/protocol/metrics/Metrics.java b/src/main/java/com/comphenix/protocol/metrics/Metrics.java similarity index 100% rename from modules/ProtocolLib/src/main/java/com/comphenix/protocol/metrics/Metrics.java rename to src/main/java/com/comphenix/protocol/metrics/Metrics.java diff --git a/modules/ProtocolLib/src/main/java/com/comphenix/protocol/metrics/Statistics.java b/src/main/java/com/comphenix/protocol/metrics/Statistics.java similarity index 100% rename from modules/ProtocolLib/src/main/java/com/comphenix/protocol/metrics/Statistics.java rename to src/main/java/com/comphenix/protocol/metrics/Statistics.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/package-info.java b/src/main/java/com/comphenix/protocol/package-info.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/package-info.java rename to src/main/java/com/comphenix/protocol/package-info.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/reflect/ClassAnalyser.java b/src/main/java/com/comphenix/protocol/reflect/ClassAnalyser.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/reflect/ClassAnalyser.java rename to src/main/java/com/comphenix/protocol/reflect/ClassAnalyser.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/reflect/EquivalentConverter.java b/src/main/java/com/comphenix/protocol/reflect/EquivalentConverter.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/reflect/EquivalentConverter.java rename to src/main/java/com/comphenix/protocol/reflect/EquivalentConverter.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/reflect/ExactReflection.java b/src/main/java/com/comphenix/protocol/reflect/ExactReflection.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/reflect/ExactReflection.java rename to src/main/java/com/comphenix/protocol/reflect/ExactReflection.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/reflect/FieldAccessException.java b/src/main/java/com/comphenix/protocol/reflect/FieldAccessException.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/reflect/FieldAccessException.java rename to src/main/java/com/comphenix/protocol/reflect/FieldAccessException.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/reflect/FieldUtils.java b/src/main/java/com/comphenix/protocol/reflect/FieldUtils.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/reflect/FieldUtils.java rename to src/main/java/com/comphenix/protocol/reflect/FieldUtils.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/reflect/FuzzyReflection.java b/src/main/java/com/comphenix/protocol/reflect/FuzzyReflection.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/reflect/FuzzyReflection.java rename to src/main/java/com/comphenix/protocol/reflect/FuzzyReflection.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/reflect/IntEnum.java b/src/main/java/com/comphenix/protocol/reflect/IntEnum.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/reflect/IntEnum.java rename to src/main/java/com/comphenix/protocol/reflect/IntEnum.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/reflect/MethodInfo.java b/src/main/java/com/comphenix/protocol/reflect/MethodInfo.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/reflect/MethodInfo.java rename to src/main/java/com/comphenix/protocol/reflect/MethodInfo.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/reflect/MethodUtils.java b/src/main/java/com/comphenix/protocol/reflect/MethodUtils.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/reflect/MethodUtils.java rename to src/main/java/com/comphenix/protocol/reflect/MethodUtils.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/reflect/ObjectWriter.java b/src/main/java/com/comphenix/protocol/reflect/ObjectWriter.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/reflect/ObjectWriter.java rename to src/main/java/com/comphenix/protocol/reflect/ObjectWriter.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/reflect/PrettyPrinter.java b/src/main/java/com/comphenix/protocol/reflect/PrettyPrinter.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/reflect/PrettyPrinter.java rename to src/main/java/com/comphenix/protocol/reflect/PrettyPrinter.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/reflect/StructureModifier.java b/src/main/java/com/comphenix/protocol/reflect/StructureModifier.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/reflect/StructureModifier.java rename to src/main/java/com/comphenix/protocol/reflect/StructureModifier.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/reflect/VolatileField.java b/src/main/java/com/comphenix/protocol/reflect/VolatileField.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/reflect/VolatileField.java rename to src/main/java/com/comphenix/protocol/reflect/VolatileField.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/reflect/accessors/Accessors.java b/src/main/java/com/comphenix/protocol/reflect/accessors/Accessors.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/reflect/accessors/Accessors.java rename to src/main/java/com/comphenix/protocol/reflect/accessors/Accessors.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/reflect/accessors/ConstructorAccessor.java b/src/main/java/com/comphenix/protocol/reflect/accessors/ConstructorAccessor.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/reflect/accessors/ConstructorAccessor.java rename to src/main/java/com/comphenix/protocol/reflect/accessors/ConstructorAccessor.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/reflect/accessors/DefaultConstrutorAccessor.java b/src/main/java/com/comphenix/protocol/reflect/accessors/DefaultConstrutorAccessor.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/reflect/accessors/DefaultConstrutorAccessor.java rename to src/main/java/com/comphenix/protocol/reflect/accessors/DefaultConstrutorAccessor.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/reflect/accessors/DefaultFieldAccessor.java b/src/main/java/com/comphenix/protocol/reflect/accessors/DefaultFieldAccessor.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/reflect/accessors/DefaultFieldAccessor.java rename to src/main/java/com/comphenix/protocol/reflect/accessors/DefaultFieldAccessor.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/reflect/accessors/DefaultMethodAccessor.java b/src/main/java/com/comphenix/protocol/reflect/accessors/DefaultMethodAccessor.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/reflect/accessors/DefaultMethodAccessor.java rename to src/main/java/com/comphenix/protocol/reflect/accessors/DefaultMethodAccessor.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/reflect/accessors/FieldAccessor.java b/src/main/java/com/comphenix/protocol/reflect/accessors/FieldAccessor.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/reflect/accessors/FieldAccessor.java rename to src/main/java/com/comphenix/protocol/reflect/accessors/FieldAccessor.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/reflect/accessors/MethodAccessor.java b/src/main/java/com/comphenix/protocol/reflect/accessors/MethodAccessor.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/reflect/accessors/MethodAccessor.java rename to src/main/java/com/comphenix/protocol/reflect/accessors/MethodAccessor.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/reflect/accessors/ReadOnlyFieldAccessor.java b/src/main/java/com/comphenix/protocol/reflect/accessors/ReadOnlyFieldAccessor.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/reflect/accessors/ReadOnlyFieldAccessor.java rename to src/main/java/com/comphenix/protocol/reflect/accessors/ReadOnlyFieldAccessor.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/reflect/cloning/AggregateCloner.java b/src/main/java/com/comphenix/protocol/reflect/cloning/AggregateCloner.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/reflect/cloning/AggregateCloner.java rename to src/main/java/com/comphenix/protocol/reflect/cloning/AggregateCloner.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/reflect/cloning/BukkitCloner.java b/src/main/java/com/comphenix/protocol/reflect/cloning/BukkitCloner.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/reflect/cloning/BukkitCloner.java rename to src/main/java/com/comphenix/protocol/reflect/cloning/BukkitCloner.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/reflect/cloning/Cloner.java b/src/main/java/com/comphenix/protocol/reflect/cloning/Cloner.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/reflect/cloning/Cloner.java rename to src/main/java/com/comphenix/protocol/reflect/cloning/Cloner.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/reflect/cloning/CollectionCloner.java b/src/main/java/com/comphenix/protocol/reflect/cloning/CollectionCloner.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/reflect/cloning/CollectionCloner.java rename to src/main/java/com/comphenix/protocol/reflect/cloning/CollectionCloner.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/reflect/cloning/FieldCloner.java b/src/main/java/com/comphenix/protocol/reflect/cloning/FieldCloner.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/reflect/cloning/FieldCloner.java rename to src/main/java/com/comphenix/protocol/reflect/cloning/FieldCloner.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/reflect/cloning/GuavaOptionalCloner.java b/src/main/java/com/comphenix/protocol/reflect/cloning/GuavaOptionalCloner.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/reflect/cloning/GuavaOptionalCloner.java rename to src/main/java/com/comphenix/protocol/reflect/cloning/GuavaOptionalCloner.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/reflect/cloning/ImmutableDetector.java b/src/main/java/com/comphenix/protocol/reflect/cloning/ImmutableDetector.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/reflect/cloning/ImmutableDetector.java rename to src/main/java/com/comphenix/protocol/reflect/cloning/ImmutableDetector.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/reflect/cloning/JavaOptionalCloner.java b/src/main/java/com/comphenix/protocol/reflect/cloning/JavaOptionalCloner.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/reflect/cloning/JavaOptionalCloner.java rename to src/main/java/com/comphenix/protocol/reflect/cloning/JavaOptionalCloner.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/reflect/cloning/NullableCloner.java b/src/main/java/com/comphenix/protocol/reflect/cloning/NullableCloner.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/reflect/cloning/NullableCloner.java rename to src/main/java/com/comphenix/protocol/reflect/cloning/NullableCloner.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/reflect/cloning/SerializableCloner.java b/src/main/java/com/comphenix/protocol/reflect/cloning/SerializableCloner.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/reflect/cloning/SerializableCloner.java rename to src/main/java/com/comphenix/protocol/reflect/cloning/SerializableCloner.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/reflect/compiler/BackgroundCompiler.java b/src/main/java/com/comphenix/protocol/reflect/compiler/BackgroundCompiler.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/reflect/compiler/BackgroundCompiler.java rename to src/main/java/com/comphenix/protocol/reflect/compiler/BackgroundCompiler.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/reflect/compiler/BoxingHelper.java b/src/main/java/com/comphenix/protocol/reflect/compiler/BoxingHelper.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/reflect/compiler/BoxingHelper.java rename to src/main/java/com/comphenix/protocol/reflect/compiler/BoxingHelper.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/reflect/compiler/CompileListener.java b/src/main/java/com/comphenix/protocol/reflect/compiler/CompileListener.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/reflect/compiler/CompileListener.java rename to src/main/java/com/comphenix/protocol/reflect/compiler/CompileListener.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/reflect/compiler/CompiledStructureModifier.java b/src/main/java/com/comphenix/protocol/reflect/compiler/CompiledStructureModifier.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/reflect/compiler/CompiledStructureModifier.java rename to src/main/java/com/comphenix/protocol/reflect/compiler/CompiledStructureModifier.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/reflect/compiler/MethodDescriptor.java b/src/main/java/com/comphenix/protocol/reflect/compiler/MethodDescriptor.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/reflect/compiler/MethodDescriptor.java rename to src/main/java/com/comphenix/protocol/reflect/compiler/MethodDescriptor.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/reflect/compiler/StructureCompiler.java b/src/main/java/com/comphenix/protocol/reflect/compiler/StructureCompiler.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/reflect/compiler/StructureCompiler.java rename to src/main/java/com/comphenix/protocol/reflect/compiler/StructureCompiler.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/reflect/fuzzy/AbstractFuzzyMatcher.java b/src/main/java/com/comphenix/protocol/reflect/fuzzy/AbstractFuzzyMatcher.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/reflect/fuzzy/AbstractFuzzyMatcher.java rename to src/main/java/com/comphenix/protocol/reflect/fuzzy/AbstractFuzzyMatcher.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/reflect/fuzzy/AbstractFuzzyMember.java b/src/main/java/com/comphenix/protocol/reflect/fuzzy/AbstractFuzzyMember.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/reflect/fuzzy/AbstractFuzzyMember.java rename to src/main/java/com/comphenix/protocol/reflect/fuzzy/AbstractFuzzyMember.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/reflect/fuzzy/ClassExactMatcher.java b/src/main/java/com/comphenix/protocol/reflect/fuzzy/ClassExactMatcher.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/reflect/fuzzy/ClassExactMatcher.java rename to src/main/java/com/comphenix/protocol/reflect/fuzzy/ClassExactMatcher.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/reflect/fuzzy/ClassRegexMatcher.java b/src/main/java/com/comphenix/protocol/reflect/fuzzy/ClassRegexMatcher.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/reflect/fuzzy/ClassRegexMatcher.java rename to src/main/java/com/comphenix/protocol/reflect/fuzzy/ClassRegexMatcher.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/reflect/fuzzy/ClassSetMatcher.java b/src/main/java/com/comphenix/protocol/reflect/fuzzy/ClassSetMatcher.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/reflect/fuzzy/ClassSetMatcher.java rename to src/main/java/com/comphenix/protocol/reflect/fuzzy/ClassSetMatcher.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/reflect/fuzzy/FuzzyClassContract.java b/src/main/java/com/comphenix/protocol/reflect/fuzzy/FuzzyClassContract.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/reflect/fuzzy/FuzzyClassContract.java rename to src/main/java/com/comphenix/protocol/reflect/fuzzy/FuzzyClassContract.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/reflect/fuzzy/FuzzyFieldContract.java b/src/main/java/com/comphenix/protocol/reflect/fuzzy/FuzzyFieldContract.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/reflect/fuzzy/FuzzyFieldContract.java rename to src/main/java/com/comphenix/protocol/reflect/fuzzy/FuzzyFieldContract.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/reflect/fuzzy/FuzzyMatchers.java b/src/main/java/com/comphenix/protocol/reflect/fuzzy/FuzzyMatchers.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/reflect/fuzzy/FuzzyMatchers.java rename to src/main/java/com/comphenix/protocol/reflect/fuzzy/FuzzyMatchers.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/reflect/fuzzy/FuzzyMethodContract.java b/src/main/java/com/comphenix/protocol/reflect/fuzzy/FuzzyMethodContract.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/reflect/fuzzy/FuzzyMethodContract.java rename to src/main/java/com/comphenix/protocol/reflect/fuzzy/FuzzyMethodContract.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/reflect/instances/BannedGenerator.java b/src/main/java/com/comphenix/protocol/reflect/instances/BannedGenerator.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/reflect/instances/BannedGenerator.java rename to src/main/java/com/comphenix/protocol/reflect/instances/BannedGenerator.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/reflect/instances/CollectionGenerator.java b/src/main/java/com/comphenix/protocol/reflect/instances/CollectionGenerator.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/reflect/instances/CollectionGenerator.java rename to src/main/java/com/comphenix/protocol/reflect/instances/CollectionGenerator.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/reflect/instances/DefaultInstances.java b/src/main/java/com/comphenix/protocol/reflect/instances/DefaultInstances.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/reflect/instances/DefaultInstances.java rename to src/main/java/com/comphenix/protocol/reflect/instances/DefaultInstances.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/reflect/instances/ExistingGenerator.java b/src/main/java/com/comphenix/protocol/reflect/instances/ExistingGenerator.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/reflect/instances/ExistingGenerator.java rename to src/main/java/com/comphenix/protocol/reflect/instances/ExistingGenerator.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/reflect/instances/InstanceProvider.java b/src/main/java/com/comphenix/protocol/reflect/instances/InstanceProvider.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/reflect/instances/InstanceProvider.java rename to src/main/java/com/comphenix/protocol/reflect/instances/InstanceProvider.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/reflect/instances/NotConstructableException.java b/src/main/java/com/comphenix/protocol/reflect/instances/NotConstructableException.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/reflect/instances/NotConstructableException.java rename to src/main/java/com/comphenix/protocol/reflect/instances/NotConstructableException.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/reflect/instances/PrimitiveGenerator.java b/src/main/java/com/comphenix/protocol/reflect/instances/PrimitiveGenerator.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/reflect/instances/PrimitiveGenerator.java rename to src/main/java/com/comphenix/protocol/reflect/instances/PrimitiveGenerator.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/timing/HistogramStream.java b/src/main/java/com/comphenix/protocol/timing/HistogramStream.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/timing/HistogramStream.java rename to src/main/java/com/comphenix/protocol/timing/HistogramStream.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/timing/OnlineComputation.java b/src/main/java/com/comphenix/protocol/timing/OnlineComputation.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/timing/OnlineComputation.java rename to src/main/java/com/comphenix/protocol/timing/OnlineComputation.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/timing/StatisticsStream.java b/src/main/java/com/comphenix/protocol/timing/StatisticsStream.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/timing/StatisticsStream.java rename to src/main/java/com/comphenix/protocol/timing/StatisticsStream.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/timing/TimedListenerManager.java b/src/main/java/com/comphenix/protocol/timing/TimedListenerManager.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/timing/TimedListenerManager.java rename to src/main/java/com/comphenix/protocol/timing/TimedListenerManager.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/timing/TimedTracker.java b/src/main/java/com/comphenix/protocol/timing/TimedTracker.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/timing/TimedTracker.java rename to src/main/java/com/comphenix/protocol/timing/TimedTracker.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/timing/TimingReportGenerator.java b/src/main/java/com/comphenix/protocol/timing/TimingReportGenerator.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/timing/TimingReportGenerator.java rename to src/main/java/com/comphenix/protocol/timing/TimingReportGenerator.java diff --git a/modules/ProtocolLib/src/main/java/com/comphenix/protocol/updater/BukkitUpdater.java b/src/main/java/com/comphenix/protocol/updater/BukkitUpdater.java similarity index 100% rename from modules/ProtocolLib/src/main/java/com/comphenix/protocol/updater/BukkitUpdater.java rename to src/main/java/com/comphenix/protocol/updater/BukkitUpdater.java diff --git a/modules/ProtocolLib/src/main/java/com/comphenix/protocol/updater/SpigotUpdater.java b/src/main/java/com/comphenix/protocol/updater/SpigotUpdater.java similarity index 100% rename from modules/ProtocolLib/src/main/java/com/comphenix/protocol/updater/SpigotUpdater.java rename to src/main/java/com/comphenix/protocol/updater/SpigotUpdater.java diff --git a/modules/ProtocolLib/src/main/java/com/comphenix/protocol/updater/Updater.java b/src/main/java/com/comphenix/protocol/updater/Updater.java similarity index 100% rename from modules/ProtocolLib/src/main/java/com/comphenix/protocol/updater/Updater.java rename to src/main/java/com/comphenix/protocol/updater/Updater.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/utility/ByteBufferInputStream.java b/src/main/java/com/comphenix/protocol/utility/ByteBufferInputStream.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/utility/ByteBufferInputStream.java rename to src/main/java/com/comphenix/protocol/utility/ByteBufferInputStream.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/utility/ByteBufferOutputStream.java b/src/main/java/com/comphenix/protocol/utility/ByteBufferOutputStream.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/utility/ByteBufferOutputStream.java rename to src/main/java/com/comphenix/protocol/utility/ByteBufferOutputStream.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/utility/CachedPackage.java b/src/main/java/com/comphenix/protocol/utility/CachedPackage.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/utility/CachedPackage.java rename to src/main/java/com/comphenix/protocol/utility/CachedPackage.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/utility/ChatExtensions.java b/src/main/java/com/comphenix/protocol/utility/ChatExtensions.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/utility/ChatExtensions.java rename to src/main/java/com/comphenix/protocol/utility/ChatExtensions.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/utility/ClassSource.java b/src/main/java/com/comphenix/protocol/utility/ClassSource.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/utility/ClassSource.java rename to src/main/java/com/comphenix/protocol/utility/ClassSource.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/utility/Closer.java b/src/main/java/com/comphenix/protocol/utility/Closer.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/utility/Closer.java rename to src/main/java/com/comphenix/protocol/utility/Closer.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/utility/Constants.java b/src/main/java/com/comphenix/protocol/utility/Constants.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/utility/Constants.java rename to src/main/java/com/comphenix/protocol/utility/Constants.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/utility/EnhancerFactory.java b/src/main/java/com/comphenix/protocol/utility/EnhancerFactory.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/utility/EnhancerFactory.java rename to src/main/java/com/comphenix/protocol/utility/EnhancerFactory.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/utility/HexDumper.java b/src/main/java/com/comphenix/protocol/utility/HexDumper.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/utility/HexDumper.java rename to src/main/java/com/comphenix/protocol/utility/HexDumper.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/utility/MinecraftFields.java b/src/main/java/com/comphenix/protocol/utility/MinecraftFields.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/utility/MinecraftFields.java rename to src/main/java/com/comphenix/protocol/utility/MinecraftFields.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/utility/MinecraftMethods.java b/src/main/java/com/comphenix/protocol/utility/MinecraftMethods.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/utility/MinecraftMethods.java rename to src/main/java/com/comphenix/protocol/utility/MinecraftMethods.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/utility/MinecraftProtocolVersion.java b/src/main/java/com/comphenix/protocol/utility/MinecraftProtocolVersion.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/utility/MinecraftProtocolVersion.java rename to src/main/java/com/comphenix/protocol/utility/MinecraftProtocolVersion.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/utility/MinecraftReflection.java b/src/main/java/com/comphenix/protocol/utility/MinecraftReflection.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/utility/MinecraftReflection.java rename to src/main/java/com/comphenix/protocol/utility/MinecraftReflection.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/utility/MinecraftVersion.java b/src/main/java/com/comphenix/protocol/utility/MinecraftVersion.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/utility/MinecraftVersion.java rename to src/main/java/com/comphenix/protocol/utility/MinecraftVersion.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/utility/RemappedClassSource.java b/src/main/java/com/comphenix/protocol/utility/RemappedClassSource.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/utility/RemappedClassSource.java rename to src/main/java/com/comphenix/protocol/utility/RemappedClassSource.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/utility/SafeCacheBuilder.java b/src/main/java/com/comphenix/protocol/utility/SafeCacheBuilder.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/utility/SafeCacheBuilder.java rename to src/main/java/com/comphenix/protocol/utility/SafeCacheBuilder.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/utility/SnapshotVersion.java b/src/main/java/com/comphenix/protocol/utility/SnapshotVersion.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/utility/SnapshotVersion.java rename to src/main/java/com/comphenix/protocol/utility/SnapshotVersion.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/utility/StreamSerializer.java b/src/main/java/com/comphenix/protocol/utility/StreamSerializer.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/utility/StreamSerializer.java rename to src/main/java/com/comphenix/protocol/utility/StreamSerializer.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/utility/Util.java b/src/main/java/com/comphenix/protocol/utility/Util.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/utility/Util.java rename to src/main/java/com/comphenix/protocol/utility/Util.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/wrappers/AbstractWrapper.java b/src/main/java/com/comphenix/protocol/wrappers/AbstractWrapper.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/wrappers/AbstractWrapper.java rename to src/main/java/com/comphenix/protocol/wrappers/AbstractWrapper.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/wrappers/AutoWrapper.java b/src/main/java/com/comphenix/protocol/wrappers/AutoWrapper.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/wrappers/AutoWrapper.java rename to src/main/java/com/comphenix/protocol/wrappers/AutoWrapper.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/wrappers/BlockPosition.java b/src/main/java/com/comphenix/protocol/wrappers/BlockPosition.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/wrappers/BlockPosition.java rename to src/main/java/com/comphenix/protocol/wrappers/BlockPosition.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/wrappers/BukkitConverters.java b/src/main/java/com/comphenix/protocol/wrappers/BukkitConverters.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/wrappers/BukkitConverters.java rename to src/main/java/com/comphenix/protocol/wrappers/BukkitConverters.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/wrappers/ChunkCoordIntPair.java b/src/main/java/com/comphenix/protocol/wrappers/ChunkCoordIntPair.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/wrappers/ChunkCoordIntPair.java rename to src/main/java/com/comphenix/protocol/wrappers/ChunkCoordIntPair.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/wrappers/ChunkPosition.java b/src/main/java/com/comphenix/protocol/wrappers/ChunkPosition.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/wrappers/ChunkPosition.java rename to src/main/java/com/comphenix/protocol/wrappers/ChunkPosition.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/wrappers/ClonableWrapper.java b/src/main/java/com/comphenix/protocol/wrappers/ClonableWrapper.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/wrappers/ClonableWrapper.java rename to src/main/java/com/comphenix/protocol/wrappers/ClonableWrapper.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/wrappers/ComponentConverter.java b/src/main/java/com/comphenix/protocol/wrappers/ComponentConverter.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/wrappers/ComponentConverter.java rename to src/main/java/com/comphenix/protocol/wrappers/ComponentConverter.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/wrappers/ComponentParser.java b/src/main/java/com/comphenix/protocol/wrappers/ComponentParser.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/wrappers/ComponentParser.java rename to src/main/java/com/comphenix/protocol/wrappers/ComponentParser.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/wrappers/Converters.java b/src/main/java/com/comphenix/protocol/wrappers/Converters.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/wrappers/Converters.java rename to src/main/java/com/comphenix/protocol/wrappers/Converters.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/wrappers/EnumWrappers.java b/src/main/java/com/comphenix/protocol/wrappers/EnumWrappers.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/wrappers/EnumWrappers.java rename to src/main/java/com/comphenix/protocol/wrappers/EnumWrappers.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/wrappers/GuavaReflection.java b/src/main/java/com/comphenix/protocol/wrappers/GuavaReflection.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/wrappers/GuavaReflection.java rename to src/main/java/com/comphenix/protocol/wrappers/GuavaReflection.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/wrappers/GuavaWrappers.java b/src/main/java/com/comphenix/protocol/wrappers/GuavaWrappers.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/wrappers/GuavaWrappers.java rename to src/main/java/com/comphenix/protocol/wrappers/GuavaWrappers.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/wrappers/MinecraftKey.java b/src/main/java/com/comphenix/protocol/wrappers/MinecraftKey.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/wrappers/MinecraftKey.java rename to src/main/java/com/comphenix/protocol/wrappers/MinecraftKey.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/wrappers/MultiBlockChangeInfo.java b/src/main/java/com/comphenix/protocol/wrappers/MultiBlockChangeInfo.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/wrappers/MultiBlockChangeInfo.java rename to src/main/java/com/comphenix/protocol/wrappers/MultiBlockChangeInfo.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/wrappers/PlayerInfoData.java b/src/main/java/com/comphenix/protocol/wrappers/PlayerInfoData.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/wrappers/PlayerInfoData.java rename to src/main/java/com/comphenix/protocol/wrappers/PlayerInfoData.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/wrappers/TroveWrapper.java b/src/main/java/com/comphenix/protocol/wrappers/TroveWrapper.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/wrappers/TroveWrapper.java rename to src/main/java/com/comphenix/protocol/wrappers/TroveWrapper.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/wrappers/Vector3F.java b/src/main/java/com/comphenix/protocol/wrappers/Vector3F.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/wrappers/Vector3F.java rename to src/main/java/com/comphenix/protocol/wrappers/Vector3F.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/wrappers/WrappedAttribute.java b/src/main/java/com/comphenix/protocol/wrappers/WrappedAttribute.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/wrappers/WrappedAttribute.java rename to src/main/java/com/comphenix/protocol/wrappers/WrappedAttribute.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/wrappers/WrappedAttributeModifier.java b/src/main/java/com/comphenix/protocol/wrappers/WrappedAttributeModifier.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/wrappers/WrappedAttributeModifier.java rename to src/main/java/com/comphenix/protocol/wrappers/WrappedAttributeModifier.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/wrappers/WrappedBlockData.java b/src/main/java/com/comphenix/protocol/wrappers/WrappedBlockData.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/wrappers/WrappedBlockData.java rename to src/main/java/com/comphenix/protocol/wrappers/WrappedBlockData.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/wrappers/WrappedChatComponent.java b/src/main/java/com/comphenix/protocol/wrappers/WrappedChatComponent.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/wrappers/WrappedChatComponent.java rename to src/main/java/com/comphenix/protocol/wrappers/WrappedChatComponent.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/wrappers/WrappedChunkCoordinate.java b/src/main/java/com/comphenix/protocol/wrappers/WrappedChunkCoordinate.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/wrappers/WrappedChunkCoordinate.java rename to src/main/java/com/comphenix/protocol/wrappers/WrappedChunkCoordinate.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/wrappers/WrappedDataWatcher.java b/src/main/java/com/comphenix/protocol/wrappers/WrappedDataWatcher.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/wrappers/WrappedDataWatcher.java rename to src/main/java/com/comphenix/protocol/wrappers/WrappedDataWatcher.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/wrappers/WrappedGameProfile.java b/src/main/java/com/comphenix/protocol/wrappers/WrappedGameProfile.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/wrappers/WrappedGameProfile.java rename to src/main/java/com/comphenix/protocol/wrappers/WrappedGameProfile.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/wrappers/WrappedIntHashMap.java b/src/main/java/com/comphenix/protocol/wrappers/WrappedIntHashMap.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/wrappers/WrappedIntHashMap.java rename to src/main/java/com/comphenix/protocol/wrappers/WrappedIntHashMap.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/wrappers/WrappedParticle.java b/src/main/java/com/comphenix/protocol/wrappers/WrappedParticle.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/wrappers/WrappedParticle.java rename to src/main/java/com/comphenix/protocol/wrappers/WrappedParticle.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/wrappers/WrappedServerPing.java b/src/main/java/com/comphenix/protocol/wrappers/WrappedServerPing.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/wrappers/WrappedServerPing.java rename to src/main/java/com/comphenix/protocol/wrappers/WrappedServerPing.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/wrappers/WrappedSignedProperty.java b/src/main/java/com/comphenix/protocol/wrappers/WrappedSignedProperty.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/wrappers/WrappedSignedProperty.java rename to src/main/java/com/comphenix/protocol/wrappers/WrappedSignedProperty.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/wrappers/WrappedStatistic.java b/src/main/java/com/comphenix/protocol/wrappers/WrappedStatistic.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/wrappers/WrappedStatistic.java rename to src/main/java/com/comphenix/protocol/wrappers/WrappedStatistic.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/wrappers/WrappedWatchableObject.java b/src/main/java/com/comphenix/protocol/wrappers/WrappedWatchableObject.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/wrappers/WrappedWatchableObject.java rename to src/main/java/com/comphenix/protocol/wrappers/WrappedWatchableObject.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/wrappers/collection/AbstractConverted.java b/src/main/java/com/comphenix/protocol/wrappers/collection/AbstractConverted.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/wrappers/collection/AbstractConverted.java rename to src/main/java/com/comphenix/protocol/wrappers/collection/AbstractConverted.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/wrappers/collection/BiFunction.java b/src/main/java/com/comphenix/protocol/wrappers/collection/BiFunction.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/wrappers/collection/BiFunction.java rename to src/main/java/com/comphenix/protocol/wrappers/collection/BiFunction.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/wrappers/collection/CachedCollection.java b/src/main/java/com/comphenix/protocol/wrappers/collection/CachedCollection.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/wrappers/collection/CachedCollection.java rename to src/main/java/com/comphenix/protocol/wrappers/collection/CachedCollection.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/wrappers/collection/CachedSet.java b/src/main/java/com/comphenix/protocol/wrappers/collection/CachedSet.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/wrappers/collection/CachedSet.java rename to src/main/java/com/comphenix/protocol/wrappers/collection/CachedSet.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/wrappers/collection/ConvertedCollection.java b/src/main/java/com/comphenix/protocol/wrappers/collection/ConvertedCollection.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/wrappers/collection/ConvertedCollection.java rename to src/main/java/com/comphenix/protocol/wrappers/collection/ConvertedCollection.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/wrappers/collection/ConvertedList.java b/src/main/java/com/comphenix/protocol/wrappers/collection/ConvertedList.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/wrappers/collection/ConvertedList.java rename to src/main/java/com/comphenix/protocol/wrappers/collection/ConvertedList.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/wrappers/collection/ConvertedMap.java b/src/main/java/com/comphenix/protocol/wrappers/collection/ConvertedMap.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/wrappers/collection/ConvertedMap.java rename to src/main/java/com/comphenix/protocol/wrappers/collection/ConvertedMap.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/wrappers/collection/ConvertedMultimap.java b/src/main/java/com/comphenix/protocol/wrappers/collection/ConvertedMultimap.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/wrappers/collection/ConvertedMultimap.java rename to src/main/java/com/comphenix/protocol/wrappers/collection/ConvertedMultimap.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/wrappers/collection/ConvertedSet.java b/src/main/java/com/comphenix/protocol/wrappers/collection/ConvertedSet.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/wrappers/collection/ConvertedSet.java rename to src/main/java/com/comphenix/protocol/wrappers/collection/ConvertedSet.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/wrappers/nbt/MemoryElement.java b/src/main/java/com/comphenix/protocol/wrappers/nbt/MemoryElement.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/wrappers/nbt/MemoryElement.java rename to src/main/java/com/comphenix/protocol/wrappers/nbt/MemoryElement.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/wrappers/nbt/NameProperty.java b/src/main/java/com/comphenix/protocol/wrappers/nbt/NameProperty.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/wrappers/nbt/NameProperty.java rename to src/main/java/com/comphenix/protocol/wrappers/nbt/NameProperty.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/wrappers/nbt/NbtBase.java b/src/main/java/com/comphenix/protocol/wrappers/nbt/NbtBase.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/wrappers/nbt/NbtBase.java rename to src/main/java/com/comphenix/protocol/wrappers/nbt/NbtBase.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/wrappers/nbt/NbtCompound.java b/src/main/java/com/comphenix/protocol/wrappers/nbt/NbtCompound.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/wrappers/nbt/NbtCompound.java rename to src/main/java/com/comphenix/protocol/wrappers/nbt/NbtCompound.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/wrappers/nbt/NbtFactory.java b/src/main/java/com/comphenix/protocol/wrappers/nbt/NbtFactory.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/wrappers/nbt/NbtFactory.java rename to src/main/java/com/comphenix/protocol/wrappers/nbt/NbtFactory.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/wrappers/nbt/NbtList.java b/src/main/java/com/comphenix/protocol/wrappers/nbt/NbtList.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/wrappers/nbt/NbtList.java rename to src/main/java/com/comphenix/protocol/wrappers/nbt/NbtList.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/wrappers/nbt/NbtType.java b/src/main/java/com/comphenix/protocol/wrappers/nbt/NbtType.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/wrappers/nbt/NbtType.java rename to src/main/java/com/comphenix/protocol/wrappers/nbt/NbtType.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/wrappers/nbt/NbtVisitor.java b/src/main/java/com/comphenix/protocol/wrappers/nbt/NbtVisitor.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/wrappers/nbt/NbtVisitor.java rename to src/main/java/com/comphenix/protocol/wrappers/nbt/NbtVisitor.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/wrappers/nbt/NbtWrapper.java b/src/main/java/com/comphenix/protocol/wrappers/nbt/NbtWrapper.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/wrappers/nbt/NbtWrapper.java rename to src/main/java/com/comphenix/protocol/wrappers/nbt/NbtWrapper.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/wrappers/nbt/TileEntityAccessor.java b/src/main/java/com/comphenix/protocol/wrappers/nbt/TileEntityAccessor.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/wrappers/nbt/TileEntityAccessor.java rename to src/main/java/com/comphenix/protocol/wrappers/nbt/TileEntityAccessor.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/wrappers/nbt/WrappedCompound.java b/src/main/java/com/comphenix/protocol/wrappers/nbt/WrappedCompound.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/wrappers/nbt/WrappedCompound.java rename to src/main/java/com/comphenix/protocol/wrappers/nbt/WrappedCompound.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/wrappers/nbt/WrappedElement.java b/src/main/java/com/comphenix/protocol/wrappers/nbt/WrappedElement.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/wrappers/nbt/WrappedElement.java rename to src/main/java/com/comphenix/protocol/wrappers/nbt/WrappedElement.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/wrappers/nbt/WrappedList.java b/src/main/java/com/comphenix/protocol/wrappers/nbt/WrappedList.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/wrappers/nbt/WrappedList.java rename to src/main/java/com/comphenix/protocol/wrappers/nbt/WrappedList.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/wrappers/nbt/io/NbtBinarySerializer.java b/src/main/java/com/comphenix/protocol/wrappers/nbt/io/NbtBinarySerializer.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/wrappers/nbt/io/NbtBinarySerializer.java rename to src/main/java/com/comphenix/protocol/wrappers/nbt/io/NbtBinarySerializer.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/wrappers/nbt/io/NbtConfigurationSerializer.java b/src/main/java/com/comphenix/protocol/wrappers/nbt/io/NbtConfigurationSerializer.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/wrappers/nbt/io/NbtConfigurationSerializer.java rename to src/main/java/com/comphenix/protocol/wrappers/nbt/io/NbtConfigurationSerializer.java diff --git a/modules/API/src/main/java/com/comphenix/protocol/wrappers/nbt/io/NbtTextSerializer.java b/src/main/java/com/comphenix/protocol/wrappers/nbt/io/NbtTextSerializer.java similarity index 100% rename from modules/API/src/main/java/com/comphenix/protocol/wrappers/nbt/io/NbtTextSerializer.java rename to src/main/java/com/comphenix/protocol/wrappers/nbt/io/NbtTextSerializer.java diff --git a/modules/ProtocolLib/src/main/resources/config.yml b/src/main/resources/config.yml similarity index 100% rename from modules/ProtocolLib/src/main/resources/config.yml rename to src/main/resources/config.yml diff --git a/modules/ProtocolLib/src/main/resources/plugin.yml b/src/main/resources/plugin.yml similarity index 100% rename from modules/ProtocolLib/src/main/resources/plugin.yml rename to src/main/resources/plugin.yml diff --git a/modules/ProtocolLib/src/test/java/com/comphenix/integration/protocol/SimpleCraftBukkitITCase.java b/src/test/java/com/comphenix/integration/protocol/SimpleCraftBukkitITCase.java similarity index 98% rename from modules/ProtocolLib/src/test/java/com/comphenix/integration/protocol/SimpleCraftBukkitITCase.java rename to src/test/java/com/comphenix/integration/protocol/SimpleCraftBukkitITCase.java index 209f0e59..39b95a14 100644 --- a/modules/ProtocolLib/src/test/java/com/comphenix/integration/protocol/SimpleCraftBukkitITCase.java +++ b/src/test/java/com/comphenix/integration/protocol/SimpleCraftBukkitITCase.java @@ -30,6 +30,7 @@ import com.comphenix.protocol.reflect.FieldUtils; import com.google.common.collect.Lists; import com.google.common.io.Files; +// TODO Migrate this to Gradle if necessary // Damn final classes ... @RunWith(org.powermock.modules.junit4.PowerMockRunner.class) @PowerMockIgnore({ "org.apache.log4j.*", "org.apache.logging.*", "org.bukkit.craftbukkit.libs.jline.*" }) @@ -51,7 +52,7 @@ public class SimpleCraftBukkitITCase { * @throws IOException Unable to setup server. * @throws InterruptedException Thread interrupted. */ - @BeforeClass + //@BeforeClass public static void setupCraftBukkit() throws Exception { setupPlugins(); @@ -89,12 +90,12 @@ public class SimpleCraftBukkitITCase { /** * Close the CraftBukkit server when they're done. */ - @AfterClass + //@AfterClass public static void shutdownCraftBukkit() { Bukkit.shutdown(); } - @Test + //@Test public void testPingPacket() throws Throwable { TestPingPacket.newTest().startTest(FAKE_PLUGIN); } diff --git a/modules/ProtocolLib/src/test/java/com/comphenix/integration/protocol/SimpleMinecraftClient.java b/src/test/java/com/comphenix/integration/protocol/SimpleMinecraftClient.java similarity index 100% rename from modules/ProtocolLib/src/test/java/com/comphenix/integration/protocol/SimpleMinecraftClient.java rename to src/test/java/com/comphenix/integration/protocol/SimpleMinecraftClient.java diff --git a/modules/ProtocolLib/src/test/java/com/comphenix/integration/protocol/TestPingPacket.java b/src/test/java/com/comphenix/integration/protocol/TestPingPacket.java similarity index 100% rename from modules/ProtocolLib/src/test/java/com/comphenix/integration/protocol/TestPingPacket.java rename to src/test/java/com/comphenix/integration/protocol/TestPingPacket.java diff --git a/modules/ProtocolLib/src/test/java/com/comphenix/protocol/BukkitInitialization.java b/src/test/java/com/comphenix/protocol/BukkitInitialization.java similarity index 100% rename from modules/ProtocolLib/src/test/java/com/comphenix/protocol/BukkitInitialization.java rename to src/test/java/com/comphenix/protocol/BukkitInitialization.java diff --git a/modules/ProtocolLib/src/test/java/com/comphenix/protocol/MinecraftVersionTest.java b/src/test/java/com/comphenix/protocol/MinecraftVersionTest.java similarity index 100% rename from modules/ProtocolLib/src/test/java/com/comphenix/protocol/MinecraftVersionTest.java rename to src/test/java/com/comphenix/protocol/MinecraftVersionTest.java diff --git a/modules/ProtocolLib/src/test/java/com/comphenix/protocol/PacketTypeTest.java b/src/test/java/com/comphenix/protocol/PacketTypeTest.java similarity index 100% rename from modules/ProtocolLib/src/test/java/com/comphenix/protocol/PacketTypeTest.java rename to src/test/java/com/comphenix/protocol/PacketTypeTest.java diff --git a/modules/ProtocolLib/src/test/java/com/comphenix/protocol/concurrency/BlockingHashMapTest.java b/src/test/java/com/comphenix/protocol/concurrency/BlockingHashMapTest.java similarity index 100% rename from modules/ProtocolLib/src/test/java/com/comphenix/protocol/concurrency/BlockingHashMapTest.java rename to src/test/java/com/comphenix/protocol/concurrency/BlockingHashMapTest.java diff --git a/modules/ProtocolLib/src/test/java/com/comphenix/protocol/events/PacketContainerTest.java b/src/test/java/com/comphenix/protocol/events/PacketContainerTest.java similarity index 100% rename from modules/ProtocolLib/src/test/java/com/comphenix/protocol/events/PacketContainerTest.java rename to src/test/java/com/comphenix/protocol/events/PacketContainerTest.java diff --git a/modules/ProtocolLib/src/test/java/com/comphenix/protocol/injector/PluginVerifierTest.java b/src/test/java/com/comphenix/protocol/injector/PluginVerifierTest.java similarity index 100% rename from modules/ProtocolLib/src/test/java/com/comphenix/protocol/injector/PluginVerifierTest.java rename to src/test/java/com/comphenix/protocol/injector/PluginVerifierTest.java diff --git a/modules/ProtocolLib/src/test/java/com/comphenix/protocol/injector/SortedCopyOnWriteArrayTest.java b/src/test/java/com/comphenix/protocol/injector/SortedCopyOnWriteArrayTest.java similarity index 100% rename from modules/ProtocolLib/src/test/java/com/comphenix/protocol/injector/SortedCopyOnWriteArrayTest.java rename to src/test/java/com/comphenix/protocol/injector/SortedCopyOnWriteArrayTest.java diff --git a/modules/ProtocolLib/src/test/java/com/comphenix/protocol/injector/WirePacketTest.java b/src/test/java/com/comphenix/protocol/injector/WirePacketTest.java similarity index 100% rename from modules/ProtocolLib/src/test/java/com/comphenix/protocol/injector/WirePacketTest.java rename to src/test/java/com/comphenix/protocol/injector/WirePacketTest.java diff --git a/modules/ProtocolLib/src/test/java/com/comphenix/protocol/reflect/accessors/AccessorsTest.java b/src/test/java/com/comphenix/protocol/reflect/accessors/AccessorsTest.java similarity index 100% rename from modules/ProtocolLib/src/test/java/com/comphenix/protocol/reflect/accessors/AccessorsTest.java rename to src/test/java/com/comphenix/protocol/reflect/accessors/AccessorsTest.java diff --git a/modules/ProtocolLib/src/test/java/com/comphenix/protocol/reflect/cloning/AggregateClonerTest.java b/src/test/java/com/comphenix/protocol/reflect/cloning/AggregateClonerTest.java similarity index 100% rename from modules/ProtocolLib/src/test/java/com/comphenix/protocol/reflect/cloning/AggregateClonerTest.java rename to src/test/java/com/comphenix/protocol/reflect/cloning/AggregateClonerTest.java diff --git a/modules/ProtocolLib/src/test/java/com/comphenix/protocol/updater/UpdaterTest.java b/src/test/java/com/comphenix/protocol/updater/UpdaterTest.java similarity index 100% rename from modules/ProtocolLib/src/test/java/com/comphenix/protocol/updater/UpdaterTest.java rename to src/test/java/com/comphenix/protocol/updater/UpdaterTest.java diff --git a/modules/ProtocolLib/src/test/java/com/comphenix/protocol/utility/MinecraftMethodsTest.java b/src/test/java/com/comphenix/protocol/utility/MinecraftMethodsTest.java similarity index 100% rename from modules/ProtocolLib/src/test/java/com/comphenix/protocol/utility/MinecraftMethodsTest.java rename to src/test/java/com/comphenix/protocol/utility/MinecraftMethodsTest.java diff --git a/modules/ProtocolLib/src/test/java/com/comphenix/protocol/utility/MinecraftReflectionTest.java b/src/test/java/com/comphenix/protocol/utility/MinecraftReflectionTest.java similarity index 100% rename from modules/ProtocolLib/src/test/java/com/comphenix/protocol/utility/MinecraftReflectionTest.java rename to src/test/java/com/comphenix/protocol/utility/MinecraftReflectionTest.java diff --git a/modules/ProtocolLib/src/test/java/com/comphenix/protocol/utility/SnapshotVersionTest.java b/src/test/java/com/comphenix/protocol/utility/SnapshotVersionTest.java similarity index 100% rename from modules/ProtocolLib/src/test/java/com/comphenix/protocol/utility/SnapshotVersionTest.java rename to src/test/java/com/comphenix/protocol/utility/SnapshotVersionTest.java diff --git a/modules/ProtocolLib/src/test/java/com/comphenix/protocol/utility/StreamSerializerTest.java b/src/test/java/com/comphenix/protocol/utility/StreamSerializerTest.java similarity index 100% rename from modules/ProtocolLib/src/test/java/com/comphenix/protocol/utility/StreamSerializerTest.java rename to src/test/java/com/comphenix/protocol/utility/StreamSerializerTest.java diff --git a/modules/ProtocolLib/src/test/java/com/comphenix/protocol/utility/TestUtils.java b/src/test/java/com/comphenix/protocol/utility/TestUtils.java similarity index 100% rename from modules/ProtocolLib/src/test/java/com/comphenix/protocol/utility/TestUtils.java rename to src/test/java/com/comphenix/protocol/utility/TestUtils.java diff --git a/modules/ProtocolLib/src/test/java/com/comphenix/protocol/wrappers/BukkitConvertersTest.java b/src/test/java/com/comphenix/protocol/wrappers/BukkitConvertersTest.java similarity index 100% rename from modules/ProtocolLib/src/test/java/com/comphenix/protocol/wrappers/BukkitConvertersTest.java rename to src/test/java/com/comphenix/protocol/wrappers/BukkitConvertersTest.java diff --git a/modules/ProtocolLib/src/test/java/com/comphenix/protocol/wrappers/ChunkCoordIntPairTest.java b/src/test/java/com/comphenix/protocol/wrappers/ChunkCoordIntPairTest.java similarity index 100% rename from modules/ProtocolLib/src/test/java/com/comphenix/protocol/wrappers/ChunkCoordIntPairTest.java rename to src/test/java/com/comphenix/protocol/wrappers/ChunkCoordIntPairTest.java diff --git a/modules/ProtocolLib/src/test/java/com/comphenix/protocol/wrappers/CloningTest.java b/src/test/java/com/comphenix/protocol/wrappers/CloningTest.java similarity index 100% rename from modules/ProtocolLib/src/test/java/com/comphenix/protocol/wrappers/CloningTest.java rename to src/test/java/com/comphenix/protocol/wrappers/CloningTest.java diff --git a/modules/ProtocolLib/src/test/java/com/comphenix/protocol/wrappers/EnumWrappersTest.java b/src/test/java/com/comphenix/protocol/wrappers/EnumWrappersTest.java similarity index 100% rename from modules/ProtocolLib/src/test/java/com/comphenix/protocol/wrappers/EnumWrappersTest.java rename to src/test/java/com/comphenix/protocol/wrappers/EnumWrappersTest.java diff --git a/modules/ProtocolLib/src/test/java/com/comphenix/protocol/wrappers/MultiBlockChangeTest.java b/src/test/java/com/comphenix/protocol/wrappers/MultiBlockChangeTest.java similarity index 100% rename from modules/ProtocolLib/src/test/java/com/comphenix/protocol/wrappers/MultiBlockChangeTest.java rename to src/test/java/com/comphenix/protocol/wrappers/MultiBlockChangeTest.java diff --git a/modules/ProtocolLib/src/test/java/com/comphenix/protocol/wrappers/PlayerInfoDataTest.java b/src/test/java/com/comphenix/protocol/wrappers/PlayerInfoDataTest.java similarity index 100% rename from modules/ProtocolLib/src/test/java/com/comphenix/protocol/wrappers/PlayerInfoDataTest.java rename to src/test/java/com/comphenix/protocol/wrappers/PlayerInfoDataTest.java diff --git a/modules/ProtocolLib/src/test/java/com/comphenix/protocol/wrappers/WrappedAttributeTest.java b/src/test/java/com/comphenix/protocol/wrappers/WrappedAttributeTest.java similarity index 100% rename from modules/ProtocolLib/src/test/java/com/comphenix/protocol/wrappers/WrappedAttributeTest.java rename to src/test/java/com/comphenix/protocol/wrappers/WrappedAttributeTest.java diff --git a/modules/ProtocolLib/src/test/java/com/comphenix/protocol/wrappers/WrappedBlockDataTest.java b/src/test/java/com/comphenix/protocol/wrappers/WrappedBlockDataTest.java similarity index 100% rename from modules/ProtocolLib/src/test/java/com/comphenix/protocol/wrappers/WrappedBlockDataTest.java rename to src/test/java/com/comphenix/protocol/wrappers/WrappedBlockDataTest.java diff --git a/modules/ProtocolLib/src/test/java/com/comphenix/protocol/wrappers/WrappedChatComponentTest.java b/src/test/java/com/comphenix/protocol/wrappers/WrappedChatComponentTest.java similarity index 100% rename from modules/ProtocolLib/src/test/java/com/comphenix/protocol/wrappers/WrappedChatComponentTest.java rename to src/test/java/com/comphenix/protocol/wrappers/WrappedChatComponentTest.java diff --git a/modules/ProtocolLib/src/test/java/com/comphenix/protocol/wrappers/WrappedDataWatcherTest.java b/src/test/java/com/comphenix/protocol/wrappers/WrappedDataWatcherTest.java similarity index 100% rename from modules/ProtocolLib/src/test/java/com/comphenix/protocol/wrappers/WrappedDataWatcherTest.java rename to src/test/java/com/comphenix/protocol/wrappers/WrappedDataWatcherTest.java diff --git a/modules/ProtocolLib/src/test/java/com/comphenix/protocol/wrappers/WrappedGameProfileTest.java b/src/test/java/com/comphenix/protocol/wrappers/WrappedGameProfileTest.java similarity index 100% rename from modules/ProtocolLib/src/test/java/com/comphenix/protocol/wrappers/WrappedGameProfileTest.java rename to src/test/java/com/comphenix/protocol/wrappers/WrappedGameProfileTest.java diff --git a/modules/ProtocolLib/src/test/java/com/comphenix/protocol/wrappers/WrappedIntHashMapTest.java b/src/test/java/com/comphenix/protocol/wrappers/WrappedIntHashMapTest.java similarity index 100% rename from modules/ProtocolLib/src/test/java/com/comphenix/protocol/wrappers/WrappedIntHashMapTest.java rename to src/test/java/com/comphenix/protocol/wrappers/WrappedIntHashMapTest.java diff --git a/modules/ProtocolLib/src/test/java/com/comphenix/protocol/wrappers/WrappedParticleTest.java b/src/test/java/com/comphenix/protocol/wrappers/WrappedParticleTest.java similarity index 100% rename from modules/ProtocolLib/src/test/java/com/comphenix/protocol/wrappers/WrappedParticleTest.java rename to src/test/java/com/comphenix/protocol/wrappers/WrappedParticleTest.java diff --git a/modules/ProtocolLib/src/test/java/com/comphenix/protocol/wrappers/WrappedServerPingTest.java b/src/test/java/com/comphenix/protocol/wrappers/WrappedServerPingTest.java similarity index 100% rename from modules/ProtocolLib/src/test/java/com/comphenix/protocol/wrappers/WrappedServerPingTest.java rename to src/test/java/com/comphenix/protocol/wrappers/WrappedServerPingTest.java diff --git a/modules/ProtocolLib/src/test/java/com/comphenix/protocol/wrappers/nbt/NbtCompoundTest.java b/src/test/java/com/comphenix/protocol/wrappers/nbt/NbtCompoundTest.java similarity index 100% rename from modules/ProtocolLib/src/test/java/com/comphenix/protocol/wrappers/nbt/NbtCompoundTest.java rename to src/test/java/com/comphenix/protocol/wrappers/nbt/NbtCompoundTest.java diff --git a/modules/ProtocolLib/src/test/java/com/comphenix/protocol/wrappers/nbt/NbtFactoryTest.java b/src/test/java/com/comphenix/protocol/wrappers/nbt/NbtFactoryTest.java similarity index 100% rename from modules/ProtocolLib/src/test/java/com/comphenix/protocol/wrappers/nbt/NbtFactoryTest.java rename to src/test/java/com/comphenix/protocol/wrappers/nbt/NbtFactoryTest.java diff --git a/modules/ProtocolLib/src/test/java/com/comphenix/protocol/wrappers/nbt/TileEntityTest.java b/src/test/java/com/comphenix/protocol/wrappers/nbt/TileEntityTest.java similarity index 100% rename from modules/ProtocolLib/src/test/java/com/comphenix/protocol/wrappers/nbt/TileEntityTest.java rename to src/test/java/com/comphenix/protocol/wrappers/nbt/TileEntityTest.java diff --git a/modules/ProtocolLib/src/test/java/com/comphenix/protocol/wrappers/nbt/io/NbtConfigurationSerializerTest.java b/src/test/java/com/comphenix/protocol/wrappers/nbt/io/NbtConfigurationSerializerTest.java similarity index 100% rename from modules/ProtocolLib/src/test/java/com/comphenix/protocol/wrappers/nbt/io/NbtConfigurationSerializerTest.java rename to src/test/java/com/comphenix/protocol/wrappers/nbt/io/NbtConfigurationSerializerTest.java diff --git a/modules/ProtocolLib/src/test/resources/tux.png b/src/test/resources/tux.png similarity index 100% rename from modules/ProtocolLib/src/test/resources/tux.png rename to src/test/resources/tux.png