diff --git a/build.gradle b/build.gradle index a4bdcb9a..c5dda50a 100644 --- a/build.gradle +++ b/build.gradle @@ -34,13 +34,13 @@ subprojects { sourceSets { main { java { - srcDirs = ['src/main'] + srcDirs = ['src/main/java'] } } test { java { - srcDirs = ['src/test'] + srcDirs = ['src/test/java'] } } } diff --git a/cache/src/main/org/apollo/cache/FileDescriptor.java b/cache/src/main/java/org/apollo/cache/FileDescriptor.java similarity index 100% rename from cache/src/main/org/apollo/cache/FileDescriptor.java rename to cache/src/main/java/org/apollo/cache/FileDescriptor.java diff --git a/cache/src/main/org/apollo/cache/FileSystemConstants.java b/cache/src/main/java/org/apollo/cache/FileSystemConstants.java similarity index 100% rename from cache/src/main/org/apollo/cache/FileSystemConstants.java rename to cache/src/main/java/org/apollo/cache/FileSystemConstants.java diff --git a/cache/src/main/org/apollo/cache/Index.java b/cache/src/main/java/org/apollo/cache/Index.java similarity index 100% rename from cache/src/main/org/apollo/cache/Index.java rename to cache/src/main/java/org/apollo/cache/Index.java diff --git a/cache/src/main/org/apollo/cache/IndexedFileSystem.java b/cache/src/main/java/org/apollo/cache/IndexedFileSystem.java similarity index 100% rename from cache/src/main/org/apollo/cache/IndexedFileSystem.java rename to cache/src/main/java/org/apollo/cache/IndexedFileSystem.java diff --git a/cache/src/main/org/apollo/cache/archive/Archive.java b/cache/src/main/java/org/apollo/cache/archive/Archive.java similarity index 100% rename from cache/src/main/org/apollo/cache/archive/Archive.java rename to cache/src/main/java/org/apollo/cache/archive/Archive.java diff --git a/cache/src/main/org/apollo/cache/archive/ArchiveEntry.java b/cache/src/main/java/org/apollo/cache/archive/ArchiveEntry.java similarity index 100% rename from cache/src/main/org/apollo/cache/archive/ArchiveEntry.java rename to cache/src/main/java/org/apollo/cache/archive/ArchiveEntry.java diff --git a/cache/src/main/org/apollo/cache/archive/package-info.java b/cache/src/main/java/org/apollo/cache/archive/package-info.java similarity index 100% rename from cache/src/main/org/apollo/cache/archive/package-info.java rename to cache/src/main/java/org/apollo/cache/archive/package-info.java diff --git a/cache/src/main/org/apollo/cache/decoder/ItemDefinitionDecoder.java b/cache/src/main/java/org/apollo/cache/decoder/ItemDefinitionDecoder.java similarity index 100% rename from cache/src/main/org/apollo/cache/decoder/ItemDefinitionDecoder.java rename to cache/src/main/java/org/apollo/cache/decoder/ItemDefinitionDecoder.java diff --git a/cache/src/main/org/apollo/cache/decoder/NpcDefinitionDecoder.java b/cache/src/main/java/org/apollo/cache/decoder/NpcDefinitionDecoder.java similarity index 100% rename from cache/src/main/org/apollo/cache/decoder/NpcDefinitionDecoder.java rename to cache/src/main/java/org/apollo/cache/decoder/NpcDefinitionDecoder.java diff --git a/cache/src/main/org/apollo/cache/decoder/ObjectDefinitionDecoder.java b/cache/src/main/java/org/apollo/cache/decoder/ObjectDefinitionDecoder.java similarity index 100% rename from cache/src/main/org/apollo/cache/decoder/ObjectDefinitionDecoder.java rename to cache/src/main/java/org/apollo/cache/decoder/ObjectDefinitionDecoder.java diff --git a/cache/src/main/org/apollo/cache/decoder/package-info.java b/cache/src/main/java/org/apollo/cache/decoder/package-info.java similarity index 100% rename from cache/src/main/org/apollo/cache/decoder/package-info.java rename to cache/src/main/java/org/apollo/cache/decoder/package-info.java diff --git a/cache/src/main/org/apollo/cache/def/EquipmentDefinition.java b/cache/src/main/java/org/apollo/cache/def/EquipmentDefinition.java similarity index 100% rename from cache/src/main/org/apollo/cache/def/EquipmentDefinition.java rename to cache/src/main/java/org/apollo/cache/def/EquipmentDefinition.java diff --git a/cache/src/main/org/apollo/cache/def/ItemDefinition.java b/cache/src/main/java/org/apollo/cache/def/ItemDefinition.java similarity index 100% rename from cache/src/main/org/apollo/cache/def/ItemDefinition.java rename to cache/src/main/java/org/apollo/cache/def/ItemDefinition.java diff --git a/cache/src/main/org/apollo/cache/def/NpcDefinition.java b/cache/src/main/java/org/apollo/cache/def/NpcDefinition.java similarity index 100% rename from cache/src/main/org/apollo/cache/def/NpcDefinition.java rename to cache/src/main/java/org/apollo/cache/def/NpcDefinition.java diff --git a/cache/src/main/org/apollo/cache/def/ObjectDefinition.java b/cache/src/main/java/org/apollo/cache/def/ObjectDefinition.java similarity index 100% rename from cache/src/main/org/apollo/cache/def/ObjectDefinition.java rename to cache/src/main/java/org/apollo/cache/def/ObjectDefinition.java diff --git a/cache/src/main/org/apollo/cache/def/package-info.java b/cache/src/main/java/org/apollo/cache/def/package-info.java similarity index 100% rename from cache/src/main/org/apollo/cache/def/package-info.java rename to cache/src/main/java/org/apollo/cache/def/package-info.java diff --git a/cache/src/main/org/apollo/cache/map/MapConstants.java b/cache/src/main/java/org/apollo/cache/map/MapConstants.java similarity index 100% rename from cache/src/main/org/apollo/cache/map/MapConstants.java rename to cache/src/main/java/org/apollo/cache/map/MapConstants.java diff --git a/cache/src/main/org/apollo/cache/map/MapFile.java b/cache/src/main/java/org/apollo/cache/map/MapFile.java similarity index 100% rename from cache/src/main/org/apollo/cache/map/MapFile.java rename to cache/src/main/java/org/apollo/cache/map/MapFile.java diff --git a/cache/src/main/org/apollo/cache/map/MapFileDecoder.java b/cache/src/main/java/org/apollo/cache/map/MapFileDecoder.java similarity index 100% rename from cache/src/main/org/apollo/cache/map/MapFileDecoder.java rename to cache/src/main/java/org/apollo/cache/map/MapFileDecoder.java diff --git a/cache/src/main/org/apollo/cache/map/MapIndex.java b/cache/src/main/java/org/apollo/cache/map/MapIndex.java similarity index 100% rename from cache/src/main/org/apollo/cache/map/MapIndex.java rename to cache/src/main/java/org/apollo/cache/map/MapIndex.java diff --git a/cache/src/main/org/apollo/cache/map/MapIndexDecoder.java b/cache/src/main/java/org/apollo/cache/map/MapIndexDecoder.java similarity index 100% rename from cache/src/main/org/apollo/cache/map/MapIndexDecoder.java rename to cache/src/main/java/org/apollo/cache/map/MapIndexDecoder.java diff --git a/cache/src/main/org/apollo/cache/map/MapObject.java b/cache/src/main/java/org/apollo/cache/map/MapObject.java similarity index 100% rename from cache/src/main/org/apollo/cache/map/MapObject.java rename to cache/src/main/java/org/apollo/cache/map/MapObject.java diff --git a/cache/src/main/org/apollo/cache/map/MapObjectsDecoder.java b/cache/src/main/java/org/apollo/cache/map/MapObjectsDecoder.java similarity index 100% rename from cache/src/main/org/apollo/cache/map/MapObjectsDecoder.java rename to cache/src/main/java/org/apollo/cache/map/MapObjectsDecoder.java diff --git a/cache/src/main/org/apollo/cache/map/MapPlane.java b/cache/src/main/java/org/apollo/cache/map/MapPlane.java similarity index 100% rename from cache/src/main/org/apollo/cache/map/MapPlane.java rename to cache/src/main/java/org/apollo/cache/map/MapPlane.java diff --git a/cache/src/main/org/apollo/cache/map/Tile.java b/cache/src/main/java/org/apollo/cache/map/Tile.java similarity index 100% rename from cache/src/main/org/apollo/cache/map/Tile.java rename to cache/src/main/java/org/apollo/cache/map/Tile.java diff --git a/cache/src/main/org/apollo/cache/map/TileUtils.java b/cache/src/main/java/org/apollo/cache/map/TileUtils.java similarity index 100% rename from cache/src/main/org/apollo/cache/map/TileUtils.java rename to cache/src/main/java/org/apollo/cache/map/TileUtils.java diff --git a/cache/src/main/org/apollo/cache/package-info.java b/cache/src/main/java/org/apollo/cache/package-info.java similarity index 100% rename from cache/src/main/org/apollo/cache/package-info.java rename to cache/src/main/java/org/apollo/cache/package-info.java diff --git a/cache/src/main/org/apollo/cache/tools/EquipmentUpdater.java b/cache/src/main/java/org/apollo/cache/tools/EquipmentUpdater.java similarity index 100% rename from cache/src/main/org/apollo/cache/tools/EquipmentUpdater.java rename to cache/src/main/java/org/apollo/cache/tools/EquipmentUpdater.java diff --git a/cache/src/main/org/apollo/cache/tools/package-info.java b/cache/src/main/java/org/apollo/cache/tools/package-info.java similarity index 100% rename from cache/src/main/org/apollo/cache/tools/package-info.java rename to cache/src/main/java/org/apollo/cache/tools/package-info.java diff --git a/game/build.gradle b/game/build.gradle index 92df95e8..bcce4790 100644 --- a/game/build.gradle +++ b/game/build.gradle @@ -12,14 +12,12 @@ buildscript { apply plugin: 'kotlin' -sourceSets { - main.kotlin.srcDirs += 'src/kotlin' - main.kotlin.excludes += 'stub.kt' - main.kotlin.excludes += '**/*.kts' +ext.pluginsDir = "$projectDir/src/plugins" +sourceSets { plugins { kotlin { - srcDir 'data/plugins' + srcDir "$pluginsDir" exclude 'stub.kt' exclude '**/*.kts' } @@ -42,7 +40,10 @@ dependencies { } -task('compilePluginScripts', dependsOn: [classes, pluginsClasses], type: JavaExec) { +task compilePluginScripts(type: JavaExec, dependsOn: [classes, pluginsClasses]) { + group = LifecycleBasePlugin.BUILD_GROUP + description = 'Compile plugin script files (.plugin.kts) to java bytecode' + def compilerClasspath = [ configurations.compile.asPath, configurations.runtime.asPath, @@ -50,17 +51,15 @@ task('compilePluginScripts', dependsOn: [classes, pluginsClasses], type: JavaExe sourceSets.main.runtimeClasspath.asPath ] - def inputDir = "$projectDir/data/plugins" def outputDir = "$buildDir/plugins" def manifestPath = "$buildDir/plugins/manifest.txt" - inputs.source inputDir + inputs.source "$pluginsDir" outputs.dir outputDir - println compilerClasspath.join(':') classpath = sourceSets.main.compileClasspath + sourceSets.main.runtimeClasspath main = 'org.apollo.game.plugin.kotlin.KotlinPluginCompiler' - args = [inputDir, outputDir, manifestPath, compilerClasspath.join(':')] + args = ["$pluginsDir", outputDir, manifestPath, compilerClasspath.join(':')] } -assemble.dependsOn(compilePluginScripts) \ No newline at end of file +assemble.dependsOn compilePluginScripts \ No newline at end of file diff --git a/game/data/plugins/dialogue/dialogue.plugin.kts b/game/data/plugins/dialogue/dialogue.plugin.kts deleted file mode 100644 index e69de29b..00000000 diff --git a/game/data/plugins/dialogue/plugin.xml b/game/data/plugins/dialogue/plugin.xml deleted file mode 100644 index e69de29b..00000000 diff --git a/game/src/main/org/apollo/Server.java b/game/src/main/java/org/apollo/Server.java similarity index 100% rename from game/src/main/org/apollo/Server.java rename to game/src/main/java/org/apollo/Server.java diff --git a/game/src/main/org/apollo/ServerContext.java b/game/src/main/java/org/apollo/ServerContext.java similarity index 100% rename from game/src/main/org/apollo/ServerContext.java rename to game/src/main/java/org/apollo/ServerContext.java diff --git a/game/src/main/org/apollo/Service.java b/game/src/main/java/org/apollo/Service.java similarity index 100% rename from game/src/main/org/apollo/Service.java rename to game/src/main/java/org/apollo/Service.java diff --git a/game/src/main/org/apollo/ServiceManager.java b/game/src/main/java/org/apollo/ServiceManager.java similarity index 100% rename from game/src/main/org/apollo/ServiceManager.java rename to game/src/main/java/org/apollo/ServiceManager.java diff --git a/game/src/main/org/apollo/game/GameConstants.java b/game/src/main/java/org/apollo/game/GameConstants.java similarity index 100% rename from game/src/main/org/apollo/game/GameConstants.java rename to game/src/main/java/org/apollo/game/GameConstants.java diff --git a/game/src/main/org/apollo/game/GamePulseHandler.java b/game/src/main/java/org/apollo/game/GamePulseHandler.java similarity index 100% rename from game/src/main/org/apollo/game/GamePulseHandler.java rename to game/src/main/java/org/apollo/game/GamePulseHandler.java diff --git a/game/src/main/org/apollo/game/action/Action.java b/game/src/main/java/org/apollo/game/action/Action.java similarity index 100% rename from game/src/main/org/apollo/game/action/Action.java rename to game/src/main/java/org/apollo/game/action/Action.java diff --git a/game/src/main/org/apollo/game/action/DistancedAction.java b/game/src/main/java/org/apollo/game/action/DistancedAction.java similarity index 100% rename from game/src/main/org/apollo/game/action/DistancedAction.java rename to game/src/main/java/org/apollo/game/action/DistancedAction.java diff --git a/game/src/main/org/apollo/game/action/package-info.java b/game/src/main/java/org/apollo/game/action/package-info.java similarity index 100% rename from game/src/main/org/apollo/game/action/package-info.java rename to game/src/main/java/org/apollo/game/action/package-info.java diff --git a/game/src/main/org/apollo/game/command/Command.java b/game/src/main/java/org/apollo/game/command/Command.java similarity index 100% rename from game/src/main/org/apollo/game/command/Command.java rename to game/src/main/java/org/apollo/game/command/Command.java diff --git a/game/src/main/org/apollo/game/command/CommandDispatcher.java b/game/src/main/java/org/apollo/game/command/CommandDispatcher.java similarity index 100% rename from game/src/main/org/apollo/game/command/CommandDispatcher.java rename to game/src/main/java/org/apollo/game/command/CommandDispatcher.java diff --git a/game/src/main/org/apollo/game/command/CommandListener.java b/game/src/main/java/org/apollo/game/command/CommandListener.java similarity index 100% rename from game/src/main/org/apollo/game/command/CommandListener.java rename to game/src/main/java/org/apollo/game/command/CommandListener.java diff --git a/game/src/main/org/apollo/game/command/CreditsCommandListener.java b/game/src/main/java/org/apollo/game/command/CreditsCommandListener.java similarity index 100% rename from game/src/main/org/apollo/game/command/CreditsCommandListener.java rename to game/src/main/java/org/apollo/game/command/CreditsCommandListener.java diff --git a/game/src/main/org/apollo/game/command/package-info.java b/game/src/main/java/org/apollo/game/command/package-info.java similarity index 100% rename from game/src/main/org/apollo/game/command/package-info.java rename to game/src/main/java/org/apollo/game/command/package-info.java diff --git a/game/src/main/org/apollo/game/fs/decoder/SynchronousDecoder.java b/game/src/main/java/org/apollo/game/fs/decoder/SynchronousDecoder.java similarity index 100% rename from game/src/main/org/apollo/game/fs/decoder/SynchronousDecoder.java rename to game/src/main/java/org/apollo/game/fs/decoder/SynchronousDecoder.java diff --git a/game/src/main/org/apollo/game/fs/decoder/SynchronousDecoderException.java b/game/src/main/java/org/apollo/game/fs/decoder/SynchronousDecoderException.java similarity index 100% rename from game/src/main/org/apollo/game/fs/decoder/SynchronousDecoderException.java rename to game/src/main/java/org/apollo/game/fs/decoder/SynchronousDecoderException.java diff --git a/game/src/main/org/apollo/game/fs/decoder/WorldMapDecoder.java b/game/src/main/java/org/apollo/game/fs/decoder/WorldMapDecoder.java similarity index 100% rename from game/src/main/org/apollo/game/fs/decoder/WorldMapDecoder.java rename to game/src/main/java/org/apollo/game/fs/decoder/WorldMapDecoder.java diff --git a/game/src/main/org/apollo/game/fs/decoder/WorldObjectsDecoder.java b/game/src/main/java/org/apollo/game/fs/decoder/WorldObjectsDecoder.java similarity index 100% rename from game/src/main/org/apollo/game/fs/decoder/WorldObjectsDecoder.java rename to game/src/main/java/org/apollo/game/fs/decoder/WorldObjectsDecoder.java diff --git a/game/src/main/org/apollo/game/fs/decoder/package-info.java b/game/src/main/java/org/apollo/game/fs/decoder/package-info.java similarity index 100% rename from game/src/main/org/apollo/game/fs/decoder/package-info.java rename to game/src/main/java/org/apollo/game/fs/decoder/package-info.java diff --git a/game/src/main/org/apollo/game/io/EquipmentDefinitionParser.java b/game/src/main/java/org/apollo/game/io/EquipmentDefinitionParser.java similarity index 100% rename from game/src/main/org/apollo/game/io/EquipmentDefinitionParser.java rename to game/src/main/java/org/apollo/game/io/EquipmentDefinitionParser.java diff --git a/game/src/main/org/apollo/game/io/MessageHandlerChainSetParser.java b/game/src/main/java/org/apollo/game/io/MessageHandlerChainSetParser.java similarity index 100% rename from game/src/main/org/apollo/game/io/MessageHandlerChainSetParser.java rename to game/src/main/java/org/apollo/game/io/MessageHandlerChainSetParser.java diff --git a/game/src/main/org/apollo/game/io/PluginMetaDataParser.java b/game/src/main/java/org/apollo/game/io/PluginMetaDataParser.java similarity index 100% rename from game/src/main/org/apollo/game/io/PluginMetaDataParser.java rename to game/src/main/java/org/apollo/game/io/PluginMetaDataParser.java diff --git a/game/src/main/org/apollo/game/io/package-info.java b/game/src/main/java/org/apollo/game/io/package-info.java similarity index 100% rename from game/src/main/org/apollo/game/io/package-info.java rename to game/src/main/java/org/apollo/game/io/package-info.java diff --git a/game/src/main/org/apollo/game/io/player/BinaryPlayerSerializer.java b/game/src/main/java/org/apollo/game/io/player/BinaryPlayerSerializer.java similarity index 100% rename from game/src/main/org/apollo/game/io/player/BinaryPlayerSerializer.java rename to game/src/main/java/org/apollo/game/io/player/BinaryPlayerSerializer.java diff --git a/game/src/main/org/apollo/game/io/player/DummyPlayerSerializer.java b/game/src/main/java/org/apollo/game/io/player/DummyPlayerSerializer.java similarity index 100% rename from game/src/main/org/apollo/game/io/player/DummyPlayerSerializer.java rename to game/src/main/java/org/apollo/game/io/player/DummyPlayerSerializer.java diff --git a/game/src/main/org/apollo/game/io/player/JdbcPlayerSerializer.java b/game/src/main/java/org/apollo/game/io/player/JdbcPlayerSerializer.java similarity index 100% rename from game/src/main/org/apollo/game/io/player/JdbcPlayerSerializer.java rename to game/src/main/java/org/apollo/game/io/player/JdbcPlayerSerializer.java diff --git a/game/src/main/org/apollo/game/io/player/PlayerLoaderResponse.java b/game/src/main/java/org/apollo/game/io/player/PlayerLoaderResponse.java similarity index 100% rename from game/src/main/org/apollo/game/io/player/PlayerLoaderResponse.java rename to game/src/main/java/org/apollo/game/io/player/PlayerLoaderResponse.java diff --git a/game/src/main/org/apollo/game/io/player/PlayerSerializer.java b/game/src/main/java/org/apollo/game/io/player/PlayerSerializer.java similarity index 100% rename from game/src/main/org/apollo/game/io/player/PlayerSerializer.java rename to game/src/main/java/org/apollo/game/io/player/PlayerSerializer.java diff --git a/game/src/main/org/apollo/game/io/player/package-info.java b/game/src/main/java/org/apollo/game/io/player/package-info.java similarity index 100% rename from game/src/main/org/apollo/game/io/player/package-info.java rename to game/src/main/java/org/apollo/game/io/player/package-info.java diff --git a/game/src/main/org/apollo/game/login/PlayerLoaderWorker.java b/game/src/main/java/org/apollo/game/login/PlayerLoaderWorker.java similarity index 100% rename from game/src/main/org/apollo/game/login/PlayerLoaderWorker.java rename to game/src/main/java/org/apollo/game/login/PlayerLoaderWorker.java diff --git a/game/src/main/org/apollo/game/login/PlayerSaverWorker.java b/game/src/main/java/org/apollo/game/login/PlayerSaverWorker.java similarity index 100% rename from game/src/main/org/apollo/game/login/PlayerSaverWorker.java rename to game/src/main/java/org/apollo/game/login/PlayerSaverWorker.java diff --git a/game/src/main/org/apollo/game/login/package-info.java b/game/src/main/java/org/apollo/game/login/package-info.java similarity index 100% rename from game/src/main/org/apollo/game/login/package-info.java rename to game/src/main/java/org/apollo/game/login/package-info.java diff --git a/game/src/main/org/apollo/game/message/handler/BankButtonMessageHandler.java b/game/src/main/java/org/apollo/game/message/handler/BankButtonMessageHandler.java similarity index 100% rename from game/src/main/org/apollo/game/message/handler/BankButtonMessageHandler.java rename to game/src/main/java/org/apollo/game/message/handler/BankButtonMessageHandler.java diff --git a/game/src/main/org/apollo/game/message/handler/BankMessageHandler.java b/game/src/main/java/org/apollo/game/message/handler/BankMessageHandler.java similarity index 100% rename from game/src/main/org/apollo/game/message/handler/BankMessageHandler.java rename to game/src/main/java/org/apollo/game/message/handler/BankMessageHandler.java diff --git a/game/src/main/org/apollo/game/message/handler/ClosedInterfaceMessageHandler.java b/game/src/main/java/org/apollo/game/message/handler/ClosedInterfaceMessageHandler.java similarity index 100% rename from game/src/main/org/apollo/game/message/handler/ClosedInterfaceMessageHandler.java rename to game/src/main/java/org/apollo/game/message/handler/ClosedInterfaceMessageHandler.java diff --git a/game/src/main/org/apollo/game/message/handler/CommandMessageHandler.java b/game/src/main/java/org/apollo/game/message/handler/CommandMessageHandler.java similarity index 100% rename from game/src/main/org/apollo/game/message/handler/CommandMessageHandler.java rename to game/src/main/java/org/apollo/game/message/handler/CommandMessageHandler.java diff --git a/game/src/main/org/apollo/game/message/handler/DialogueButtonHandler.java b/game/src/main/java/org/apollo/game/message/handler/DialogueButtonHandler.java similarity index 100% rename from game/src/main/org/apollo/game/message/handler/DialogueButtonHandler.java rename to game/src/main/java/org/apollo/game/message/handler/DialogueButtonHandler.java diff --git a/game/src/main/org/apollo/game/message/handler/DialogueContinueMessageHandler.java b/game/src/main/java/org/apollo/game/message/handler/DialogueContinueMessageHandler.java similarity index 100% rename from game/src/main/org/apollo/game/message/handler/DialogueContinueMessageHandler.java rename to game/src/main/java/org/apollo/game/message/handler/DialogueContinueMessageHandler.java diff --git a/game/src/main/org/apollo/game/message/handler/EnteredAmountMessageHandler.java b/game/src/main/java/org/apollo/game/message/handler/EnteredAmountMessageHandler.java similarity index 100% rename from game/src/main/org/apollo/game/message/handler/EnteredAmountMessageHandler.java rename to game/src/main/java/org/apollo/game/message/handler/EnteredAmountMessageHandler.java diff --git a/game/src/main/org/apollo/game/message/handler/EquipItemHandler.java b/game/src/main/java/org/apollo/game/message/handler/EquipItemHandler.java similarity index 100% rename from game/src/main/org/apollo/game/message/handler/EquipItemHandler.java rename to game/src/main/java/org/apollo/game/message/handler/EquipItemHandler.java diff --git a/game/src/main/org/apollo/game/message/handler/ItemOnItemVerificationHandler.java b/game/src/main/java/org/apollo/game/message/handler/ItemOnItemVerificationHandler.java similarity index 100% rename from game/src/main/org/apollo/game/message/handler/ItemOnItemVerificationHandler.java rename to game/src/main/java/org/apollo/game/message/handler/ItemOnItemVerificationHandler.java diff --git a/game/src/main/org/apollo/game/message/handler/ItemOnObjectVerificationHandler.java b/game/src/main/java/org/apollo/game/message/handler/ItemOnObjectVerificationHandler.java similarity index 100% rename from game/src/main/org/apollo/game/message/handler/ItemOnObjectVerificationHandler.java rename to game/src/main/java/org/apollo/game/message/handler/ItemOnObjectVerificationHandler.java diff --git a/game/src/main/org/apollo/game/message/handler/ItemVerificationHandler.java b/game/src/main/java/org/apollo/game/message/handler/ItemVerificationHandler.java similarity index 100% rename from game/src/main/org/apollo/game/message/handler/ItemVerificationHandler.java rename to game/src/main/java/org/apollo/game/message/handler/ItemVerificationHandler.java diff --git a/game/src/main/org/apollo/game/message/handler/MessageHandler.java b/game/src/main/java/org/apollo/game/message/handler/MessageHandler.java similarity index 100% rename from game/src/main/org/apollo/game/message/handler/MessageHandler.java rename to game/src/main/java/org/apollo/game/message/handler/MessageHandler.java diff --git a/game/src/main/org/apollo/game/message/handler/MessageHandlerChain.java b/game/src/main/java/org/apollo/game/message/handler/MessageHandlerChain.java similarity index 100% rename from game/src/main/org/apollo/game/message/handler/MessageHandlerChain.java rename to game/src/main/java/org/apollo/game/message/handler/MessageHandlerChain.java diff --git a/game/src/main/org/apollo/game/message/handler/MessageHandlerChainSet.java b/game/src/main/java/org/apollo/game/message/handler/MessageHandlerChainSet.java similarity index 100% rename from game/src/main/org/apollo/game/message/handler/MessageHandlerChainSet.java rename to game/src/main/java/org/apollo/game/message/handler/MessageHandlerChainSet.java diff --git a/game/src/main/org/apollo/game/message/handler/NpcActionVerificationHandler.java b/game/src/main/java/org/apollo/game/message/handler/NpcActionVerificationHandler.java similarity index 100% rename from game/src/main/org/apollo/game/message/handler/NpcActionVerificationHandler.java rename to game/src/main/java/org/apollo/game/message/handler/NpcActionVerificationHandler.java diff --git a/game/src/main/org/apollo/game/message/handler/ObjectActionVerificationHandler.java b/game/src/main/java/org/apollo/game/message/handler/ObjectActionVerificationHandler.java similarity index 100% rename from game/src/main/org/apollo/game/message/handler/ObjectActionVerificationHandler.java rename to game/src/main/java/org/apollo/game/message/handler/ObjectActionVerificationHandler.java diff --git a/game/src/main/org/apollo/game/message/handler/PlayerActionVerificationHandler.java b/game/src/main/java/org/apollo/game/message/handler/PlayerActionVerificationHandler.java similarity index 100% rename from game/src/main/org/apollo/game/message/handler/PlayerActionVerificationHandler.java rename to game/src/main/java/org/apollo/game/message/handler/PlayerActionVerificationHandler.java diff --git a/game/src/main/org/apollo/game/message/handler/PlayerDesignMessageHandler.java b/game/src/main/java/org/apollo/game/message/handler/PlayerDesignMessageHandler.java similarity index 100% rename from game/src/main/org/apollo/game/message/handler/PlayerDesignMessageHandler.java rename to game/src/main/java/org/apollo/game/message/handler/PlayerDesignMessageHandler.java diff --git a/game/src/main/org/apollo/game/message/handler/PlayerDesignVerificationHandler.java b/game/src/main/java/org/apollo/game/message/handler/PlayerDesignVerificationHandler.java similarity index 100% rename from game/src/main/org/apollo/game/message/handler/PlayerDesignVerificationHandler.java rename to game/src/main/java/org/apollo/game/message/handler/PlayerDesignVerificationHandler.java diff --git a/game/src/main/org/apollo/game/message/handler/PublicChatMessageHandler.java b/game/src/main/java/org/apollo/game/message/handler/PublicChatMessageHandler.java similarity index 100% rename from game/src/main/org/apollo/game/message/handler/PublicChatMessageHandler.java rename to game/src/main/java/org/apollo/game/message/handler/PublicChatMessageHandler.java diff --git a/game/src/main/org/apollo/game/message/handler/PublicChatVerificationHandler.java b/game/src/main/java/org/apollo/game/message/handler/PublicChatVerificationHandler.java similarity index 100% rename from game/src/main/org/apollo/game/message/handler/PublicChatVerificationHandler.java rename to game/src/main/java/org/apollo/game/message/handler/PublicChatVerificationHandler.java diff --git a/game/src/main/org/apollo/game/message/handler/RemoveEquippedItemHandler.java b/game/src/main/java/org/apollo/game/message/handler/RemoveEquippedItemHandler.java similarity index 100% rename from game/src/main/org/apollo/game/message/handler/RemoveEquippedItemHandler.java rename to game/src/main/java/org/apollo/game/message/handler/RemoveEquippedItemHandler.java diff --git a/game/src/main/org/apollo/game/message/handler/SwitchItemMessageHandler.java b/game/src/main/java/org/apollo/game/message/handler/SwitchItemMessageHandler.java similarity index 100% rename from game/src/main/org/apollo/game/message/handler/SwitchItemMessageHandler.java rename to game/src/main/java/org/apollo/game/message/handler/SwitchItemMessageHandler.java diff --git a/game/src/main/org/apollo/game/message/handler/WalkMessageHandler.java b/game/src/main/java/org/apollo/game/message/handler/WalkMessageHandler.java similarity index 100% rename from game/src/main/org/apollo/game/message/handler/WalkMessageHandler.java rename to game/src/main/java/org/apollo/game/message/handler/WalkMessageHandler.java diff --git a/game/src/main/org/apollo/game/message/handler/package-info.java b/game/src/main/java/org/apollo/game/message/handler/package-info.java similarity index 100% rename from game/src/main/org/apollo/game/message/handler/package-info.java rename to game/src/main/java/org/apollo/game/message/handler/package-info.java diff --git a/game/src/main/org/apollo/game/message/impl/AddFriendMessage.java b/game/src/main/java/org/apollo/game/message/impl/AddFriendMessage.java similarity index 100% rename from game/src/main/org/apollo/game/message/impl/AddFriendMessage.java rename to game/src/main/java/org/apollo/game/message/impl/AddFriendMessage.java diff --git a/game/src/main/org/apollo/game/message/impl/AddIgnoreMessage.java b/game/src/main/java/org/apollo/game/message/impl/AddIgnoreMessage.java similarity index 100% rename from game/src/main/org/apollo/game/message/impl/AddIgnoreMessage.java rename to game/src/main/java/org/apollo/game/message/impl/AddIgnoreMessage.java diff --git a/game/src/main/org/apollo/game/message/impl/ArrowKeyMessage.java b/game/src/main/java/org/apollo/game/message/impl/ArrowKeyMessage.java similarity index 100% rename from game/src/main/org/apollo/game/message/impl/ArrowKeyMessage.java rename to game/src/main/java/org/apollo/game/message/impl/ArrowKeyMessage.java diff --git a/game/src/main/org/apollo/game/message/impl/ButtonMessage.java b/game/src/main/java/org/apollo/game/message/impl/ButtonMessage.java similarity index 100% rename from game/src/main/org/apollo/game/message/impl/ButtonMessage.java rename to game/src/main/java/org/apollo/game/message/impl/ButtonMessage.java diff --git a/game/src/main/org/apollo/game/message/impl/ChatMessage.java b/game/src/main/java/org/apollo/game/message/impl/ChatMessage.java similarity index 100% rename from game/src/main/org/apollo/game/message/impl/ChatMessage.java rename to game/src/main/java/org/apollo/game/message/impl/ChatMessage.java diff --git a/game/src/main/org/apollo/game/message/impl/ClearRegionMessage.java b/game/src/main/java/org/apollo/game/message/impl/ClearRegionMessage.java similarity index 100% rename from game/src/main/org/apollo/game/message/impl/ClearRegionMessage.java rename to game/src/main/java/org/apollo/game/message/impl/ClearRegionMessage.java diff --git a/game/src/main/org/apollo/game/message/impl/CloseInterfaceMessage.java b/game/src/main/java/org/apollo/game/message/impl/CloseInterfaceMessage.java similarity index 100% rename from game/src/main/org/apollo/game/message/impl/CloseInterfaceMessage.java rename to game/src/main/java/org/apollo/game/message/impl/CloseInterfaceMessage.java diff --git a/game/src/main/org/apollo/game/message/impl/ClosedInterfaceMessage.java b/game/src/main/java/org/apollo/game/message/impl/ClosedInterfaceMessage.java similarity index 100% rename from game/src/main/org/apollo/game/message/impl/ClosedInterfaceMessage.java rename to game/src/main/java/org/apollo/game/message/impl/ClosedInterfaceMessage.java diff --git a/game/src/main/org/apollo/game/message/impl/CommandMessage.java b/game/src/main/java/org/apollo/game/message/impl/CommandMessage.java similarity index 100% rename from game/src/main/org/apollo/game/message/impl/CommandMessage.java rename to game/src/main/java/org/apollo/game/message/impl/CommandMessage.java diff --git a/game/src/main/org/apollo/game/message/impl/ConfigMessage.java b/game/src/main/java/org/apollo/game/message/impl/ConfigMessage.java similarity index 100% rename from game/src/main/org/apollo/game/message/impl/ConfigMessage.java rename to game/src/main/java/org/apollo/game/message/impl/ConfigMessage.java diff --git a/game/src/main/org/apollo/game/message/impl/DialogueContinueMessage.java b/game/src/main/java/org/apollo/game/message/impl/DialogueContinueMessage.java similarity index 100% rename from game/src/main/org/apollo/game/message/impl/DialogueContinueMessage.java rename to game/src/main/java/org/apollo/game/message/impl/DialogueContinueMessage.java diff --git a/game/src/main/org/apollo/game/message/impl/DisplayCrossbonesMessage.java b/game/src/main/java/org/apollo/game/message/impl/DisplayCrossbonesMessage.java similarity index 100% rename from game/src/main/org/apollo/game/message/impl/DisplayCrossbonesMessage.java rename to game/src/main/java/org/apollo/game/message/impl/DisplayCrossbonesMessage.java diff --git a/game/src/main/org/apollo/game/message/impl/DisplayTabInterfaceMessage.java b/game/src/main/java/org/apollo/game/message/impl/DisplayTabInterfaceMessage.java similarity index 100% rename from game/src/main/org/apollo/game/message/impl/DisplayTabInterfaceMessage.java rename to game/src/main/java/org/apollo/game/message/impl/DisplayTabInterfaceMessage.java diff --git a/game/src/main/org/apollo/game/message/impl/EnterAmountMessage.java b/game/src/main/java/org/apollo/game/message/impl/EnterAmountMessage.java similarity index 100% rename from game/src/main/org/apollo/game/message/impl/EnterAmountMessage.java rename to game/src/main/java/org/apollo/game/message/impl/EnterAmountMessage.java diff --git a/game/src/main/org/apollo/game/message/impl/EnteredAmountMessage.java b/game/src/main/java/org/apollo/game/message/impl/EnteredAmountMessage.java similarity index 100% rename from game/src/main/org/apollo/game/message/impl/EnteredAmountMessage.java rename to game/src/main/java/org/apollo/game/message/impl/EnteredAmountMessage.java diff --git a/game/src/main/org/apollo/game/message/impl/FlaggedMouseEventMessage.java b/game/src/main/java/org/apollo/game/message/impl/FlaggedMouseEventMessage.java similarity index 100% rename from game/src/main/org/apollo/game/message/impl/FlaggedMouseEventMessage.java rename to game/src/main/java/org/apollo/game/message/impl/FlaggedMouseEventMessage.java diff --git a/game/src/main/org/apollo/game/message/impl/FlashTabInterfaceMessage.java b/game/src/main/java/org/apollo/game/message/impl/FlashTabInterfaceMessage.java similarity index 100% rename from game/src/main/org/apollo/game/message/impl/FlashTabInterfaceMessage.java rename to game/src/main/java/org/apollo/game/message/impl/FlashTabInterfaceMessage.java diff --git a/game/src/main/org/apollo/game/message/impl/FlashingTabClickedMessage.java b/game/src/main/java/org/apollo/game/message/impl/FlashingTabClickedMessage.java similarity index 100% rename from game/src/main/org/apollo/game/message/impl/FlashingTabClickedMessage.java rename to game/src/main/java/org/apollo/game/message/impl/FlashingTabClickedMessage.java diff --git a/game/src/main/org/apollo/game/message/impl/FocusUpdateMessage.java b/game/src/main/java/org/apollo/game/message/impl/FocusUpdateMessage.java similarity index 100% rename from game/src/main/org/apollo/game/message/impl/FocusUpdateMessage.java rename to game/src/main/java/org/apollo/game/message/impl/FocusUpdateMessage.java diff --git a/game/src/main/org/apollo/game/message/impl/ForwardPrivateChatMessage.java b/game/src/main/java/org/apollo/game/message/impl/ForwardPrivateChatMessage.java similarity index 100% rename from game/src/main/org/apollo/game/message/impl/ForwardPrivateChatMessage.java rename to game/src/main/java/org/apollo/game/message/impl/ForwardPrivateChatMessage.java diff --git a/game/src/main/org/apollo/game/message/impl/FriendServerStatusMessage.java b/game/src/main/java/org/apollo/game/message/impl/FriendServerStatusMessage.java similarity index 100% rename from game/src/main/org/apollo/game/message/impl/FriendServerStatusMessage.java rename to game/src/main/java/org/apollo/game/message/impl/FriendServerStatusMessage.java diff --git a/game/src/main/org/apollo/game/message/impl/GroupedRegionUpdateMessage.java b/game/src/main/java/org/apollo/game/message/impl/GroupedRegionUpdateMessage.java similarity index 100% rename from game/src/main/org/apollo/game/message/impl/GroupedRegionUpdateMessage.java rename to game/src/main/java/org/apollo/game/message/impl/GroupedRegionUpdateMessage.java diff --git a/game/src/main/org/apollo/game/message/impl/HintIconMessage.java b/game/src/main/java/org/apollo/game/message/impl/HintIconMessage.java similarity index 100% rename from game/src/main/org/apollo/game/message/impl/HintIconMessage.java rename to game/src/main/java/org/apollo/game/message/impl/HintIconMessage.java diff --git a/game/src/main/org/apollo/game/message/impl/IdAssignmentMessage.java b/game/src/main/java/org/apollo/game/message/impl/IdAssignmentMessage.java similarity index 100% rename from game/src/main/org/apollo/game/message/impl/IdAssignmentMessage.java rename to game/src/main/java/org/apollo/game/message/impl/IdAssignmentMessage.java diff --git a/game/src/main/org/apollo/game/message/impl/IgnoreListMessage.java b/game/src/main/java/org/apollo/game/message/impl/IgnoreListMessage.java similarity index 100% rename from game/src/main/org/apollo/game/message/impl/IgnoreListMessage.java rename to game/src/main/java/org/apollo/game/message/impl/IgnoreListMessage.java diff --git a/game/src/main/org/apollo/game/message/impl/InventoryItemMessage.java b/game/src/main/java/org/apollo/game/message/impl/InventoryItemMessage.java similarity index 100% rename from game/src/main/org/apollo/game/message/impl/InventoryItemMessage.java rename to game/src/main/java/org/apollo/game/message/impl/InventoryItemMessage.java diff --git a/game/src/main/org/apollo/game/message/impl/ItemActionMessage.java b/game/src/main/java/org/apollo/game/message/impl/ItemActionMessage.java similarity index 100% rename from game/src/main/org/apollo/game/message/impl/ItemActionMessage.java rename to game/src/main/java/org/apollo/game/message/impl/ItemActionMessage.java diff --git a/game/src/main/org/apollo/game/message/impl/ItemOnItemMessage.java b/game/src/main/java/org/apollo/game/message/impl/ItemOnItemMessage.java similarity index 100% rename from game/src/main/org/apollo/game/message/impl/ItemOnItemMessage.java rename to game/src/main/java/org/apollo/game/message/impl/ItemOnItemMessage.java diff --git a/game/src/main/org/apollo/game/message/impl/ItemOnNpcMessage.java b/game/src/main/java/org/apollo/game/message/impl/ItemOnNpcMessage.java similarity index 100% rename from game/src/main/org/apollo/game/message/impl/ItemOnNpcMessage.java rename to game/src/main/java/org/apollo/game/message/impl/ItemOnNpcMessage.java diff --git a/game/src/main/org/apollo/game/message/impl/ItemOnObjectMessage.java b/game/src/main/java/org/apollo/game/message/impl/ItemOnObjectMessage.java similarity index 100% rename from game/src/main/org/apollo/game/message/impl/ItemOnObjectMessage.java rename to game/src/main/java/org/apollo/game/message/impl/ItemOnObjectMessage.java diff --git a/game/src/main/org/apollo/game/message/impl/ItemOptionMessage.java b/game/src/main/java/org/apollo/game/message/impl/ItemOptionMessage.java similarity index 100% rename from game/src/main/org/apollo/game/message/impl/ItemOptionMessage.java rename to game/src/main/java/org/apollo/game/message/impl/ItemOptionMessage.java diff --git a/game/src/main/org/apollo/game/message/impl/KeepAliveMessage.java b/game/src/main/java/org/apollo/game/message/impl/KeepAliveMessage.java similarity index 100% rename from game/src/main/org/apollo/game/message/impl/KeepAliveMessage.java rename to game/src/main/java/org/apollo/game/message/impl/KeepAliveMessage.java diff --git a/game/src/main/org/apollo/game/message/impl/LogoutMessage.java b/game/src/main/java/org/apollo/game/message/impl/LogoutMessage.java similarity index 100% rename from game/src/main/org/apollo/game/message/impl/LogoutMessage.java rename to game/src/main/java/org/apollo/game/message/impl/LogoutMessage.java diff --git a/game/src/main/org/apollo/game/message/impl/MagicOnItemMessage.java b/game/src/main/java/org/apollo/game/message/impl/MagicOnItemMessage.java similarity index 100% rename from game/src/main/org/apollo/game/message/impl/MagicOnItemMessage.java rename to game/src/main/java/org/apollo/game/message/impl/MagicOnItemMessage.java diff --git a/game/src/main/org/apollo/game/message/impl/MagicOnMobMessage.java b/game/src/main/java/org/apollo/game/message/impl/MagicOnMobMessage.java similarity index 100% rename from game/src/main/org/apollo/game/message/impl/MagicOnMobMessage.java rename to game/src/main/java/org/apollo/game/message/impl/MagicOnMobMessage.java diff --git a/game/src/main/org/apollo/game/message/impl/MagicOnNpcMessage.java b/game/src/main/java/org/apollo/game/message/impl/MagicOnNpcMessage.java similarity index 100% rename from game/src/main/org/apollo/game/message/impl/MagicOnNpcMessage.java rename to game/src/main/java/org/apollo/game/message/impl/MagicOnNpcMessage.java diff --git a/game/src/main/org/apollo/game/message/impl/MagicOnPlayerMessage.java b/game/src/main/java/org/apollo/game/message/impl/MagicOnPlayerMessage.java similarity index 100% rename from game/src/main/org/apollo/game/message/impl/MagicOnPlayerMessage.java rename to game/src/main/java/org/apollo/game/message/impl/MagicOnPlayerMessage.java diff --git a/game/src/main/org/apollo/game/message/impl/MobAnimationResetMessage.java b/game/src/main/java/org/apollo/game/message/impl/MobAnimationResetMessage.java similarity index 100% rename from game/src/main/org/apollo/game/message/impl/MobAnimationResetMessage.java rename to game/src/main/java/org/apollo/game/message/impl/MobAnimationResetMessage.java diff --git a/game/src/main/org/apollo/game/message/impl/MobHintIconMessage.java b/game/src/main/java/org/apollo/game/message/impl/MobHintIconMessage.java similarity index 100% rename from game/src/main/org/apollo/game/message/impl/MobHintIconMessage.java rename to game/src/main/java/org/apollo/game/message/impl/MobHintIconMessage.java diff --git a/game/src/main/org/apollo/game/message/impl/MouseClickedMessage.java b/game/src/main/java/org/apollo/game/message/impl/MouseClickedMessage.java similarity index 100% rename from game/src/main/org/apollo/game/message/impl/MouseClickedMessage.java rename to game/src/main/java/org/apollo/game/message/impl/MouseClickedMessage.java diff --git a/game/src/main/org/apollo/game/message/impl/NpcActionMessage.java b/game/src/main/java/org/apollo/game/message/impl/NpcActionMessage.java similarity index 100% rename from game/src/main/org/apollo/game/message/impl/NpcActionMessage.java rename to game/src/main/java/org/apollo/game/message/impl/NpcActionMessage.java diff --git a/game/src/main/org/apollo/game/message/impl/NpcSynchronizationMessage.java b/game/src/main/java/org/apollo/game/message/impl/NpcSynchronizationMessage.java similarity index 100% rename from game/src/main/org/apollo/game/message/impl/NpcSynchronizationMessage.java rename to game/src/main/java/org/apollo/game/message/impl/NpcSynchronizationMessage.java diff --git a/game/src/main/org/apollo/game/message/impl/ObjectActionMessage.java b/game/src/main/java/org/apollo/game/message/impl/ObjectActionMessage.java similarity index 100% rename from game/src/main/org/apollo/game/message/impl/ObjectActionMessage.java rename to game/src/main/java/org/apollo/game/message/impl/ObjectActionMessage.java diff --git a/game/src/main/org/apollo/game/message/impl/OpenDialogueInterfaceMessage.java b/game/src/main/java/org/apollo/game/message/impl/OpenDialogueInterfaceMessage.java similarity index 100% rename from game/src/main/org/apollo/game/message/impl/OpenDialogueInterfaceMessage.java rename to game/src/main/java/org/apollo/game/message/impl/OpenDialogueInterfaceMessage.java diff --git a/game/src/main/org/apollo/game/message/impl/OpenDialogueOverlayMessage.java b/game/src/main/java/org/apollo/game/message/impl/OpenDialogueOverlayMessage.java similarity index 100% rename from game/src/main/org/apollo/game/message/impl/OpenDialogueOverlayMessage.java rename to game/src/main/java/org/apollo/game/message/impl/OpenDialogueOverlayMessage.java diff --git a/game/src/main/org/apollo/game/message/impl/OpenInterfaceMessage.java b/game/src/main/java/org/apollo/game/message/impl/OpenInterfaceMessage.java similarity index 100% rename from game/src/main/org/apollo/game/message/impl/OpenInterfaceMessage.java rename to game/src/main/java/org/apollo/game/message/impl/OpenInterfaceMessage.java diff --git a/game/src/main/org/apollo/game/message/impl/OpenInterfaceSidebarMessage.java b/game/src/main/java/org/apollo/game/message/impl/OpenInterfaceSidebarMessage.java similarity index 100% rename from game/src/main/org/apollo/game/message/impl/OpenInterfaceSidebarMessage.java rename to game/src/main/java/org/apollo/game/message/impl/OpenInterfaceSidebarMessage.java diff --git a/game/src/main/org/apollo/game/message/impl/OpenOverlayMessage.java b/game/src/main/java/org/apollo/game/message/impl/OpenOverlayMessage.java similarity index 100% rename from game/src/main/org/apollo/game/message/impl/OpenOverlayMessage.java rename to game/src/main/java/org/apollo/game/message/impl/OpenOverlayMessage.java diff --git a/game/src/main/org/apollo/game/message/impl/OpenSidebarMessage.java b/game/src/main/java/org/apollo/game/message/impl/OpenSidebarMessage.java similarity index 100% rename from game/src/main/org/apollo/game/message/impl/OpenSidebarMessage.java rename to game/src/main/java/org/apollo/game/message/impl/OpenSidebarMessage.java diff --git a/game/src/main/org/apollo/game/message/impl/PlayerActionMessage.java b/game/src/main/java/org/apollo/game/message/impl/PlayerActionMessage.java similarity index 100% rename from game/src/main/org/apollo/game/message/impl/PlayerActionMessage.java rename to game/src/main/java/org/apollo/game/message/impl/PlayerActionMessage.java diff --git a/game/src/main/org/apollo/game/message/impl/PlayerDesignMessage.java b/game/src/main/java/org/apollo/game/message/impl/PlayerDesignMessage.java similarity index 100% rename from game/src/main/org/apollo/game/message/impl/PlayerDesignMessage.java rename to game/src/main/java/org/apollo/game/message/impl/PlayerDesignMessage.java diff --git a/game/src/main/org/apollo/game/message/impl/PlayerSynchronizationMessage.java b/game/src/main/java/org/apollo/game/message/impl/PlayerSynchronizationMessage.java similarity index 100% rename from game/src/main/org/apollo/game/message/impl/PlayerSynchronizationMessage.java rename to game/src/main/java/org/apollo/game/message/impl/PlayerSynchronizationMessage.java diff --git a/game/src/main/org/apollo/game/message/impl/PositionHintIconMessage.java b/game/src/main/java/org/apollo/game/message/impl/PositionHintIconMessage.java similarity index 100% rename from game/src/main/org/apollo/game/message/impl/PositionHintIconMessage.java rename to game/src/main/java/org/apollo/game/message/impl/PositionHintIconMessage.java diff --git a/game/src/main/org/apollo/game/message/impl/PrivacyOptionMessage.java b/game/src/main/java/org/apollo/game/message/impl/PrivacyOptionMessage.java similarity index 100% rename from game/src/main/org/apollo/game/message/impl/PrivacyOptionMessage.java rename to game/src/main/java/org/apollo/game/message/impl/PrivacyOptionMessage.java diff --git a/game/src/main/org/apollo/game/message/impl/PrivateChatMessage.java b/game/src/main/java/org/apollo/game/message/impl/PrivateChatMessage.java similarity index 100% rename from game/src/main/org/apollo/game/message/impl/PrivateChatMessage.java rename to game/src/main/java/org/apollo/game/message/impl/PrivateChatMessage.java diff --git a/game/src/main/org/apollo/game/message/impl/PublicChatMessage.java b/game/src/main/java/org/apollo/game/message/impl/PublicChatMessage.java similarity index 100% rename from game/src/main/org/apollo/game/message/impl/PublicChatMessage.java rename to game/src/main/java/org/apollo/game/message/impl/PublicChatMessage.java diff --git a/game/src/main/org/apollo/game/message/impl/RegionChangeMessage.java b/game/src/main/java/org/apollo/game/message/impl/RegionChangeMessage.java similarity index 100% rename from game/src/main/org/apollo/game/message/impl/RegionChangeMessage.java rename to game/src/main/java/org/apollo/game/message/impl/RegionChangeMessage.java diff --git a/game/src/main/org/apollo/game/message/impl/RegionUpdateMessage.java b/game/src/main/java/org/apollo/game/message/impl/RegionUpdateMessage.java similarity index 100% rename from game/src/main/org/apollo/game/message/impl/RegionUpdateMessage.java rename to game/src/main/java/org/apollo/game/message/impl/RegionUpdateMessage.java diff --git a/game/src/main/org/apollo/game/message/impl/RemoveFriendMessage.java b/game/src/main/java/org/apollo/game/message/impl/RemoveFriendMessage.java similarity index 100% rename from game/src/main/org/apollo/game/message/impl/RemoveFriendMessage.java rename to game/src/main/java/org/apollo/game/message/impl/RemoveFriendMessage.java diff --git a/game/src/main/org/apollo/game/message/impl/RemoveIgnoreMessage.java b/game/src/main/java/org/apollo/game/message/impl/RemoveIgnoreMessage.java similarity index 100% rename from game/src/main/org/apollo/game/message/impl/RemoveIgnoreMessage.java rename to game/src/main/java/org/apollo/game/message/impl/RemoveIgnoreMessage.java diff --git a/game/src/main/org/apollo/game/message/impl/RemoveObjectMessage.java b/game/src/main/java/org/apollo/game/message/impl/RemoveObjectMessage.java similarity index 100% rename from game/src/main/org/apollo/game/message/impl/RemoveObjectMessage.java rename to game/src/main/java/org/apollo/game/message/impl/RemoveObjectMessage.java diff --git a/game/src/main/org/apollo/game/message/impl/RemoveTileItemMessage.java b/game/src/main/java/org/apollo/game/message/impl/RemoveTileItemMessage.java similarity index 100% rename from game/src/main/org/apollo/game/message/impl/RemoveTileItemMessage.java rename to game/src/main/java/org/apollo/game/message/impl/RemoveTileItemMessage.java diff --git a/game/src/main/org/apollo/game/message/impl/ReportAbuseMessage.java b/game/src/main/java/org/apollo/game/message/impl/ReportAbuseMessage.java similarity index 100% rename from game/src/main/org/apollo/game/message/impl/ReportAbuseMessage.java rename to game/src/main/java/org/apollo/game/message/impl/ReportAbuseMessage.java diff --git a/game/src/main/org/apollo/game/message/impl/SendFriendMessage.java b/game/src/main/java/org/apollo/game/message/impl/SendFriendMessage.java similarity index 100% rename from game/src/main/org/apollo/game/message/impl/SendFriendMessage.java rename to game/src/main/java/org/apollo/game/message/impl/SendFriendMessage.java diff --git a/game/src/main/org/apollo/game/message/impl/SendObjectMessage.java b/game/src/main/java/org/apollo/game/message/impl/SendObjectMessage.java similarity index 100% rename from game/src/main/org/apollo/game/message/impl/SendObjectMessage.java rename to game/src/main/java/org/apollo/game/message/impl/SendObjectMessage.java diff --git a/game/src/main/org/apollo/game/message/impl/SendProjectileMessage.java b/game/src/main/java/org/apollo/game/message/impl/SendProjectileMessage.java similarity index 100% rename from game/src/main/org/apollo/game/message/impl/SendProjectileMessage.java rename to game/src/main/java/org/apollo/game/message/impl/SendProjectileMessage.java diff --git a/game/src/main/org/apollo/game/message/impl/SendPublicTileItemMessage.java b/game/src/main/java/org/apollo/game/message/impl/SendPublicTileItemMessage.java similarity index 100% rename from game/src/main/org/apollo/game/message/impl/SendPublicTileItemMessage.java rename to game/src/main/java/org/apollo/game/message/impl/SendPublicTileItemMessage.java diff --git a/game/src/main/org/apollo/game/message/impl/SendTileItemMessage.java b/game/src/main/java/org/apollo/game/message/impl/SendTileItemMessage.java similarity index 100% rename from game/src/main/org/apollo/game/message/impl/SendTileItemMessage.java rename to game/src/main/java/org/apollo/game/message/impl/SendTileItemMessage.java diff --git a/game/src/main/org/apollo/game/message/impl/ServerChatMessage.java b/game/src/main/java/org/apollo/game/message/impl/ServerChatMessage.java similarity index 100% rename from game/src/main/org/apollo/game/message/impl/ServerChatMessage.java rename to game/src/main/java/org/apollo/game/message/impl/ServerChatMessage.java diff --git a/game/src/main/org/apollo/game/message/impl/SetPlayerActionMessage.java b/game/src/main/java/org/apollo/game/message/impl/SetPlayerActionMessage.java similarity index 100% rename from game/src/main/org/apollo/game/message/impl/SetPlayerActionMessage.java rename to game/src/main/java/org/apollo/game/message/impl/SetPlayerActionMessage.java diff --git a/game/src/main/org/apollo/game/message/impl/SetUpdatedRegionMessage.java b/game/src/main/java/org/apollo/game/message/impl/SetUpdatedRegionMessage.java similarity index 100% rename from game/src/main/org/apollo/game/message/impl/SetUpdatedRegionMessage.java rename to game/src/main/java/org/apollo/game/message/impl/SetUpdatedRegionMessage.java diff --git a/game/src/main/org/apollo/game/message/impl/SetWidgetItemModelMessage.java b/game/src/main/java/org/apollo/game/message/impl/SetWidgetItemModelMessage.java similarity index 100% rename from game/src/main/org/apollo/game/message/impl/SetWidgetItemModelMessage.java rename to game/src/main/java/org/apollo/game/message/impl/SetWidgetItemModelMessage.java diff --git a/game/src/main/org/apollo/game/message/impl/SetWidgetModelAnimationMessage.java b/game/src/main/java/org/apollo/game/message/impl/SetWidgetModelAnimationMessage.java similarity index 100% rename from game/src/main/org/apollo/game/message/impl/SetWidgetModelAnimationMessage.java rename to game/src/main/java/org/apollo/game/message/impl/SetWidgetModelAnimationMessage.java diff --git a/game/src/main/org/apollo/game/message/impl/SetWidgetModelMessage.java b/game/src/main/java/org/apollo/game/message/impl/SetWidgetModelMessage.java similarity index 100% rename from game/src/main/org/apollo/game/message/impl/SetWidgetModelMessage.java rename to game/src/main/java/org/apollo/game/message/impl/SetWidgetModelMessage.java diff --git a/game/src/main/org/apollo/game/message/impl/SetWidgetNpcModelMessage.java b/game/src/main/java/org/apollo/game/message/impl/SetWidgetNpcModelMessage.java similarity index 100% rename from game/src/main/org/apollo/game/message/impl/SetWidgetNpcModelMessage.java rename to game/src/main/java/org/apollo/game/message/impl/SetWidgetNpcModelMessage.java diff --git a/game/src/main/org/apollo/game/message/impl/SetWidgetPlayerModelMessage.java b/game/src/main/java/org/apollo/game/message/impl/SetWidgetPlayerModelMessage.java similarity index 100% rename from game/src/main/org/apollo/game/message/impl/SetWidgetPlayerModelMessage.java rename to game/src/main/java/org/apollo/game/message/impl/SetWidgetPlayerModelMessage.java diff --git a/game/src/main/org/apollo/game/message/impl/SetWidgetTextMessage.java b/game/src/main/java/org/apollo/game/message/impl/SetWidgetTextMessage.java similarity index 100% rename from game/src/main/org/apollo/game/message/impl/SetWidgetTextMessage.java rename to game/src/main/java/org/apollo/game/message/impl/SetWidgetTextMessage.java diff --git a/game/src/main/org/apollo/game/message/impl/SetWidgetVisibilityMessage.java b/game/src/main/java/org/apollo/game/message/impl/SetWidgetVisibilityMessage.java similarity index 100% rename from game/src/main/org/apollo/game/message/impl/SetWidgetVisibilityMessage.java rename to game/src/main/java/org/apollo/game/message/impl/SetWidgetVisibilityMessage.java diff --git a/game/src/main/org/apollo/game/message/impl/SpamPacketMessage.java b/game/src/main/java/org/apollo/game/message/impl/SpamPacketMessage.java similarity index 100% rename from game/src/main/org/apollo/game/message/impl/SpamPacketMessage.java rename to game/src/main/java/org/apollo/game/message/impl/SpamPacketMessage.java diff --git a/game/src/main/org/apollo/game/message/impl/SwitchItemMessage.java b/game/src/main/java/org/apollo/game/message/impl/SwitchItemMessage.java similarity index 100% rename from game/src/main/org/apollo/game/message/impl/SwitchItemMessage.java rename to game/src/main/java/org/apollo/game/message/impl/SwitchItemMessage.java diff --git a/game/src/main/org/apollo/game/message/impl/SwitchTabInterfaceMessage.java b/game/src/main/java/org/apollo/game/message/impl/SwitchTabInterfaceMessage.java similarity index 100% rename from game/src/main/org/apollo/game/message/impl/SwitchTabInterfaceMessage.java rename to game/src/main/java/org/apollo/game/message/impl/SwitchTabInterfaceMessage.java diff --git a/game/src/main/org/apollo/game/message/impl/TakeTileItemMessage.java b/game/src/main/java/org/apollo/game/message/impl/TakeTileItemMessage.java similarity index 100% rename from game/src/main/org/apollo/game/message/impl/TakeTileItemMessage.java rename to game/src/main/java/org/apollo/game/message/impl/TakeTileItemMessage.java diff --git a/game/src/main/org/apollo/game/message/impl/UpdateItemsMessage.java b/game/src/main/java/org/apollo/game/message/impl/UpdateItemsMessage.java similarity index 100% rename from game/src/main/org/apollo/game/message/impl/UpdateItemsMessage.java rename to game/src/main/java/org/apollo/game/message/impl/UpdateItemsMessage.java diff --git a/game/src/main/org/apollo/game/message/impl/UpdateRunEnergyMessage.java b/game/src/main/java/org/apollo/game/message/impl/UpdateRunEnergyMessage.java similarity index 100% rename from game/src/main/org/apollo/game/message/impl/UpdateRunEnergyMessage.java rename to game/src/main/java/org/apollo/game/message/impl/UpdateRunEnergyMessage.java diff --git a/game/src/main/org/apollo/game/message/impl/UpdateSkillMessage.java b/game/src/main/java/org/apollo/game/message/impl/UpdateSkillMessage.java similarity index 100% rename from game/src/main/org/apollo/game/message/impl/UpdateSkillMessage.java rename to game/src/main/java/org/apollo/game/message/impl/UpdateSkillMessage.java diff --git a/game/src/main/org/apollo/game/message/impl/UpdateSlottedItemsMessage.java b/game/src/main/java/org/apollo/game/message/impl/UpdateSlottedItemsMessage.java similarity index 100% rename from game/src/main/org/apollo/game/message/impl/UpdateSlottedItemsMessage.java rename to game/src/main/java/org/apollo/game/message/impl/UpdateSlottedItemsMessage.java diff --git a/game/src/main/org/apollo/game/message/impl/UpdateTileItemMessage.java b/game/src/main/java/org/apollo/game/message/impl/UpdateTileItemMessage.java similarity index 100% rename from game/src/main/org/apollo/game/message/impl/UpdateTileItemMessage.java rename to game/src/main/java/org/apollo/game/message/impl/UpdateTileItemMessage.java diff --git a/game/src/main/org/apollo/game/message/impl/UpdateWeightMessage.java b/game/src/main/java/org/apollo/game/message/impl/UpdateWeightMessage.java similarity index 100% rename from game/src/main/org/apollo/game/message/impl/UpdateWeightMessage.java rename to game/src/main/java/org/apollo/game/message/impl/UpdateWeightMessage.java diff --git a/game/src/main/org/apollo/game/message/impl/WalkMessage.java b/game/src/main/java/org/apollo/game/message/impl/WalkMessage.java similarity index 100% rename from game/src/main/org/apollo/game/message/impl/WalkMessage.java rename to game/src/main/java/org/apollo/game/message/impl/WalkMessage.java diff --git a/game/src/main/org/apollo/game/message/impl/package-info.java b/game/src/main/java/org/apollo/game/message/impl/package-info.java similarity index 100% rename from game/src/main/org/apollo/game/message/impl/package-info.java rename to game/src/main/java/org/apollo/game/message/impl/package-info.java diff --git a/game/src/main/org/apollo/game/model/Animation.java b/game/src/main/java/org/apollo/game/model/Animation.java similarity index 100% rename from game/src/main/org/apollo/game/model/Animation.java rename to game/src/main/java/org/apollo/game/model/Animation.java diff --git a/game/src/main/org/apollo/game/model/Appearance.java b/game/src/main/java/org/apollo/game/model/Appearance.java similarity index 100% rename from game/src/main/org/apollo/game/model/Appearance.java rename to game/src/main/java/org/apollo/game/model/Appearance.java diff --git a/game/src/main/org/apollo/game/model/Direction.java b/game/src/main/java/org/apollo/game/model/Direction.java similarity index 100% rename from game/src/main/org/apollo/game/model/Direction.java rename to game/src/main/java/org/apollo/game/model/Direction.java diff --git a/game/src/main/org/apollo/game/model/Graphic.java b/game/src/main/java/org/apollo/game/model/Graphic.java similarity index 100% rename from game/src/main/org/apollo/game/model/Graphic.java rename to game/src/main/java/org/apollo/game/model/Graphic.java diff --git a/game/src/main/org/apollo/game/model/Item.java b/game/src/main/java/org/apollo/game/model/Item.java similarity index 100% rename from game/src/main/org/apollo/game/model/Item.java rename to game/src/main/java/org/apollo/game/model/Item.java diff --git a/game/src/main/org/apollo/game/model/Position.java b/game/src/main/java/org/apollo/game/model/Position.java similarity index 100% rename from game/src/main/org/apollo/game/model/Position.java rename to game/src/main/java/org/apollo/game/model/Position.java diff --git a/game/src/main/org/apollo/game/model/World.java b/game/src/main/java/org/apollo/game/model/World.java similarity index 100% rename from game/src/main/org/apollo/game/model/World.java rename to game/src/main/java/org/apollo/game/model/World.java diff --git a/game/src/main/org/apollo/game/model/WorldConstants.java b/game/src/main/java/org/apollo/game/model/WorldConstants.java similarity index 100% rename from game/src/main/org/apollo/game/model/WorldConstants.java rename to game/src/main/java/org/apollo/game/model/WorldConstants.java diff --git a/game/src/main/org/apollo/game/model/area/EntityUpdateType.java b/game/src/main/java/org/apollo/game/model/area/EntityUpdateType.java similarity index 100% rename from game/src/main/org/apollo/game/model/area/EntityUpdateType.java rename to game/src/main/java/org/apollo/game/model/area/EntityUpdateType.java diff --git a/game/src/main/org/apollo/game/model/area/Region.java b/game/src/main/java/org/apollo/game/model/area/Region.java similarity index 100% rename from game/src/main/org/apollo/game/model/area/Region.java rename to game/src/main/java/org/apollo/game/model/area/Region.java diff --git a/game/src/main/org/apollo/game/model/area/RegionCoordinates.java b/game/src/main/java/org/apollo/game/model/area/RegionCoordinates.java similarity index 100% rename from game/src/main/org/apollo/game/model/area/RegionCoordinates.java rename to game/src/main/java/org/apollo/game/model/area/RegionCoordinates.java diff --git a/game/src/main/org/apollo/game/model/area/RegionListener.java b/game/src/main/java/org/apollo/game/model/area/RegionListener.java similarity index 100% rename from game/src/main/org/apollo/game/model/area/RegionListener.java rename to game/src/main/java/org/apollo/game/model/area/RegionListener.java diff --git a/game/src/main/org/apollo/game/model/area/RegionRepository.java b/game/src/main/java/org/apollo/game/model/area/RegionRepository.java similarity index 100% rename from game/src/main/org/apollo/game/model/area/RegionRepository.java rename to game/src/main/java/org/apollo/game/model/area/RegionRepository.java diff --git a/game/src/main/org/apollo/game/model/area/collision/CollisionFlag.java b/game/src/main/java/org/apollo/game/model/area/collision/CollisionFlag.java similarity index 100% rename from game/src/main/org/apollo/game/model/area/collision/CollisionFlag.java rename to game/src/main/java/org/apollo/game/model/area/collision/CollisionFlag.java diff --git a/game/src/main/org/apollo/game/model/area/collision/CollisionManager.java b/game/src/main/java/org/apollo/game/model/area/collision/CollisionManager.java similarity index 100% rename from game/src/main/org/apollo/game/model/area/collision/CollisionManager.java rename to game/src/main/java/org/apollo/game/model/area/collision/CollisionManager.java diff --git a/game/src/main/org/apollo/game/model/area/collision/CollisionMatrix.java b/game/src/main/java/org/apollo/game/model/area/collision/CollisionMatrix.java similarity index 100% rename from game/src/main/org/apollo/game/model/area/collision/CollisionMatrix.java rename to game/src/main/java/org/apollo/game/model/area/collision/CollisionMatrix.java diff --git a/game/src/main/org/apollo/game/model/area/collision/CollisionUpdate.java b/game/src/main/java/org/apollo/game/model/area/collision/CollisionUpdate.java similarity index 100% rename from game/src/main/org/apollo/game/model/area/collision/CollisionUpdate.java rename to game/src/main/java/org/apollo/game/model/area/collision/CollisionUpdate.java diff --git a/game/src/main/org/apollo/game/model/area/collision/CollisionUpdateListener.java b/game/src/main/java/org/apollo/game/model/area/collision/CollisionUpdateListener.java similarity index 100% rename from game/src/main/org/apollo/game/model/area/collision/CollisionUpdateListener.java rename to game/src/main/java/org/apollo/game/model/area/collision/CollisionUpdateListener.java diff --git a/game/src/main/org/apollo/game/model/area/collision/CollisionUpdateType.java b/game/src/main/java/org/apollo/game/model/area/collision/CollisionUpdateType.java similarity index 100% rename from game/src/main/org/apollo/game/model/area/collision/CollisionUpdateType.java rename to game/src/main/java/org/apollo/game/model/area/collision/CollisionUpdateType.java diff --git a/game/src/main/org/apollo/game/model/area/collision/package-info.java b/game/src/main/java/org/apollo/game/model/area/collision/package-info.java similarity index 100% rename from game/src/main/org/apollo/game/model/area/collision/package-info.java rename to game/src/main/java/org/apollo/game/model/area/collision/package-info.java diff --git a/game/src/main/org/apollo/game/model/area/package-info.java b/game/src/main/java/org/apollo/game/model/area/package-info.java similarity index 100% rename from game/src/main/org/apollo/game/model/area/package-info.java rename to game/src/main/java/org/apollo/game/model/area/package-info.java diff --git a/game/src/main/org/apollo/game/model/area/update/GroupableEntity.java b/game/src/main/java/org/apollo/game/model/area/update/GroupableEntity.java similarity index 100% rename from game/src/main/org/apollo/game/model/area/update/GroupableEntity.java rename to game/src/main/java/org/apollo/game/model/area/update/GroupableEntity.java diff --git a/game/src/main/org/apollo/game/model/area/update/ItemUpdateOperation.java b/game/src/main/java/org/apollo/game/model/area/update/ItemUpdateOperation.java similarity index 100% rename from game/src/main/org/apollo/game/model/area/update/ItemUpdateOperation.java rename to game/src/main/java/org/apollo/game/model/area/update/ItemUpdateOperation.java diff --git a/game/src/main/org/apollo/game/model/area/update/ObjectUpdateOperation.java b/game/src/main/java/org/apollo/game/model/area/update/ObjectUpdateOperation.java similarity index 100% rename from game/src/main/org/apollo/game/model/area/update/ObjectUpdateOperation.java rename to game/src/main/java/org/apollo/game/model/area/update/ObjectUpdateOperation.java diff --git a/game/src/main/org/apollo/game/model/area/update/ProjectileUpdateOperation.java b/game/src/main/java/org/apollo/game/model/area/update/ProjectileUpdateOperation.java similarity index 100% rename from game/src/main/org/apollo/game/model/area/update/ProjectileUpdateOperation.java rename to game/src/main/java/org/apollo/game/model/area/update/ProjectileUpdateOperation.java diff --git a/game/src/main/org/apollo/game/model/area/update/UpdateOperation.java b/game/src/main/java/org/apollo/game/model/area/update/UpdateOperation.java similarity index 100% rename from game/src/main/org/apollo/game/model/area/update/UpdateOperation.java rename to game/src/main/java/org/apollo/game/model/area/update/UpdateOperation.java diff --git a/game/src/main/org/apollo/game/model/area/update/package-info.java b/game/src/main/java/org/apollo/game/model/area/update/package-info.java similarity index 100% rename from game/src/main/org/apollo/game/model/area/update/package-info.java rename to game/src/main/java/org/apollo/game/model/area/update/package-info.java diff --git a/game/src/main/org/apollo/game/model/entity/Entity.java b/game/src/main/java/org/apollo/game/model/entity/Entity.java similarity index 100% rename from game/src/main/org/apollo/game/model/entity/Entity.java rename to game/src/main/java/org/apollo/game/model/entity/Entity.java diff --git a/game/src/main/org/apollo/game/model/entity/EntityType.java b/game/src/main/java/org/apollo/game/model/entity/EntityType.java similarity index 100% rename from game/src/main/org/apollo/game/model/entity/EntityType.java rename to game/src/main/java/org/apollo/game/model/entity/EntityType.java diff --git a/game/src/main/org/apollo/game/model/entity/EquipmentConstants.java b/game/src/main/java/org/apollo/game/model/entity/EquipmentConstants.java similarity index 100% rename from game/src/main/org/apollo/game/model/entity/EquipmentConstants.java rename to game/src/main/java/org/apollo/game/model/entity/EquipmentConstants.java diff --git a/game/src/main/org/apollo/game/model/entity/GroundItem.java b/game/src/main/java/org/apollo/game/model/entity/GroundItem.java similarity index 100% rename from game/src/main/org/apollo/game/model/entity/GroundItem.java rename to game/src/main/java/org/apollo/game/model/entity/GroundItem.java diff --git a/game/src/main/org/apollo/game/model/entity/Mob.java b/game/src/main/java/org/apollo/game/model/entity/Mob.java similarity index 100% rename from game/src/main/org/apollo/game/model/entity/Mob.java rename to game/src/main/java/org/apollo/game/model/entity/Mob.java diff --git a/game/src/main/org/apollo/game/model/entity/MobRepository.java b/game/src/main/java/org/apollo/game/model/entity/MobRepository.java similarity index 100% rename from game/src/main/org/apollo/game/model/entity/MobRepository.java rename to game/src/main/java/org/apollo/game/model/entity/MobRepository.java diff --git a/game/src/main/org/apollo/game/model/entity/Npc.java b/game/src/main/java/org/apollo/game/model/entity/Npc.java similarity index 100% rename from game/src/main/org/apollo/game/model/entity/Npc.java rename to game/src/main/java/org/apollo/game/model/entity/Npc.java diff --git a/game/src/main/org/apollo/game/model/entity/Player.java b/game/src/main/java/org/apollo/game/model/entity/Player.java similarity index 100% rename from game/src/main/org/apollo/game/model/entity/Player.java rename to game/src/main/java/org/apollo/game/model/entity/Player.java diff --git a/game/src/main/org/apollo/game/model/entity/Projectile.java b/game/src/main/java/org/apollo/game/model/entity/Projectile.java similarity index 100% rename from game/src/main/org/apollo/game/model/entity/Projectile.java rename to game/src/main/java/org/apollo/game/model/entity/Projectile.java diff --git a/game/src/main/org/apollo/game/model/entity/Skill.java b/game/src/main/java/org/apollo/game/model/entity/Skill.java similarity index 100% rename from game/src/main/org/apollo/game/model/entity/Skill.java rename to game/src/main/java/org/apollo/game/model/entity/Skill.java diff --git a/game/src/main/org/apollo/game/model/entity/SkillSet.java b/game/src/main/java/org/apollo/game/model/entity/SkillSet.java similarity index 100% rename from game/src/main/org/apollo/game/model/entity/SkillSet.java rename to game/src/main/java/org/apollo/game/model/entity/SkillSet.java diff --git a/game/src/main/org/apollo/game/model/entity/WalkingQueue.java b/game/src/main/java/org/apollo/game/model/entity/WalkingQueue.java similarity index 100% rename from game/src/main/org/apollo/game/model/entity/WalkingQueue.java rename to game/src/main/java/org/apollo/game/model/entity/WalkingQueue.java diff --git a/game/src/main/org/apollo/game/model/entity/attr/Attribute.java b/game/src/main/java/org/apollo/game/model/entity/attr/Attribute.java similarity index 100% rename from game/src/main/org/apollo/game/model/entity/attr/Attribute.java rename to game/src/main/java/org/apollo/game/model/entity/attr/Attribute.java diff --git a/game/src/main/org/apollo/game/model/entity/attr/AttributeDefinition.java b/game/src/main/java/org/apollo/game/model/entity/attr/AttributeDefinition.java similarity index 100% rename from game/src/main/org/apollo/game/model/entity/attr/AttributeDefinition.java rename to game/src/main/java/org/apollo/game/model/entity/attr/AttributeDefinition.java diff --git a/game/src/main/org/apollo/game/model/entity/attr/AttributeMap.java b/game/src/main/java/org/apollo/game/model/entity/attr/AttributeMap.java similarity index 100% rename from game/src/main/org/apollo/game/model/entity/attr/AttributeMap.java rename to game/src/main/java/org/apollo/game/model/entity/attr/AttributeMap.java diff --git a/game/src/main/org/apollo/game/model/entity/attr/AttributePersistence.java b/game/src/main/java/org/apollo/game/model/entity/attr/AttributePersistence.java similarity index 100% rename from game/src/main/org/apollo/game/model/entity/attr/AttributePersistence.java rename to game/src/main/java/org/apollo/game/model/entity/attr/AttributePersistence.java diff --git a/game/src/main/org/apollo/game/model/entity/attr/AttributeType.java b/game/src/main/java/org/apollo/game/model/entity/attr/AttributeType.java similarity index 100% rename from game/src/main/org/apollo/game/model/entity/attr/AttributeType.java rename to game/src/main/java/org/apollo/game/model/entity/attr/AttributeType.java diff --git a/game/src/main/org/apollo/game/model/entity/attr/BooleanAttribute.java b/game/src/main/java/org/apollo/game/model/entity/attr/BooleanAttribute.java similarity index 100% rename from game/src/main/org/apollo/game/model/entity/attr/BooleanAttribute.java rename to game/src/main/java/org/apollo/game/model/entity/attr/BooleanAttribute.java diff --git a/game/src/main/org/apollo/game/model/entity/attr/NumericalAttribute.java b/game/src/main/java/org/apollo/game/model/entity/attr/NumericalAttribute.java similarity index 100% rename from game/src/main/org/apollo/game/model/entity/attr/NumericalAttribute.java rename to game/src/main/java/org/apollo/game/model/entity/attr/NumericalAttribute.java diff --git a/game/src/main/org/apollo/game/model/entity/attr/StringAttribute.java b/game/src/main/java/org/apollo/game/model/entity/attr/StringAttribute.java similarity index 100% rename from game/src/main/org/apollo/game/model/entity/attr/StringAttribute.java rename to game/src/main/java/org/apollo/game/model/entity/attr/StringAttribute.java diff --git a/game/src/main/org/apollo/game/model/entity/attr/package-info.java b/game/src/main/java/org/apollo/game/model/entity/attr/package-info.java similarity index 100% rename from game/src/main/org/apollo/game/model/entity/attr/package-info.java rename to game/src/main/java/org/apollo/game/model/entity/attr/package-info.java diff --git a/game/src/main/org/apollo/game/model/entity/obj/DynamicGameObject.java b/game/src/main/java/org/apollo/game/model/entity/obj/DynamicGameObject.java similarity index 100% rename from game/src/main/org/apollo/game/model/entity/obj/DynamicGameObject.java rename to game/src/main/java/org/apollo/game/model/entity/obj/DynamicGameObject.java diff --git a/game/src/main/org/apollo/game/model/entity/obj/GameObject.java b/game/src/main/java/org/apollo/game/model/entity/obj/GameObject.java similarity index 100% rename from game/src/main/org/apollo/game/model/entity/obj/GameObject.java rename to game/src/main/java/org/apollo/game/model/entity/obj/GameObject.java diff --git a/game/src/main/org/apollo/game/model/entity/obj/ObjectGroup.java b/game/src/main/java/org/apollo/game/model/entity/obj/ObjectGroup.java similarity index 100% rename from game/src/main/org/apollo/game/model/entity/obj/ObjectGroup.java rename to game/src/main/java/org/apollo/game/model/entity/obj/ObjectGroup.java diff --git a/game/src/main/org/apollo/game/model/entity/obj/ObjectType.java b/game/src/main/java/org/apollo/game/model/entity/obj/ObjectType.java similarity index 100% rename from game/src/main/org/apollo/game/model/entity/obj/ObjectType.java rename to game/src/main/java/org/apollo/game/model/entity/obj/ObjectType.java diff --git a/game/src/main/org/apollo/game/model/entity/obj/StaticGameObject.java b/game/src/main/java/org/apollo/game/model/entity/obj/StaticGameObject.java similarity index 100% rename from game/src/main/org/apollo/game/model/entity/obj/StaticGameObject.java rename to game/src/main/java/org/apollo/game/model/entity/obj/StaticGameObject.java diff --git a/game/src/main/org/apollo/game/model/entity/obj/package-info.java b/game/src/main/java/org/apollo/game/model/entity/obj/package-info.java similarity index 100% rename from game/src/main/org/apollo/game/model/entity/obj/package-info.java rename to game/src/main/java/org/apollo/game/model/entity/obj/package-info.java diff --git a/game/src/main/org/apollo/game/model/entity/package-info.java b/game/src/main/java/org/apollo/game/model/entity/package-info.java similarity index 100% rename from game/src/main/org/apollo/game/model/entity/package-info.java rename to game/src/main/java/org/apollo/game/model/entity/package-info.java diff --git a/game/src/main/org/apollo/game/model/entity/path/AStarPathfindingAlgorithm.java b/game/src/main/java/org/apollo/game/model/entity/path/AStarPathfindingAlgorithm.java similarity index 100% rename from game/src/main/org/apollo/game/model/entity/path/AStarPathfindingAlgorithm.java rename to game/src/main/java/org/apollo/game/model/entity/path/AStarPathfindingAlgorithm.java diff --git a/game/src/main/org/apollo/game/model/entity/path/ChebyshevHeuristic.java b/game/src/main/java/org/apollo/game/model/entity/path/ChebyshevHeuristic.java similarity index 100% rename from game/src/main/org/apollo/game/model/entity/path/ChebyshevHeuristic.java rename to game/src/main/java/org/apollo/game/model/entity/path/ChebyshevHeuristic.java diff --git a/game/src/main/org/apollo/game/model/entity/path/EuclideanHeuristic.java b/game/src/main/java/org/apollo/game/model/entity/path/EuclideanHeuristic.java similarity index 100% rename from game/src/main/org/apollo/game/model/entity/path/EuclideanHeuristic.java rename to game/src/main/java/org/apollo/game/model/entity/path/EuclideanHeuristic.java diff --git a/game/src/main/org/apollo/game/model/entity/path/Heuristic.java b/game/src/main/java/org/apollo/game/model/entity/path/Heuristic.java similarity index 100% rename from game/src/main/org/apollo/game/model/entity/path/Heuristic.java rename to game/src/main/java/org/apollo/game/model/entity/path/Heuristic.java diff --git a/game/src/main/org/apollo/game/model/entity/path/ManhattanHeuristic.java b/game/src/main/java/org/apollo/game/model/entity/path/ManhattanHeuristic.java similarity index 100% rename from game/src/main/org/apollo/game/model/entity/path/ManhattanHeuristic.java rename to game/src/main/java/org/apollo/game/model/entity/path/ManhattanHeuristic.java diff --git a/game/src/main/org/apollo/game/model/entity/path/Node.java b/game/src/main/java/org/apollo/game/model/entity/path/Node.java similarity index 100% rename from game/src/main/org/apollo/game/model/entity/path/Node.java rename to game/src/main/java/org/apollo/game/model/entity/path/Node.java diff --git a/game/src/main/org/apollo/game/model/entity/path/PathfindingAlgorithm.java b/game/src/main/java/org/apollo/game/model/entity/path/PathfindingAlgorithm.java similarity index 100% rename from game/src/main/org/apollo/game/model/entity/path/PathfindingAlgorithm.java rename to game/src/main/java/org/apollo/game/model/entity/path/PathfindingAlgorithm.java diff --git a/game/src/main/org/apollo/game/model/entity/path/SimplePathfindingAlgorithm.java b/game/src/main/java/org/apollo/game/model/entity/path/SimplePathfindingAlgorithm.java similarity index 100% rename from game/src/main/org/apollo/game/model/entity/path/SimplePathfindingAlgorithm.java rename to game/src/main/java/org/apollo/game/model/entity/path/SimplePathfindingAlgorithm.java diff --git a/game/src/main/org/apollo/game/model/entity/path/package-info.java b/game/src/main/java/org/apollo/game/model/entity/path/package-info.java similarity index 100% rename from game/src/main/org/apollo/game/model/entity/path/package-info.java rename to game/src/main/java/org/apollo/game/model/entity/path/package-info.java diff --git a/game/src/main/org/apollo/game/model/entity/setting/Gender.java b/game/src/main/java/org/apollo/game/model/entity/setting/Gender.java similarity index 100% rename from game/src/main/org/apollo/game/model/entity/setting/Gender.java rename to game/src/main/java/org/apollo/game/model/entity/setting/Gender.java diff --git a/game/src/main/org/apollo/game/model/entity/setting/MembershipStatus.java b/game/src/main/java/org/apollo/game/model/entity/setting/MembershipStatus.java similarity index 100% rename from game/src/main/org/apollo/game/model/entity/setting/MembershipStatus.java rename to game/src/main/java/org/apollo/game/model/entity/setting/MembershipStatus.java diff --git a/game/src/main/org/apollo/game/model/entity/setting/PrivacyState.java b/game/src/main/java/org/apollo/game/model/entity/setting/PrivacyState.java similarity index 100% rename from game/src/main/org/apollo/game/model/entity/setting/PrivacyState.java rename to game/src/main/java/org/apollo/game/model/entity/setting/PrivacyState.java diff --git a/game/src/main/org/apollo/game/model/entity/setting/PrivilegeLevel.java b/game/src/main/java/org/apollo/game/model/entity/setting/PrivilegeLevel.java similarity index 100% rename from game/src/main/org/apollo/game/model/entity/setting/PrivilegeLevel.java rename to game/src/main/java/org/apollo/game/model/entity/setting/PrivilegeLevel.java diff --git a/game/src/main/org/apollo/game/model/entity/setting/ScreenBrightness.java b/game/src/main/java/org/apollo/game/model/entity/setting/ScreenBrightness.java similarity index 100% rename from game/src/main/org/apollo/game/model/entity/setting/ScreenBrightness.java rename to game/src/main/java/org/apollo/game/model/entity/setting/ScreenBrightness.java diff --git a/game/src/main/org/apollo/game/model/entity/setting/ServerStatus.java b/game/src/main/java/org/apollo/game/model/entity/setting/ServerStatus.java similarity index 100% rename from game/src/main/org/apollo/game/model/entity/setting/ServerStatus.java rename to game/src/main/java/org/apollo/game/model/entity/setting/ServerStatus.java diff --git a/game/src/main/org/apollo/game/model/entity/setting/package-info.java b/game/src/main/java/org/apollo/game/model/entity/setting/package-info.java similarity index 100% rename from game/src/main/org/apollo/game/model/entity/setting/package-info.java rename to game/src/main/java/org/apollo/game/model/entity/setting/package-info.java diff --git a/game/src/main/org/apollo/game/model/event/Event.java b/game/src/main/java/org/apollo/game/model/event/Event.java similarity index 100% rename from game/src/main/org/apollo/game/model/event/Event.java rename to game/src/main/java/org/apollo/game/model/event/Event.java diff --git a/game/src/main/org/apollo/game/model/event/EventListener.java b/game/src/main/java/org/apollo/game/model/event/EventListener.java similarity index 100% rename from game/src/main/org/apollo/game/model/event/EventListener.java rename to game/src/main/java/org/apollo/game/model/event/EventListener.java diff --git a/game/src/main/org/apollo/game/model/event/EventListenerChain.java b/game/src/main/java/org/apollo/game/model/event/EventListenerChain.java similarity index 100% rename from game/src/main/org/apollo/game/model/event/EventListenerChain.java rename to game/src/main/java/org/apollo/game/model/event/EventListenerChain.java diff --git a/game/src/main/org/apollo/game/model/event/EventListenerChainSet.java b/game/src/main/java/org/apollo/game/model/event/EventListenerChainSet.java similarity index 100% rename from game/src/main/org/apollo/game/model/event/EventListenerChainSet.java rename to game/src/main/java/org/apollo/game/model/event/EventListenerChainSet.java diff --git a/game/src/main/org/apollo/game/model/event/PlayerEvent.java b/game/src/main/java/org/apollo/game/model/event/PlayerEvent.java similarity index 100% rename from game/src/main/org/apollo/game/model/event/PlayerEvent.java rename to game/src/main/java/org/apollo/game/model/event/PlayerEvent.java diff --git a/game/src/main/org/apollo/game/model/event/ProxyEvent.java b/game/src/main/java/org/apollo/game/model/event/ProxyEvent.java similarity index 100% rename from game/src/main/org/apollo/game/model/event/ProxyEvent.java rename to game/src/main/java/org/apollo/game/model/event/ProxyEvent.java diff --git a/game/src/main/org/apollo/game/model/event/ProxyEventListener.java b/game/src/main/java/org/apollo/game/model/event/ProxyEventListener.java similarity index 100% rename from game/src/main/org/apollo/game/model/event/ProxyEventListener.java rename to game/src/main/java/org/apollo/game/model/event/ProxyEventListener.java diff --git a/game/src/main/org/apollo/game/model/event/impl/CloseInterfacesEvent.java b/game/src/main/java/org/apollo/game/model/event/impl/CloseInterfacesEvent.java similarity index 100% rename from game/src/main/org/apollo/game/model/event/impl/CloseInterfacesEvent.java rename to game/src/main/java/org/apollo/game/model/event/impl/CloseInterfacesEvent.java diff --git a/game/src/main/org/apollo/game/model/event/impl/LoginEvent.java b/game/src/main/java/org/apollo/game/model/event/impl/LoginEvent.java similarity index 100% rename from game/src/main/org/apollo/game/model/event/impl/LoginEvent.java rename to game/src/main/java/org/apollo/game/model/event/impl/LoginEvent.java diff --git a/game/src/main/org/apollo/game/model/event/impl/LogoutEvent.java b/game/src/main/java/org/apollo/game/model/event/impl/LogoutEvent.java similarity index 100% rename from game/src/main/org/apollo/game/model/event/impl/LogoutEvent.java rename to game/src/main/java/org/apollo/game/model/event/impl/LogoutEvent.java diff --git a/game/src/main/org/apollo/game/model/event/impl/MobPositionUpdateEvent.java b/game/src/main/java/org/apollo/game/model/event/impl/MobPositionUpdateEvent.java similarity index 100% rename from game/src/main/org/apollo/game/model/event/impl/MobPositionUpdateEvent.java rename to game/src/main/java/org/apollo/game/model/event/impl/MobPositionUpdateEvent.java diff --git a/game/src/main/org/apollo/game/model/event/impl/package-info.java b/game/src/main/java/org/apollo/game/model/event/impl/package-info.java similarity index 100% rename from game/src/main/org/apollo/game/model/event/impl/package-info.java rename to game/src/main/java/org/apollo/game/model/event/impl/package-info.java diff --git a/game/src/main/org/apollo/game/model/event/package-info.java b/game/src/main/java/org/apollo/game/model/event/package-info.java similarity index 100% rename from game/src/main/org/apollo/game/model/event/package-info.java rename to game/src/main/java/org/apollo/game/model/event/package-info.java diff --git a/game/src/main/org/apollo/game/model/inter/EnterAmountListener.java b/game/src/main/java/org/apollo/game/model/inter/EnterAmountListener.java similarity index 100% rename from game/src/main/org/apollo/game/model/inter/EnterAmountListener.java rename to game/src/main/java/org/apollo/game/model/inter/EnterAmountListener.java diff --git a/game/src/main/org/apollo/game/model/inter/InterfaceConstants.java b/game/src/main/java/org/apollo/game/model/inter/InterfaceConstants.java similarity index 100% rename from game/src/main/org/apollo/game/model/inter/InterfaceConstants.java rename to game/src/main/java/org/apollo/game/model/inter/InterfaceConstants.java diff --git a/game/src/main/org/apollo/game/model/inter/InterfaceListener.java b/game/src/main/java/org/apollo/game/model/inter/InterfaceListener.java similarity index 100% rename from game/src/main/org/apollo/game/model/inter/InterfaceListener.java rename to game/src/main/java/org/apollo/game/model/inter/InterfaceListener.java diff --git a/game/src/main/org/apollo/game/model/inter/InterfaceSet.java b/game/src/main/java/org/apollo/game/model/inter/InterfaceSet.java similarity index 100% rename from game/src/main/org/apollo/game/model/inter/InterfaceSet.java rename to game/src/main/java/org/apollo/game/model/inter/InterfaceSet.java diff --git a/game/src/main/org/apollo/game/model/inter/InterfaceType.java b/game/src/main/java/org/apollo/game/model/inter/InterfaceType.java similarity index 100% rename from game/src/main/org/apollo/game/model/inter/InterfaceType.java rename to game/src/main/java/org/apollo/game/model/inter/InterfaceType.java diff --git a/game/src/main/org/apollo/game/model/inter/bank/BankConstants.java b/game/src/main/java/org/apollo/game/model/inter/bank/BankConstants.java similarity index 100% rename from game/src/main/org/apollo/game/model/inter/bank/BankConstants.java rename to game/src/main/java/org/apollo/game/model/inter/bank/BankConstants.java diff --git a/game/src/main/org/apollo/game/model/inter/bank/BankDepositEnterAmountListener.java b/game/src/main/java/org/apollo/game/model/inter/bank/BankDepositEnterAmountListener.java similarity index 100% rename from game/src/main/org/apollo/game/model/inter/bank/BankDepositEnterAmountListener.java rename to game/src/main/java/org/apollo/game/model/inter/bank/BankDepositEnterAmountListener.java diff --git a/game/src/main/org/apollo/game/model/inter/bank/BankInterfaceListener.java b/game/src/main/java/org/apollo/game/model/inter/bank/BankInterfaceListener.java similarity index 100% rename from game/src/main/org/apollo/game/model/inter/bank/BankInterfaceListener.java rename to game/src/main/java/org/apollo/game/model/inter/bank/BankInterfaceListener.java diff --git a/game/src/main/org/apollo/game/model/inter/bank/BankUtils.java b/game/src/main/java/org/apollo/game/model/inter/bank/BankUtils.java similarity index 100% rename from game/src/main/org/apollo/game/model/inter/bank/BankUtils.java rename to game/src/main/java/org/apollo/game/model/inter/bank/BankUtils.java diff --git a/game/src/main/org/apollo/game/model/inter/bank/BankWithdrawEnterAmountListener.java b/game/src/main/java/org/apollo/game/model/inter/bank/BankWithdrawEnterAmountListener.java similarity index 100% rename from game/src/main/org/apollo/game/model/inter/bank/BankWithdrawEnterAmountListener.java rename to game/src/main/java/org/apollo/game/model/inter/bank/BankWithdrawEnterAmountListener.java diff --git a/game/src/main/org/apollo/game/model/inter/bank/package-info.java b/game/src/main/java/org/apollo/game/model/inter/bank/package-info.java similarity index 100% rename from game/src/main/org/apollo/game/model/inter/bank/package-info.java rename to game/src/main/java/org/apollo/game/model/inter/bank/package-info.java diff --git a/game/src/main/org/apollo/game/model/inter/dialogue/DialogueAdapter.java b/game/src/main/java/org/apollo/game/model/inter/dialogue/DialogueAdapter.java similarity index 100% rename from game/src/main/org/apollo/game/model/inter/dialogue/DialogueAdapter.java rename to game/src/main/java/org/apollo/game/model/inter/dialogue/DialogueAdapter.java diff --git a/game/src/main/org/apollo/game/model/inter/dialogue/DialogueListener.java b/game/src/main/java/org/apollo/game/model/inter/dialogue/DialogueListener.java similarity index 100% rename from game/src/main/org/apollo/game/model/inter/dialogue/DialogueListener.java rename to game/src/main/java/org/apollo/game/model/inter/dialogue/DialogueListener.java diff --git a/game/src/main/org/apollo/game/model/inter/dialogue/package-info.java b/game/src/main/java/org/apollo/game/model/inter/dialogue/package-info.java similarity index 100% rename from game/src/main/org/apollo/game/model/inter/dialogue/package-info.java rename to game/src/main/java/org/apollo/game/model/inter/dialogue/package-info.java diff --git a/game/src/main/org/apollo/game/model/inter/package-info.java b/game/src/main/java/org/apollo/game/model/inter/package-info.java similarity index 100% rename from game/src/main/org/apollo/game/model/inter/package-info.java rename to game/src/main/java/org/apollo/game/model/inter/package-info.java diff --git a/game/src/main/org/apollo/game/model/inv/AppearanceInventoryListener.java b/game/src/main/java/org/apollo/game/model/inv/AppearanceInventoryListener.java similarity index 100% rename from game/src/main/org/apollo/game/model/inv/AppearanceInventoryListener.java rename to game/src/main/java/org/apollo/game/model/inv/AppearanceInventoryListener.java diff --git a/game/src/main/org/apollo/game/model/inv/FullInventoryListener.java b/game/src/main/java/org/apollo/game/model/inv/FullInventoryListener.java similarity index 100% rename from game/src/main/org/apollo/game/model/inv/FullInventoryListener.java rename to game/src/main/java/org/apollo/game/model/inv/FullInventoryListener.java diff --git a/game/src/main/org/apollo/game/model/inv/Inventory.java b/game/src/main/java/org/apollo/game/model/inv/Inventory.java similarity index 100% rename from game/src/main/org/apollo/game/model/inv/Inventory.java rename to game/src/main/java/org/apollo/game/model/inv/Inventory.java diff --git a/game/src/main/org/apollo/game/model/inv/InventoryAdapter.java b/game/src/main/java/org/apollo/game/model/inv/InventoryAdapter.java similarity index 100% rename from game/src/main/org/apollo/game/model/inv/InventoryAdapter.java rename to game/src/main/java/org/apollo/game/model/inv/InventoryAdapter.java diff --git a/game/src/main/org/apollo/game/model/inv/InventoryConstants.java b/game/src/main/java/org/apollo/game/model/inv/InventoryConstants.java similarity index 100% rename from game/src/main/org/apollo/game/model/inv/InventoryConstants.java rename to game/src/main/java/org/apollo/game/model/inv/InventoryConstants.java diff --git a/game/src/main/org/apollo/game/model/inv/InventoryListener.java b/game/src/main/java/org/apollo/game/model/inv/InventoryListener.java similarity index 100% rename from game/src/main/org/apollo/game/model/inv/InventoryListener.java rename to game/src/main/java/org/apollo/game/model/inv/InventoryListener.java diff --git a/game/src/main/org/apollo/game/model/inv/SlottedItem.java b/game/src/main/java/org/apollo/game/model/inv/SlottedItem.java similarity index 100% rename from game/src/main/org/apollo/game/model/inv/SlottedItem.java rename to game/src/main/java/org/apollo/game/model/inv/SlottedItem.java diff --git a/game/src/main/org/apollo/game/model/inv/SynchronizationInventoryListener.java b/game/src/main/java/org/apollo/game/model/inv/SynchronizationInventoryListener.java similarity index 100% rename from game/src/main/org/apollo/game/model/inv/SynchronizationInventoryListener.java rename to game/src/main/java/org/apollo/game/model/inv/SynchronizationInventoryListener.java diff --git a/game/src/main/org/apollo/game/model/inv/package-info.java b/game/src/main/java/org/apollo/game/model/inv/package-info.java similarity index 100% rename from game/src/main/org/apollo/game/model/inv/package-info.java rename to game/src/main/java/org/apollo/game/model/inv/package-info.java diff --git a/game/src/main/org/apollo/game/model/package-info.java b/game/src/main/java/org/apollo/game/model/package-info.java similarity index 100% rename from game/src/main/org/apollo/game/model/package-info.java rename to game/src/main/java/org/apollo/game/model/package-info.java diff --git a/game/src/main/org/apollo/game/model/skill/LevelUpSkillListener.java b/game/src/main/java/org/apollo/game/model/skill/LevelUpSkillListener.java similarity index 100% rename from game/src/main/org/apollo/game/model/skill/LevelUpSkillListener.java rename to game/src/main/java/org/apollo/game/model/skill/LevelUpSkillListener.java diff --git a/game/src/main/org/apollo/game/model/skill/SkillAdapter.java b/game/src/main/java/org/apollo/game/model/skill/SkillAdapter.java similarity index 100% rename from game/src/main/org/apollo/game/model/skill/SkillAdapter.java rename to game/src/main/java/org/apollo/game/model/skill/SkillAdapter.java diff --git a/game/src/main/org/apollo/game/model/skill/SkillListener.java b/game/src/main/java/org/apollo/game/model/skill/SkillListener.java similarity index 100% rename from game/src/main/org/apollo/game/model/skill/SkillListener.java rename to game/src/main/java/org/apollo/game/model/skill/SkillListener.java diff --git a/game/src/main/org/apollo/game/model/skill/SynchronizationSkillListener.java b/game/src/main/java/org/apollo/game/model/skill/SynchronizationSkillListener.java similarity index 100% rename from game/src/main/org/apollo/game/model/skill/SynchronizationSkillListener.java rename to game/src/main/java/org/apollo/game/model/skill/SynchronizationSkillListener.java diff --git a/game/src/main/org/apollo/game/model/skill/package-info.java b/game/src/main/java/org/apollo/game/model/skill/package-info.java similarity index 100% rename from game/src/main/org/apollo/game/model/skill/package-info.java rename to game/src/main/java/org/apollo/game/model/skill/package-info.java diff --git a/game/src/main/org/apollo/game/package-info.java b/game/src/main/java/org/apollo/game/package-info.java similarity index 100% rename from game/src/main/org/apollo/game/package-info.java rename to game/src/main/java/org/apollo/game/package-info.java diff --git a/game/src/main/org/apollo/game/plugin/DependencyException.java b/game/src/main/java/org/apollo/game/plugin/DependencyException.java similarity index 100% rename from game/src/main/org/apollo/game/plugin/DependencyException.java rename to game/src/main/java/org/apollo/game/plugin/DependencyException.java diff --git a/game/src/main/java/org/apollo/game/plugin/KotlinPluginCompilerStub.java b/game/src/main/java/org/apollo/game/plugin/KotlinPluginCompilerStub.java new file mode 100644 index 00000000..1912d407 --- /dev/null +++ b/game/src/main/java/org/apollo/game/plugin/KotlinPluginCompilerStub.java @@ -0,0 +1,9 @@ +package org.apollo.game.plugin; + +import org.apollo.game.plugin.kotlin.KotlinPluginCompiler; + +public class KotlinPluginCompilerStub { + public static void main(String[] argv) { + KotlinPluginCompiler.main(argv); + } +} diff --git a/game/src/main/java/org/apollo/game/plugin/KotlinPluginEnvironment.java b/game/src/main/java/org/apollo/game/plugin/KotlinPluginEnvironment.java new file mode 100644 index 00000000..d433db17 --- /dev/null +++ b/game/src/main/java/org/apollo/game/plugin/KotlinPluginEnvironment.java @@ -0,0 +1,66 @@ +package org.apollo.game.plugin; + +import java.io.BufferedReader; +import java.io.File; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.lang.reflect.Constructor; +import java.net.URISyntaxException; +import java.net.URL; +import java.net.URLClassLoader; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.List; +import java.util.logging.Level; +import java.util.logging.Logger; +import java.util.stream.Collectors; +import org.apollo.game.model.World; +import org.apollo.game.plugin.kotlin.KotlinPluginCompiler; +import org.apollo.game.plugin.kotlin.KotlinPluginScript; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.kotlin.cli.common.messages.CompilerMessageLocation; +import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity; +import org.jetbrains.kotlin.cli.common.messages.MessageCollector; + +public class KotlinPluginEnvironment implements PluginEnvironment { + + private static final Logger logger = Logger.getLogger(KotlinPluginEnvironment.class.getName()); + + private final World world; + private PluginContext context; + + public KotlinPluginEnvironment(World world) { + this.world = world; + } + + @Override + public void load(Collection plugins) { + List pluginScripts = new ArrayList<>(); + + try (InputStream resource = KotlinPluginEnvironment.class.getResourceAsStream("/manifest.txt")) { + BufferedReader reader = new BufferedReader(new InputStreamReader(resource)); + List pluginClassNames = reader.lines().collect(Collectors.toList()); + + for (String pluginClassName : pluginClassNames) { + Class pluginClass = + (Class) Class.forName(pluginClassName); + + Constructor pluginConstructor = + pluginClass.getConstructor(World.class, PluginContext.class); + + pluginScripts.add(pluginConstructor.newInstance(world, context)); + } + } catch (Exception e) { + throw new RuntimeException(e); + } + + pluginScripts.forEach(KotlinPluginScript::doStart); + } + + @Override + public void setContext(PluginContext context) { + this.context = context; + } + +} diff --git a/game/src/main/org/apollo/game/plugin/PluginContext.java b/game/src/main/java/org/apollo/game/plugin/PluginContext.java similarity index 100% rename from game/src/main/org/apollo/game/plugin/PluginContext.java rename to game/src/main/java/org/apollo/game/plugin/PluginContext.java diff --git a/game/src/main/org/apollo/game/plugin/PluginEnvironment.java b/game/src/main/java/org/apollo/game/plugin/PluginEnvironment.java similarity index 100% rename from game/src/main/org/apollo/game/plugin/PluginEnvironment.java rename to game/src/main/java/org/apollo/game/plugin/PluginEnvironment.java diff --git a/game/src/main/org/apollo/game/plugin/PluginManager.java b/game/src/main/java/org/apollo/game/plugin/PluginManager.java similarity index 92% rename from game/src/main/org/apollo/game/plugin/PluginManager.java rename to game/src/main/java/org/apollo/game/plugin/PluginManager.java index db1b45dd..5471cb69 100644 --- a/game/src/main/org/apollo/game/plugin/PluginManager.java +++ b/game/src/main/java/org/apollo/game/plugin/PluginManager.java @@ -4,14 +4,7 @@ import java.io.File; import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; -import java.util.SortedSet; -import java.util.TreeSet; +import java.util.*; import java.util.function.Function; import java.util.stream.Collectors; @@ -143,8 +136,8 @@ public final class PluginManager { * @throws DependencyException If a dependency could not be resolved. */ public void start() throws IOException, SAXException, DependencyException { - Map plugins = createMap(findPlugins()); - Set started = new HashSet<>(); + //@todo - load metadata and respective plugins + Map plugins = new HashMap<>(); PluginEnvironment env = new KotlinPluginEnvironment(world); // TODO isolate plugins if possible in the future! env.setContext(context); diff --git a/game/src/main/org/apollo/game/plugin/PluginMetaData.java b/game/src/main/java/org/apollo/game/plugin/PluginMetaData.java similarity index 100% rename from game/src/main/org/apollo/game/plugin/PluginMetaData.java rename to game/src/main/java/org/apollo/game/plugin/PluginMetaData.java diff --git a/game/src/main/org/apollo/game/plugin/package-info.java b/game/src/main/java/org/apollo/game/plugin/package-info.java similarity index 100% rename from game/src/main/org/apollo/game/plugin/package-info.java rename to game/src/main/java/org/apollo/game/plugin/package-info.java diff --git a/game/src/main/org/apollo/game/release/r317/AddFriendMessageDecoder.java b/game/src/main/java/org/apollo/game/release/r317/AddFriendMessageDecoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r317/AddFriendMessageDecoder.java rename to game/src/main/java/org/apollo/game/release/r317/AddFriendMessageDecoder.java diff --git a/game/src/main/org/apollo/game/release/r317/AddGlobalTileItemMessageEncoder.java b/game/src/main/java/org/apollo/game/release/r317/AddGlobalTileItemMessageEncoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r317/AddGlobalTileItemMessageEncoder.java rename to game/src/main/java/org/apollo/game/release/r317/AddGlobalTileItemMessageEncoder.java diff --git a/game/src/main/org/apollo/game/release/r317/AddIgnoreMessageDecoder.java b/game/src/main/java/org/apollo/game/release/r317/AddIgnoreMessageDecoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r317/AddIgnoreMessageDecoder.java rename to game/src/main/java/org/apollo/game/release/r317/AddIgnoreMessageDecoder.java diff --git a/game/src/main/org/apollo/game/release/r317/AddTileItemMessageEncoder.java b/game/src/main/java/org/apollo/game/release/r317/AddTileItemMessageEncoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r317/AddTileItemMessageEncoder.java rename to game/src/main/java/org/apollo/game/release/r317/AddTileItemMessageEncoder.java diff --git a/game/src/main/org/apollo/game/release/r317/ArrowKeyMessageDecoder.java b/game/src/main/java/org/apollo/game/release/r317/ArrowKeyMessageDecoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r317/ArrowKeyMessageDecoder.java rename to game/src/main/java/org/apollo/game/release/r317/ArrowKeyMessageDecoder.java diff --git a/game/src/main/org/apollo/game/release/r317/ButtonMessageDecoder.java b/game/src/main/java/org/apollo/game/release/r317/ButtonMessageDecoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r317/ButtonMessageDecoder.java rename to game/src/main/java/org/apollo/game/release/r317/ButtonMessageDecoder.java diff --git a/game/src/main/org/apollo/game/release/r317/ClearRegionMessageEncoder.java b/game/src/main/java/org/apollo/game/release/r317/ClearRegionMessageEncoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r317/ClearRegionMessageEncoder.java rename to game/src/main/java/org/apollo/game/release/r317/ClearRegionMessageEncoder.java diff --git a/game/src/main/org/apollo/game/release/r317/CloseInterfaceMessageEncoder.java b/game/src/main/java/org/apollo/game/release/r317/CloseInterfaceMessageEncoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r317/CloseInterfaceMessageEncoder.java rename to game/src/main/java/org/apollo/game/release/r317/CloseInterfaceMessageEncoder.java diff --git a/game/src/main/org/apollo/game/release/r317/ClosedInterfaceMessageDecoder.java b/game/src/main/java/org/apollo/game/release/r317/ClosedInterfaceMessageDecoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r317/ClosedInterfaceMessageDecoder.java rename to game/src/main/java/org/apollo/game/release/r317/ClosedInterfaceMessageDecoder.java diff --git a/game/src/main/org/apollo/game/release/r317/CommandMessageDecoder.java b/game/src/main/java/org/apollo/game/release/r317/CommandMessageDecoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r317/CommandMessageDecoder.java rename to game/src/main/java/org/apollo/game/release/r317/CommandMessageDecoder.java diff --git a/game/src/main/org/apollo/game/release/r317/ConfigMessageEncoder.java b/game/src/main/java/org/apollo/game/release/r317/ConfigMessageEncoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r317/ConfigMessageEncoder.java rename to game/src/main/java/org/apollo/game/release/r317/ConfigMessageEncoder.java diff --git a/game/src/main/org/apollo/game/release/r317/DialogueContinueMessageDecoder.java b/game/src/main/java/org/apollo/game/release/r317/DialogueContinueMessageDecoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r317/DialogueContinueMessageDecoder.java rename to game/src/main/java/org/apollo/game/release/r317/DialogueContinueMessageDecoder.java diff --git a/game/src/main/org/apollo/game/release/r317/DisplayCrossbonesMessageEncoder.java b/game/src/main/java/org/apollo/game/release/r317/DisplayCrossbonesMessageEncoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r317/DisplayCrossbonesMessageEncoder.java rename to game/src/main/java/org/apollo/game/release/r317/DisplayCrossbonesMessageEncoder.java diff --git a/game/src/main/org/apollo/game/release/r317/DisplayTabInterfaceMessageEncoder.java b/game/src/main/java/org/apollo/game/release/r317/DisplayTabInterfaceMessageEncoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r317/DisplayTabInterfaceMessageEncoder.java rename to game/src/main/java/org/apollo/game/release/r317/DisplayTabInterfaceMessageEncoder.java diff --git a/game/src/main/org/apollo/game/release/r317/EnterAmountMessageEncoder.java b/game/src/main/java/org/apollo/game/release/r317/EnterAmountMessageEncoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r317/EnterAmountMessageEncoder.java rename to game/src/main/java/org/apollo/game/release/r317/EnterAmountMessageEncoder.java diff --git a/game/src/main/org/apollo/game/release/r317/EnteredAmountMessageDecoder.java b/game/src/main/java/org/apollo/game/release/r317/EnteredAmountMessageDecoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r317/EnteredAmountMessageDecoder.java rename to game/src/main/java/org/apollo/game/release/r317/EnteredAmountMessageDecoder.java diff --git a/game/src/main/org/apollo/game/release/r317/FifthItemActionMessageDecoder.java b/game/src/main/java/org/apollo/game/release/r317/FifthItemActionMessageDecoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r317/FifthItemActionMessageDecoder.java rename to game/src/main/java/org/apollo/game/release/r317/FifthItemActionMessageDecoder.java diff --git a/game/src/main/org/apollo/game/release/r317/FifthItemOptionMessageDecoder.java b/game/src/main/java/org/apollo/game/release/r317/FifthItemOptionMessageDecoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r317/FifthItemOptionMessageDecoder.java rename to game/src/main/java/org/apollo/game/release/r317/FifthItemOptionMessageDecoder.java diff --git a/game/src/main/org/apollo/game/release/r317/FifthNpcActionMessageDecoder.java b/game/src/main/java/org/apollo/game/release/r317/FifthNpcActionMessageDecoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r317/FifthNpcActionMessageDecoder.java rename to game/src/main/java/org/apollo/game/release/r317/FifthNpcActionMessageDecoder.java diff --git a/game/src/main/org/apollo/game/release/r317/FifthPlayerActionMessageDecoder.java b/game/src/main/java/org/apollo/game/release/r317/FifthPlayerActionMessageDecoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r317/FifthPlayerActionMessageDecoder.java rename to game/src/main/java/org/apollo/game/release/r317/FifthPlayerActionMessageDecoder.java diff --git a/game/src/main/org/apollo/game/release/r317/FirstItemActionMessageDecoder.java b/game/src/main/java/org/apollo/game/release/r317/FirstItemActionMessageDecoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r317/FirstItemActionMessageDecoder.java rename to game/src/main/java/org/apollo/game/release/r317/FirstItemActionMessageDecoder.java diff --git a/game/src/main/org/apollo/game/release/r317/FirstItemOptionMessageDecoder.java b/game/src/main/java/org/apollo/game/release/r317/FirstItemOptionMessageDecoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r317/FirstItemOptionMessageDecoder.java rename to game/src/main/java/org/apollo/game/release/r317/FirstItemOptionMessageDecoder.java diff --git a/game/src/main/org/apollo/game/release/r317/FirstNpcActionMessageDecoder.java b/game/src/main/java/org/apollo/game/release/r317/FirstNpcActionMessageDecoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r317/FirstNpcActionMessageDecoder.java rename to game/src/main/java/org/apollo/game/release/r317/FirstNpcActionMessageDecoder.java diff --git a/game/src/main/org/apollo/game/release/r317/FirstObjectActionMessageDecoder.java b/game/src/main/java/org/apollo/game/release/r317/FirstObjectActionMessageDecoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r317/FirstObjectActionMessageDecoder.java rename to game/src/main/java/org/apollo/game/release/r317/FirstObjectActionMessageDecoder.java diff --git a/game/src/main/org/apollo/game/release/r317/FirstPlayerActionMessageDecoder.java b/game/src/main/java/org/apollo/game/release/r317/FirstPlayerActionMessageDecoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r317/FirstPlayerActionMessageDecoder.java rename to game/src/main/java/org/apollo/game/release/r317/FirstPlayerActionMessageDecoder.java diff --git a/game/src/main/org/apollo/game/release/r317/FlaggedMouseEventMessageDecoder.java b/game/src/main/java/org/apollo/game/release/r317/FlaggedMouseEventMessageDecoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r317/FlaggedMouseEventMessageDecoder.java rename to game/src/main/java/org/apollo/game/release/r317/FlaggedMouseEventMessageDecoder.java diff --git a/game/src/main/org/apollo/game/release/r317/FlashTabInterfaceMessageEncoder.java b/game/src/main/java/org/apollo/game/release/r317/FlashTabInterfaceMessageEncoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r317/FlashTabInterfaceMessageEncoder.java rename to game/src/main/java/org/apollo/game/release/r317/FlashTabInterfaceMessageEncoder.java diff --git a/game/src/main/org/apollo/game/release/r317/FlashingTabClickedMessageDecoder.java b/game/src/main/java/org/apollo/game/release/r317/FlashingTabClickedMessageDecoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r317/FlashingTabClickedMessageDecoder.java rename to game/src/main/java/org/apollo/game/release/r317/FlashingTabClickedMessageDecoder.java diff --git a/game/src/main/org/apollo/game/release/r317/FocusUpdateMessageDecoder.java b/game/src/main/java/org/apollo/game/release/r317/FocusUpdateMessageDecoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r317/FocusUpdateMessageDecoder.java rename to game/src/main/java/org/apollo/game/release/r317/FocusUpdateMessageDecoder.java diff --git a/game/src/main/org/apollo/game/release/r317/ForwardPrivateChatMessageEncoder.java b/game/src/main/java/org/apollo/game/release/r317/ForwardPrivateChatMessageEncoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r317/ForwardPrivateChatMessageEncoder.java rename to game/src/main/java/org/apollo/game/release/r317/ForwardPrivateChatMessageEncoder.java diff --git a/game/src/main/org/apollo/game/release/r317/FourthItemActionMessageDecoder.java b/game/src/main/java/org/apollo/game/release/r317/FourthItemActionMessageDecoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r317/FourthItemActionMessageDecoder.java rename to game/src/main/java/org/apollo/game/release/r317/FourthItemActionMessageDecoder.java diff --git a/game/src/main/org/apollo/game/release/r317/FourthItemOptionMessageDecoder.java b/game/src/main/java/org/apollo/game/release/r317/FourthItemOptionMessageDecoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r317/FourthItemOptionMessageDecoder.java rename to game/src/main/java/org/apollo/game/release/r317/FourthItemOptionMessageDecoder.java diff --git a/game/src/main/org/apollo/game/release/r317/FourthNpcActionMessageDecoder.java b/game/src/main/java/org/apollo/game/release/r317/FourthNpcActionMessageDecoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r317/FourthNpcActionMessageDecoder.java rename to game/src/main/java/org/apollo/game/release/r317/FourthNpcActionMessageDecoder.java diff --git a/game/src/main/org/apollo/game/release/r317/FourthPlayerActionMessageDecoder.java b/game/src/main/java/org/apollo/game/release/r317/FourthPlayerActionMessageDecoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r317/FourthPlayerActionMessageDecoder.java rename to game/src/main/java/org/apollo/game/release/r317/FourthPlayerActionMessageDecoder.java diff --git a/game/src/main/org/apollo/game/release/r317/FriendServerStatusMessageEncoder.java b/game/src/main/java/org/apollo/game/release/r317/FriendServerStatusMessageEncoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r317/FriendServerStatusMessageEncoder.java rename to game/src/main/java/org/apollo/game/release/r317/FriendServerStatusMessageEncoder.java diff --git a/game/src/main/org/apollo/game/release/r317/GroupedRegionUpdateMessageEncoder.java b/game/src/main/java/org/apollo/game/release/r317/GroupedRegionUpdateMessageEncoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r317/GroupedRegionUpdateMessageEncoder.java rename to game/src/main/java/org/apollo/game/release/r317/GroupedRegionUpdateMessageEncoder.java diff --git a/game/src/main/org/apollo/game/release/r317/IdAssignmentMessageEncoder.java b/game/src/main/java/org/apollo/game/release/r317/IdAssignmentMessageEncoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r317/IdAssignmentMessageEncoder.java rename to game/src/main/java/org/apollo/game/release/r317/IdAssignmentMessageEncoder.java diff --git a/game/src/main/org/apollo/game/release/r317/IgnoreListMessageEncoder.java b/game/src/main/java/org/apollo/game/release/r317/IgnoreListMessageEncoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r317/IgnoreListMessageEncoder.java rename to game/src/main/java/org/apollo/game/release/r317/IgnoreListMessageEncoder.java diff --git a/game/src/main/org/apollo/game/release/r317/ItemOnItemMessageDecoder.java b/game/src/main/java/org/apollo/game/release/r317/ItemOnItemMessageDecoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r317/ItemOnItemMessageDecoder.java rename to game/src/main/java/org/apollo/game/release/r317/ItemOnItemMessageDecoder.java diff --git a/game/src/main/org/apollo/game/release/r317/ItemOnNpcMessageDecoder.java b/game/src/main/java/org/apollo/game/release/r317/ItemOnNpcMessageDecoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r317/ItemOnNpcMessageDecoder.java rename to game/src/main/java/org/apollo/game/release/r317/ItemOnNpcMessageDecoder.java diff --git a/game/src/main/org/apollo/game/release/r317/ItemOnObjectMessageDecoder.java b/game/src/main/java/org/apollo/game/release/r317/ItemOnObjectMessageDecoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r317/ItemOnObjectMessageDecoder.java rename to game/src/main/java/org/apollo/game/release/r317/ItemOnObjectMessageDecoder.java diff --git a/game/src/main/org/apollo/game/release/r317/KeepAliveMessageDecoder.java b/game/src/main/java/org/apollo/game/release/r317/KeepAliveMessageDecoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r317/KeepAliveMessageDecoder.java rename to game/src/main/java/org/apollo/game/release/r317/KeepAliveMessageDecoder.java diff --git a/game/src/main/org/apollo/game/release/r317/LogoutMessageEncoder.java b/game/src/main/java/org/apollo/game/release/r317/LogoutMessageEncoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r317/LogoutMessageEncoder.java rename to game/src/main/java/org/apollo/game/release/r317/LogoutMessageEncoder.java diff --git a/game/src/main/org/apollo/game/release/r317/MagicOnItemMessageDecoder.java b/game/src/main/java/org/apollo/game/release/r317/MagicOnItemMessageDecoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r317/MagicOnItemMessageDecoder.java rename to game/src/main/java/org/apollo/game/release/r317/MagicOnItemMessageDecoder.java diff --git a/game/src/main/org/apollo/game/release/r317/MagicOnNpcMessageDecoder.java b/game/src/main/java/org/apollo/game/release/r317/MagicOnNpcMessageDecoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r317/MagicOnNpcMessageDecoder.java rename to game/src/main/java/org/apollo/game/release/r317/MagicOnNpcMessageDecoder.java diff --git a/game/src/main/org/apollo/game/release/r317/MagicOnPlayerMessageDecoder.java b/game/src/main/java/org/apollo/game/release/r317/MagicOnPlayerMessageDecoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r317/MagicOnPlayerMessageDecoder.java rename to game/src/main/java/org/apollo/game/release/r317/MagicOnPlayerMessageDecoder.java diff --git a/game/src/main/org/apollo/game/release/r317/MobAnimationResetMessageEncoder.java b/game/src/main/java/org/apollo/game/release/r317/MobAnimationResetMessageEncoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r317/MobAnimationResetMessageEncoder.java rename to game/src/main/java/org/apollo/game/release/r317/MobAnimationResetMessageEncoder.java diff --git a/game/src/main/org/apollo/game/release/r317/MobHintIconMessageEncoder.java b/game/src/main/java/org/apollo/game/release/r317/MobHintIconMessageEncoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r317/MobHintIconMessageEncoder.java rename to game/src/main/java/org/apollo/game/release/r317/MobHintIconMessageEncoder.java diff --git a/game/src/main/org/apollo/game/release/r317/MouseClickedMessageDecoder.java b/game/src/main/java/org/apollo/game/release/r317/MouseClickedMessageDecoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r317/MouseClickedMessageDecoder.java rename to game/src/main/java/org/apollo/game/release/r317/MouseClickedMessageDecoder.java diff --git a/game/src/main/org/apollo/game/release/r317/NpcSynchronizationMessageEncoder.java b/game/src/main/java/org/apollo/game/release/r317/NpcSynchronizationMessageEncoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r317/NpcSynchronizationMessageEncoder.java rename to game/src/main/java/org/apollo/game/release/r317/NpcSynchronizationMessageEncoder.java diff --git a/game/src/main/org/apollo/game/release/r317/OpenDialogueInterfaceMessageEncoder.java b/game/src/main/java/org/apollo/game/release/r317/OpenDialogueInterfaceMessageEncoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r317/OpenDialogueInterfaceMessageEncoder.java rename to game/src/main/java/org/apollo/game/release/r317/OpenDialogueInterfaceMessageEncoder.java diff --git a/game/src/main/org/apollo/game/release/r317/OpenDialogueOverlayMessageEncoder.java b/game/src/main/java/org/apollo/game/release/r317/OpenDialogueOverlayMessageEncoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r317/OpenDialogueOverlayMessageEncoder.java rename to game/src/main/java/org/apollo/game/release/r317/OpenDialogueOverlayMessageEncoder.java diff --git a/game/src/main/org/apollo/game/release/r317/OpenInterfaceMessageEncoder.java b/game/src/main/java/org/apollo/game/release/r317/OpenInterfaceMessageEncoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r317/OpenInterfaceMessageEncoder.java rename to game/src/main/java/org/apollo/game/release/r317/OpenInterfaceMessageEncoder.java diff --git a/game/src/main/org/apollo/game/release/r317/OpenInterfaceSidebarMessageEncoder.java b/game/src/main/java/org/apollo/game/release/r317/OpenInterfaceSidebarMessageEncoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r317/OpenInterfaceSidebarMessageEncoder.java rename to game/src/main/java/org/apollo/game/release/r317/OpenInterfaceSidebarMessageEncoder.java diff --git a/game/src/main/org/apollo/game/release/r317/OpenOverlayMessageEncoder.java b/game/src/main/java/org/apollo/game/release/r317/OpenOverlayMessageEncoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r317/OpenOverlayMessageEncoder.java rename to game/src/main/java/org/apollo/game/release/r317/OpenOverlayMessageEncoder.java diff --git a/game/src/main/org/apollo/game/release/r317/OpenSidebarMessageEncoder.java b/game/src/main/java/org/apollo/game/release/r317/OpenSidebarMessageEncoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r317/OpenSidebarMessageEncoder.java rename to game/src/main/java/org/apollo/game/release/r317/OpenSidebarMessageEncoder.java diff --git a/game/src/main/org/apollo/game/release/r317/PlayerDesignMessageDecoder.java b/game/src/main/java/org/apollo/game/release/r317/PlayerDesignMessageDecoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r317/PlayerDesignMessageDecoder.java rename to game/src/main/java/org/apollo/game/release/r317/PlayerDesignMessageDecoder.java diff --git a/game/src/main/org/apollo/game/release/r317/PlayerSynchronizationMessageEncoder.java b/game/src/main/java/org/apollo/game/release/r317/PlayerSynchronizationMessageEncoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r317/PlayerSynchronizationMessageEncoder.java rename to game/src/main/java/org/apollo/game/release/r317/PlayerSynchronizationMessageEncoder.java diff --git a/game/src/main/org/apollo/game/release/r317/PositionHintIconMessageEncoder.java b/game/src/main/java/org/apollo/game/release/r317/PositionHintIconMessageEncoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r317/PositionHintIconMessageEncoder.java rename to game/src/main/java/org/apollo/game/release/r317/PositionHintIconMessageEncoder.java diff --git a/game/src/main/org/apollo/game/release/r317/PrivacyOptionMessageDecoder.java b/game/src/main/java/org/apollo/game/release/r317/PrivacyOptionMessageDecoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r317/PrivacyOptionMessageDecoder.java rename to game/src/main/java/org/apollo/game/release/r317/PrivacyOptionMessageDecoder.java diff --git a/game/src/main/org/apollo/game/release/r317/PrivacyOptionMessageEncoder.java b/game/src/main/java/org/apollo/game/release/r317/PrivacyOptionMessageEncoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r317/PrivacyOptionMessageEncoder.java rename to game/src/main/java/org/apollo/game/release/r317/PrivacyOptionMessageEncoder.java diff --git a/game/src/main/org/apollo/game/release/r317/PrivateChatMessageDecoder.java b/game/src/main/java/org/apollo/game/release/r317/PrivateChatMessageDecoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r317/PrivateChatMessageDecoder.java rename to game/src/main/java/org/apollo/game/release/r317/PrivateChatMessageDecoder.java diff --git a/game/src/main/org/apollo/game/release/r317/PublicChatMessageDecoder.java b/game/src/main/java/org/apollo/game/release/r317/PublicChatMessageDecoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r317/PublicChatMessageDecoder.java rename to game/src/main/java/org/apollo/game/release/r317/PublicChatMessageDecoder.java diff --git a/game/src/main/org/apollo/game/release/r317/RegionChangeMessageEncoder.java b/game/src/main/java/org/apollo/game/release/r317/RegionChangeMessageEncoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r317/RegionChangeMessageEncoder.java rename to game/src/main/java/org/apollo/game/release/r317/RegionChangeMessageEncoder.java diff --git a/game/src/main/org/apollo/game/release/r317/Release317.java b/game/src/main/java/org/apollo/game/release/r317/Release317.java similarity index 100% rename from game/src/main/org/apollo/game/release/r317/Release317.java rename to game/src/main/java/org/apollo/game/release/r317/Release317.java diff --git a/game/src/main/org/apollo/game/release/r317/RemoveFriendMessageDecoder.java b/game/src/main/java/org/apollo/game/release/r317/RemoveFriendMessageDecoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r317/RemoveFriendMessageDecoder.java rename to game/src/main/java/org/apollo/game/release/r317/RemoveFriendMessageDecoder.java diff --git a/game/src/main/org/apollo/game/release/r317/RemoveIgnoreMessageDecoder.java b/game/src/main/java/org/apollo/game/release/r317/RemoveIgnoreMessageDecoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r317/RemoveIgnoreMessageDecoder.java rename to game/src/main/java/org/apollo/game/release/r317/RemoveIgnoreMessageDecoder.java diff --git a/game/src/main/org/apollo/game/release/r317/RemoveObjectMessageEncoder.java b/game/src/main/java/org/apollo/game/release/r317/RemoveObjectMessageEncoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r317/RemoveObjectMessageEncoder.java rename to game/src/main/java/org/apollo/game/release/r317/RemoveObjectMessageEncoder.java diff --git a/game/src/main/org/apollo/game/release/r317/RemoveTileItemMessageEncoder.java b/game/src/main/java/org/apollo/game/release/r317/RemoveTileItemMessageEncoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r317/RemoveTileItemMessageEncoder.java rename to game/src/main/java/org/apollo/game/release/r317/RemoveTileItemMessageEncoder.java diff --git a/game/src/main/org/apollo/game/release/r317/ReportAbuseMessageDecoder.java b/game/src/main/java/org/apollo/game/release/r317/ReportAbuseMessageDecoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r317/ReportAbuseMessageDecoder.java rename to game/src/main/java/org/apollo/game/release/r317/ReportAbuseMessageDecoder.java diff --git a/game/src/main/org/apollo/game/release/r317/SecondItemActionMessageDecoder.java b/game/src/main/java/org/apollo/game/release/r317/SecondItemActionMessageDecoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r317/SecondItemActionMessageDecoder.java rename to game/src/main/java/org/apollo/game/release/r317/SecondItemActionMessageDecoder.java diff --git a/game/src/main/org/apollo/game/release/r317/SecondItemOptionMessageDecoder.java b/game/src/main/java/org/apollo/game/release/r317/SecondItemOptionMessageDecoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r317/SecondItemOptionMessageDecoder.java rename to game/src/main/java/org/apollo/game/release/r317/SecondItemOptionMessageDecoder.java diff --git a/game/src/main/org/apollo/game/release/r317/SecondNpcActionMessageDecoder.java b/game/src/main/java/org/apollo/game/release/r317/SecondNpcActionMessageDecoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r317/SecondNpcActionMessageDecoder.java rename to game/src/main/java/org/apollo/game/release/r317/SecondNpcActionMessageDecoder.java diff --git a/game/src/main/org/apollo/game/release/r317/SecondObjectActionMessageDecoder.java b/game/src/main/java/org/apollo/game/release/r317/SecondObjectActionMessageDecoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r317/SecondObjectActionMessageDecoder.java rename to game/src/main/java/org/apollo/game/release/r317/SecondObjectActionMessageDecoder.java diff --git a/game/src/main/org/apollo/game/release/r317/SecondPlayerActionMessageDecoder.java b/game/src/main/java/org/apollo/game/release/r317/SecondPlayerActionMessageDecoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r317/SecondPlayerActionMessageDecoder.java rename to game/src/main/java/org/apollo/game/release/r317/SecondPlayerActionMessageDecoder.java diff --git a/game/src/main/org/apollo/game/release/r317/SendFriendMessageEncoder.java b/game/src/main/java/org/apollo/game/release/r317/SendFriendMessageEncoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r317/SendFriendMessageEncoder.java rename to game/src/main/java/org/apollo/game/release/r317/SendFriendMessageEncoder.java diff --git a/game/src/main/org/apollo/game/release/r317/SendObjectMessageEncoder.java b/game/src/main/java/org/apollo/game/release/r317/SendObjectMessageEncoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r317/SendObjectMessageEncoder.java rename to game/src/main/java/org/apollo/game/release/r317/SendObjectMessageEncoder.java diff --git a/game/src/main/org/apollo/game/release/r317/ServerMessageMessageEncoder.java b/game/src/main/java/org/apollo/game/release/r317/ServerMessageMessageEncoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r317/ServerMessageMessageEncoder.java rename to game/src/main/java/org/apollo/game/release/r317/ServerMessageMessageEncoder.java diff --git a/game/src/main/org/apollo/game/release/r317/SetPlayerActionMessageEncoder.java b/game/src/main/java/org/apollo/game/release/r317/SetPlayerActionMessageEncoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r317/SetPlayerActionMessageEncoder.java rename to game/src/main/java/org/apollo/game/release/r317/SetPlayerActionMessageEncoder.java diff --git a/game/src/main/org/apollo/game/release/r317/SetUpdatedRegionMessageEncoder.java b/game/src/main/java/org/apollo/game/release/r317/SetUpdatedRegionMessageEncoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r317/SetUpdatedRegionMessageEncoder.java rename to game/src/main/java/org/apollo/game/release/r317/SetUpdatedRegionMessageEncoder.java diff --git a/game/src/main/org/apollo/game/release/r317/SetWidgetItemModelMessageEncoder.java b/game/src/main/java/org/apollo/game/release/r317/SetWidgetItemModelMessageEncoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r317/SetWidgetItemModelMessageEncoder.java rename to game/src/main/java/org/apollo/game/release/r317/SetWidgetItemModelMessageEncoder.java diff --git a/game/src/main/org/apollo/game/release/r317/SetWidgetModelAnimationMessageEncoder.java b/game/src/main/java/org/apollo/game/release/r317/SetWidgetModelAnimationMessageEncoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r317/SetWidgetModelAnimationMessageEncoder.java rename to game/src/main/java/org/apollo/game/release/r317/SetWidgetModelAnimationMessageEncoder.java diff --git a/game/src/main/org/apollo/game/release/r317/SetWidgetModelMessageEncoder.java b/game/src/main/java/org/apollo/game/release/r317/SetWidgetModelMessageEncoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r317/SetWidgetModelMessageEncoder.java rename to game/src/main/java/org/apollo/game/release/r317/SetWidgetModelMessageEncoder.java diff --git a/game/src/main/org/apollo/game/release/r317/SetWidgetNpcModelMessageEncoder.java b/game/src/main/java/org/apollo/game/release/r317/SetWidgetNpcModelMessageEncoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r317/SetWidgetNpcModelMessageEncoder.java rename to game/src/main/java/org/apollo/game/release/r317/SetWidgetNpcModelMessageEncoder.java diff --git a/game/src/main/org/apollo/game/release/r317/SetWidgetPlayerModelMessageEncoder.java b/game/src/main/java/org/apollo/game/release/r317/SetWidgetPlayerModelMessageEncoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r317/SetWidgetPlayerModelMessageEncoder.java rename to game/src/main/java/org/apollo/game/release/r317/SetWidgetPlayerModelMessageEncoder.java diff --git a/game/src/main/org/apollo/game/release/r317/SetWidgetTextMessageEncoder.java b/game/src/main/java/org/apollo/game/release/r317/SetWidgetTextMessageEncoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r317/SetWidgetTextMessageEncoder.java rename to game/src/main/java/org/apollo/game/release/r317/SetWidgetTextMessageEncoder.java diff --git a/game/src/main/org/apollo/game/release/r317/SetWidgetVisibilityMessageEncoder.java b/game/src/main/java/org/apollo/game/release/r317/SetWidgetVisibilityMessageEncoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r317/SetWidgetVisibilityMessageEncoder.java rename to game/src/main/java/org/apollo/game/release/r317/SetWidgetVisibilityMessageEncoder.java diff --git a/game/src/main/org/apollo/game/release/r317/SpamPacketMessageDecoder.java b/game/src/main/java/org/apollo/game/release/r317/SpamPacketMessageDecoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r317/SpamPacketMessageDecoder.java rename to game/src/main/java/org/apollo/game/release/r317/SpamPacketMessageDecoder.java diff --git a/game/src/main/org/apollo/game/release/r317/SwitchItemMessageDecoder.java b/game/src/main/java/org/apollo/game/release/r317/SwitchItemMessageDecoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r317/SwitchItemMessageDecoder.java rename to game/src/main/java/org/apollo/game/release/r317/SwitchItemMessageDecoder.java diff --git a/game/src/main/org/apollo/game/release/r317/SwitchTabInterfaceMessageEncoder.java b/game/src/main/java/org/apollo/game/release/r317/SwitchTabInterfaceMessageEncoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r317/SwitchTabInterfaceMessageEncoder.java rename to game/src/main/java/org/apollo/game/release/r317/SwitchTabInterfaceMessageEncoder.java diff --git a/game/src/main/org/apollo/game/release/r317/TakeTileItemMessageDecoder.java b/game/src/main/java/org/apollo/game/release/r317/TakeTileItemMessageDecoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r317/TakeTileItemMessageDecoder.java rename to game/src/main/java/org/apollo/game/release/r317/TakeTileItemMessageDecoder.java diff --git a/game/src/main/org/apollo/game/release/r317/ThirdItemActionMessageDecoder.java b/game/src/main/java/org/apollo/game/release/r317/ThirdItemActionMessageDecoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r317/ThirdItemActionMessageDecoder.java rename to game/src/main/java/org/apollo/game/release/r317/ThirdItemActionMessageDecoder.java diff --git a/game/src/main/org/apollo/game/release/r317/ThirdItemOptionMessageDecoder.java b/game/src/main/java/org/apollo/game/release/r317/ThirdItemOptionMessageDecoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r317/ThirdItemOptionMessageDecoder.java rename to game/src/main/java/org/apollo/game/release/r317/ThirdItemOptionMessageDecoder.java diff --git a/game/src/main/org/apollo/game/release/r317/ThirdNpcActionMessageDecoder.java b/game/src/main/java/org/apollo/game/release/r317/ThirdNpcActionMessageDecoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r317/ThirdNpcActionMessageDecoder.java rename to game/src/main/java/org/apollo/game/release/r317/ThirdNpcActionMessageDecoder.java diff --git a/game/src/main/org/apollo/game/release/r317/ThirdObjectActionMessageDecoder.java b/game/src/main/java/org/apollo/game/release/r317/ThirdObjectActionMessageDecoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r317/ThirdObjectActionMessageDecoder.java rename to game/src/main/java/org/apollo/game/release/r317/ThirdObjectActionMessageDecoder.java diff --git a/game/src/main/org/apollo/game/release/r317/ThirdPlayerActionMessageDecoder.java b/game/src/main/java/org/apollo/game/release/r317/ThirdPlayerActionMessageDecoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r317/ThirdPlayerActionMessageDecoder.java rename to game/src/main/java/org/apollo/game/release/r317/ThirdPlayerActionMessageDecoder.java diff --git a/game/src/main/org/apollo/game/release/r317/UpdateItemsMessageEncoder.java b/game/src/main/java/org/apollo/game/release/r317/UpdateItemsMessageEncoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r317/UpdateItemsMessageEncoder.java rename to game/src/main/java/org/apollo/game/release/r317/UpdateItemsMessageEncoder.java diff --git a/game/src/main/org/apollo/game/release/r317/UpdateRunEnergyMessageEncoder.java b/game/src/main/java/org/apollo/game/release/r317/UpdateRunEnergyMessageEncoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r317/UpdateRunEnergyMessageEncoder.java rename to game/src/main/java/org/apollo/game/release/r317/UpdateRunEnergyMessageEncoder.java diff --git a/game/src/main/org/apollo/game/release/r317/UpdateSkillMessageEncoder.java b/game/src/main/java/org/apollo/game/release/r317/UpdateSkillMessageEncoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r317/UpdateSkillMessageEncoder.java rename to game/src/main/java/org/apollo/game/release/r317/UpdateSkillMessageEncoder.java diff --git a/game/src/main/org/apollo/game/release/r317/UpdateSlottedItemsMessageEncoder.java b/game/src/main/java/org/apollo/game/release/r317/UpdateSlottedItemsMessageEncoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r317/UpdateSlottedItemsMessageEncoder.java rename to game/src/main/java/org/apollo/game/release/r317/UpdateSlottedItemsMessageEncoder.java diff --git a/game/src/main/org/apollo/game/release/r317/UpdateTileItemMessageEncoder.java b/game/src/main/java/org/apollo/game/release/r317/UpdateTileItemMessageEncoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r317/UpdateTileItemMessageEncoder.java rename to game/src/main/java/org/apollo/game/release/r317/UpdateTileItemMessageEncoder.java diff --git a/game/src/main/org/apollo/game/release/r317/UpdateWeightMessageEncoder.java b/game/src/main/java/org/apollo/game/release/r317/UpdateWeightMessageEncoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r317/UpdateWeightMessageEncoder.java rename to game/src/main/java/org/apollo/game/release/r317/UpdateWeightMessageEncoder.java diff --git a/game/src/main/org/apollo/game/release/r317/WalkMessageDecoder.java b/game/src/main/java/org/apollo/game/release/r317/WalkMessageDecoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r317/WalkMessageDecoder.java rename to game/src/main/java/org/apollo/game/release/r317/WalkMessageDecoder.java diff --git a/game/src/main/org/apollo/game/release/r317/package-info.java b/game/src/main/java/org/apollo/game/release/r317/package-info.java similarity index 100% rename from game/src/main/org/apollo/game/release/r317/package-info.java rename to game/src/main/java/org/apollo/game/release/r317/package-info.java diff --git a/game/src/main/org/apollo/game/release/r377/AddFriendMessageDecoder.java b/game/src/main/java/org/apollo/game/release/r377/AddFriendMessageDecoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r377/AddFriendMessageDecoder.java rename to game/src/main/java/org/apollo/game/release/r377/AddFriendMessageDecoder.java diff --git a/game/src/main/org/apollo/game/release/r377/AddGlobalTileItemMessageEncoder.java b/game/src/main/java/org/apollo/game/release/r377/AddGlobalTileItemMessageEncoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r377/AddGlobalTileItemMessageEncoder.java rename to game/src/main/java/org/apollo/game/release/r377/AddGlobalTileItemMessageEncoder.java diff --git a/game/src/main/org/apollo/game/release/r377/AddIgnoreMessageDecoder.java b/game/src/main/java/org/apollo/game/release/r377/AddIgnoreMessageDecoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r377/AddIgnoreMessageDecoder.java rename to game/src/main/java/org/apollo/game/release/r377/AddIgnoreMessageDecoder.java diff --git a/game/src/main/org/apollo/game/release/r377/AddTileItemMessageEncoder.java b/game/src/main/java/org/apollo/game/release/r377/AddTileItemMessageEncoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r377/AddTileItemMessageEncoder.java rename to game/src/main/java/org/apollo/game/release/r377/AddTileItemMessageEncoder.java diff --git a/game/src/main/org/apollo/game/release/r377/ArrowKeyMessageDecoder.java b/game/src/main/java/org/apollo/game/release/r377/ArrowKeyMessageDecoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r377/ArrowKeyMessageDecoder.java rename to game/src/main/java/org/apollo/game/release/r377/ArrowKeyMessageDecoder.java diff --git a/game/src/main/org/apollo/game/release/r377/ButtonMessageDecoder.java b/game/src/main/java/org/apollo/game/release/r377/ButtonMessageDecoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r377/ButtonMessageDecoder.java rename to game/src/main/java/org/apollo/game/release/r377/ButtonMessageDecoder.java diff --git a/game/src/main/org/apollo/game/release/r377/ClearRegionMessageEncoder.java b/game/src/main/java/org/apollo/game/release/r377/ClearRegionMessageEncoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r377/ClearRegionMessageEncoder.java rename to game/src/main/java/org/apollo/game/release/r377/ClearRegionMessageEncoder.java diff --git a/game/src/main/org/apollo/game/release/r377/CloseInterfaceMessageEncoder.java b/game/src/main/java/org/apollo/game/release/r377/CloseInterfaceMessageEncoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r377/CloseInterfaceMessageEncoder.java rename to game/src/main/java/org/apollo/game/release/r377/CloseInterfaceMessageEncoder.java diff --git a/game/src/main/org/apollo/game/release/r377/ClosedInterfaceMessageDecoder.java b/game/src/main/java/org/apollo/game/release/r377/ClosedInterfaceMessageDecoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r377/ClosedInterfaceMessageDecoder.java rename to game/src/main/java/org/apollo/game/release/r377/ClosedInterfaceMessageDecoder.java diff --git a/game/src/main/org/apollo/game/release/r377/CommandMessageDecoder.java b/game/src/main/java/org/apollo/game/release/r377/CommandMessageDecoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r377/CommandMessageDecoder.java rename to game/src/main/java/org/apollo/game/release/r377/CommandMessageDecoder.java diff --git a/game/src/main/org/apollo/game/release/r377/ConfigMessageEncoder.java b/game/src/main/java/org/apollo/game/release/r377/ConfigMessageEncoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r377/ConfigMessageEncoder.java rename to game/src/main/java/org/apollo/game/release/r377/ConfigMessageEncoder.java diff --git a/game/src/main/org/apollo/game/release/r377/DialogueContinueMessageDecoder.java b/game/src/main/java/org/apollo/game/release/r377/DialogueContinueMessageDecoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r377/DialogueContinueMessageDecoder.java rename to game/src/main/java/org/apollo/game/release/r377/DialogueContinueMessageDecoder.java diff --git a/game/src/main/org/apollo/game/release/r377/DisplayCrossbonesMessageEncoder.java b/game/src/main/java/org/apollo/game/release/r377/DisplayCrossbonesMessageEncoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r377/DisplayCrossbonesMessageEncoder.java rename to game/src/main/java/org/apollo/game/release/r377/DisplayCrossbonesMessageEncoder.java diff --git a/game/src/main/org/apollo/game/release/r377/DisplayTabInterfaceMessageEncoder.java b/game/src/main/java/org/apollo/game/release/r377/DisplayTabInterfaceMessageEncoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r377/DisplayTabInterfaceMessageEncoder.java rename to game/src/main/java/org/apollo/game/release/r377/DisplayTabInterfaceMessageEncoder.java diff --git a/game/src/main/org/apollo/game/release/r377/EnterAmountMessageEncoder.java b/game/src/main/java/org/apollo/game/release/r377/EnterAmountMessageEncoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r377/EnterAmountMessageEncoder.java rename to game/src/main/java/org/apollo/game/release/r377/EnterAmountMessageEncoder.java diff --git a/game/src/main/org/apollo/game/release/r377/EnteredAmountMessageDecoder.java b/game/src/main/java/org/apollo/game/release/r377/EnteredAmountMessageDecoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r377/EnteredAmountMessageDecoder.java rename to game/src/main/java/org/apollo/game/release/r377/EnteredAmountMessageDecoder.java diff --git a/game/src/main/org/apollo/game/release/r377/FifthItemActionMessageDecoder.java b/game/src/main/java/org/apollo/game/release/r377/FifthItemActionMessageDecoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r377/FifthItemActionMessageDecoder.java rename to game/src/main/java/org/apollo/game/release/r377/FifthItemActionMessageDecoder.java diff --git a/game/src/main/org/apollo/game/release/r377/FifthItemOptionMessageDecoder.java b/game/src/main/java/org/apollo/game/release/r377/FifthItemOptionMessageDecoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r377/FifthItemOptionMessageDecoder.java rename to game/src/main/java/org/apollo/game/release/r377/FifthItemOptionMessageDecoder.java diff --git a/game/src/main/org/apollo/game/release/r377/FifthNpcActionMessageDecoder.java b/game/src/main/java/org/apollo/game/release/r377/FifthNpcActionMessageDecoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r377/FifthNpcActionMessageDecoder.java rename to game/src/main/java/org/apollo/game/release/r377/FifthNpcActionMessageDecoder.java diff --git a/game/src/main/org/apollo/game/release/r377/FifthPlayerActionMessageDecoder.java b/game/src/main/java/org/apollo/game/release/r377/FifthPlayerActionMessageDecoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r377/FifthPlayerActionMessageDecoder.java rename to game/src/main/java/org/apollo/game/release/r377/FifthPlayerActionMessageDecoder.java diff --git a/game/src/main/org/apollo/game/release/r377/FirstItemActionMessageDecoder.java b/game/src/main/java/org/apollo/game/release/r377/FirstItemActionMessageDecoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r377/FirstItemActionMessageDecoder.java rename to game/src/main/java/org/apollo/game/release/r377/FirstItemActionMessageDecoder.java diff --git a/game/src/main/org/apollo/game/release/r377/FirstItemOptionMessageDecoder.java b/game/src/main/java/org/apollo/game/release/r377/FirstItemOptionMessageDecoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r377/FirstItemOptionMessageDecoder.java rename to game/src/main/java/org/apollo/game/release/r377/FirstItemOptionMessageDecoder.java diff --git a/game/src/main/org/apollo/game/release/r377/FirstNpcActionMessageDecoder.java b/game/src/main/java/org/apollo/game/release/r377/FirstNpcActionMessageDecoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r377/FirstNpcActionMessageDecoder.java rename to game/src/main/java/org/apollo/game/release/r377/FirstNpcActionMessageDecoder.java diff --git a/game/src/main/org/apollo/game/release/r377/FirstObjectActionMessageDecoder.java b/game/src/main/java/org/apollo/game/release/r377/FirstObjectActionMessageDecoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r377/FirstObjectActionMessageDecoder.java rename to game/src/main/java/org/apollo/game/release/r377/FirstObjectActionMessageDecoder.java diff --git a/game/src/main/org/apollo/game/release/r377/FirstPlayerActionMessageDecoder.java b/game/src/main/java/org/apollo/game/release/r377/FirstPlayerActionMessageDecoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r377/FirstPlayerActionMessageDecoder.java rename to game/src/main/java/org/apollo/game/release/r377/FirstPlayerActionMessageDecoder.java diff --git a/game/src/main/org/apollo/game/release/r377/FlaggedMouseEventMessageDecoder.java b/game/src/main/java/org/apollo/game/release/r377/FlaggedMouseEventMessageDecoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r377/FlaggedMouseEventMessageDecoder.java rename to game/src/main/java/org/apollo/game/release/r377/FlaggedMouseEventMessageDecoder.java diff --git a/game/src/main/org/apollo/game/release/r377/FlashTabInterfaceMessageEncoder.java b/game/src/main/java/org/apollo/game/release/r377/FlashTabInterfaceMessageEncoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r377/FlashTabInterfaceMessageEncoder.java rename to game/src/main/java/org/apollo/game/release/r377/FlashTabInterfaceMessageEncoder.java diff --git a/game/src/main/org/apollo/game/release/r377/FlashingTabClickedMessageDecoder.java b/game/src/main/java/org/apollo/game/release/r377/FlashingTabClickedMessageDecoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r377/FlashingTabClickedMessageDecoder.java rename to game/src/main/java/org/apollo/game/release/r377/FlashingTabClickedMessageDecoder.java diff --git a/game/src/main/org/apollo/game/release/r377/FocusUpdateMessageDecoder.java b/game/src/main/java/org/apollo/game/release/r377/FocusUpdateMessageDecoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r377/FocusUpdateMessageDecoder.java rename to game/src/main/java/org/apollo/game/release/r377/FocusUpdateMessageDecoder.java diff --git a/game/src/main/org/apollo/game/release/r377/ForwardPrivateChatMessageEncoder.java b/game/src/main/java/org/apollo/game/release/r377/ForwardPrivateChatMessageEncoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r377/ForwardPrivateChatMessageEncoder.java rename to game/src/main/java/org/apollo/game/release/r377/ForwardPrivateChatMessageEncoder.java diff --git a/game/src/main/org/apollo/game/release/r377/FourthItemActionMessageDecoder.java b/game/src/main/java/org/apollo/game/release/r377/FourthItemActionMessageDecoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r377/FourthItemActionMessageDecoder.java rename to game/src/main/java/org/apollo/game/release/r377/FourthItemActionMessageDecoder.java diff --git a/game/src/main/org/apollo/game/release/r377/FourthItemOptionMessageDecoder.java b/game/src/main/java/org/apollo/game/release/r377/FourthItemOptionMessageDecoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r377/FourthItemOptionMessageDecoder.java rename to game/src/main/java/org/apollo/game/release/r377/FourthItemOptionMessageDecoder.java diff --git a/game/src/main/org/apollo/game/release/r377/FourthNpcActionMessageDecoder.java b/game/src/main/java/org/apollo/game/release/r377/FourthNpcActionMessageDecoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r377/FourthNpcActionMessageDecoder.java rename to game/src/main/java/org/apollo/game/release/r377/FourthNpcActionMessageDecoder.java diff --git a/game/src/main/org/apollo/game/release/r377/FourthPlayerActionMessageDecoder.java b/game/src/main/java/org/apollo/game/release/r377/FourthPlayerActionMessageDecoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r377/FourthPlayerActionMessageDecoder.java rename to game/src/main/java/org/apollo/game/release/r377/FourthPlayerActionMessageDecoder.java diff --git a/game/src/main/org/apollo/game/release/r377/FriendServerStatusMessageEncoder.java b/game/src/main/java/org/apollo/game/release/r377/FriendServerStatusMessageEncoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r377/FriendServerStatusMessageEncoder.java rename to game/src/main/java/org/apollo/game/release/r377/FriendServerStatusMessageEncoder.java diff --git a/game/src/main/org/apollo/game/release/r377/GroupedRegionUpdateMessageEncoder.java b/game/src/main/java/org/apollo/game/release/r377/GroupedRegionUpdateMessageEncoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r377/GroupedRegionUpdateMessageEncoder.java rename to game/src/main/java/org/apollo/game/release/r377/GroupedRegionUpdateMessageEncoder.java diff --git a/game/src/main/org/apollo/game/release/r377/IdAssignmentMessageEncoder.java b/game/src/main/java/org/apollo/game/release/r377/IdAssignmentMessageEncoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r377/IdAssignmentMessageEncoder.java rename to game/src/main/java/org/apollo/game/release/r377/IdAssignmentMessageEncoder.java diff --git a/game/src/main/org/apollo/game/release/r377/IgnoreListMessageEncoder.java b/game/src/main/java/org/apollo/game/release/r377/IgnoreListMessageEncoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r377/IgnoreListMessageEncoder.java rename to game/src/main/java/org/apollo/game/release/r377/IgnoreListMessageEncoder.java diff --git a/game/src/main/org/apollo/game/release/r377/ItemOnItemMessageDecoder.java b/game/src/main/java/org/apollo/game/release/r377/ItemOnItemMessageDecoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r377/ItemOnItemMessageDecoder.java rename to game/src/main/java/org/apollo/game/release/r377/ItemOnItemMessageDecoder.java diff --git a/game/src/main/org/apollo/game/release/r377/ItemOnNpcMessageDecoder.java b/game/src/main/java/org/apollo/game/release/r377/ItemOnNpcMessageDecoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r377/ItemOnNpcMessageDecoder.java rename to game/src/main/java/org/apollo/game/release/r377/ItemOnNpcMessageDecoder.java diff --git a/game/src/main/org/apollo/game/release/r377/ItemOnObjectMessageDecoder.java b/game/src/main/java/org/apollo/game/release/r377/ItemOnObjectMessageDecoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r377/ItemOnObjectMessageDecoder.java rename to game/src/main/java/org/apollo/game/release/r377/ItemOnObjectMessageDecoder.java diff --git a/game/src/main/org/apollo/game/release/r377/KeepAliveMessageDecoder.java b/game/src/main/java/org/apollo/game/release/r377/KeepAliveMessageDecoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r377/KeepAliveMessageDecoder.java rename to game/src/main/java/org/apollo/game/release/r377/KeepAliveMessageDecoder.java diff --git a/game/src/main/org/apollo/game/release/r377/LogoutMessageEncoder.java b/game/src/main/java/org/apollo/game/release/r377/LogoutMessageEncoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r377/LogoutMessageEncoder.java rename to game/src/main/java/org/apollo/game/release/r377/LogoutMessageEncoder.java diff --git a/game/src/main/org/apollo/game/release/r377/MagicOnItemMessageDecoder.java b/game/src/main/java/org/apollo/game/release/r377/MagicOnItemMessageDecoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r377/MagicOnItemMessageDecoder.java rename to game/src/main/java/org/apollo/game/release/r377/MagicOnItemMessageDecoder.java diff --git a/game/src/main/org/apollo/game/release/r377/MagicOnNpcMessageDecoder.java b/game/src/main/java/org/apollo/game/release/r377/MagicOnNpcMessageDecoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r377/MagicOnNpcMessageDecoder.java rename to game/src/main/java/org/apollo/game/release/r377/MagicOnNpcMessageDecoder.java diff --git a/game/src/main/org/apollo/game/release/r377/MagicOnPlayerMessageDecoder.java b/game/src/main/java/org/apollo/game/release/r377/MagicOnPlayerMessageDecoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r377/MagicOnPlayerMessageDecoder.java rename to game/src/main/java/org/apollo/game/release/r377/MagicOnPlayerMessageDecoder.java diff --git a/game/src/main/org/apollo/game/release/r377/MobAnimationResetMessageEncoder.java b/game/src/main/java/org/apollo/game/release/r377/MobAnimationResetMessageEncoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r377/MobAnimationResetMessageEncoder.java rename to game/src/main/java/org/apollo/game/release/r377/MobAnimationResetMessageEncoder.java diff --git a/game/src/main/org/apollo/game/release/r377/MobHintIconMessageEncoder.java b/game/src/main/java/org/apollo/game/release/r377/MobHintIconMessageEncoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r377/MobHintIconMessageEncoder.java rename to game/src/main/java/org/apollo/game/release/r377/MobHintIconMessageEncoder.java diff --git a/game/src/main/org/apollo/game/release/r377/MouseClickedMessageDecoder.java b/game/src/main/java/org/apollo/game/release/r377/MouseClickedMessageDecoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r377/MouseClickedMessageDecoder.java rename to game/src/main/java/org/apollo/game/release/r377/MouseClickedMessageDecoder.java diff --git a/game/src/main/org/apollo/game/release/r377/NpcSynchronizationMessageEncoder.java b/game/src/main/java/org/apollo/game/release/r377/NpcSynchronizationMessageEncoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r377/NpcSynchronizationMessageEncoder.java rename to game/src/main/java/org/apollo/game/release/r377/NpcSynchronizationMessageEncoder.java diff --git a/game/src/main/org/apollo/game/release/r377/OpenDialogueInterfaceMessageEncoder.java b/game/src/main/java/org/apollo/game/release/r377/OpenDialogueInterfaceMessageEncoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r377/OpenDialogueInterfaceMessageEncoder.java rename to game/src/main/java/org/apollo/game/release/r377/OpenDialogueInterfaceMessageEncoder.java diff --git a/game/src/main/org/apollo/game/release/r377/OpenDialogueOverlayMessageEncoder.java b/game/src/main/java/org/apollo/game/release/r377/OpenDialogueOverlayMessageEncoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r377/OpenDialogueOverlayMessageEncoder.java rename to game/src/main/java/org/apollo/game/release/r377/OpenDialogueOverlayMessageEncoder.java diff --git a/game/src/main/org/apollo/game/release/r377/OpenInterfaceMessageEncoder.java b/game/src/main/java/org/apollo/game/release/r377/OpenInterfaceMessageEncoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r377/OpenInterfaceMessageEncoder.java rename to game/src/main/java/org/apollo/game/release/r377/OpenInterfaceMessageEncoder.java diff --git a/game/src/main/org/apollo/game/release/r377/OpenInterfaceSidebarMessageEncoder.java b/game/src/main/java/org/apollo/game/release/r377/OpenInterfaceSidebarMessageEncoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r377/OpenInterfaceSidebarMessageEncoder.java rename to game/src/main/java/org/apollo/game/release/r377/OpenInterfaceSidebarMessageEncoder.java diff --git a/game/src/main/org/apollo/game/release/r377/OpenOverlayMessageEncoder.java b/game/src/main/java/org/apollo/game/release/r377/OpenOverlayMessageEncoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r377/OpenOverlayMessageEncoder.java rename to game/src/main/java/org/apollo/game/release/r377/OpenOverlayMessageEncoder.java diff --git a/game/src/main/org/apollo/game/release/r377/OpenSidebarMessageEncoder.java b/game/src/main/java/org/apollo/game/release/r377/OpenSidebarMessageEncoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r377/OpenSidebarMessageEncoder.java rename to game/src/main/java/org/apollo/game/release/r377/OpenSidebarMessageEncoder.java diff --git a/game/src/main/org/apollo/game/release/r377/PlayerDesignMessageDecoder.java b/game/src/main/java/org/apollo/game/release/r377/PlayerDesignMessageDecoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r377/PlayerDesignMessageDecoder.java rename to game/src/main/java/org/apollo/game/release/r377/PlayerDesignMessageDecoder.java diff --git a/game/src/main/org/apollo/game/release/r377/PlayerSynchronizationMessageEncoder.java b/game/src/main/java/org/apollo/game/release/r377/PlayerSynchronizationMessageEncoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r377/PlayerSynchronizationMessageEncoder.java rename to game/src/main/java/org/apollo/game/release/r377/PlayerSynchronizationMessageEncoder.java diff --git a/game/src/main/org/apollo/game/release/r377/PositionHintIconMessageEncoder.java b/game/src/main/java/org/apollo/game/release/r377/PositionHintIconMessageEncoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r377/PositionHintIconMessageEncoder.java rename to game/src/main/java/org/apollo/game/release/r377/PositionHintIconMessageEncoder.java diff --git a/game/src/main/org/apollo/game/release/r377/PrivacyOptionMessageDecoder.java b/game/src/main/java/org/apollo/game/release/r377/PrivacyOptionMessageDecoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r377/PrivacyOptionMessageDecoder.java rename to game/src/main/java/org/apollo/game/release/r377/PrivacyOptionMessageDecoder.java diff --git a/game/src/main/org/apollo/game/release/r377/PrivacyOptionMessageEncoder.java b/game/src/main/java/org/apollo/game/release/r377/PrivacyOptionMessageEncoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r377/PrivacyOptionMessageEncoder.java rename to game/src/main/java/org/apollo/game/release/r377/PrivacyOptionMessageEncoder.java diff --git a/game/src/main/org/apollo/game/release/r377/PrivateChatMessageDecoder.java b/game/src/main/java/org/apollo/game/release/r377/PrivateChatMessageDecoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r377/PrivateChatMessageDecoder.java rename to game/src/main/java/org/apollo/game/release/r377/PrivateChatMessageDecoder.java diff --git a/game/src/main/org/apollo/game/release/r377/PublicChatMessageDecoder.java b/game/src/main/java/org/apollo/game/release/r377/PublicChatMessageDecoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r377/PublicChatMessageDecoder.java rename to game/src/main/java/org/apollo/game/release/r377/PublicChatMessageDecoder.java diff --git a/game/src/main/org/apollo/game/release/r377/RegionChangeMessageEncoder.java b/game/src/main/java/org/apollo/game/release/r377/RegionChangeMessageEncoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r377/RegionChangeMessageEncoder.java rename to game/src/main/java/org/apollo/game/release/r377/RegionChangeMessageEncoder.java diff --git a/game/src/main/org/apollo/game/release/r377/Release377.java b/game/src/main/java/org/apollo/game/release/r377/Release377.java similarity index 100% rename from game/src/main/org/apollo/game/release/r377/Release377.java rename to game/src/main/java/org/apollo/game/release/r377/Release377.java diff --git a/game/src/main/org/apollo/game/release/r377/RemoveFriendMessageDecoder.java b/game/src/main/java/org/apollo/game/release/r377/RemoveFriendMessageDecoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r377/RemoveFriendMessageDecoder.java rename to game/src/main/java/org/apollo/game/release/r377/RemoveFriendMessageDecoder.java diff --git a/game/src/main/org/apollo/game/release/r377/RemoveIgnoreMessageDecoder.java b/game/src/main/java/org/apollo/game/release/r377/RemoveIgnoreMessageDecoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r377/RemoveIgnoreMessageDecoder.java rename to game/src/main/java/org/apollo/game/release/r377/RemoveIgnoreMessageDecoder.java diff --git a/game/src/main/org/apollo/game/release/r377/RemoveObjectMessageEncoder.java b/game/src/main/java/org/apollo/game/release/r377/RemoveObjectMessageEncoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r377/RemoveObjectMessageEncoder.java rename to game/src/main/java/org/apollo/game/release/r377/RemoveObjectMessageEncoder.java diff --git a/game/src/main/org/apollo/game/release/r377/RemoveTileItemMessageEncoder.java b/game/src/main/java/org/apollo/game/release/r377/RemoveTileItemMessageEncoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r377/RemoveTileItemMessageEncoder.java rename to game/src/main/java/org/apollo/game/release/r377/RemoveTileItemMessageEncoder.java diff --git a/game/src/main/org/apollo/game/release/r377/ReportAbuseMessageDecoder.java b/game/src/main/java/org/apollo/game/release/r377/ReportAbuseMessageDecoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r377/ReportAbuseMessageDecoder.java rename to game/src/main/java/org/apollo/game/release/r377/ReportAbuseMessageDecoder.java diff --git a/game/src/main/org/apollo/game/release/r377/SecondItemActionMessageDecoder.java b/game/src/main/java/org/apollo/game/release/r377/SecondItemActionMessageDecoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r377/SecondItemActionMessageDecoder.java rename to game/src/main/java/org/apollo/game/release/r377/SecondItemActionMessageDecoder.java diff --git a/game/src/main/org/apollo/game/release/r377/SecondItemOptionMessageDecoder.java b/game/src/main/java/org/apollo/game/release/r377/SecondItemOptionMessageDecoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r377/SecondItemOptionMessageDecoder.java rename to game/src/main/java/org/apollo/game/release/r377/SecondItemOptionMessageDecoder.java diff --git a/game/src/main/org/apollo/game/release/r377/SecondNpcActionMessageDecoder.java b/game/src/main/java/org/apollo/game/release/r377/SecondNpcActionMessageDecoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r377/SecondNpcActionMessageDecoder.java rename to game/src/main/java/org/apollo/game/release/r377/SecondNpcActionMessageDecoder.java diff --git a/game/src/main/org/apollo/game/release/r377/SecondObjectActionMessageDecoder.java b/game/src/main/java/org/apollo/game/release/r377/SecondObjectActionMessageDecoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r377/SecondObjectActionMessageDecoder.java rename to game/src/main/java/org/apollo/game/release/r377/SecondObjectActionMessageDecoder.java diff --git a/game/src/main/org/apollo/game/release/r377/SecondPlayerActionMessageDecoder.java b/game/src/main/java/org/apollo/game/release/r377/SecondPlayerActionMessageDecoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r377/SecondPlayerActionMessageDecoder.java rename to game/src/main/java/org/apollo/game/release/r377/SecondPlayerActionMessageDecoder.java diff --git a/game/src/main/org/apollo/game/release/r377/SendFriendMessageEncoder.java b/game/src/main/java/org/apollo/game/release/r377/SendFriendMessageEncoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r377/SendFriendMessageEncoder.java rename to game/src/main/java/org/apollo/game/release/r377/SendFriendMessageEncoder.java diff --git a/game/src/main/org/apollo/game/release/r377/SendObjectMessageEncoder.java b/game/src/main/java/org/apollo/game/release/r377/SendObjectMessageEncoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r377/SendObjectMessageEncoder.java rename to game/src/main/java/org/apollo/game/release/r377/SendObjectMessageEncoder.java diff --git a/game/src/main/org/apollo/game/release/r377/SendProjectileMessageEncoder.java b/game/src/main/java/org/apollo/game/release/r377/SendProjectileMessageEncoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r377/SendProjectileMessageEncoder.java rename to game/src/main/java/org/apollo/game/release/r377/SendProjectileMessageEncoder.java diff --git a/game/src/main/org/apollo/game/release/r377/ServerMessageMessageEncoder.java b/game/src/main/java/org/apollo/game/release/r377/ServerMessageMessageEncoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r377/ServerMessageMessageEncoder.java rename to game/src/main/java/org/apollo/game/release/r377/ServerMessageMessageEncoder.java diff --git a/game/src/main/org/apollo/game/release/r377/SetPlayerActionMessageEncoder.java b/game/src/main/java/org/apollo/game/release/r377/SetPlayerActionMessageEncoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r377/SetPlayerActionMessageEncoder.java rename to game/src/main/java/org/apollo/game/release/r377/SetPlayerActionMessageEncoder.java diff --git a/game/src/main/org/apollo/game/release/r377/SetUpdatedRegionMessageEncoder.java b/game/src/main/java/org/apollo/game/release/r377/SetUpdatedRegionMessageEncoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r377/SetUpdatedRegionMessageEncoder.java rename to game/src/main/java/org/apollo/game/release/r377/SetUpdatedRegionMessageEncoder.java diff --git a/game/src/main/org/apollo/game/release/r377/SetWidgetItemModelMessageEncoder.java b/game/src/main/java/org/apollo/game/release/r377/SetWidgetItemModelMessageEncoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r377/SetWidgetItemModelMessageEncoder.java rename to game/src/main/java/org/apollo/game/release/r377/SetWidgetItemModelMessageEncoder.java diff --git a/game/src/main/org/apollo/game/release/r377/SetWidgetModelAnimationMessageEncoder.java b/game/src/main/java/org/apollo/game/release/r377/SetWidgetModelAnimationMessageEncoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r377/SetWidgetModelAnimationMessageEncoder.java rename to game/src/main/java/org/apollo/game/release/r377/SetWidgetModelAnimationMessageEncoder.java diff --git a/game/src/main/org/apollo/game/release/r377/SetWidgetModelMessageEncoder.java b/game/src/main/java/org/apollo/game/release/r377/SetWidgetModelMessageEncoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r377/SetWidgetModelMessageEncoder.java rename to game/src/main/java/org/apollo/game/release/r377/SetWidgetModelMessageEncoder.java diff --git a/game/src/main/org/apollo/game/release/r377/SetWidgetNpcModelMessageEncoder.java b/game/src/main/java/org/apollo/game/release/r377/SetWidgetNpcModelMessageEncoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r377/SetWidgetNpcModelMessageEncoder.java rename to game/src/main/java/org/apollo/game/release/r377/SetWidgetNpcModelMessageEncoder.java diff --git a/game/src/main/org/apollo/game/release/r377/SetWidgetPlayerModelMessageEncoder.java b/game/src/main/java/org/apollo/game/release/r377/SetWidgetPlayerModelMessageEncoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r377/SetWidgetPlayerModelMessageEncoder.java rename to game/src/main/java/org/apollo/game/release/r377/SetWidgetPlayerModelMessageEncoder.java diff --git a/game/src/main/org/apollo/game/release/r377/SetWidgetTextMessageEncoder.java b/game/src/main/java/org/apollo/game/release/r377/SetWidgetTextMessageEncoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r377/SetWidgetTextMessageEncoder.java rename to game/src/main/java/org/apollo/game/release/r377/SetWidgetTextMessageEncoder.java diff --git a/game/src/main/org/apollo/game/release/r377/SetWidgetVisibilityMessageEncoder.java b/game/src/main/java/org/apollo/game/release/r377/SetWidgetVisibilityMessageEncoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r377/SetWidgetVisibilityMessageEncoder.java rename to game/src/main/java/org/apollo/game/release/r377/SetWidgetVisibilityMessageEncoder.java diff --git a/game/src/main/org/apollo/game/release/r377/SpamPacketMessageDecoder.java b/game/src/main/java/org/apollo/game/release/r377/SpamPacketMessageDecoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r377/SpamPacketMessageDecoder.java rename to game/src/main/java/org/apollo/game/release/r377/SpamPacketMessageDecoder.java diff --git a/game/src/main/org/apollo/game/release/r377/SwitchItemMessageDecoder.java b/game/src/main/java/org/apollo/game/release/r377/SwitchItemMessageDecoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r377/SwitchItemMessageDecoder.java rename to game/src/main/java/org/apollo/game/release/r377/SwitchItemMessageDecoder.java diff --git a/game/src/main/org/apollo/game/release/r377/SwitchTabInterfaceMessageEncoder.java b/game/src/main/java/org/apollo/game/release/r377/SwitchTabInterfaceMessageEncoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r377/SwitchTabInterfaceMessageEncoder.java rename to game/src/main/java/org/apollo/game/release/r377/SwitchTabInterfaceMessageEncoder.java diff --git a/game/src/main/org/apollo/game/release/r377/TakeTileItemMessageDecoder.java b/game/src/main/java/org/apollo/game/release/r377/TakeTileItemMessageDecoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r377/TakeTileItemMessageDecoder.java rename to game/src/main/java/org/apollo/game/release/r377/TakeTileItemMessageDecoder.java diff --git a/game/src/main/org/apollo/game/release/r377/ThirdItemActionMessageDecoder.java b/game/src/main/java/org/apollo/game/release/r377/ThirdItemActionMessageDecoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r377/ThirdItemActionMessageDecoder.java rename to game/src/main/java/org/apollo/game/release/r377/ThirdItemActionMessageDecoder.java diff --git a/game/src/main/org/apollo/game/release/r377/ThirdItemOptionMessageDecoder.java b/game/src/main/java/org/apollo/game/release/r377/ThirdItemOptionMessageDecoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r377/ThirdItemOptionMessageDecoder.java rename to game/src/main/java/org/apollo/game/release/r377/ThirdItemOptionMessageDecoder.java diff --git a/game/src/main/org/apollo/game/release/r377/ThirdNpcActionMessageDecoder.java b/game/src/main/java/org/apollo/game/release/r377/ThirdNpcActionMessageDecoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r377/ThirdNpcActionMessageDecoder.java rename to game/src/main/java/org/apollo/game/release/r377/ThirdNpcActionMessageDecoder.java diff --git a/game/src/main/org/apollo/game/release/r377/ThirdObjectActionMessageDecoder.java b/game/src/main/java/org/apollo/game/release/r377/ThirdObjectActionMessageDecoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r377/ThirdObjectActionMessageDecoder.java rename to game/src/main/java/org/apollo/game/release/r377/ThirdObjectActionMessageDecoder.java diff --git a/game/src/main/org/apollo/game/release/r377/ThirdPlayerActionMessageDecoder.java b/game/src/main/java/org/apollo/game/release/r377/ThirdPlayerActionMessageDecoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r377/ThirdPlayerActionMessageDecoder.java rename to game/src/main/java/org/apollo/game/release/r377/ThirdPlayerActionMessageDecoder.java diff --git a/game/src/main/org/apollo/game/release/r377/UpdateItemsMessageEncoder.java b/game/src/main/java/org/apollo/game/release/r377/UpdateItemsMessageEncoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r377/UpdateItemsMessageEncoder.java rename to game/src/main/java/org/apollo/game/release/r377/UpdateItemsMessageEncoder.java diff --git a/game/src/main/org/apollo/game/release/r377/UpdateRunEnergyMessageEncoder.java b/game/src/main/java/org/apollo/game/release/r377/UpdateRunEnergyMessageEncoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r377/UpdateRunEnergyMessageEncoder.java rename to game/src/main/java/org/apollo/game/release/r377/UpdateRunEnergyMessageEncoder.java diff --git a/game/src/main/org/apollo/game/release/r377/UpdateSkillMessageEncoder.java b/game/src/main/java/org/apollo/game/release/r377/UpdateSkillMessageEncoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r377/UpdateSkillMessageEncoder.java rename to game/src/main/java/org/apollo/game/release/r377/UpdateSkillMessageEncoder.java diff --git a/game/src/main/org/apollo/game/release/r377/UpdateSlottedItemsMessageEncoder.java b/game/src/main/java/org/apollo/game/release/r377/UpdateSlottedItemsMessageEncoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r377/UpdateSlottedItemsMessageEncoder.java rename to game/src/main/java/org/apollo/game/release/r377/UpdateSlottedItemsMessageEncoder.java diff --git a/game/src/main/org/apollo/game/release/r377/UpdateTileItemMessageEncoder.java b/game/src/main/java/org/apollo/game/release/r377/UpdateTileItemMessageEncoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r377/UpdateTileItemMessageEncoder.java rename to game/src/main/java/org/apollo/game/release/r377/UpdateTileItemMessageEncoder.java diff --git a/game/src/main/org/apollo/game/release/r377/UpdateWeightMessageEncoder.java b/game/src/main/java/org/apollo/game/release/r377/UpdateWeightMessageEncoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r377/UpdateWeightMessageEncoder.java rename to game/src/main/java/org/apollo/game/release/r377/UpdateWeightMessageEncoder.java diff --git a/game/src/main/org/apollo/game/release/r377/WalkMessageDecoder.java b/game/src/main/java/org/apollo/game/release/r377/WalkMessageDecoder.java similarity index 100% rename from game/src/main/org/apollo/game/release/r377/WalkMessageDecoder.java rename to game/src/main/java/org/apollo/game/release/r377/WalkMessageDecoder.java diff --git a/game/src/main/org/apollo/game/release/r377/package-info.java b/game/src/main/java/org/apollo/game/release/r377/package-info.java similarity index 100% rename from game/src/main/org/apollo/game/release/r377/package-info.java rename to game/src/main/java/org/apollo/game/release/r377/package-info.java diff --git a/game/src/main/org/apollo/game/scheduling/ScheduledTask.java b/game/src/main/java/org/apollo/game/scheduling/ScheduledTask.java similarity index 100% rename from game/src/main/org/apollo/game/scheduling/ScheduledTask.java rename to game/src/main/java/org/apollo/game/scheduling/ScheduledTask.java diff --git a/game/src/main/org/apollo/game/scheduling/Scheduler.java b/game/src/main/java/org/apollo/game/scheduling/Scheduler.java similarity index 100% rename from game/src/main/org/apollo/game/scheduling/Scheduler.java rename to game/src/main/java/org/apollo/game/scheduling/Scheduler.java diff --git a/game/src/main/org/apollo/game/scheduling/impl/NpcMovementTask.java b/game/src/main/java/org/apollo/game/scheduling/impl/NpcMovementTask.java similarity index 100% rename from game/src/main/org/apollo/game/scheduling/impl/NpcMovementTask.java rename to game/src/main/java/org/apollo/game/scheduling/impl/NpcMovementTask.java diff --git a/game/src/main/org/apollo/game/scheduling/impl/SkillNormalizationTask.java b/game/src/main/java/org/apollo/game/scheduling/impl/SkillNormalizationTask.java similarity index 100% rename from game/src/main/org/apollo/game/scheduling/impl/SkillNormalizationTask.java rename to game/src/main/java/org/apollo/game/scheduling/impl/SkillNormalizationTask.java diff --git a/game/src/main/org/apollo/game/scheduling/impl/package-info.java b/game/src/main/java/org/apollo/game/scheduling/impl/package-info.java similarity index 100% rename from game/src/main/org/apollo/game/scheduling/impl/package-info.java rename to game/src/main/java/org/apollo/game/scheduling/impl/package-info.java diff --git a/game/src/main/org/apollo/game/scheduling/package-info.java b/game/src/main/java/org/apollo/game/scheduling/package-info.java similarity index 100% rename from game/src/main/org/apollo/game/scheduling/package-info.java rename to game/src/main/java/org/apollo/game/scheduling/package-info.java diff --git a/game/src/main/org/apollo/game/service/GameService.java b/game/src/main/java/org/apollo/game/service/GameService.java similarity index 100% rename from game/src/main/org/apollo/game/service/GameService.java rename to game/src/main/java/org/apollo/game/service/GameService.java diff --git a/game/src/main/org/apollo/game/service/LoginService.java b/game/src/main/java/org/apollo/game/service/LoginService.java similarity index 100% rename from game/src/main/org/apollo/game/service/LoginService.java rename to game/src/main/java/org/apollo/game/service/LoginService.java diff --git a/game/src/main/org/apollo/game/service/UpdateService.java b/game/src/main/java/org/apollo/game/service/UpdateService.java similarity index 100% rename from game/src/main/org/apollo/game/service/UpdateService.java rename to game/src/main/java/org/apollo/game/service/UpdateService.java diff --git a/game/src/main/org/apollo/game/service/package-info.java b/game/src/main/java/org/apollo/game/service/package-info.java similarity index 100% rename from game/src/main/org/apollo/game/service/package-info.java rename to game/src/main/java/org/apollo/game/service/package-info.java diff --git a/game/src/main/org/apollo/game/session/ApolloHandler.java b/game/src/main/java/org/apollo/game/session/ApolloHandler.java similarity index 100% rename from game/src/main/org/apollo/game/session/ApolloHandler.java rename to game/src/main/java/org/apollo/game/session/ApolloHandler.java diff --git a/game/src/main/org/apollo/game/session/GameSession.java b/game/src/main/java/org/apollo/game/session/GameSession.java similarity index 100% rename from game/src/main/org/apollo/game/session/GameSession.java rename to game/src/main/java/org/apollo/game/session/GameSession.java diff --git a/game/src/main/org/apollo/game/session/LoginSession.java b/game/src/main/java/org/apollo/game/session/LoginSession.java similarity index 100% rename from game/src/main/org/apollo/game/session/LoginSession.java rename to game/src/main/java/org/apollo/game/session/LoginSession.java diff --git a/game/src/main/org/apollo/game/session/Session.java b/game/src/main/java/org/apollo/game/session/Session.java similarity index 100% rename from game/src/main/org/apollo/game/session/Session.java rename to game/src/main/java/org/apollo/game/session/Session.java diff --git a/game/src/main/org/apollo/game/session/UpdateSession.java b/game/src/main/java/org/apollo/game/session/UpdateSession.java similarity index 100% rename from game/src/main/org/apollo/game/session/UpdateSession.java rename to game/src/main/java/org/apollo/game/session/UpdateSession.java diff --git a/game/src/main/org/apollo/game/session/package-info.java b/game/src/main/java/org/apollo/game/session/package-info.java similarity index 100% rename from game/src/main/org/apollo/game/session/package-info.java rename to game/src/main/java/org/apollo/game/session/package-info.java diff --git a/game/src/main/org/apollo/game/sync/ClientSynchronizer.java b/game/src/main/java/org/apollo/game/sync/ClientSynchronizer.java similarity index 100% rename from game/src/main/org/apollo/game/sync/ClientSynchronizer.java rename to game/src/main/java/org/apollo/game/sync/ClientSynchronizer.java diff --git a/game/src/main/org/apollo/game/sync/ParallelClientSynchronizer.java b/game/src/main/java/org/apollo/game/sync/ParallelClientSynchronizer.java similarity index 100% rename from game/src/main/org/apollo/game/sync/ParallelClientSynchronizer.java rename to game/src/main/java/org/apollo/game/sync/ParallelClientSynchronizer.java diff --git a/game/src/main/org/apollo/game/sync/SequentialClientSynchronizer.java b/game/src/main/java/org/apollo/game/sync/SequentialClientSynchronizer.java similarity index 100% rename from game/src/main/org/apollo/game/sync/SequentialClientSynchronizer.java rename to game/src/main/java/org/apollo/game/sync/SequentialClientSynchronizer.java diff --git a/game/src/main/org/apollo/game/sync/block/AnimationBlock.java b/game/src/main/java/org/apollo/game/sync/block/AnimationBlock.java similarity index 100% rename from game/src/main/org/apollo/game/sync/block/AnimationBlock.java rename to game/src/main/java/org/apollo/game/sync/block/AnimationBlock.java diff --git a/game/src/main/org/apollo/game/sync/block/AppearanceBlock.java b/game/src/main/java/org/apollo/game/sync/block/AppearanceBlock.java similarity index 100% rename from game/src/main/org/apollo/game/sync/block/AppearanceBlock.java rename to game/src/main/java/org/apollo/game/sync/block/AppearanceBlock.java diff --git a/game/src/main/org/apollo/game/sync/block/ChatBlock.java b/game/src/main/java/org/apollo/game/sync/block/ChatBlock.java similarity index 100% rename from game/src/main/org/apollo/game/sync/block/ChatBlock.java rename to game/src/main/java/org/apollo/game/sync/block/ChatBlock.java diff --git a/game/src/main/org/apollo/game/sync/block/ForceChatBlock.java b/game/src/main/java/org/apollo/game/sync/block/ForceChatBlock.java similarity index 100% rename from game/src/main/org/apollo/game/sync/block/ForceChatBlock.java rename to game/src/main/java/org/apollo/game/sync/block/ForceChatBlock.java diff --git a/game/src/main/org/apollo/game/sync/block/ForceMovementBlock.java b/game/src/main/java/org/apollo/game/sync/block/ForceMovementBlock.java similarity index 100% rename from game/src/main/org/apollo/game/sync/block/ForceMovementBlock.java rename to game/src/main/java/org/apollo/game/sync/block/ForceMovementBlock.java diff --git a/game/src/main/org/apollo/game/sync/block/GraphicBlock.java b/game/src/main/java/org/apollo/game/sync/block/GraphicBlock.java similarity index 100% rename from game/src/main/org/apollo/game/sync/block/GraphicBlock.java rename to game/src/main/java/org/apollo/game/sync/block/GraphicBlock.java diff --git a/game/src/main/org/apollo/game/sync/block/HitUpdateBlock.java b/game/src/main/java/org/apollo/game/sync/block/HitUpdateBlock.java similarity index 100% rename from game/src/main/org/apollo/game/sync/block/HitUpdateBlock.java rename to game/src/main/java/org/apollo/game/sync/block/HitUpdateBlock.java diff --git a/game/src/main/org/apollo/game/sync/block/InteractingMobBlock.java b/game/src/main/java/org/apollo/game/sync/block/InteractingMobBlock.java similarity index 100% rename from game/src/main/org/apollo/game/sync/block/InteractingMobBlock.java rename to game/src/main/java/org/apollo/game/sync/block/InteractingMobBlock.java diff --git a/game/src/main/org/apollo/game/sync/block/SecondaryHitUpdateBlock.java b/game/src/main/java/org/apollo/game/sync/block/SecondaryHitUpdateBlock.java similarity index 100% rename from game/src/main/org/apollo/game/sync/block/SecondaryHitUpdateBlock.java rename to game/src/main/java/org/apollo/game/sync/block/SecondaryHitUpdateBlock.java diff --git a/game/src/main/org/apollo/game/sync/block/SynchronizationBlock.java b/game/src/main/java/org/apollo/game/sync/block/SynchronizationBlock.java similarity index 100% rename from game/src/main/org/apollo/game/sync/block/SynchronizationBlock.java rename to game/src/main/java/org/apollo/game/sync/block/SynchronizationBlock.java diff --git a/game/src/main/org/apollo/game/sync/block/SynchronizationBlockSet.java b/game/src/main/java/org/apollo/game/sync/block/SynchronizationBlockSet.java similarity index 100% rename from game/src/main/org/apollo/game/sync/block/SynchronizationBlockSet.java rename to game/src/main/java/org/apollo/game/sync/block/SynchronizationBlockSet.java diff --git a/game/src/main/org/apollo/game/sync/block/TransformBlock.java b/game/src/main/java/org/apollo/game/sync/block/TransformBlock.java similarity index 100% rename from game/src/main/org/apollo/game/sync/block/TransformBlock.java rename to game/src/main/java/org/apollo/game/sync/block/TransformBlock.java diff --git a/game/src/main/org/apollo/game/sync/block/TurnToPositionBlock.java b/game/src/main/java/org/apollo/game/sync/block/TurnToPositionBlock.java similarity index 100% rename from game/src/main/org/apollo/game/sync/block/TurnToPositionBlock.java rename to game/src/main/java/org/apollo/game/sync/block/TurnToPositionBlock.java diff --git a/game/src/main/org/apollo/game/sync/block/package-info.java b/game/src/main/java/org/apollo/game/sync/block/package-info.java similarity index 100% rename from game/src/main/org/apollo/game/sync/block/package-info.java rename to game/src/main/java/org/apollo/game/sync/block/package-info.java diff --git a/game/src/main/org/apollo/game/sync/package-info.java b/game/src/main/java/org/apollo/game/sync/package-info.java similarity index 100% rename from game/src/main/org/apollo/game/sync/package-info.java rename to game/src/main/java/org/apollo/game/sync/package-info.java diff --git a/game/src/main/org/apollo/game/sync/seg/AddNpcSegment.java b/game/src/main/java/org/apollo/game/sync/seg/AddNpcSegment.java similarity index 100% rename from game/src/main/org/apollo/game/sync/seg/AddNpcSegment.java rename to game/src/main/java/org/apollo/game/sync/seg/AddNpcSegment.java diff --git a/game/src/main/org/apollo/game/sync/seg/AddPlayerSegment.java b/game/src/main/java/org/apollo/game/sync/seg/AddPlayerSegment.java similarity index 100% rename from game/src/main/org/apollo/game/sync/seg/AddPlayerSegment.java rename to game/src/main/java/org/apollo/game/sync/seg/AddPlayerSegment.java diff --git a/game/src/main/org/apollo/game/sync/seg/MovementSegment.java b/game/src/main/java/org/apollo/game/sync/seg/MovementSegment.java similarity index 100% rename from game/src/main/org/apollo/game/sync/seg/MovementSegment.java rename to game/src/main/java/org/apollo/game/sync/seg/MovementSegment.java diff --git a/game/src/main/org/apollo/game/sync/seg/RemoveMobSegment.java b/game/src/main/java/org/apollo/game/sync/seg/RemoveMobSegment.java similarity index 100% rename from game/src/main/org/apollo/game/sync/seg/RemoveMobSegment.java rename to game/src/main/java/org/apollo/game/sync/seg/RemoveMobSegment.java diff --git a/game/src/main/org/apollo/game/sync/seg/SegmentType.java b/game/src/main/java/org/apollo/game/sync/seg/SegmentType.java similarity index 100% rename from game/src/main/org/apollo/game/sync/seg/SegmentType.java rename to game/src/main/java/org/apollo/game/sync/seg/SegmentType.java diff --git a/game/src/main/org/apollo/game/sync/seg/SynchronizationSegment.java b/game/src/main/java/org/apollo/game/sync/seg/SynchronizationSegment.java similarity index 100% rename from game/src/main/org/apollo/game/sync/seg/SynchronizationSegment.java rename to game/src/main/java/org/apollo/game/sync/seg/SynchronizationSegment.java diff --git a/game/src/main/org/apollo/game/sync/seg/TeleportSegment.java b/game/src/main/java/org/apollo/game/sync/seg/TeleportSegment.java similarity index 100% rename from game/src/main/org/apollo/game/sync/seg/TeleportSegment.java rename to game/src/main/java/org/apollo/game/sync/seg/TeleportSegment.java diff --git a/game/src/main/org/apollo/game/sync/seg/package-info.java b/game/src/main/java/org/apollo/game/sync/seg/package-info.java similarity index 100% rename from game/src/main/org/apollo/game/sync/seg/package-info.java rename to game/src/main/java/org/apollo/game/sync/seg/package-info.java diff --git a/game/src/main/org/apollo/game/sync/task/NpcSynchronizationTask.java b/game/src/main/java/org/apollo/game/sync/task/NpcSynchronizationTask.java similarity index 100% rename from game/src/main/org/apollo/game/sync/task/NpcSynchronizationTask.java rename to game/src/main/java/org/apollo/game/sync/task/NpcSynchronizationTask.java diff --git a/game/src/main/org/apollo/game/sync/task/PhasedSynchronizationTask.java b/game/src/main/java/org/apollo/game/sync/task/PhasedSynchronizationTask.java similarity index 100% rename from game/src/main/org/apollo/game/sync/task/PhasedSynchronizationTask.java rename to game/src/main/java/org/apollo/game/sync/task/PhasedSynchronizationTask.java diff --git a/game/src/main/org/apollo/game/sync/task/PlayerSynchronizationTask.java b/game/src/main/java/org/apollo/game/sync/task/PlayerSynchronizationTask.java similarity index 100% rename from game/src/main/org/apollo/game/sync/task/PlayerSynchronizationTask.java rename to game/src/main/java/org/apollo/game/sync/task/PlayerSynchronizationTask.java diff --git a/game/src/main/org/apollo/game/sync/task/PostNpcSynchronizationTask.java b/game/src/main/java/org/apollo/game/sync/task/PostNpcSynchronizationTask.java similarity index 100% rename from game/src/main/org/apollo/game/sync/task/PostNpcSynchronizationTask.java rename to game/src/main/java/org/apollo/game/sync/task/PostNpcSynchronizationTask.java diff --git a/game/src/main/org/apollo/game/sync/task/PostPlayerSynchronizationTask.java b/game/src/main/java/org/apollo/game/sync/task/PostPlayerSynchronizationTask.java similarity index 100% rename from game/src/main/org/apollo/game/sync/task/PostPlayerSynchronizationTask.java rename to game/src/main/java/org/apollo/game/sync/task/PostPlayerSynchronizationTask.java diff --git a/game/src/main/org/apollo/game/sync/task/PreNpcSynchronizationTask.java b/game/src/main/java/org/apollo/game/sync/task/PreNpcSynchronizationTask.java similarity index 100% rename from game/src/main/org/apollo/game/sync/task/PreNpcSynchronizationTask.java rename to game/src/main/java/org/apollo/game/sync/task/PreNpcSynchronizationTask.java diff --git a/game/src/main/org/apollo/game/sync/task/PrePlayerSynchronizationTask.java b/game/src/main/java/org/apollo/game/sync/task/PrePlayerSynchronizationTask.java similarity index 100% rename from game/src/main/org/apollo/game/sync/task/PrePlayerSynchronizationTask.java rename to game/src/main/java/org/apollo/game/sync/task/PrePlayerSynchronizationTask.java diff --git a/game/src/main/org/apollo/game/sync/task/SynchronizationTask.java b/game/src/main/java/org/apollo/game/sync/task/SynchronizationTask.java similarity index 100% rename from game/src/main/org/apollo/game/sync/task/SynchronizationTask.java rename to game/src/main/java/org/apollo/game/sync/task/SynchronizationTask.java diff --git a/game/src/main/org/apollo/game/sync/task/package-info.java b/game/src/main/java/org/apollo/game/sync/task/package-info.java similarity index 100% rename from game/src/main/org/apollo/game/sync/task/package-info.java rename to game/src/main/java/org/apollo/game/sync/task/package-info.java diff --git a/game/src/main/org/apollo/package-info.java b/game/src/main/java/org/apollo/package-info.java similarity index 100% rename from game/src/main/org/apollo/package-info.java rename to game/src/main/java/org/apollo/package-info.java diff --git a/game/src/kotlin/org/apollo/game/plugin/kotlin/KotlinPluginCompiler.kt b/game/src/main/kotlin/org/apollo/game/plugin/kotlin/KotlinPluginCompiler.kt similarity index 97% rename from game/src/kotlin/org/apollo/game/plugin/kotlin/KotlinPluginCompiler.kt rename to game/src/main/kotlin/org/apollo/game/plugin/kotlin/KotlinPluginCompiler.kt index 71bfb4cf..4c615583 100644 --- a/game/src/kotlin/org/apollo/game/plugin/kotlin/KotlinPluginCompiler.kt +++ b/game/src/main/kotlin/org/apollo/game/plugin/kotlin/KotlinPluginCompiler.kt @@ -97,7 +97,11 @@ class KotlinPluginCompiler(val classpath: List, val messageCollector: Mess val compiledScriptClasses = mutableListOf() try { - Files.createDirectory(outputDir) + try { + Files.createDirectory(outputDir) + } catch (e: FileAlreadyExistsException) { + // do nothing... + } inputScripts.forEach { compiledScriptClasses.add(compiler.compile(it, outputDir).fqName) diff --git a/game/src/kotlin/org/apollo/game/plugin/kotlin/KotlinPluginScript.kt b/game/src/main/kotlin/org/apollo/game/plugin/kotlin/KotlinPluginScript.kt similarity index 75% rename from game/src/kotlin/org/apollo/game/plugin/kotlin/KotlinPluginScript.kt rename to game/src/main/kotlin/org/apollo/game/plugin/kotlin/KotlinPluginScript.kt index 29a84213..c26febcc 100644 --- a/game/src/kotlin/org/apollo/game/plugin/kotlin/KotlinPluginScript.kt +++ b/game/src/main/kotlin/org/apollo/game/plugin/kotlin/KotlinPluginScript.kt @@ -4,6 +4,7 @@ import org.apollo.game.message.handler.MessageHandler import org.apollo.game.model.World import org.apollo.game.model.entity.Player import org.apollo.game.plugin.PluginContext +import org.apollo.game.scheduling.ScheduledTask import org.apollo.net.message.Message import kotlin.reflect.KClass import kotlin.script.templates.ScriptTemplateDefinition @@ -12,11 +13,28 @@ import kotlin.script.templates.ScriptTemplateDefinition scriptFilePattern = ".*\\.plugin\\.kts" ) abstract class KotlinPluginScript(val world: World, val context: PluginContext) { + var startListener: () -> Unit = {}; + var stopListener: () -> Unit = {}; protected fun on(type: () -> KClass): KotlinMessageHandler { return KotlinMessageHandler(world, context, type.invoke()) } + protected fun start(callback: () -> Unit) { + this.startListener = callback + } + + protected fun stop(callback: () -> Unit) { + this.stopListener = callback + } + + fun doStart() { + this.startListener.invoke() + } + + fun doStop() { + this.stopListener.invoke() + } } diff --git a/game/src/main/org/apollo/game/plugin/KotlinPluginEnvironment.java b/game/src/main/org/apollo/game/plugin/KotlinPluginEnvironment.java deleted file mode 100644 index dce8bb60..00000000 --- a/game/src/main/org/apollo/game/plugin/KotlinPluginEnvironment.java +++ /dev/null @@ -1,144 +0,0 @@ -package org.apollo.game.plugin; - -import java.io.BufferedReader; -import java.io.File; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.lang.reflect.Constructor; -import java.net.URISyntaxException; -import java.net.URL; -import java.net.URLClassLoader; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.List; -import java.util.logging.Level; -import java.util.logging.Logger; -import java.util.stream.Collectors; -import org.apollo.game.model.World; -import org.apollo.game.plugin.kotlin.KotlinPluginCompiler; -import org.apollo.game.plugin.kotlin.KotlinPluginScript; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.cli.common.messages.CompilerMessageLocation; -import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity; -import org.jetbrains.kotlin.cli.common.messages.MessageCollector; - -public class KotlinPluginEnvironment implements PluginEnvironment, MessageCollector { - - private static final Logger logger = Logger.getLogger(KotlinPluginEnvironment.class.getName()); - - private final World world; - private final KotlinPluginCompiler pluginCompiler; - - private PluginContext context; - - public KotlinPluginEnvironment(World world) { - this.world = world; - this.pluginCompiler = new KotlinPluginCompiler(resolveClasspath(), this); - } - - /** - * Resolve the classpath of the current running {@link Thread}. - * - * @return A {@link List} of {@link File}s pointing to classpath entries. - */ - private static List resolveClasspath() { - ClassLoader classLoader = Thread.currentThread().getContextClassLoader(); - - if (!(classLoader instanceof URLClassLoader)) { - throw new RuntimeException("Unable to resolve classpath for current ClassLoader"); - } - - URLClassLoader urlClassLoader = (URLClassLoader) classLoader; - URL[] classpathUrls = urlClassLoader.getURLs(); - List classpath = new ArrayList<>(); - - for (URL classpathUrl : classpathUrls) { - try { - classpath.add(new File(classpathUrl.toURI())); - } catch (URISyntaxException e) { - throw new RuntimeException("URL returned by ClassLoader is invalid"); - } - } - - return classpath; - } - - @Override - public void load(Collection plugins) { - try (InputStream resource = KotlinPluginEnvironment.class.getResourceAsStream("/manifest.txt")) { - BufferedReader reader = new BufferedReader(new InputStreamReader(resource)); - List pluginClassNames = reader.lines().collect(Collectors.toList()); - - for (String pluginClassName : pluginClassNames) { - Class pluginClass = - (Class) Class.forName(pluginClassName); - - Constructor pluginConstructor = - pluginClass.getConstructor(World.class, PluginContext.class); - - KotlinPluginScript plugin = pluginConstructor.newInstance(world, context); - } - } catch (Exception e) { - throw new RuntimeException(e); - } - - List> pluginClasses = new ArrayList<>(); - List sourceRoots = new ArrayList<>(); - - for (PluginMetaData plugin : plugins) { - List pluginSourceRoots = Arrays.stream(plugin.getScripts()) - .map(script -> plugin.getBase() + "/" + script) - .collect(Collectors.toList()); - - sourceRoots.addAll(pluginSourceRoots); - } - - for (String scriptSource : sourceRoots) { -// try { - List dependencySourceRoots = new ArrayList<>(sourceRoots); - dependencySourceRoots.remove(scriptSource); - -// pluginClasses.add(pluginCompiler.compile(scriptSource)); -// } catch (KotlinPluginCompilerException e) { -// throw new RuntimeException(e); -// } - } - - for (Class pluginClass : pluginClasses) { - try { - Constructor constructor = pluginClass - .getConstructor(World.class, PluginContext.class); - - KotlinPluginScript script = constructor.newInstance(world, context); - } catch (Exception e) { - throw new RuntimeException(e); - } - } - } - - @Override - public void setContext(PluginContext context) { - this.context = context; - } - - @Override - public void clear() { - - } - - @Override - public void report(@NotNull CompilerMessageSeverity severity, @NotNull String message, - @NotNull CompilerMessageLocation location) { - if (severity.isError()) { - logger.log(Level.SEVERE, String.format("%s:%s-%s: %s", location.getPath(), location.getLine(), - location.getColumn(), message)); - } - } - - @Override - public boolean hasErrors() { - return false; - } - -} diff --git a/game/data/plugins/bank/bank.plugin.kts b/game/src/plugins/bank/bank.plugin.kts similarity index 96% rename from game/data/plugins/bank/bank.plugin.kts rename to game/src/plugins/bank/bank.plugin.kts index 929ffacd..96082328 100644 --- a/game/data/plugins/bank/bank.plugin.kts +++ b/game/src/plugins/bank/bank.plugin.kts @@ -9,6 +9,7 @@ import org.apollo.net.message.Message val BANK_BOOTH_ID = 2213 + /** * Hook into the [ObjectActionMessage] and listen for when a bank booth's second action ("Open Bank") is selected. */ @@ -22,7 +23,7 @@ on { ObjectActionMessage::class } on { NpcActionMessage::class } .where { option == 2 } .then { - val npc: Npc = Any() as Npc // TODO world.npcRepository.get(index) + val npc = world.npcRepository[index] if (npc.id in BANKER_NPCS) { BankAction.start(this, it, npc.position) diff --git a/game/data/plugins/bank/plugin.xml b/game/src/plugins/bank/plugin.xml similarity index 100% rename from game/data/plugins/bank/plugin.xml rename to game/src/plugins/bank/plugin.xml diff --git a/game/src/plugins/chat/private-messaging/friends.plugin.kts b/game/src/plugins/chat/private-messaging/friends.plugin.kts new file mode 100644 index 00000000..e7fef1bb --- /dev/null +++ b/game/src/plugins/chat/private-messaging/friends.plugin.kts @@ -0,0 +1,23 @@ +import org.apollo.game.message.impl.AddFriendMessage +import org.apollo.game.message.impl.SendFriendMessage +import org.apollo.game.model.entity.setting.PrivacyState + +on { AddFriendMessage::class } + .then { player -> + player.addFriend(username) + + val playerUsername = player.username + val friend = world.getPlayer(username) + + if (friend == null) { + player.send(SendFriendMessage(username, 0)) + } else if (friend.friendsWith(playerUsername) || friend.friendPrivacy == PrivacyState.ON) { + if (player.friendPrivacy != PrivacyState.OFF) { + friend.send(SendFriendMessage(playerUsername, player.worldId)) + } + + if (friend.friendPrivacy != PrivacyState.OFF) { + player.send(SendFriendMessage(username, friend.worldId)) + } + } + } \ No newline at end of file diff --git a/game/src/plugins/chat/private-messaging/ignores.plugin.kts b/game/src/plugins/chat/private-messaging/ignores.plugin.kts new file mode 100644 index 00000000..a42816da --- /dev/null +++ b/game/src/plugins/chat/private-messaging/ignores.plugin.kts @@ -0,0 +1,8 @@ +import org.apollo.game.message.impl.AddIgnoreMessage +import org.apollo.game.message.impl.RemoveIgnoreMessage + +on { AddIgnoreMessage::class } + .then { player -> player.addIgnore(username) } + +on { RemoveIgnoreMessage::class } + .then { player -> player.removeIgnore(username) } \ No newline at end of file diff --git a/game/src/plugins/entity/spawn/spawn.kt b/game/src/plugins/entity/spawn/spawn.kt new file mode 100644 index 00000000..684bcdc0 --- /dev/null +++ b/game/src/plugins/entity/spawn/spawn.kt @@ -0,0 +1,15 @@ +import org.apollo.cache.def.NpcDefinition +import org.apollo.game.model.* +import org.apollo.game.model.entity.Npc + +data class Spawn(val id: Int?, val name: String, val position: Position, val facing: Direction, + val spawnAnimation: Animation? = null, + val spawnGraphic: Graphic? = null) + +object Spawns { + val list = mutableListOf() +} + +fun npc_spawn(name: String, x: Int, y: Int, id: Int? = null) { + Spawns.list.add(Spawn(id, name, Position(x, y), Direction.NORTH)) +} diff --git a/game/src/plugins/entity/spawn/spawn.plugin.kts b/game/src/plugins/entity/spawn/spawn.plugin.kts new file mode 100644 index 00000000..878ab4e3 --- /dev/null +++ b/game/src/plugins/entity/spawn/spawn.plugin.kts @@ -0,0 +1,27 @@ +import org.apollo.cache.def.NpcDefinition +import org.apollo.game.model.entity.Npc + +start { + Spawns.list.forEach { + val definition = if (it.id != null) NpcDefinition.lookup(it.id) else lookup_npc(it.name) + if (definition == null) { + throw IllegalArgumentException("Invalid NPC name or ID ${it.name}, ${it.id}") + } + + val npc = Npc(world, definition.id, it.position) + npc.turnTo(it.position.step(1, it.facing)) + + if (it.spawnAnimation != null) { + npc.playAnimation(it.spawnAnimation) + } + + if (it.spawnGraphic != null) { + npc.playGraphic(it.spawnGraphic) + } + + world.register(npc) + } +} + +stop { +} diff --git a/game/src/plugins/locations/lumbridge/lumbridge-npcs.kts b/game/src/plugins/locations/lumbridge/lumbridge-npcs.kts new file mode 100644 index 00000000..aa92c584 --- /dev/null +++ b/game/src/plugins/locations/lumbridge/lumbridge-npcs.kts @@ -0,0 +1,10 @@ +npc_spawn("woman", id = 4, x = 3232, y = 3207) +npc_spawn("man", id = 1, x = 3231, y = 3237) +npc_spawn("man", id = 2, x = 3224, y = 3240) +npc_spawn("woman", id = 5, x = 3229, y = 2329) + +npc_spawn("hans", x = 3221, y = 3221) +npc_spawn("father aereck", x = 3243, y = 3210) +npc_spawn("shop keeper", x = 3212, y = 3247) +npc_spawn("shop assistant", x = 3211, y = 3245) +npc_spawn("lumbridge guide", x = 323, y = 3229) diff --git a/game/data/plugins/stub.kt b/game/src/plugins/stub.kt similarity index 84% rename from game/data/plugins/stub.kt rename to game/src/plugins/stub.kt index 4e6fe63f..1f0fe80d 100644 --- a/game/data/plugins/stub.kt +++ b/game/src/plugins/stub.kt @@ -8,7 +8,7 @@ import org.apollo.game.model.World import org.apollo.game.plugin.PluginContext -import org.apollo.game.plugin.kotlin.KotlinMessageHandler +import org.apollo.game.plugin.kotlin.* import org.apollo.net.message.Message import kotlin.reflect.KClass @@ -17,4 +17,12 @@ var context: PluginContext = null!! fun on(type: () -> KClass): KotlinMessageHandler { null!! -} \ No newline at end of file +} + +fun start(callback: () -> Unit) { + +} + +fun stop(callback: () -> Unit) { + +} diff --git a/game/src/plugins/util/lookup/lookup.kt b/game/src/plugins/util/lookup/lookup.kt new file mode 100644 index 00000000..c7395e10 --- /dev/null +++ b/game/src/plugins/util/lookup/lookup.kt @@ -0,0 +1,17 @@ +import org.apollo.cache.def.* + +fun lookup_object(name: String): ObjectDefinition? { + val definitions = ObjectDefinition.getDefinitions() + return definitions.filter { name.equals(it.name, true) }.firstOrNull() +} + +fun lookup_npc(name: String): NpcDefinition? { + val definitions = NpcDefinition.getDefinitions() + return definitions.filter { name.equals(it.name, true) }.firstOrNull() +} + +fun lookup_item(name: String): ItemDefinition? { + val definitions = ItemDefinition.getDefinitions() + return definitions.filter { name.equals(it.name, true) }.firstOrNull() +} + diff --git a/game/src/test/org/apollo/game/message/handler/ItemOnItemVerificationHandlerTests.java b/game/src/test/java/org/apollo/game/message/handler/ItemOnItemVerificationHandlerTests.java similarity index 100% rename from game/src/test/org/apollo/game/message/handler/ItemOnItemVerificationHandlerTests.java rename to game/src/test/java/org/apollo/game/message/handler/ItemOnItemVerificationHandlerTests.java diff --git a/game/src/test/org/apollo/game/message/handler/ItemOnObjectVerificationHandlerTests.java b/game/src/test/java/org/apollo/game/message/handler/ItemOnObjectVerificationHandlerTests.java similarity index 100% rename from game/src/test/org/apollo/game/message/handler/ItemOnObjectVerificationHandlerTests.java rename to game/src/test/java/org/apollo/game/message/handler/ItemOnObjectVerificationHandlerTests.java diff --git a/game/src/test/org/apollo/game/message/handler/ObjectActionVerificationHandlerTests.java b/game/src/test/java/org/apollo/game/message/handler/ObjectActionVerificationHandlerTests.java similarity index 100% rename from game/src/test/org/apollo/game/message/handler/ObjectActionVerificationHandlerTests.java rename to game/src/test/java/org/apollo/game/message/handler/ObjectActionVerificationHandlerTests.java diff --git a/game/src/test/org/apollo/game/message/handler/PublicChatMessageHandlerTests.java b/game/src/test/java/org/apollo/game/message/handler/PublicChatMessageHandlerTests.java similarity index 100% rename from game/src/test/org/apollo/game/message/handler/PublicChatMessageHandlerTests.java rename to game/src/test/java/org/apollo/game/message/handler/PublicChatMessageHandlerTests.java diff --git a/game/src/test/org/apollo/game/model/PositionTests.java b/game/src/test/java/org/apollo/game/model/PositionTests.java similarity index 100% rename from game/src/test/org/apollo/game/model/PositionTests.java rename to game/src/test/java/org/apollo/game/model/PositionTests.java diff --git a/game/src/test/org/apollo/game/model/area/collision/CollisionManagerTests.java b/game/src/test/java/org/apollo/game/model/area/collision/CollisionManagerTests.java similarity index 100% rename from game/src/test/org/apollo/game/model/area/collision/CollisionManagerTests.java rename to game/src/test/java/org/apollo/game/model/area/collision/CollisionManagerTests.java diff --git a/game/src/test/org/apollo/game/model/entity/MobRepositoryTests.java b/game/src/test/java/org/apollo/game/model/entity/MobRepositoryTests.java similarity index 100% rename from game/src/test/org/apollo/game/model/entity/MobRepositoryTests.java rename to game/src/test/java/org/apollo/game/model/entity/MobRepositoryTests.java diff --git a/game/src/test/org/apollo/game/model/entity/SkillSetTests.java b/game/src/test/java/org/apollo/game/model/entity/SkillSetTests.java similarity index 100% rename from game/src/test/org/apollo/game/model/entity/SkillSetTests.java rename to game/src/test/java/org/apollo/game/model/entity/SkillSetTests.java diff --git a/game/src/test/org/apollo/game/model/entity/attr/AttributeTests.java b/game/src/test/java/org/apollo/game/model/entity/attr/AttributeTests.java similarity index 100% rename from game/src/test/org/apollo/game/model/entity/attr/AttributeTests.java rename to game/src/test/java/org/apollo/game/model/entity/attr/AttributeTests.java diff --git a/net/src/main/org/apollo/net/HttpChannelInitializer.java b/net/src/main/java/org/apollo/net/HttpChannelInitializer.java similarity index 100% rename from net/src/main/org/apollo/net/HttpChannelInitializer.java rename to net/src/main/java/org/apollo/net/HttpChannelInitializer.java diff --git a/net/src/main/org/apollo/net/JagGrabChannelInitializer.java b/net/src/main/java/org/apollo/net/JagGrabChannelInitializer.java similarity index 100% rename from net/src/main/org/apollo/net/JagGrabChannelInitializer.java rename to net/src/main/java/org/apollo/net/JagGrabChannelInitializer.java diff --git a/net/src/main/org/apollo/net/NetworkConstants.java b/net/src/main/java/org/apollo/net/NetworkConstants.java similarity index 100% rename from net/src/main/org/apollo/net/NetworkConstants.java rename to net/src/main/java/org/apollo/net/NetworkConstants.java diff --git a/net/src/main/org/apollo/net/ServiceChannelInitializer.java b/net/src/main/java/org/apollo/net/ServiceChannelInitializer.java similarity index 100% rename from net/src/main/org/apollo/net/ServiceChannelInitializer.java rename to net/src/main/java/org/apollo/net/ServiceChannelInitializer.java diff --git a/net/src/main/org/apollo/net/codec/game/AccessMode.java b/net/src/main/java/org/apollo/net/codec/game/AccessMode.java similarity index 100% rename from net/src/main/org/apollo/net/codec/game/AccessMode.java rename to net/src/main/java/org/apollo/net/codec/game/AccessMode.java diff --git a/net/src/main/org/apollo/net/codec/game/DataConstants.java b/net/src/main/java/org/apollo/net/codec/game/DataConstants.java similarity index 100% rename from net/src/main/org/apollo/net/codec/game/DataConstants.java rename to net/src/main/java/org/apollo/net/codec/game/DataConstants.java diff --git a/net/src/main/org/apollo/net/codec/game/DataOrder.java b/net/src/main/java/org/apollo/net/codec/game/DataOrder.java similarity index 100% rename from net/src/main/org/apollo/net/codec/game/DataOrder.java rename to net/src/main/java/org/apollo/net/codec/game/DataOrder.java diff --git a/net/src/main/org/apollo/net/codec/game/DataTransformation.java b/net/src/main/java/org/apollo/net/codec/game/DataTransformation.java similarity index 100% rename from net/src/main/org/apollo/net/codec/game/DataTransformation.java rename to net/src/main/java/org/apollo/net/codec/game/DataTransformation.java diff --git a/net/src/main/org/apollo/net/codec/game/DataType.java b/net/src/main/java/org/apollo/net/codec/game/DataType.java similarity index 100% rename from net/src/main/org/apollo/net/codec/game/DataType.java rename to net/src/main/java/org/apollo/net/codec/game/DataType.java diff --git a/net/src/main/org/apollo/net/codec/game/GameDecoderState.java b/net/src/main/java/org/apollo/net/codec/game/GameDecoderState.java similarity index 100% rename from net/src/main/org/apollo/net/codec/game/GameDecoderState.java rename to net/src/main/java/org/apollo/net/codec/game/GameDecoderState.java diff --git a/net/src/main/org/apollo/net/codec/game/GameMessageDecoder.java b/net/src/main/java/org/apollo/net/codec/game/GameMessageDecoder.java similarity index 100% rename from net/src/main/org/apollo/net/codec/game/GameMessageDecoder.java rename to net/src/main/java/org/apollo/net/codec/game/GameMessageDecoder.java diff --git a/net/src/main/org/apollo/net/codec/game/GameMessageEncoder.java b/net/src/main/java/org/apollo/net/codec/game/GameMessageEncoder.java similarity index 100% rename from net/src/main/org/apollo/net/codec/game/GameMessageEncoder.java rename to net/src/main/java/org/apollo/net/codec/game/GameMessageEncoder.java diff --git a/net/src/main/org/apollo/net/codec/game/GamePacket.java b/net/src/main/java/org/apollo/net/codec/game/GamePacket.java similarity index 100% rename from net/src/main/org/apollo/net/codec/game/GamePacket.java rename to net/src/main/java/org/apollo/net/codec/game/GamePacket.java diff --git a/net/src/main/org/apollo/net/codec/game/GamePacketBuilder.java b/net/src/main/java/org/apollo/net/codec/game/GamePacketBuilder.java similarity index 100% rename from net/src/main/org/apollo/net/codec/game/GamePacketBuilder.java rename to net/src/main/java/org/apollo/net/codec/game/GamePacketBuilder.java diff --git a/net/src/main/org/apollo/net/codec/game/GamePacketDecoder.java b/net/src/main/java/org/apollo/net/codec/game/GamePacketDecoder.java similarity index 100% rename from net/src/main/org/apollo/net/codec/game/GamePacketDecoder.java rename to net/src/main/java/org/apollo/net/codec/game/GamePacketDecoder.java diff --git a/net/src/main/org/apollo/net/codec/game/GamePacketEncoder.java b/net/src/main/java/org/apollo/net/codec/game/GamePacketEncoder.java similarity index 100% rename from net/src/main/org/apollo/net/codec/game/GamePacketEncoder.java rename to net/src/main/java/org/apollo/net/codec/game/GamePacketEncoder.java diff --git a/net/src/main/org/apollo/net/codec/game/GamePacketReader.java b/net/src/main/java/org/apollo/net/codec/game/GamePacketReader.java similarity index 100% rename from net/src/main/org/apollo/net/codec/game/GamePacketReader.java rename to net/src/main/java/org/apollo/net/codec/game/GamePacketReader.java diff --git a/net/src/main/org/apollo/net/codec/game/package-info.java b/net/src/main/java/org/apollo/net/codec/game/package-info.java similarity index 100% rename from net/src/main/org/apollo/net/codec/game/package-info.java rename to net/src/main/java/org/apollo/net/codec/game/package-info.java diff --git a/net/src/main/org/apollo/net/codec/handshake/HandshakeConstants.java b/net/src/main/java/org/apollo/net/codec/handshake/HandshakeConstants.java similarity index 100% rename from net/src/main/org/apollo/net/codec/handshake/HandshakeConstants.java rename to net/src/main/java/org/apollo/net/codec/handshake/HandshakeConstants.java diff --git a/net/src/main/org/apollo/net/codec/handshake/HandshakeDecoder.java b/net/src/main/java/org/apollo/net/codec/handshake/HandshakeDecoder.java similarity index 100% rename from net/src/main/org/apollo/net/codec/handshake/HandshakeDecoder.java rename to net/src/main/java/org/apollo/net/codec/handshake/HandshakeDecoder.java diff --git a/net/src/main/org/apollo/net/codec/handshake/HandshakeMessage.java b/net/src/main/java/org/apollo/net/codec/handshake/HandshakeMessage.java similarity index 100% rename from net/src/main/org/apollo/net/codec/handshake/HandshakeMessage.java rename to net/src/main/java/org/apollo/net/codec/handshake/HandshakeMessage.java diff --git a/net/src/main/org/apollo/net/codec/handshake/package-info.java b/net/src/main/java/org/apollo/net/codec/handshake/package-info.java similarity index 100% rename from net/src/main/org/apollo/net/codec/handshake/package-info.java rename to net/src/main/java/org/apollo/net/codec/handshake/package-info.java diff --git a/net/src/main/org/apollo/net/codec/jaggrab/JagGrabRequest.java b/net/src/main/java/org/apollo/net/codec/jaggrab/JagGrabRequest.java similarity index 100% rename from net/src/main/org/apollo/net/codec/jaggrab/JagGrabRequest.java rename to net/src/main/java/org/apollo/net/codec/jaggrab/JagGrabRequest.java diff --git a/net/src/main/org/apollo/net/codec/jaggrab/JagGrabRequestDecoder.java b/net/src/main/java/org/apollo/net/codec/jaggrab/JagGrabRequestDecoder.java similarity index 100% rename from net/src/main/org/apollo/net/codec/jaggrab/JagGrabRequestDecoder.java rename to net/src/main/java/org/apollo/net/codec/jaggrab/JagGrabRequestDecoder.java diff --git a/net/src/main/org/apollo/net/codec/jaggrab/JagGrabResponse.java b/net/src/main/java/org/apollo/net/codec/jaggrab/JagGrabResponse.java similarity index 100% rename from net/src/main/org/apollo/net/codec/jaggrab/JagGrabResponse.java rename to net/src/main/java/org/apollo/net/codec/jaggrab/JagGrabResponse.java diff --git a/net/src/main/org/apollo/net/codec/jaggrab/JagGrabResponseEncoder.java b/net/src/main/java/org/apollo/net/codec/jaggrab/JagGrabResponseEncoder.java similarity index 100% rename from net/src/main/org/apollo/net/codec/jaggrab/JagGrabResponseEncoder.java rename to net/src/main/java/org/apollo/net/codec/jaggrab/JagGrabResponseEncoder.java diff --git a/net/src/main/org/apollo/net/codec/jaggrab/package-info.java b/net/src/main/java/org/apollo/net/codec/jaggrab/package-info.java similarity index 100% rename from net/src/main/org/apollo/net/codec/jaggrab/package-info.java rename to net/src/main/java/org/apollo/net/codec/jaggrab/package-info.java diff --git a/net/src/main/org/apollo/net/codec/login/LoginConstants.java b/net/src/main/java/org/apollo/net/codec/login/LoginConstants.java similarity index 100% rename from net/src/main/org/apollo/net/codec/login/LoginConstants.java rename to net/src/main/java/org/apollo/net/codec/login/LoginConstants.java diff --git a/net/src/main/org/apollo/net/codec/login/LoginDecoder.java b/net/src/main/java/org/apollo/net/codec/login/LoginDecoder.java similarity index 100% rename from net/src/main/org/apollo/net/codec/login/LoginDecoder.java rename to net/src/main/java/org/apollo/net/codec/login/LoginDecoder.java diff --git a/net/src/main/org/apollo/net/codec/login/LoginDecoderState.java b/net/src/main/java/org/apollo/net/codec/login/LoginDecoderState.java similarity index 100% rename from net/src/main/org/apollo/net/codec/login/LoginDecoderState.java rename to net/src/main/java/org/apollo/net/codec/login/LoginDecoderState.java diff --git a/net/src/main/org/apollo/net/codec/login/LoginEncoder.java b/net/src/main/java/org/apollo/net/codec/login/LoginEncoder.java similarity index 100% rename from net/src/main/org/apollo/net/codec/login/LoginEncoder.java rename to net/src/main/java/org/apollo/net/codec/login/LoginEncoder.java diff --git a/net/src/main/org/apollo/net/codec/login/LoginRequest.java b/net/src/main/java/org/apollo/net/codec/login/LoginRequest.java similarity index 100% rename from net/src/main/org/apollo/net/codec/login/LoginRequest.java rename to net/src/main/java/org/apollo/net/codec/login/LoginRequest.java diff --git a/net/src/main/org/apollo/net/codec/login/LoginResponse.java b/net/src/main/java/org/apollo/net/codec/login/LoginResponse.java similarity index 100% rename from net/src/main/org/apollo/net/codec/login/LoginResponse.java rename to net/src/main/java/org/apollo/net/codec/login/LoginResponse.java diff --git a/net/src/main/org/apollo/net/codec/login/package-info.java b/net/src/main/java/org/apollo/net/codec/login/package-info.java similarity index 100% rename from net/src/main/org/apollo/net/codec/login/package-info.java rename to net/src/main/java/org/apollo/net/codec/login/package-info.java diff --git a/net/src/main/org/apollo/net/codec/update/OnDemandRequest.java b/net/src/main/java/org/apollo/net/codec/update/OnDemandRequest.java similarity index 100% rename from net/src/main/org/apollo/net/codec/update/OnDemandRequest.java rename to net/src/main/java/org/apollo/net/codec/update/OnDemandRequest.java diff --git a/net/src/main/org/apollo/net/codec/update/OnDemandResponse.java b/net/src/main/java/org/apollo/net/codec/update/OnDemandResponse.java similarity index 100% rename from net/src/main/org/apollo/net/codec/update/OnDemandResponse.java rename to net/src/main/java/org/apollo/net/codec/update/OnDemandResponse.java diff --git a/net/src/main/org/apollo/net/codec/update/UpdateDecoder.java b/net/src/main/java/org/apollo/net/codec/update/UpdateDecoder.java similarity index 100% rename from net/src/main/org/apollo/net/codec/update/UpdateDecoder.java rename to net/src/main/java/org/apollo/net/codec/update/UpdateDecoder.java diff --git a/net/src/main/org/apollo/net/codec/update/UpdateEncoder.java b/net/src/main/java/org/apollo/net/codec/update/UpdateEncoder.java similarity index 100% rename from net/src/main/org/apollo/net/codec/update/UpdateEncoder.java rename to net/src/main/java/org/apollo/net/codec/update/UpdateEncoder.java diff --git a/net/src/main/org/apollo/net/codec/update/package-info.java b/net/src/main/java/org/apollo/net/codec/update/package-info.java similarity index 100% rename from net/src/main/org/apollo/net/codec/update/package-info.java rename to net/src/main/java/org/apollo/net/codec/update/package-info.java diff --git a/net/src/main/org/apollo/net/message/Message.java b/net/src/main/java/org/apollo/net/message/Message.java similarity index 100% rename from net/src/main/org/apollo/net/message/Message.java rename to net/src/main/java/org/apollo/net/message/Message.java diff --git a/net/src/main/org/apollo/net/message/package-info.java b/net/src/main/java/org/apollo/net/message/package-info.java similarity index 100% rename from net/src/main/org/apollo/net/message/package-info.java rename to net/src/main/java/org/apollo/net/message/package-info.java diff --git a/net/src/main/org/apollo/net/meta/PacketMetaData.java b/net/src/main/java/org/apollo/net/meta/PacketMetaData.java similarity index 100% rename from net/src/main/org/apollo/net/meta/PacketMetaData.java rename to net/src/main/java/org/apollo/net/meta/PacketMetaData.java diff --git a/net/src/main/org/apollo/net/meta/PacketMetaDataGroup.java b/net/src/main/java/org/apollo/net/meta/PacketMetaDataGroup.java similarity index 100% rename from net/src/main/org/apollo/net/meta/PacketMetaDataGroup.java rename to net/src/main/java/org/apollo/net/meta/PacketMetaDataGroup.java diff --git a/net/src/main/org/apollo/net/meta/PacketType.java b/net/src/main/java/org/apollo/net/meta/PacketType.java similarity index 100% rename from net/src/main/org/apollo/net/meta/PacketType.java rename to net/src/main/java/org/apollo/net/meta/PacketType.java diff --git a/net/src/main/org/apollo/net/meta/package-info.java b/net/src/main/java/org/apollo/net/meta/package-info.java similarity index 100% rename from net/src/main/org/apollo/net/meta/package-info.java rename to net/src/main/java/org/apollo/net/meta/package-info.java diff --git a/net/src/main/org/apollo/net/package-info.java b/net/src/main/java/org/apollo/net/package-info.java similarity index 100% rename from net/src/main/org/apollo/net/package-info.java rename to net/src/main/java/org/apollo/net/package-info.java diff --git a/net/src/main/org/apollo/net/release/MessageDecoder.java b/net/src/main/java/org/apollo/net/release/MessageDecoder.java similarity index 100% rename from net/src/main/org/apollo/net/release/MessageDecoder.java rename to net/src/main/java/org/apollo/net/release/MessageDecoder.java diff --git a/net/src/main/org/apollo/net/release/MessageEncoder.java b/net/src/main/java/org/apollo/net/release/MessageEncoder.java similarity index 100% rename from net/src/main/org/apollo/net/release/MessageEncoder.java rename to net/src/main/java/org/apollo/net/release/MessageEncoder.java diff --git a/net/src/main/org/apollo/net/release/Release.java b/net/src/main/java/org/apollo/net/release/Release.java similarity index 100% rename from net/src/main/org/apollo/net/release/Release.java rename to net/src/main/java/org/apollo/net/release/Release.java diff --git a/net/src/main/org/apollo/net/release/package-info.java b/net/src/main/java/org/apollo/net/release/package-info.java similarity index 100% rename from net/src/main/org/apollo/net/release/package-info.java rename to net/src/main/java/org/apollo/net/release/package-info.java diff --git a/net/src/main/org/apollo/net/update/ChannelRequest.java b/net/src/main/java/org/apollo/net/update/ChannelRequest.java similarity index 100% rename from net/src/main/org/apollo/net/update/ChannelRequest.java rename to net/src/main/java/org/apollo/net/update/ChannelRequest.java diff --git a/net/src/main/org/apollo/net/update/ComparableChannelRequest.java b/net/src/main/java/org/apollo/net/update/ComparableChannelRequest.java similarity index 100% rename from net/src/main/org/apollo/net/update/ComparableChannelRequest.java rename to net/src/main/java/org/apollo/net/update/ComparableChannelRequest.java diff --git a/net/src/main/org/apollo/net/update/HttpRequestWorker.java b/net/src/main/java/org/apollo/net/update/HttpRequestWorker.java similarity index 100% rename from net/src/main/org/apollo/net/update/HttpRequestWorker.java rename to net/src/main/java/org/apollo/net/update/HttpRequestWorker.java diff --git a/net/src/main/org/apollo/net/update/JagGrabRequestWorker.java b/net/src/main/java/org/apollo/net/update/JagGrabRequestWorker.java similarity index 100% rename from net/src/main/org/apollo/net/update/JagGrabRequestWorker.java rename to net/src/main/java/org/apollo/net/update/JagGrabRequestWorker.java diff --git a/net/src/main/org/apollo/net/update/OnDemandRequestWorker.java b/net/src/main/java/org/apollo/net/update/OnDemandRequestWorker.java similarity index 100% rename from net/src/main/org/apollo/net/update/OnDemandRequestWorker.java rename to net/src/main/java/org/apollo/net/update/OnDemandRequestWorker.java diff --git a/net/src/main/org/apollo/net/update/RequestWorker.java b/net/src/main/java/org/apollo/net/update/RequestWorker.java similarity index 100% rename from net/src/main/org/apollo/net/update/RequestWorker.java rename to net/src/main/java/org/apollo/net/update/RequestWorker.java diff --git a/net/src/main/org/apollo/net/update/UpdateConstants.java b/net/src/main/java/org/apollo/net/update/UpdateConstants.java similarity index 100% rename from net/src/main/org/apollo/net/update/UpdateConstants.java rename to net/src/main/java/org/apollo/net/update/UpdateConstants.java diff --git a/net/src/main/org/apollo/net/update/UpdateDispatcher.java b/net/src/main/java/org/apollo/net/update/UpdateDispatcher.java similarity index 100% rename from net/src/main/org/apollo/net/update/UpdateDispatcher.java rename to net/src/main/java/org/apollo/net/update/UpdateDispatcher.java diff --git a/net/src/main/org/apollo/net/update/package-info.java b/net/src/main/java/org/apollo/net/update/package-info.java similarity index 100% rename from net/src/main/org/apollo/net/update/package-info.java rename to net/src/main/java/org/apollo/net/update/package-info.java diff --git a/net/src/main/org/apollo/net/update/resource/CombinedResourceProvider.java b/net/src/main/java/org/apollo/net/update/resource/CombinedResourceProvider.java similarity index 100% rename from net/src/main/org/apollo/net/update/resource/CombinedResourceProvider.java rename to net/src/main/java/org/apollo/net/update/resource/CombinedResourceProvider.java diff --git a/net/src/main/org/apollo/net/update/resource/HypertextResourceProvider.java b/net/src/main/java/org/apollo/net/update/resource/HypertextResourceProvider.java similarity index 100% rename from net/src/main/org/apollo/net/update/resource/HypertextResourceProvider.java rename to net/src/main/java/org/apollo/net/update/resource/HypertextResourceProvider.java diff --git a/net/src/main/org/apollo/net/update/resource/ResourceProvider.java b/net/src/main/java/org/apollo/net/update/resource/ResourceProvider.java similarity index 100% rename from net/src/main/org/apollo/net/update/resource/ResourceProvider.java rename to net/src/main/java/org/apollo/net/update/resource/ResourceProvider.java diff --git a/net/src/main/org/apollo/net/update/resource/VirtualResourceProvider.java b/net/src/main/java/org/apollo/net/update/resource/VirtualResourceProvider.java similarity index 100% rename from net/src/main/org/apollo/net/update/resource/VirtualResourceProvider.java rename to net/src/main/java/org/apollo/net/update/resource/VirtualResourceProvider.java diff --git a/net/src/main/org/apollo/net/update/resource/package-info.java b/net/src/main/java/org/apollo/net/update/resource/package-info.java similarity index 100% rename from net/src/main/org/apollo/net/update/resource/package-info.java rename to net/src/main/java/org/apollo/net/update/resource/package-info.java diff --git a/net/src/test/org/apollo/net/codec/game/GamePacketEncoderTests.java b/net/src/test/java/org/apollo/net/codec/game/GamePacketEncoderTests.java similarity index 100% rename from net/src/test/org/apollo/net/codec/game/GamePacketEncoderTests.java rename to net/src/test/java/org/apollo/net/codec/game/GamePacketEncoderTests.java diff --git a/util/src/main/org/apollo/util/BufferUtil.java b/util/src/main/java/org/apollo/util/BufferUtil.java similarity index 100% rename from util/src/main/org/apollo/util/BufferUtil.java rename to util/src/main/java/org/apollo/util/BufferUtil.java diff --git a/util/src/main/org/apollo/util/CollectionUtil.java b/util/src/main/java/org/apollo/util/CollectionUtil.java similarity index 100% rename from util/src/main/org/apollo/util/CollectionUtil.java rename to util/src/main/java/org/apollo/util/CollectionUtil.java diff --git a/util/src/main/org/apollo/util/CompressionUtil.java b/util/src/main/java/org/apollo/util/CompressionUtil.java similarity index 100% rename from util/src/main/org/apollo/util/CompressionUtil.java rename to util/src/main/java/org/apollo/util/CompressionUtil.java diff --git a/util/src/main/org/apollo/util/LanguageUtil.java b/util/src/main/java/org/apollo/util/LanguageUtil.java similarity index 100% rename from util/src/main/org/apollo/util/LanguageUtil.java rename to util/src/main/java/org/apollo/util/LanguageUtil.java diff --git a/util/src/main/org/apollo/util/NameUtil.java b/util/src/main/java/org/apollo/util/NameUtil.java similarity index 100% rename from util/src/main/org/apollo/util/NameUtil.java rename to util/src/main/java/org/apollo/util/NameUtil.java diff --git a/util/src/main/org/apollo/util/Point.java b/util/src/main/java/org/apollo/util/Point.java similarity index 100% rename from util/src/main/org/apollo/util/Point.java rename to util/src/main/java/org/apollo/util/Point.java diff --git a/util/src/main/org/apollo/util/StatefulFrameDecoder.java b/util/src/main/java/org/apollo/util/StatefulFrameDecoder.java similarity index 100% rename from util/src/main/org/apollo/util/StatefulFrameDecoder.java rename to util/src/main/java/org/apollo/util/StatefulFrameDecoder.java diff --git a/util/src/main/org/apollo/util/StreamUtil.java b/util/src/main/java/org/apollo/util/StreamUtil.java similarity index 100% rename from util/src/main/org/apollo/util/StreamUtil.java rename to util/src/main/java/org/apollo/util/StreamUtil.java diff --git a/util/src/main/org/apollo/util/TextUtil.java b/util/src/main/java/org/apollo/util/TextUtil.java similarity index 100% rename from util/src/main/org/apollo/util/TextUtil.java rename to util/src/main/java/org/apollo/util/TextUtil.java diff --git a/util/src/main/org/apollo/util/ThreadUtil.java b/util/src/main/java/org/apollo/util/ThreadUtil.java similarity index 100% rename from util/src/main/org/apollo/util/ThreadUtil.java rename to util/src/main/java/org/apollo/util/ThreadUtil.java diff --git a/util/src/main/org/apollo/util/package-info.java b/util/src/main/java/org/apollo/util/package-info.java similarity index 100% rename from util/src/main/org/apollo/util/package-info.java rename to util/src/main/java/org/apollo/util/package-info.java diff --git a/util/src/main/org/apollo/util/security/IsaacRandom.java b/util/src/main/java/org/apollo/util/security/IsaacRandom.java similarity index 100% rename from util/src/main/org/apollo/util/security/IsaacRandom.java rename to util/src/main/java/org/apollo/util/security/IsaacRandom.java diff --git a/util/src/main/org/apollo/util/security/IsaacRandomPair.java b/util/src/main/java/org/apollo/util/security/IsaacRandomPair.java similarity index 100% rename from util/src/main/org/apollo/util/security/IsaacRandomPair.java rename to util/src/main/java/org/apollo/util/security/IsaacRandomPair.java diff --git a/util/src/main/org/apollo/util/security/PlayerCredentials.java b/util/src/main/java/org/apollo/util/security/PlayerCredentials.java similarity index 100% rename from util/src/main/org/apollo/util/security/PlayerCredentials.java rename to util/src/main/java/org/apollo/util/security/PlayerCredentials.java diff --git a/util/src/main/org/apollo/util/security/package-info.java b/util/src/main/java/org/apollo/util/security/package-info.java similarity index 100% rename from util/src/main/org/apollo/util/security/package-info.java rename to util/src/main/java/org/apollo/util/security/package-info.java diff --git a/util/src/main/org/apollo/util/tools/EquipmentConstants.java b/util/src/main/java/org/apollo/util/tools/EquipmentConstants.java similarity index 100% rename from util/src/main/org/apollo/util/tools/EquipmentConstants.java rename to util/src/main/java/org/apollo/util/tools/EquipmentConstants.java diff --git a/util/src/main/org/apollo/util/tools/RsaKeyGenerator.java b/util/src/main/java/org/apollo/util/tools/RsaKeyGenerator.java similarity index 100% rename from util/src/main/org/apollo/util/tools/RsaKeyGenerator.java rename to util/src/main/java/org/apollo/util/tools/RsaKeyGenerator.java diff --git a/util/src/main/org/apollo/util/tools/package-info.java b/util/src/main/java/org/apollo/util/tools/package-info.java similarity index 100% rename from util/src/main/org/apollo/util/tools/package-info.java rename to util/src/main/java/org/apollo/util/tools/package-info.java diff --git a/util/src/main/org/apollo/util/xml/XmlNode.java b/util/src/main/java/org/apollo/util/xml/XmlNode.java similarity index 100% rename from util/src/main/org/apollo/util/xml/XmlNode.java rename to util/src/main/java/org/apollo/util/xml/XmlNode.java diff --git a/util/src/main/org/apollo/util/xml/XmlParser.java b/util/src/main/java/org/apollo/util/xml/XmlParser.java similarity index 100% rename from util/src/main/org/apollo/util/xml/XmlParser.java rename to util/src/main/java/org/apollo/util/xml/XmlParser.java diff --git a/util/src/main/org/apollo/util/xml/package-info.java b/util/src/main/java/org/apollo/util/xml/package-info.java similarity index 100% rename from util/src/main/org/apollo/util/xml/package-info.java rename to util/src/main/java/org/apollo/util/xml/package-info.java diff --git a/util/src/test/org/apollo/util/BufferUtilTests.java b/util/src/test/java/org/apollo/util/BufferUtilTests.java similarity index 100% rename from util/src/test/org/apollo/util/BufferUtilTests.java rename to util/src/test/java/org/apollo/util/BufferUtilTests.java diff --git a/util/src/test/org/apollo/util/CollectionUtilTests.java b/util/src/test/java/org/apollo/util/CollectionUtilTests.java similarity index 100% rename from util/src/test/org/apollo/util/CollectionUtilTests.java rename to util/src/test/java/org/apollo/util/CollectionUtilTests.java diff --git a/util/src/test/org/apollo/util/CompressionUtilTests.java b/util/src/test/java/org/apollo/util/CompressionUtilTests.java similarity index 100% rename from util/src/test/org/apollo/util/CompressionUtilTests.java rename to util/src/test/java/org/apollo/util/CompressionUtilTests.java diff --git a/util/src/test/org/apollo/util/LanguageUtilTests.java b/util/src/test/java/org/apollo/util/LanguageUtilTests.java similarity index 100% rename from util/src/test/org/apollo/util/LanguageUtilTests.java rename to util/src/test/java/org/apollo/util/LanguageUtilTests.java diff --git a/util/src/test/org/apollo/util/NameUtilTests.java b/util/src/test/java/org/apollo/util/NameUtilTests.java similarity index 100% rename from util/src/test/org/apollo/util/NameUtilTests.java rename to util/src/test/java/org/apollo/util/NameUtilTests.java diff --git a/util/src/test/org/apollo/util/StreamUtilTests.java b/util/src/test/java/org/apollo/util/StreamUtilTests.java similarity index 100% rename from util/src/test/org/apollo/util/StreamUtilTests.java rename to util/src/test/java/org/apollo/util/StreamUtilTests.java diff --git a/util/src/test/org/apollo/util/TextUtilTests.java b/util/src/test/java/org/apollo/util/TextUtilTests.java similarity index 100% rename from util/src/test/org/apollo/util/TextUtilTests.java rename to util/src/test/java/org/apollo/util/TextUtilTests.java diff --git a/util/src/test/org/apollo/util/ThreadUtilTests.java b/util/src/test/java/org/apollo/util/ThreadUtilTests.java similarity index 100% rename from util/src/test/org/apollo/util/ThreadUtilTests.java rename to util/src/test/java/org/apollo/util/ThreadUtilTests.java diff --git a/util/src/test/org/apollo/util/xml/XmlParserTests.java b/util/src/test/java/org/apollo/util/xml/XmlParserTests.java similarity index 100% rename from util/src/test/org/apollo/util/xml/XmlParserTests.java rename to util/src/test/java/org/apollo/util/xml/XmlParserTests.java