diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..f91f646 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,12 @@ +# +# https://help.github.com/articles/dealing-with-line-endings/ +# +# Linux start script should use lf +/gradlew text eol=lf + +# These are Windows script files and should use crlf +*.bat text eol=crlf + +# Binary files should be left untouched +*.jar binary + diff --git a/.gitignore b/.gitignore index 0407d70..ef95ed8 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,5 @@ .classpath .project .settings +.gradle +build diff --git a/client/build.gradle.kts b/client/build.gradle.kts new file mode 100644 index 0000000..c8c05d3 --- /dev/null +++ b/client/build.gradle.kts @@ -0,0 +1,48 @@ + +plugins { + application + id("com.gradleup.shadow") version "8.3.6" + eclipse +} + +repositories { + mavenCentral() +} + +dependencies { + implementation(project(":common")) + + implementation(platform("org.lwjgl:lwjgl-bom:3.3.6")) + + implementation("org.lwjgl", "lwjgl") + implementation("org.lwjgl", "lwjgl-glfw") + implementation("org.lwjgl", "lwjgl-opengl") + + runtimeOnly("org.lwjgl", "lwjgl", classifier = "natives-linux") + runtimeOnly("org.lwjgl", "lwjgl", classifier = "natives-freebsd") + runtimeOnly("org.lwjgl", "lwjgl", classifier = "natives-windows") + runtimeOnly("org.lwjgl", "lwjgl-glfw", classifier = "natives-linux") + runtimeOnly("org.lwjgl", "lwjgl-glfw", classifier = "natives-freebsd") + runtimeOnly("org.lwjgl", "lwjgl-glfw", classifier = "natives-windows") + runtimeOnly("org.lwjgl", "lwjgl-opengl", classifier = "natives-linux") + runtimeOnly("org.lwjgl", "lwjgl-opengl", classifier = "natives-freebsd") + runtimeOnly("org.lwjgl", "lwjgl-opengl", classifier = "natives-windows") +} + +java { + toolchain { + languageVersion = JavaLanguageVersion.of(8) + } +} + +application { + mainClass = "client.Client" + tasks.run.get().workingDir = rootProject.file("dev/client") + tasks.run.get().workingDir.mkdirs() + tasks.run.get().systemProperties.put("crash.nodump", "") +} + +tasks.shadowJar { + destinationDirectory = rootProject.file("dev") + archiveFileName = "tcr_client.jar" +} diff --git a/client/src/client/Client.java b/client/src/main/java/client/Client.java similarity index 100% rename from client/src/client/Client.java rename to client/src/main/java/client/Client.java diff --git a/client/src/client/audio/AudioInterface.java b/client/src/main/java/client/audio/AudioInterface.java similarity index 100% rename from client/src/client/audio/AudioInterface.java rename to client/src/main/java/client/audio/AudioInterface.java diff --git a/client/src/client/audio/CodecJOrbis.java b/client/src/main/java/client/audio/CodecJOrbis.java similarity index 100% rename from client/src/client/audio/CodecJOrbis.java rename to client/src/main/java/client/audio/CodecJOrbis.java diff --git a/client/src/client/audio/SoundManager.java b/client/src/main/java/client/audio/SoundManager.java similarity index 100% rename from client/src/client/audio/SoundManager.java rename to client/src/main/java/client/audio/SoundManager.java diff --git a/client/src/client/audio/Volume.java b/client/src/main/java/client/audio/Volume.java similarity index 100% rename from client/src/client/audio/Volume.java rename to client/src/main/java/client/audio/Volume.java diff --git a/client/src/client/audio/jogg/Buffer.java b/client/src/main/java/client/audio/jogg/Buffer.java similarity index 100% rename from client/src/client/audio/jogg/Buffer.java rename to client/src/main/java/client/audio/jogg/Buffer.java diff --git a/client/src/client/audio/jogg/Packet.java b/client/src/main/java/client/audio/jogg/Packet.java similarity index 100% rename from client/src/client/audio/jogg/Packet.java rename to client/src/main/java/client/audio/jogg/Packet.java diff --git a/client/src/client/audio/jogg/Page.java b/client/src/main/java/client/audio/jogg/Page.java similarity index 100% rename from client/src/client/audio/jogg/Page.java rename to client/src/main/java/client/audio/jogg/Page.java diff --git a/client/src/client/audio/jogg/StreamState.java b/client/src/main/java/client/audio/jogg/StreamState.java similarity index 100% rename from client/src/client/audio/jogg/StreamState.java rename to client/src/main/java/client/audio/jogg/StreamState.java diff --git a/client/src/client/audio/jogg/SyncState.java b/client/src/main/java/client/audio/jogg/SyncState.java similarity index 100% rename from client/src/client/audio/jogg/SyncState.java rename to client/src/main/java/client/audio/jogg/SyncState.java diff --git a/client/src/client/audio/jorbis/Block.java b/client/src/main/java/client/audio/jorbis/Block.java similarity index 100% rename from client/src/client/audio/jorbis/Block.java rename to client/src/main/java/client/audio/jorbis/Block.java diff --git a/client/src/client/audio/jorbis/ChainingExample.java b/client/src/main/java/client/audio/jorbis/ChainingExample.java similarity index 100% rename from client/src/client/audio/jorbis/ChainingExample.java rename to client/src/main/java/client/audio/jorbis/ChainingExample.java diff --git a/client/src/client/audio/jorbis/CodeBook.java b/client/src/main/java/client/audio/jorbis/CodeBook.java similarity index 100% rename from client/src/client/audio/jorbis/CodeBook.java rename to client/src/main/java/client/audio/jorbis/CodeBook.java diff --git a/client/src/client/audio/jorbis/Comment.java b/client/src/main/java/client/audio/jorbis/Comment.java similarity index 100% rename from client/src/client/audio/jorbis/Comment.java rename to client/src/main/java/client/audio/jorbis/Comment.java diff --git a/client/src/client/audio/jorbis/DecodeExample.java b/client/src/main/java/client/audio/jorbis/DecodeExample.java similarity index 100% rename from client/src/client/audio/jorbis/DecodeExample.java rename to client/src/main/java/client/audio/jorbis/DecodeExample.java diff --git a/client/src/client/audio/jorbis/Drft.java b/client/src/main/java/client/audio/jorbis/Drft.java similarity index 100% rename from client/src/client/audio/jorbis/Drft.java rename to client/src/main/java/client/audio/jorbis/Drft.java diff --git a/client/src/client/audio/jorbis/DspState.java b/client/src/main/java/client/audio/jorbis/DspState.java similarity index 100% rename from client/src/client/audio/jorbis/DspState.java rename to client/src/main/java/client/audio/jorbis/DspState.java diff --git a/client/src/client/audio/jorbis/Floor0.java b/client/src/main/java/client/audio/jorbis/Floor0.java similarity index 100% rename from client/src/client/audio/jorbis/Floor0.java rename to client/src/main/java/client/audio/jorbis/Floor0.java diff --git a/client/src/client/audio/jorbis/Floor1.java b/client/src/main/java/client/audio/jorbis/Floor1.java similarity index 100% rename from client/src/client/audio/jorbis/Floor1.java rename to client/src/main/java/client/audio/jorbis/Floor1.java diff --git a/client/src/client/audio/jorbis/FuncFloor.java b/client/src/main/java/client/audio/jorbis/FuncFloor.java similarity index 100% rename from client/src/client/audio/jorbis/FuncFloor.java rename to client/src/main/java/client/audio/jorbis/FuncFloor.java diff --git a/client/src/client/audio/jorbis/FuncMapping.java b/client/src/main/java/client/audio/jorbis/FuncMapping.java similarity index 100% rename from client/src/client/audio/jorbis/FuncMapping.java rename to client/src/main/java/client/audio/jorbis/FuncMapping.java diff --git a/client/src/client/audio/jorbis/FuncResidue.java b/client/src/main/java/client/audio/jorbis/FuncResidue.java similarity index 100% rename from client/src/client/audio/jorbis/FuncResidue.java rename to client/src/main/java/client/audio/jorbis/FuncResidue.java diff --git a/client/src/client/audio/jorbis/FuncTime.java b/client/src/main/java/client/audio/jorbis/FuncTime.java similarity index 100% rename from client/src/client/audio/jorbis/FuncTime.java rename to client/src/main/java/client/audio/jorbis/FuncTime.java diff --git a/client/src/client/audio/jorbis/Info.java b/client/src/main/java/client/audio/jorbis/Info.java similarity index 100% rename from client/src/client/audio/jorbis/Info.java rename to client/src/main/java/client/audio/jorbis/Info.java diff --git a/client/src/client/audio/jorbis/InfoMode.java b/client/src/main/java/client/audio/jorbis/InfoMode.java similarity index 100% rename from client/src/client/audio/jorbis/InfoMode.java rename to client/src/main/java/client/audio/jorbis/InfoMode.java diff --git a/client/src/client/audio/jorbis/JOrbisException.java b/client/src/main/java/client/audio/jorbis/JOrbisException.java similarity index 100% rename from client/src/client/audio/jorbis/JOrbisException.java rename to client/src/main/java/client/audio/jorbis/JOrbisException.java diff --git a/client/src/client/audio/jorbis/Lookup.java b/client/src/main/java/client/audio/jorbis/Lookup.java similarity index 100% rename from client/src/client/audio/jorbis/Lookup.java rename to client/src/main/java/client/audio/jorbis/Lookup.java diff --git a/client/src/client/audio/jorbis/Lpc.java b/client/src/main/java/client/audio/jorbis/Lpc.java similarity index 100% rename from client/src/client/audio/jorbis/Lpc.java rename to client/src/main/java/client/audio/jorbis/Lpc.java diff --git a/client/src/client/audio/jorbis/Lsp.java b/client/src/main/java/client/audio/jorbis/Lsp.java similarity index 100% rename from client/src/client/audio/jorbis/Lsp.java rename to client/src/main/java/client/audio/jorbis/Lsp.java diff --git a/client/src/client/audio/jorbis/Mapping0.java b/client/src/main/java/client/audio/jorbis/Mapping0.java similarity index 100% rename from client/src/client/audio/jorbis/Mapping0.java rename to client/src/main/java/client/audio/jorbis/Mapping0.java diff --git a/client/src/client/audio/jorbis/Mdct.java b/client/src/main/java/client/audio/jorbis/Mdct.java similarity index 100% rename from client/src/client/audio/jorbis/Mdct.java rename to client/src/main/java/client/audio/jorbis/Mdct.java diff --git a/client/src/client/audio/jorbis/PsyInfo.java b/client/src/main/java/client/audio/jorbis/PsyInfo.java similarity index 100% rename from client/src/client/audio/jorbis/PsyInfo.java rename to client/src/main/java/client/audio/jorbis/PsyInfo.java diff --git a/client/src/client/audio/jorbis/PsyLook.java b/client/src/main/java/client/audio/jorbis/PsyLook.java similarity index 100% rename from client/src/client/audio/jorbis/PsyLook.java rename to client/src/main/java/client/audio/jorbis/PsyLook.java diff --git a/client/src/client/audio/jorbis/Residue0.java b/client/src/main/java/client/audio/jorbis/Residue0.java similarity index 100% rename from client/src/client/audio/jorbis/Residue0.java rename to client/src/main/java/client/audio/jorbis/Residue0.java diff --git a/client/src/client/audio/jorbis/Residue1.java b/client/src/main/java/client/audio/jorbis/Residue1.java similarity index 100% rename from client/src/client/audio/jorbis/Residue1.java rename to client/src/main/java/client/audio/jorbis/Residue1.java diff --git a/client/src/client/audio/jorbis/Residue2.java b/client/src/main/java/client/audio/jorbis/Residue2.java similarity index 100% rename from client/src/client/audio/jorbis/Residue2.java rename to client/src/main/java/client/audio/jorbis/Residue2.java diff --git a/client/src/client/audio/jorbis/StaticCodeBook.java b/client/src/main/java/client/audio/jorbis/StaticCodeBook.java similarity index 100% rename from client/src/client/audio/jorbis/StaticCodeBook.java rename to client/src/main/java/client/audio/jorbis/StaticCodeBook.java diff --git a/client/src/client/audio/jorbis/Time0.java b/client/src/main/java/client/audio/jorbis/Time0.java similarity index 100% rename from client/src/client/audio/jorbis/Time0.java rename to client/src/main/java/client/audio/jorbis/Time0.java diff --git a/client/src/client/audio/jorbis/Util.java b/client/src/main/java/client/audio/jorbis/Util.java similarity index 100% rename from client/src/client/audio/jorbis/Util.java rename to client/src/main/java/client/audio/jorbis/Util.java diff --git a/client/src/client/audio/jorbis/VorbisFile.java b/client/src/main/java/client/audio/jorbis/VorbisFile.java similarity index 100% rename from client/src/client/audio/jorbis/VorbisFile.java rename to client/src/main/java/client/audio/jorbis/VorbisFile.java diff --git a/client/src/client/gui/FileCallback.java b/client/src/main/java/client/gui/FileCallback.java similarity index 100% rename from client/src/client/gui/FileCallback.java rename to client/src/main/java/client/gui/FileCallback.java diff --git a/client/src/client/gui/Font.java b/client/src/main/java/client/gui/Font.java similarity index 100% rename from client/src/client/gui/Font.java rename to client/src/main/java/client/gui/Font.java diff --git a/client/src/client/gui/FontChar.java b/client/src/main/java/client/gui/FontChar.java similarity index 100% rename from client/src/client/gui/FontChar.java rename to client/src/main/java/client/gui/FontChar.java diff --git a/client/src/client/gui/Formatter.java b/client/src/main/java/client/gui/Formatter.java similarity index 100% rename from client/src/client/gui/Formatter.java rename to client/src/main/java/client/gui/Formatter.java diff --git a/client/src/client/gui/Gui.java b/client/src/main/java/client/gui/Gui.java similarity index 100% rename from client/src/client/gui/Gui.java rename to client/src/main/java/client/gui/Gui.java diff --git a/client/src/client/gui/GuiConfirm.java b/client/src/main/java/client/gui/GuiConfirm.java similarity index 100% rename from client/src/client/gui/GuiConfirm.java rename to client/src/main/java/client/gui/GuiConfirm.java diff --git a/client/src/client/gui/GuiConnect.java b/client/src/main/java/client/gui/GuiConnect.java similarity index 100% rename from client/src/client/gui/GuiConnect.java rename to client/src/main/java/client/gui/GuiConnect.java diff --git a/client/src/client/gui/GuiConsole.java b/client/src/main/java/client/gui/GuiConsole.java similarity index 100% rename from client/src/client/gui/GuiConsole.java rename to client/src/main/java/client/gui/GuiConsole.java diff --git a/client/src/client/gui/GuiInfo.java b/client/src/main/java/client/gui/GuiInfo.java similarity index 100% rename from client/src/client/gui/GuiInfo.java rename to client/src/main/java/client/gui/GuiInfo.java diff --git a/client/src/client/gui/GuiLoading.java b/client/src/main/java/client/gui/GuiLoading.java similarity index 100% rename from client/src/client/gui/GuiLoading.java rename to client/src/main/java/client/gui/GuiLoading.java diff --git a/client/src/client/gui/GuiMenu.java b/client/src/main/java/client/gui/GuiMenu.java similarity index 100% rename from client/src/client/gui/GuiMenu.java rename to client/src/main/java/client/gui/GuiMenu.java diff --git a/client/src/client/gui/GuiServer.java b/client/src/main/java/client/gui/GuiServer.java similarity index 100% rename from client/src/client/gui/GuiServer.java rename to client/src/main/java/client/gui/GuiServer.java diff --git a/client/src/client/gui/Splashes.java b/client/src/main/java/client/gui/Splashes.java similarity index 100% rename from client/src/client/gui/Splashes.java rename to client/src/main/java/client/gui/Splashes.java diff --git a/client/src/client/gui/Style.java b/client/src/main/java/client/gui/Style.java similarity index 100% rename from client/src/client/gui/Style.java rename to client/src/main/java/client/gui/Style.java diff --git a/client/src/client/gui/character/GuiChar.java b/client/src/main/java/client/gui/character/GuiChar.java similarity index 100% rename from client/src/client/gui/character/GuiChar.java rename to client/src/main/java/client/gui/character/GuiChar.java diff --git a/client/src/client/gui/character/GuiCharacters.java b/client/src/main/java/client/gui/character/GuiCharacters.java similarity index 100% rename from client/src/client/gui/character/GuiCharacters.java rename to client/src/main/java/client/gui/character/GuiCharacters.java diff --git a/client/src/client/gui/character/GuiClass.java b/client/src/main/java/client/gui/character/GuiClass.java similarity index 100% rename from client/src/client/gui/character/GuiClass.java rename to client/src/main/java/client/gui/character/GuiClass.java diff --git a/client/src/client/gui/character/GuiSpecies.java b/client/src/main/java/client/gui/character/GuiSpecies.java similarity index 100% rename from client/src/client/gui/character/GuiSpecies.java rename to client/src/main/java/client/gui/character/GuiSpecies.java diff --git a/client/src/client/gui/container/GuiBrewing.java b/client/src/main/java/client/gui/container/GuiBrewing.java similarity index 100% rename from client/src/client/gui/container/GuiBrewing.java rename to client/src/main/java/client/gui/container/GuiBrewing.java diff --git a/client/src/client/gui/container/GuiChest.java b/client/src/main/java/client/gui/container/GuiChest.java similarity index 100% rename from client/src/client/gui/container/GuiChest.java rename to client/src/main/java/client/gui/container/GuiChest.java diff --git a/client/src/client/gui/container/GuiContainer.java b/client/src/main/java/client/gui/container/GuiContainer.java similarity index 100% rename from client/src/client/gui/container/GuiContainer.java rename to client/src/main/java/client/gui/container/GuiContainer.java diff --git a/client/src/client/gui/container/GuiCrafting.java b/client/src/main/java/client/gui/container/GuiCrafting.java similarity index 100% rename from client/src/client/gui/container/GuiCrafting.java rename to client/src/main/java/client/gui/container/GuiCrafting.java diff --git a/client/src/client/gui/container/GuiDispenser.java b/client/src/main/java/client/gui/container/GuiDispenser.java similarity index 100% rename from client/src/client/gui/container/GuiDispenser.java rename to client/src/main/java/client/gui/container/GuiDispenser.java diff --git a/client/src/client/gui/container/GuiEnchant.java b/client/src/main/java/client/gui/container/GuiEnchant.java similarity index 100% rename from client/src/client/gui/container/GuiEnchant.java rename to client/src/main/java/client/gui/container/GuiEnchant.java diff --git a/client/src/client/gui/container/GuiFurnace.java b/client/src/main/java/client/gui/container/GuiFurnace.java similarity index 100% rename from client/src/client/gui/container/GuiFurnace.java rename to client/src/main/java/client/gui/container/GuiFurnace.java diff --git a/client/src/client/gui/container/GuiHopper.java b/client/src/main/java/client/gui/container/GuiHopper.java similarity index 100% rename from client/src/client/gui/container/GuiHopper.java rename to client/src/main/java/client/gui/container/GuiHopper.java diff --git a/client/src/client/gui/container/GuiHorse.java b/client/src/main/java/client/gui/container/GuiHorse.java similarity index 100% rename from client/src/client/gui/container/GuiHorse.java rename to client/src/main/java/client/gui/container/GuiHorse.java diff --git a/client/src/client/gui/container/GuiInventory.java b/client/src/main/java/client/gui/container/GuiInventory.java similarity index 100% rename from client/src/client/gui/container/GuiInventory.java rename to client/src/main/java/client/gui/container/GuiInventory.java diff --git a/client/src/client/gui/container/GuiMachine.java b/client/src/main/java/client/gui/container/GuiMachine.java similarity index 100% rename from client/src/client/gui/container/GuiMachine.java rename to client/src/main/java/client/gui/container/GuiMachine.java diff --git a/client/src/client/gui/container/GuiMerchant.java b/client/src/main/java/client/gui/container/GuiMerchant.java similarity index 100% rename from client/src/client/gui/container/GuiMerchant.java rename to client/src/main/java/client/gui/container/GuiMerchant.java diff --git a/client/src/client/gui/container/GuiRepair.java b/client/src/main/java/client/gui/container/GuiRepair.java similarity index 100% rename from client/src/client/gui/container/GuiRepair.java rename to client/src/main/java/client/gui/container/GuiRepair.java diff --git a/client/src/client/gui/element/ActButton.java b/client/src/main/java/client/gui/element/ActButton.java similarity index 100% rename from client/src/client/gui/element/ActButton.java rename to client/src/main/java/client/gui/element/ActButton.java diff --git a/client/src/client/gui/element/Area.java b/client/src/main/java/client/gui/element/Area.java similarity index 100% rename from client/src/client/gui/element/Area.java rename to client/src/main/java/client/gui/element/Area.java diff --git a/client/src/client/gui/element/Bar.java b/client/src/main/java/client/gui/element/Bar.java similarity index 100% rename from client/src/client/gui/element/Bar.java rename to client/src/main/java/client/gui/element/Bar.java diff --git a/client/src/client/gui/element/ButtonCallback.java b/client/src/main/java/client/gui/element/ButtonCallback.java similarity index 100% rename from client/src/client/gui/element/ButtonCallback.java rename to client/src/main/java/client/gui/element/ButtonCallback.java diff --git a/client/src/client/gui/element/Dropdown.java b/client/src/main/java/client/gui/element/Dropdown.java similarity index 100% rename from client/src/client/gui/element/Dropdown.java rename to client/src/main/java/client/gui/element/Dropdown.java diff --git a/client/src/client/gui/element/DropdownCallback.java b/client/src/main/java/client/gui/element/DropdownCallback.java similarity index 100% rename from client/src/client/gui/element/DropdownCallback.java rename to client/src/main/java/client/gui/element/DropdownCallback.java diff --git a/client/src/client/gui/element/Element.java b/client/src/main/java/client/gui/element/Element.java similarity index 100% rename from client/src/client/gui/element/Element.java rename to client/src/main/java/client/gui/element/Element.java diff --git a/client/src/client/gui/element/Field.java b/client/src/main/java/client/gui/element/Field.java similarity index 100% rename from client/src/client/gui/element/Field.java rename to client/src/main/java/client/gui/element/Field.java diff --git a/client/src/client/gui/element/FieldAction.java b/client/src/main/java/client/gui/element/FieldAction.java similarity index 100% rename from client/src/client/gui/element/FieldAction.java rename to client/src/main/java/client/gui/element/FieldAction.java diff --git a/client/src/client/gui/element/FieldCallback.java b/client/src/main/java/client/gui/element/FieldCallback.java similarity index 100% rename from client/src/client/gui/element/FieldCallback.java rename to client/src/main/java/client/gui/element/FieldCallback.java diff --git a/client/src/client/gui/element/Fill.java b/client/src/main/java/client/gui/element/Fill.java similarity index 100% rename from client/src/client/gui/element/Fill.java rename to client/src/main/java/client/gui/element/Fill.java diff --git a/client/src/client/gui/element/GuiList.java b/client/src/main/java/client/gui/element/GuiList.java similarity index 100% rename from client/src/client/gui/element/GuiList.java rename to client/src/main/java/client/gui/element/GuiList.java diff --git a/client/src/client/gui/element/InventoryButton.java b/client/src/main/java/client/gui/element/InventoryButton.java similarity index 100% rename from client/src/client/gui/element/InventoryButton.java rename to client/src/main/java/client/gui/element/InventoryButton.java diff --git a/client/src/client/gui/element/Label.java b/client/src/main/java/client/gui/element/Label.java similarity index 100% rename from client/src/client/gui/element/Label.java rename to client/src/main/java/client/gui/element/Label.java diff --git a/client/src/client/gui/element/ListEntry.java b/client/src/main/java/client/gui/element/ListEntry.java similarity index 100% rename from client/src/client/gui/element/ListEntry.java rename to client/src/main/java/client/gui/element/ListEntry.java diff --git a/client/src/client/gui/element/NavButton.java b/client/src/main/java/client/gui/element/NavButton.java similarity index 100% rename from client/src/client/gui/element/NavButton.java rename to client/src/main/java/client/gui/element/NavButton.java diff --git a/client/src/client/gui/element/PasswordField.java b/client/src/main/java/client/gui/element/PasswordField.java similarity index 100% rename from client/src/client/gui/element/PasswordField.java rename to client/src/main/java/client/gui/element/PasswordField.java diff --git a/client/src/client/gui/element/PressType.java b/client/src/main/java/client/gui/element/PressType.java similarity index 100% rename from client/src/client/gui/element/PressType.java rename to client/src/main/java/client/gui/element/PressType.java diff --git a/client/src/client/gui/element/SelectableButton.java b/client/src/main/java/client/gui/element/SelectableButton.java similarity index 100% rename from client/src/client/gui/element/SelectableButton.java rename to client/src/main/java/client/gui/element/SelectableButton.java diff --git a/client/src/client/gui/element/Slider.java b/client/src/main/java/client/gui/element/Slider.java similarity index 100% rename from client/src/client/gui/element/Slider.java rename to client/src/main/java/client/gui/element/Slider.java diff --git a/client/src/client/gui/element/SliderCallback.java b/client/src/main/java/client/gui/element/SliderCallback.java similarity index 100% rename from client/src/client/gui/element/SliderCallback.java rename to client/src/main/java/client/gui/element/SliderCallback.java diff --git a/client/src/client/gui/element/SliderFloatCallback.java b/client/src/main/java/client/gui/element/SliderFloatCallback.java similarity index 100% rename from client/src/client/gui/element/SliderFloatCallback.java rename to client/src/main/java/client/gui/element/SliderFloatCallback.java diff --git a/client/src/client/gui/element/Switch.java b/client/src/main/java/client/gui/element/Switch.java similarity index 100% rename from client/src/client/gui/element/Switch.java rename to client/src/main/java/client/gui/element/Switch.java diff --git a/client/src/client/gui/element/SwitchCallback.java b/client/src/main/java/client/gui/element/SwitchCallback.java similarity index 100% rename from client/src/client/gui/element/SwitchCallback.java rename to client/src/main/java/client/gui/element/SwitchCallback.java diff --git a/client/src/client/gui/element/TextCallback.java b/client/src/main/java/client/gui/element/TextCallback.java similarity index 100% rename from client/src/client/gui/element/TextCallback.java rename to client/src/main/java/client/gui/element/TextCallback.java diff --git a/client/src/client/gui/element/Textbox.java b/client/src/main/java/client/gui/element/Textbox.java similarity index 100% rename from client/src/client/gui/element/Textbox.java rename to client/src/main/java/client/gui/element/Textbox.java diff --git a/client/src/client/gui/element/Toggle.java b/client/src/main/java/client/gui/element/Toggle.java similarity index 100% rename from client/src/client/gui/element/Toggle.java rename to client/src/main/java/client/gui/element/Toggle.java diff --git a/client/src/client/gui/element/ToggleCallback.java b/client/src/main/java/client/gui/element/ToggleCallback.java similarity index 100% rename from client/src/client/gui/element/ToggleCallback.java rename to client/src/main/java/client/gui/element/ToggleCallback.java diff --git a/client/src/client/gui/element/TransparentArea.java b/client/src/main/java/client/gui/element/TransparentArea.java similarity index 100% rename from client/src/client/gui/element/TransparentArea.java rename to client/src/main/java/client/gui/element/TransparentArea.java diff --git a/client/src/client/gui/ingame/GuiForm.java b/client/src/main/java/client/gui/ingame/GuiForm.java similarity index 100% rename from client/src/client/gui/ingame/GuiForm.java rename to client/src/main/java/client/gui/ingame/GuiForm.java diff --git a/client/src/client/gui/ingame/GuiGameOver.java b/client/src/main/java/client/gui/ingame/GuiGameOver.java similarity index 100% rename from client/src/client/gui/ingame/GuiGameOver.java rename to client/src/main/java/client/gui/ingame/GuiGameOver.java diff --git a/client/src/client/gui/ingame/GuiSign.java b/client/src/main/java/client/gui/ingame/GuiSign.java similarity index 100% rename from client/src/client/gui/ingame/GuiSign.java rename to client/src/main/java/client/gui/ingame/GuiSign.java diff --git a/client/src/client/gui/options/GuiBinds.java b/client/src/main/java/client/gui/options/GuiBinds.java similarity index 100% rename from client/src/client/gui/options/GuiBinds.java rename to client/src/main/java/client/gui/options/GuiBinds.java diff --git a/client/src/client/gui/options/GuiDisplay.java b/client/src/main/java/client/gui/options/GuiDisplay.java similarity index 100% rename from client/src/client/gui/options/GuiDisplay.java rename to client/src/main/java/client/gui/options/GuiDisplay.java diff --git a/client/src/client/gui/options/GuiOptions.java b/client/src/main/java/client/gui/options/GuiOptions.java similarity index 100% rename from client/src/client/gui/options/GuiOptions.java rename to client/src/main/java/client/gui/options/GuiOptions.java diff --git a/client/src/client/gui/options/GuiSound.java b/client/src/main/java/client/gui/options/GuiSound.java similarity index 100% rename from client/src/client/gui/options/GuiSound.java rename to client/src/main/java/client/gui/options/GuiSound.java diff --git a/client/src/client/gui/options/GuiStyle.java b/client/src/main/java/client/gui/options/GuiStyle.java similarity index 100% rename from client/src/client/gui/options/GuiStyle.java rename to client/src/main/java/client/gui/options/GuiStyle.java diff --git a/client/src/client/init/RenderRegistry.java b/client/src/main/java/client/init/RenderRegistry.java similarity index 100% rename from client/src/client/init/RenderRegistry.java rename to client/src/main/java/client/init/RenderRegistry.java diff --git a/client/src/client/network/ClientLoginHandler.java b/client/src/main/java/client/network/ClientLoginHandler.java similarity index 100% rename from client/src/client/network/ClientLoginHandler.java rename to client/src/main/java/client/network/ClientLoginHandler.java diff --git a/client/src/client/network/ClientPlayer.java b/client/src/main/java/client/network/ClientPlayer.java similarity index 100% rename from client/src/client/network/ClientPlayer.java rename to client/src/main/java/client/network/ClientPlayer.java diff --git a/client/src/client/renderer/ActiveRenderInfo.java b/client/src/main/java/client/renderer/ActiveRenderInfo.java similarity index 100% rename from client/src/client/renderer/ActiveRenderInfo.java rename to client/src/main/java/client/renderer/ActiveRenderInfo.java diff --git a/client/src/client/renderer/BlockRenderer.java b/client/src/main/java/client/renderer/BlockRenderer.java similarity index 100% rename from client/src/client/renderer/BlockRenderer.java rename to client/src/main/java/client/renderer/BlockRenderer.java diff --git a/client/src/client/renderer/DefaultVertexFormats.java b/client/src/main/java/client/renderer/DefaultVertexFormats.java similarity index 100% rename from client/src/client/renderer/DefaultVertexFormats.java rename to client/src/main/java/client/renderer/DefaultVertexFormats.java diff --git a/client/src/client/renderer/Drawing.java b/client/src/main/java/client/renderer/Drawing.java similarity index 100% rename from client/src/client/renderer/Drawing.java rename to client/src/main/java/client/renderer/Drawing.java diff --git a/client/src/client/renderer/EntityRenderer.java b/client/src/main/java/client/renderer/EntityRenderer.java similarity index 100% rename from client/src/client/renderer/EntityRenderer.java rename to client/src/main/java/client/renderer/EntityRenderer.java diff --git a/client/src/client/renderer/Frustum.java b/client/src/main/java/client/renderer/Frustum.java similarity index 100% rename from client/src/client/renderer/Frustum.java rename to client/src/main/java/client/renderer/Frustum.java diff --git a/client/src/client/renderer/GlState.java b/client/src/main/java/client/renderer/GlState.java similarity index 100% rename from client/src/client/renderer/GlState.java rename to client/src/main/java/client/renderer/GlState.java diff --git a/client/src/client/renderer/ItemModelMesher.java b/client/src/main/java/client/renderer/ItemModelMesher.java similarity index 100% rename from client/src/client/renderer/ItemModelMesher.java rename to client/src/main/java/client/renderer/ItemModelMesher.java diff --git a/client/src/client/renderer/ItemRenderer.java b/client/src/main/java/client/renderer/ItemRenderer.java similarity index 100% rename from client/src/client/renderer/ItemRenderer.java rename to client/src/main/java/client/renderer/ItemRenderer.java diff --git a/client/src/client/renderer/Project.java b/client/src/main/java/client/renderer/Project.java similarity index 100% rename from client/src/client/renderer/Project.java rename to client/src/main/java/client/renderer/Project.java diff --git a/client/src/client/renderer/RegionRenderCache.java b/client/src/main/java/client/renderer/RegionRenderCache.java similarity index 100% rename from client/src/client/renderer/RegionRenderCache.java rename to client/src/main/java/client/renderer/RegionRenderCache.java diff --git a/client/src/client/renderer/RegionRenderCacheBuilder.java b/client/src/main/java/client/renderer/RegionRenderCacheBuilder.java similarity index 100% rename from client/src/client/renderer/RegionRenderCacheBuilder.java rename to client/src/main/java/client/renderer/RegionRenderCacheBuilder.java diff --git a/client/src/client/renderer/RenderBuffer.java b/client/src/main/java/client/renderer/RenderBuffer.java similarity index 100% rename from client/src/client/renderer/RenderBuffer.java rename to client/src/main/java/client/renderer/RenderBuffer.java diff --git a/client/src/client/renderer/RenderGlobal.java b/client/src/main/java/client/renderer/RenderGlobal.java similarity index 100% rename from client/src/client/renderer/RenderGlobal.java rename to client/src/main/java/client/renderer/RenderGlobal.java diff --git a/client/src/client/renderer/Tessellator.java b/client/src/main/java/client/renderer/Tessellator.java similarity index 100% rename from client/src/client/renderer/Tessellator.java rename to client/src/main/java/client/renderer/Tessellator.java diff --git a/client/src/client/renderer/VertexBuffer.java b/client/src/main/java/client/renderer/VertexBuffer.java similarity index 100% rename from client/src/client/renderer/VertexBuffer.java rename to client/src/main/java/client/renderer/VertexBuffer.java diff --git a/client/src/client/renderer/VertexFormat.java b/client/src/main/java/client/renderer/VertexFormat.java similarity index 100% rename from client/src/client/renderer/VertexFormat.java rename to client/src/main/java/client/renderer/VertexFormat.java diff --git a/client/src/client/renderer/VertexFormatElement.java b/client/src/main/java/client/renderer/VertexFormatElement.java similarity index 100% rename from client/src/client/renderer/VertexFormatElement.java rename to client/src/main/java/client/renderer/VertexFormatElement.java diff --git a/client/src/client/renderer/ViewFrustum.java b/client/src/main/java/client/renderer/ViewFrustum.java similarity index 100% rename from client/src/client/renderer/ViewFrustum.java rename to client/src/main/java/client/renderer/ViewFrustum.java diff --git a/client/src/client/renderer/blockmodel/BakedModel.java b/client/src/main/java/client/renderer/blockmodel/BakedModel.java similarity index 100% rename from client/src/client/renderer/blockmodel/BakedModel.java rename to client/src/main/java/client/renderer/blockmodel/BakedModel.java diff --git a/client/src/client/renderer/blockmodel/BakedQuad.java b/client/src/main/java/client/renderer/blockmodel/BakedQuad.java similarity index 100% rename from client/src/client/renderer/blockmodel/BakedQuad.java rename to client/src/main/java/client/renderer/blockmodel/BakedQuad.java diff --git a/client/src/client/renderer/blockmodel/BlockFaceUV.java b/client/src/main/java/client/renderer/blockmodel/BlockFaceUV.java similarity index 100% rename from client/src/client/renderer/blockmodel/BlockFaceUV.java rename to client/src/main/java/client/renderer/blockmodel/BlockFaceUV.java diff --git a/client/src/client/renderer/blockmodel/BlockPart.java b/client/src/main/java/client/renderer/blockmodel/BlockPart.java similarity index 100% rename from client/src/client/renderer/blockmodel/BlockPart.java rename to client/src/main/java/client/renderer/blockmodel/BlockPart.java diff --git a/client/src/client/renderer/blockmodel/BlockPartFace.java b/client/src/main/java/client/renderer/blockmodel/BlockPartFace.java similarity index 100% rename from client/src/client/renderer/blockmodel/BlockPartFace.java rename to client/src/main/java/client/renderer/blockmodel/BlockPartFace.java diff --git a/client/src/client/renderer/blockmodel/BlockPartRotation.java b/client/src/main/java/client/renderer/blockmodel/BlockPartRotation.java similarity index 100% rename from client/src/client/renderer/blockmodel/BlockPartRotation.java rename to client/src/main/java/client/renderer/blockmodel/BlockPartRotation.java diff --git a/client/src/client/renderer/blockmodel/BreakingFour.java b/client/src/main/java/client/renderer/blockmodel/BreakingFour.java similarity index 100% rename from client/src/client/renderer/blockmodel/BreakingFour.java rename to client/src/main/java/client/renderer/blockmodel/BreakingFour.java diff --git a/client/src/client/renderer/blockmodel/BuiltInModel.java b/client/src/main/java/client/renderer/blockmodel/BuiltInModel.java similarity index 100% rename from client/src/client/renderer/blockmodel/BuiltInModel.java rename to client/src/main/java/client/renderer/blockmodel/BuiltInModel.java diff --git a/client/src/client/renderer/blockmodel/FaceBakery.java b/client/src/main/java/client/renderer/blockmodel/FaceBakery.java similarity index 100% rename from client/src/client/renderer/blockmodel/FaceBakery.java rename to client/src/main/java/client/renderer/blockmodel/FaceBakery.java diff --git a/client/src/client/renderer/blockmodel/IBakedModel.java b/client/src/main/java/client/renderer/blockmodel/IBakedModel.java similarity index 100% rename from client/src/client/renderer/blockmodel/IBakedModel.java rename to client/src/main/java/client/renderer/blockmodel/IBakedModel.java diff --git a/client/src/client/renderer/blockmodel/ModelBakery.java b/client/src/main/java/client/renderer/blockmodel/ModelBakery.java similarity index 100% rename from client/src/client/renderer/blockmodel/ModelBakery.java rename to client/src/main/java/client/renderer/blockmodel/ModelBakery.java diff --git a/client/src/client/renderer/blockmodel/ModelBlock.java b/client/src/main/java/client/renderer/blockmodel/ModelBlock.java similarity index 100% rename from client/src/client/renderer/blockmodel/ModelBlock.java rename to client/src/main/java/client/renderer/blockmodel/ModelBlock.java diff --git a/client/src/client/renderer/blockmodel/ModelGenerator.java b/client/src/main/java/client/renderer/blockmodel/ModelGenerator.java similarity index 100% rename from client/src/client/renderer/blockmodel/ModelGenerator.java rename to client/src/main/java/client/renderer/blockmodel/ModelGenerator.java diff --git a/client/src/client/renderer/blockmodel/ModelManager.java b/client/src/main/java/client/renderer/blockmodel/ModelManager.java similarity index 100% rename from client/src/client/renderer/blockmodel/ModelManager.java rename to client/src/main/java/client/renderer/blockmodel/ModelManager.java diff --git a/client/src/client/renderer/blockmodel/MultiStateMap.java b/client/src/main/java/client/renderer/blockmodel/MultiStateMap.java similarity index 100% rename from client/src/client/renderer/blockmodel/MultiStateMap.java rename to client/src/main/java/client/renderer/blockmodel/MultiStateMap.java diff --git a/client/src/client/renderer/blockmodel/SingleStateMap.java b/client/src/main/java/client/renderer/blockmodel/SingleStateMap.java similarity index 100% rename from client/src/client/renderer/blockmodel/SingleStateMap.java rename to client/src/main/java/client/renderer/blockmodel/SingleStateMap.java diff --git a/client/src/client/renderer/blockmodel/StateMap.java b/client/src/main/java/client/renderer/blockmodel/StateMap.java similarity index 100% rename from client/src/client/renderer/blockmodel/StateMap.java rename to client/src/main/java/client/renderer/blockmodel/StateMap.java diff --git a/client/src/client/renderer/chunk/ChunkCompileTaskGenerator.java b/client/src/main/java/client/renderer/chunk/ChunkCompileTaskGenerator.java similarity index 100% rename from client/src/client/renderer/chunk/ChunkCompileTaskGenerator.java rename to client/src/main/java/client/renderer/chunk/ChunkCompileTaskGenerator.java diff --git a/client/src/client/renderer/chunk/ChunkRenderDispatcher.java b/client/src/main/java/client/renderer/chunk/ChunkRenderDispatcher.java similarity index 100% rename from client/src/client/renderer/chunk/ChunkRenderDispatcher.java rename to client/src/main/java/client/renderer/chunk/ChunkRenderDispatcher.java diff --git a/client/src/client/renderer/chunk/ChunkRenderWorker.java b/client/src/main/java/client/renderer/chunk/ChunkRenderWorker.java similarity index 100% rename from client/src/client/renderer/chunk/ChunkRenderWorker.java rename to client/src/main/java/client/renderer/chunk/ChunkRenderWorker.java diff --git a/client/src/client/renderer/chunk/CompiledChunk.java b/client/src/main/java/client/renderer/chunk/CompiledChunk.java similarity index 100% rename from client/src/client/renderer/chunk/CompiledChunk.java rename to client/src/main/java/client/renderer/chunk/CompiledChunk.java diff --git a/client/src/client/renderer/chunk/RenderChunk.java b/client/src/main/java/client/renderer/chunk/RenderChunk.java similarity index 100% rename from client/src/client/renderer/chunk/RenderChunk.java rename to client/src/main/java/client/renderer/chunk/RenderChunk.java diff --git a/client/src/client/renderer/chunk/SetVisibility.java b/client/src/main/java/client/renderer/chunk/SetVisibility.java similarity index 100% rename from client/src/client/renderer/chunk/SetVisibility.java rename to client/src/main/java/client/renderer/chunk/SetVisibility.java diff --git a/client/src/client/renderer/chunk/VisGraph.java b/client/src/main/java/client/renderer/chunk/VisGraph.java similarity index 100% rename from client/src/client/renderer/chunk/VisGraph.java rename to client/src/main/java/client/renderer/chunk/VisGraph.java diff --git a/client/src/client/renderer/entity/Render.java b/client/src/main/java/client/renderer/entity/Render.java similarity index 100% rename from client/src/client/renderer/entity/Render.java rename to client/src/main/java/client/renderer/entity/Render.java diff --git a/client/src/client/renderer/entity/RenderArachnoid.java b/client/src/main/java/client/renderer/entity/RenderArachnoid.java similarity index 100% rename from client/src/client/renderer/entity/RenderArachnoid.java rename to client/src/main/java/client/renderer/entity/RenderArachnoid.java diff --git a/client/src/client/renderer/entity/RenderArrow.java b/client/src/main/java/client/renderer/entity/RenderArrow.java similarity index 100% rename from client/src/client/renderer/entity/RenderArrow.java rename to client/src/main/java/client/renderer/entity/RenderArrow.java diff --git a/client/src/client/renderer/entity/RenderBat.java b/client/src/main/java/client/renderer/entity/RenderBat.java similarity index 100% rename from client/src/client/renderer/entity/RenderBat.java rename to client/src/main/java/client/renderer/entity/RenderBat.java diff --git a/client/src/client/renderer/entity/RenderBlockEntity.java b/client/src/main/java/client/renderer/entity/RenderBlockEntity.java similarity index 100% rename from client/src/client/renderer/entity/RenderBlockEntity.java rename to client/src/main/java/client/renderer/entity/RenderBlockEntity.java diff --git a/client/src/client/renderer/entity/RenderBoat.java b/client/src/main/java/client/renderer/entity/RenderBoat.java similarity index 100% rename from client/src/client/renderer/entity/RenderBoat.java rename to client/src/main/java/client/renderer/entity/RenderBoat.java diff --git a/client/src/client/renderer/entity/RenderBullet.java b/client/src/main/java/client/renderer/entity/RenderBullet.java similarity index 100% rename from client/src/client/renderer/entity/RenderBullet.java rename to client/src/main/java/client/renderer/entity/RenderBullet.java diff --git a/client/src/client/renderer/entity/RenderChicken.java b/client/src/main/java/client/renderer/entity/RenderChicken.java similarity index 100% rename from client/src/client/renderer/entity/RenderChicken.java rename to client/src/main/java/client/renderer/entity/RenderChicken.java diff --git a/client/src/client/renderer/entity/RenderCow.java b/client/src/main/java/client/renderer/entity/RenderCow.java similarity index 100% rename from client/src/client/renderer/entity/RenderCow.java rename to client/src/main/java/client/renderer/entity/RenderCow.java diff --git a/client/src/client/renderer/entity/RenderCrystal.java b/client/src/main/java/client/renderer/entity/RenderCrystal.java similarity index 100% rename from client/src/client/renderer/entity/RenderCrystal.java rename to client/src/main/java/client/renderer/entity/RenderCrystal.java diff --git a/client/src/client/renderer/entity/RenderDie.java b/client/src/main/java/client/renderer/entity/RenderDie.java similarity index 100% rename from client/src/client/renderer/entity/RenderDie.java rename to client/src/main/java/client/renderer/entity/RenderDie.java diff --git a/client/src/client/renderer/entity/RenderDragon.java b/client/src/main/java/client/renderer/entity/RenderDragon.java similarity index 100% rename from client/src/client/renderer/entity/RenderDragon.java rename to client/src/main/java/client/renderer/entity/RenderDragon.java diff --git a/client/src/client/renderer/entity/RenderDynamite.java b/client/src/main/java/client/renderer/entity/RenderDynamite.java similarity index 100% rename from client/src/client/renderer/entity/RenderDynamite.java rename to client/src/main/java/client/renderer/entity/RenderDynamite.java diff --git a/client/src/client/renderer/entity/RenderEntity.java b/client/src/main/java/client/renderer/entity/RenderEntity.java similarity index 100% rename from client/src/client/renderer/entity/RenderEntity.java rename to client/src/main/java/client/renderer/entity/RenderEntity.java diff --git a/client/src/client/renderer/entity/RenderEntityItem.java b/client/src/main/java/client/renderer/entity/RenderEntityItem.java similarity index 100% rename from client/src/client/renderer/entity/RenderEntityItem.java rename to client/src/main/java/client/renderer/entity/RenderEntityItem.java diff --git a/client/src/client/renderer/entity/RenderFallingBlock.java b/client/src/main/java/client/renderer/entity/RenderFallingBlock.java similarity index 100% rename from client/src/client/renderer/entity/RenderFallingBlock.java rename to client/src/main/java/client/renderer/entity/RenderFallingBlock.java diff --git a/client/src/client/renderer/entity/RenderFireball.java b/client/src/main/java/client/renderer/entity/RenderFireball.java similarity index 100% rename from client/src/client/renderer/entity/RenderFireball.java rename to client/src/main/java/client/renderer/entity/RenderFireball.java diff --git a/client/src/client/renderer/entity/RenderFish.java b/client/src/main/java/client/renderer/entity/RenderFish.java similarity index 100% rename from client/src/client/renderer/entity/RenderFish.java rename to client/src/main/java/client/renderer/entity/RenderFish.java diff --git a/client/src/client/renderer/entity/RenderFlyingBox.java b/client/src/main/java/client/renderer/entity/RenderFlyingBox.java similarity index 100% rename from client/src/client/renderer/entity/RenderFlyingBox.java rename to client/src/main/java/client/renderer/entity/RenderFlyingBox.java diff --git a/client/src/client/renderer/entity/RenderHorse.java b/client/src/main/java/client/renderer/entity/RenderHorse.java similarity index 100% rename from client/src/client/renderer/entity/RenderHorse.java rename to client/src/main/java/client/renderer/entity/RenderHorse.java diff --git a/client/src/client/renderer/entity/RenderHumanoid.java b/client/src/main/java/client/renderer/entity/RenderHumanoid.java similarity index 100% rename from client/src/client/renderer/entity/RenderHumanoid.java rename to client/src/main/java/client/renderer/entity/RenderHumanoid.java diff --git a/client/src/client/renderer/entity/RenderItem.java b/client/src/main/java/client/renderer/entity/RenderItem.java similarity index 100% rename from client/src/client/renderer/entity/RenderItem.java rename to client/src/main/java/client/renderer/entity/RenderItem.java diff --git a/client/src/client/renderer/entity/RenderItemEntity.java b/client/src/main/java/client/renderer/entity/RenderItemEntity.java similarity index 100% rename from client/src/client/renderer/entity/RenderItemEntity.java rename to client/src/main/java/client/renderer/entity/RenderItemEntity.java diff --git a/client/src/client/renderer/entity/RenderLeashKnot.java b/client/src/main/java/client/renderer/entity/RenderLeashKnot.java similarity index 100% rename from client/src/client/renderer/entity/RenderLeashKnot.java rename to client/src/main/java/client/renderer/entity/RenderLeashKnot.java diff --git a/client/src/client/renderer/entity/RenderLightning.java b/client/src/main/java/client/renderer/entity/RenderLightning.java similarity index 100% rename from client/src/client/renderer/entity/RenderLightning.java rename to client/src/main/java/client/renderer/entity/RenderLightning.java diff --git a/client/src/client/renderer/entity/RenderLiving.java b/client/src/main/java/client/renderer/entity/RenderLiving.java similarity index 100% rename from client/src/client/renderer/entity/RenderLiving.java rename to client/src/main/java/client/renderer/entity/RenderLiving.java diff --git a/client/src/client/renderer/entity/RenderManager.java b/client/src/main/java/client/renderer/entity/RenderManager.java similarity index 100% rename from client/src/client/renderer/entity/RenderManager.java rename to client/src/main/java/client/renderer/entity/RenderManager.java diff --git a/client/src/client/renderer/entity/RenderMinecart.java b/client/src/main/java/client/renderer/entity/RenderMinecart.java similarity index 100% rename from client/src/client/renderer/entity/RenderMinecart.java rename to client/src/main/java/client/renderer/entity/RenderMinecart.java diff --git a/client/src/client/renderer/entity/RenderMooshroom.java b/client/src/main/java/client/renderer/entity/RenderMooshroom.java similarity index 100% rename from client/src/client/renderer/entity/RenderMooshroom.java rename to client/src/main/java/client/renderer/entity/RenderMooshroom.java diff --git a/client/src/client/renderer/entity/RenderMouse.java b/client/src/main/java/client/renderer/entity/RenderMouse.java similarity index 100% rename from client/src/client/renderer/entity/RenderMouse.java rename to client/src/main/java/client/renderer/entity/RenderMouse.java diff --git a/client/src/client/renderer/entity/RenderNpc.java b/client/src/main/java/client/renderer/entity/RenderNpc.java similarity index 100% rename from client/src/client/renderer/entity/RenderNpc.java rename to client/src/main/java/client/renderer/entity/RenderNpc.java diff --git a/client/src/client/renderer/entity/RenderOcelot.java b/client/src/main/java/client/renderer/entity/RenderOcelot.java similarity index 100% rename from client/src/client/renderer/entity/RenderOcelot.java rename to client/src/main/java/client/renderer/entity/RenderOcelot.java diff --git a/client/src/client/renderer/entity/RenderPig.java b/client/src/main/java/client/renderer/entity/RenderPig.java similarity index 100% rename from client/src/client/renderer/entity/RenderPig.java rename to client/src/main/java/client/renderer/entity/RenderPig.java diff --git a/client/src/client/renderer/entity/RenderPotion.java b/client/src/main/java/client/renderer/entity/RenderPotion.java similarity index 100% rename from client/src/client/renderer/entity/RenderPotion.java rename to client/src/main/java/client/renderer/entity/RenderPotion.java diff --git a/client/src/client/renderer/entity/RenderRabbit.java b/client/src/main/java/client/renderer/entity/RenderRabbit.java similarity index 100% rename from client/src/client/renderer/entity/RenderRabbit.java rename to client/src/main/java/client/renderer/entity/RenderRabbit.java diff --git a/client/src/client/renderer/entity/RenderSheep.java b/client/src/main/java/client/renderer/entity/RenderSheep.java similarity index 100% rename from client/src/client/renderer/entity/RenderSheep.java rename to client/src/main/java/client/renderer/entity/RenderSheep.java diff --git a/client/src/client/renderer/entity/RenderSlime.java b/client/src/main/java/client/renderer/entity/RenderSlime.java similarity index 100% rename from client/src/client/renderer/entity/RenderSlime.java rename to client/src/main/java/client/renderer/entity/RenderSlime.java diff --git a/client/src/client/renderer/entity/RenderSpaceMarine.java b/client/src/main/java/client/renderer/entity/RenderSpaceMarine.java similarity index 100% rename from client/src/client/renderer/entity/RenderSpaceMarine.java rename to client/src/main/java/client/renderer/entity/RenderSpaceMarine.java diff --git a/client/src/client/renderer/entity/RenderSquid.java b/client/src/main/java/client/renderer/entity/RenderSquid.java similarity index 100% rename from client/src/client/renderer/entity/RenderSquid.java rename to client/src/main/java/client/renderer/entity/RenderSquid.java diff --git a/client/src/client/renderer/entity/RenderTntMinecart.java b/client/src/main/java/client/renderer/entity/RenderTntMinecart.java similarity index 100% rename from client/src/client/renderer/entity/RenderTntMinecart.java rename to client/src/main/java/client/renderer/entity/RenderTntMinecart.java diff --git a/client/src/client/renderer/entity/RenderTntPrimed.java b/client/src/main/java/client/renderer/entity/RenderTntPrimed.java similarity index 100% rename from client/src/client/renderer/entity/RenderTntPrimed.java rename to client/src/main/java/client/renderer/entity/RenderTntPrimed.java diff --git a/client/src/client/renderer/entity/RenderWolf.java b/client/src/main/java/client/renderer/entity/RenderWolf.java similarity index 100% rename from client/src/client/renderer/entity/RenderWolf.java rename to client/src/main/java/client/renderer/entity/RenderWolf.java diff --git a/client/src/client/renderer/entity/RenderXpOrb.java b/client/src/main/java/client/renderer/entity/RenderXpOrb.java similarity index 100% rename from client/src/client/renderer/entity/RenderXpOrb.java rename to client/src/main/java/client/renderer/entity/RenderXpOrb.java diff --git a/client/src/client/renderer/entity/RendererLivingEntity.java b/client/src/main/java/client/renderer/entity/RendererLivingEntity.java similarity index 100% rename from client/src/client/renderer/entity/RendererLivingEntity.java rename to client/src/main/java/client/renderer/entity/RendererLivingEntity.java diff --git a/client/src/client/renderer/layers/LayerArachnoidArmor.java b/client/src/main/java/client/renderer/layers/LayerArachnoidArmor.java similarity index 100% rename from client/src/client/renderer/layers/LayerArachnoidArmor.java rename to client/src/main/java/client/renderer/layers/LayerArachnoidArmor.java diff --git a/client/src/client/renderer/layers/LayerArmor.java b/client/src/main/java/client/renderer/layers/LayerArmor.java similarity index 100% rename from client/src/client/renderer/layers/LayerArmor.java rename to client/src/main/java/client/renderer/layers/LayerArmor.java diff --git a/client/src/client/renderer/layers/LayerArrow.java b/client/src/main/java/client/renderer/layers/LayerArrow.java similarity index 100% rename from client/src/client/renderer/layers/LayerArrow.java rename to client/src/main/java/client/renderer/layers/LayerArrow.java diff --git a/client/src/client/renderer/layers/LayerCape.java b/client/src/main/java/client/renderer/layers/LayerCape.java similarity index 100% rename from client/src/client/renderer/layers/LayerCape.java rename to client/src/main/java/client/renderer/layers/LayerCape.java diff --git a/client/src/client/renderer/layers/LayerCharge.java b/client/src/main/java/client/renderer/layers/LayerCharge.java similarity index 100% rename from client/src/client/renderer/layers/LayerCharge.java rename to client/src/main/java/client/renderer/layers/LayerCharge.java diff --git a/client/src/client/renderer/layers/LayerEnderDragonEyes.java b/client/src/main/java/client/renderer/layers/LayerEnderDragonEyes.java similarity index 100% rename from client/src/client/renderer/layers/LayerEnderDragonEyes.java rename to client/src/main/java/client/renderer/layers/LayerEnderDragonEyes.java diff --git a/client/src/client/renderer/layers/LayerEntityBreak.java b/client/src/main/java/client/renderer/layers/LayerEntityBreak.java similarity index 100% rename from client/src/client/renderer/layers/LayerEntityBreak.java rename to client/src/main/java/client/renderer/layers/LayerEntityBreak.java diff --git a/client/src/client/renderer/layers/LayerExtra.java b/client/src/main/java/client/renderer/layers/LayerExtra.java similarity index 100% rename from client/src/client/renderer/layers/LayerExtra.java rename to client/src/main/java/client/renderer/layers/LayerExtra.java diff --git a/client/src/client/renderer/layers/LayerHeldItem.java b/client/src/main/java/client/renderer/layers/LayerHeldItem.java similarity index 100% rename from client/src/client/renderer/layers/LayerHeldItem.java rename to client/src/main/java/client/renderer/layers/LayerHeldItem.java diff --git a/client/src/client/renderer/layers/LayerMooshroomMushroom.java b/client/src/main/java/client/renderer/layers/LayerMooshroomMushroom.java similarity index 100% rename from client/src/client/renderer/layers/LayerMooshroomMushroom.java rename to client/src/main/java/client/renderer/layers/LayerMooshroomMushroom.java diff --git a/client/src/client/renderer/layers/LayerPowerRods.java b/client/src/main/java/client/renderer/layers/LayerPowerRods.java similarity index 100% rename from client/src/client/renderer/layers/LayerPowerRods.java rename to client/src/main/java/client/renderer/layers/LayerPowerRods.java diff --git a/client/src/client/renderer/layers/LayerRenderer.java b/client/src/main/java/client/renderer/layers/LayerRenderer.java similarity index 100% rename from client/src/client/renderer/layers/LayerRenderer.java rename to client/src/main/java/client/renderer/layers/LayerRenderer.java diff --git a/client/src/client/renderer/layers/LayerSaddle.java b/client/src/main/java/client/renderer/layers/LayerSaddle.java similarity index 100% rename from client/src/client/renderer/layers/LayerSaddle.java rename to client/src/main/java/client/renderer/layers/LayerSaddle.java diff --git a/client/src/client/renderer/layers/LayerSheepWool.java b/client/src/main/java/client/renderer/layers/LayerSheepWool.java similarity index 100% rename from client/src/client/renderer/layers/LayerSheepWool.java rename to client/src/main/java/client/renderer/layers/LayerSheepWool.java diff --git a/client/src/client/renderer/layers/LayerSlimeGel.java b/client/src/main/java/client/renderer/layers/LayerSlimeGel.java similarity index 100% rename from client/src/client/renderer/layers/LayerSlimeGel.java rename to client/src/main/java/client/renderer/layers/LayerSlimeGel.java diff --git a/client/src/client/renderer/layers/LayerWolfCollar.java b/client/src/main/java/client/renderer/layers/LayerWolfCollar.java similarity index 100% rename from client/src/client/renderer/layers/LayerWolfCollar.java rename to client/src/main/java/client/renderer/layers/LayerWolfCollar.java diff --git a/client/src/client/renderer/model/ModelArachnoid.java b/client/src/main/java/client/renderer/model/ModelArachnoid.java similarity index 100% rename from client/src/client/renderer/model/ModelArachnoid.java rename to client/src/main/java/client/renderer/model/ModelArachnoid.java diff --git a/client/src/client/renderer/model/ModelArmor.java b/client/src/main/java/client/renderer/model/ModelArmor.java similarity index 100% rename from client/src/client/renderer/model/ModelArmor.java rename to client/src/main/java/client/renderer/model/ModelArmor.java diff --git a/client/src/client/renderer/model/ModelBanner.java b/client/src/main/java/client/renderer/model/ModelBanner.java similarity index 100% rename from client/src/client/renderer/model/ModelBanner.java rename to client/src/main/java/client/renderer/model/ModelBanner.java diff --git a/client/src/client/renderer/model/ModelBase.java b/client/src/main/java/client/renderer/model/ModelBase.java similarity index 100% rename from client/src/client/renderer/model/ModelBase.java rename to client/src/main/java/client/renderer/model/ModelBase.java diff --git a/client/src/client/renderer/model/ModelBat.java b/client/src/main/java/client/renderer/model/ModelBat.java similarity index 100% rename from client/src/client/renderer/model/ModelBat.java rename to client/src/main/java/client/renderer/model/ModelBat.java diff --git a/client/src/client/renderer/model/ModelBiped.java b/client/src/main/java/client/renderer/model/ModelBiped.java similarity index 100% rename from client/src/client/renderer/model/ModelBiped.java rename to client/src/main/java/client/renderer/model/ModelBiped.java diff --git a/client/src/client/renderer/model/ModelBoat.java b/client/src/main/java/client/renderer/model/ModelBoat.java similarity index 100% rename from client/src/client/renderer/model/ModelBoat.java rename to client/src/main/java/client/renderer/model/ModelBoat.java diff --git a/client/src/client/renderer/model/ModelBox.java b/client/src/main/java/client/renderer/model/ModelBox.java similarity index 100% rename from client/src/client/renderer/model/ModelBox.java rename to client/src/main/java/client/renderer/model/ModelBox.java diff --git a/client/src/client/renderer/model/ModelCharge.java b/client/src/main/java/client/renderer/model/ModelCharge.java similarity index 100% rename from client/src/client/renderer/model/ModelCharge.java rename to client/src/main/java/client/renderer/model/ModelCharge.java diff --git a/client/src/client/renderer/model/ModelChest.java b/client/src/main/java/client/renderer/model/ModelChest.java similarity index 100% rename from client/src/client/renderer/model/ModelChest.java rename to client/src/main/java/client/renderer/model/ModelChest.java diff --git a/client/src/client/renderer/model/ModelChicken.java b/client/src/main/java/client/renderer/model/ModelChicken.java similarity index 100% rename from client/src/client/renderer/model/ModelChicken.java rename to client/src/main/java/client/renderer/model/ModelChicken.java diff --git a/client/src/client/renderer/model/ModelCow.java b/client/src/main/java/client/renderer/model/ModelCow.java similarity index 100% rename from client/src/client/renderer/model/ModelCow.java rename to client/src/main/java/client/renderer/model/ModelCow.java diff --git a/client/src/client/renderer/model/ModelCrystal.java b/client/src/main/java/client/renderer/model/ModelCrystal.java similarity index 100% rename from client/src/client/renderer/model/ModelCrystal.java rename to client/src/main/java/client/renderer/model/ModelCrystal.java diff --git a/client/src/client/renderer/model/ModelDie.java b/client/src/main/java/client/renderer/model/ModelDie.java similarity index 100% rename from client/src/client/renderer/model/ModelDie.java rename to client/src/main/java/client/renderer/model/ModelDie.java diff --git a/client/src/client/renderer/model/ModelDragon.java b/client/src/main/java/client/renderer/model/ModelDragon.java similarity index 100% rename from client/src/client/renderer/model/ModelDragon.java rename to client/src/main/java/client/renderer/model/ModelDragon.java diff --git a/client/src/client/renderer/model/ModelHead.java b/client/src/main/java/client/renderer/model/ModelHead.java similarity index 100% rename from client/src/client/renderer/model/ModelHead.java rename to client/src/main/java/client/renderer/model/ModelHead.java diff --git a/client/src/client/renderer/model/ModelHorse.java b/client/src/main/java/client/renderer/model/ModelHorse.java similarity index 100% rename from client/src/client/renderer/model/ModelHorse.java rename to client/src/main/java/client/renderer/model/ModelHorse.java diff --git a/client/src/client/renderer/model/ModelHumanoid.java b/client/src/main/java/client/renderer/model/ModelHumanoid.java similarity index 100% rename from client/src/client/renderer/model/ModelHumanoid.java rename to client/src/main/java/client/renderer/model/ModelHumanoid.java diff --git a/client/src/client/renderer/model/ModelHumanoidHead.java b/client/src/main/java/client/renderer/model/ModelHumanoidHead.java similarity index 100% rename from client/src/client/renderer/model/ModelHumanoidHead.java rename to client/src/main/java/client/renderer/model/ModelHumanoidHead.java diff --git a/client/src/client/renderer/model/ModelLargeChest.java b/client/src/main/java/client/renderer/model/ModelLargeChest.java similarity index 100% rename from client/src/client/renderer/model/ModelLargeChest.java rename to client/src/main/java/client/renderer/model/ModelLargeChest.java diff --git a/client/src/client/renderer/model/ModelLeashKnot.java b/client/src/main/java/client/renderer/model/ModelLeashKnot.java similarity index 100% rename from client/src/client/renderer/model/ModelLeashKnot.java rename to client/src/main/java/client/renderer/model/ModelLeashKnot.java diff --git a/client/src/client/renderer/model/ModelMinecart.java b/client/src/main/java/client/renderer/model/ModelMinecart.java similarity index 100% rename from client/src/client/renderer/model/ModelMinecart.java rename to client/src/main/java/client/renderer/model/ModelMinecart.java diff --git a/client/src/client/renderer/model/ModelMouse.java b/client/src/main/java/client/renderer/model/ModelMouse.java similarity index 100% rename from client/src/client/renderer/model/ModelMouse.java rename to client/src/main/java/client/renderer/model/ModelMouse.java diff --git a/client/src/client/renderer/model/ModelOcelot.java b/client/src/main/java/client/renderer/model/ModelOcelot.java similarity index 100% rename from client/src/client/renderer/model/ModelOcelot.java rename to client/src/main/java/client/renderer/model/ModelOcelot.java diff --git a/client/src/client/renderer/model/ModelPig.java b/client/src/main/java/client/renderer/model/ModelPig.java similarity index 100% rename from client/src/client/renderer/model/ModelPig.java rename to client/src/main/java/client/renderer/model/ModelPig.java diff --git a/client/src/client/renderer/model/ModelQuadruped.java b/client/src/main/java/client/renderer/model/ModelQuadruped.java similarity index 100% rename from client/src/client/renderer/model/ModelQuadruped.java rename to client/src/main/java/client/renderer/model/ModelQuadruped.java diff --git a/client/src/client/renderer/model/ModelRabbit.java b/client/src/main/java/client/renderer/model/ModelRabbit.java similarity index 100% rename from client/src/client/renderer/model/ModelRabbit.java rename to client/src/main/java/client/renderer/model/ModelRabbit.java diff --git a/client/src/client/renderer/model/ModelRenderer.java b/client/src/main/java/client/renderer/model/ModelRenderer.java similarity index 100% rename from client/src/client/renderer/model/ModelRenderer.java rename to client/src/main/java/client/renderer/model/ModelRenderer.java diff --git a/client/src/client/renderer/model/ModelSheep1.java b/client/src/main/java/client/renderer/model/ModelSheep1.java similarity index 100% rename from client/src/client/renderer/model/ModelSheep1.java rename to client/src/main/java/client/renderer/model/ModelSheep1.java diff --git a/client/src/client/renderer/model/ModelSheep2.java b/client/src/main/java/client/renderer/model/ModelSheep2.java similarity index 100% rename from client/src/client/renderer/model/ModelSheep2.java rename to client/src/main/java/client/renderer/model/ModelSheep2.java diff --git a/client/src/client/renderer/model/ModelSign.java b/client/src/main/java/client/renderer/model/ModelSign.java similarity index 100% rename from client/src/client/renderer/model/ModelSign.java rename to client/src/main/java/client/renderer/model/ModelSign.java diff --git a/client/src/client/renderer/model/ModelSlime.java b/client/src/main/java/client/renderer/model/ModelSlime.java similarity index 100% rename from client/src/client/renderer/model/ModelSlime.java rename to client/src/main/java/client/renderer/model/ModelSlime.java diff --git a/client/src/client/renderer/model/ModelSpaceMarine.java b/client/src/main/java/client/renderer/model/ModelSpaceMarine.java similarity index 100% rename from client/src/client/renderer/model/ModelSpaceMarine.java rename to client/src/main/java/client/renderer/model/ModelSpaceMarine.java diff --git a/client/src/client/renderer/model/ModelSquid.java b/client/src/main/java/client/renderer/model/ModelSquid.java similarity index 100% rename from client/src/client/renderer/model/ModelSquid.java rename to client/src/main/java/client/renderer/model/ModelSquid.java diff --git a/client/src/client/renderer/model/ModelWolf.java b/client/src/main/java/client/renderer/model/ModelWolf.java similarity index 100% rename from client/src/client/renderer/model/ModelWolf.java rename to client/src/main/java/client/renderer/model/ModelWolf.java diff --git a/client/src/client/renderer/model/PositionTextureVertex.java b/client/src/main/java/client/renderer/model/PositionTextureVertex.java similarity index 100% rename from client/src/client/renderer/model/PositionTextureVertex.java rename to client/src/main/java/client/renderer/model/PositionTextureVertex.java diff --git a/client/src/client/renderer/model/TextureOffset.java b/client/src/main/java/client/renderer/model/TextureOffset.java similarity index 100% rename from client/src/client/renderer/model/TextureOffset.java rename to client/src/main/java/client/renderer/model/TextureOffset.java diff --git a/client/src/client/renderer/model/TexturedQuad.java b/client/src/main/java/client/renderer/model/TexturedQuad.java similarity index 100% rename from client/src/client/renderer/model/TexturedQuad.java rename to client/src/main/java/client/renderer/model/TexturedQuad.java diff --git a/client/src/client/renderer/particle/EffectRenderer.java b/client/src/main/java/client/renderer/particle/EffectRenderer.java similarity index 100% rename from client/src/client/renderer/particle/EffectRenderer.java rename to client/src/main/java/client/renderer/particle/EffectRenderer.java diff --git a/client/src/client/renderer/particle/EntityAuraFX.java b/client/src/main/java/client/renderer/particle/EntityAuraFX.java similarity index 100% rename from client/src/client/renderer/particle/EntityAuraFX.java rename to client/src/main/java/client/renderer/particle/EntityAuraFX.java diff --git a/client/src/client/renderer/particle/EntityBlockDustFX.java b/client/src/main/java/client/renderer/particle/EntityBlockDustFX.java similarity index 100% rename from client/src/client/renderer/particle/EntityBlockDustFX.java rename to client/src/main/java/client/renderer/particle/EntityBlockDustFX.java diff --git a/client/src/client/renderer/particle/EntityBreakingFX.java b/client/src/main/java/client/renderer/particle/EntityBreakingFX.java similarity index 100% rename from client/src/client/renderer/particle/EntityBreakingFX.java rename to client/src/main/java/client/renderer/particle/EntityBreakingFX.java diff --git a/client/src/client/renderer/particle/EntityBubbleFX.java b/client/src/main/java/client/renderer/particle/EntityBubbleFX.java similarity index 100% rename from client/src/client/renderer/particle/EntityBubbleFX.java rename to client/src/main/java/client/renderer/particle/EntityBubbleFX.java diff --git a/client/src/client/renderer/particle/EntityCloudFX.java b/client/src/main/java/client/renderer/particle/EntityCloudFX.java similarity index 100% rename from client/src/client/renderer/particle/EntityCloudFX.java rename to client/src/main/java/client/renderer/particle/EntityCloudFX.java diff --git a/client/src/client/renderer/particle/EntityCrit2FX.java b/client/src/main/java/client/renderer/particle/EntityCrit2FX.java similarity index 100% rename from client/src/client/renderer/particle/EntityCrit2FX.java rename to client/src/main/java/client/renderer/particle/EntityCrit2FX.java diff --git a/client/src/client/renderer/particle/EntityCritFX.java b/client/src/main/java/client/renderer/particle/EntityCritFX.java similarity index 100% rename from client/src/client/renderer/particle/EntityCritFX.java rename to client/src/main/java/client/renderer/particle/EntityCritFX.java diff --git a/client/src/client/renderer/particle/EntityDiggingFX.java b/client/src/main/java/client/renderer/particle/EntityDiggingFX.java similarity index 100% rename from client/src/client/renderer/particle/EntityDiggingFX.java rename to client/src/main/java/client/renderer/particle/EntityDiggingFX.java diff --git a/client/src/client/renderer/particle/EntityDownfallFX.java b/client/src/main/java/client/renderer/particle/EntityDownfallFX.java similarity index 100% rename from client/src/client/renderer/particle/EntityDownfallFX.java rename to client/src/main/java/client/renderer/particle/EntityDownfallFX.java diff --git a/client/src/client/renderer/particle/EntityDropParticleFX.java b/client/src/main/java/client/renderer/particle/EntityDropParticleFX.java similarity index 100% rename from client/src/client/renderer/particle/EntityDropParticleFX.java rename to client/src/main/java/client/renderer/particle/EntityDropParticleFX.java diff --git a/client/src/client/renderer/particle/EntityEnchantmentTableParticleFX.java b/client/src/main/java/client/renderer/particle/EntityEnchantmentTableParticleFX.java similarity index 100% rename from client/src/client/renderer/particle/EntityEnchantmentTableParticleFX.java rename to client/src/main/java/client/renderer/particle/EntityEnchantmentTableParticleFX.java diff --git a/client/src/client/renderer/particle/EntityExplodeFX.java b/client/src/main/java/client/renderer/particle/EntityExplodeFX.java similarity index 100% rename from client/src/client/renderer/particle/EntityExplodeFX.java rename to client/src/main/java/client/renderer/particle/EntityExplodeFX.java diff --git a/client/src/client/renderer/particle/EntityFX.java b/client/src/main/java/client/renderer/particle/EntityFX.java similarity index 100% rename from client/src/client/renderer/particle/EntityFX.java rename to client/src/main/java/client/renderer/particle/EntityFX.java diff --git a/client/src/client/renderer/particle/EntityFirework.java b/client/src/main/java/client/renderer/particle/EntityFirework.java similarity index 100% rename from client/src/client/renderer/particle/EntityFirework.java rename to client/src/main/java/client/renderer/particle/EntityFirework.java diff --git a/client/src/client/renderer/particle/EntityFishWakeFX.java b/client/src/main/java/client/renderer/particle/EntityFishWakeFX.java similarity index 100% rename from client/src/client/renderer/particle/EntityFishWakeFX.java rename to client/src/main/java/client/renderer/particle/EntityFishWakeFX.java diff --git a/client/src/client/renderer/particle/EntityFlameFX.java b/client/src/main/java/client/renderer/particle/EntityFlameFX.java similarity index 100% rename from client/src/client/renderer/particle/EntityFlameFX.java rename to client/src/main/java/client/renderer/particle/EntityFlameFX.java diff --git a/client/src/client/renderer/particle/EntityFootStepFX.java b/client/src/main/java/client/renderer/particle/EntityFootStepFX.java similarity index 100% rename from client/src/client/renderer/particle/EntityFootStepFX.java rename to client/src/main/java/client/renderer/particle/EntityFootStepFX.java diff --git a/client/src/client/renderer/particle/EntityHeartFX.java b/client/src/main/java/client/renderer/particle/EntityHeartFX.java similarity index 100% rename from client/src/client/renderer/particle/EntityHeartFX.java rename to client/src/main/java/client/renderer/particle/EntityHeartFX.java diff --git a/client/src/client/renderer/particle/EntityHugeExplodeFX.java b/client/src/main/java/client/renderer/particle/EntityHugeExplodeFX.java similarity index 100% rename from client/src/client/renderer/particle/EntityHugeExplodeFX.java rename to client/src/main/java/client/renderer/particle/EntityHugeExplodeFX.java diff --git a/client/src/client/renderer/particle/EntityLargeExplodeFX.java b/client/src/main/java/client/renderer/particle/EntityLargeExplodeFX.java similarity index 100% rename from client/src/client/renderer/particle/EntityLargeExplodeFX.java rename to client/src/main/java/client/renderer/particle/EntityLargeExplodeFX.java diff --git a/client/src/client/renderer/particle/EntityLavaFX.java b/client/src/main/java/client/renderer/particle/EntityLavaFX.java similarity index 100% rename from client/src/client/renderer/particle/EntityLavaFX.java rename to client/src/main/java/client/renderer/particle/EntityLavaFX.java diff --git a/client/src/client/renderer/particle/EntityNoteFX.java b/client/src/main/java/client/renderer/particle/EntityNoteFX.java similarity index 100% rename from client/src/client/renderer/particle/EntityNoteFX.java rename to client/src/main/java/client/renderer/particle/EntityNoteFX.java diff --git a/client/src/client/renderer/particle/EntityParticleEmitter.java b/client/src/main/java/client/renderer/particle/EntityParticleEmitter.java similarity index 100% rename from client/src/client/renderer/particle/EntityParticleEmitter.java rename to client/src/main/java/client/renderer/particle/EntityParticleEmitter.java diff --git a/client/src/client/renderer/particle/EntityPickupFX.java b/client/src/main/java/client/renderer/particle/EntityPickupFX.java similarity index 100% rename from client/src/client/renderer/particle/EntityPickupFX.java rename to client/src/main/java/client/renderer/particle/EntityPickupFX.java diff --git a/client/src/client/renderer/particle/EntityPortalFX.java b/client/src/main/java/client/renderer/particle/EntityPortalFX.java similarity index 100% rename from client/src/client/renderer/particle/EntityPortalFX.java rename to client/src/main/java/client/renderer/particle/EntityPortalFX.java diff --git a/client/src/client/renderer/particle/EntityReddustFX.java b/client/src/main/java/client/renderer/particle/EntityReddustFX.java similarity index 100% rename from client/src/client/renderer/particle/EntityReddustFX.java rename to client/src/main/java/client/renderer/particle/EntityReddustFX.java diff --git a/client/src/client/renderer/particle/EntitySmokeFX.java b/client/src/main/java/client/renderer/particle/EntitySmokeFX.java similarity index 100% rename from client/src/client/renderer/particle/EntitySmokeFX.java rename to client/src/main/java/client/renderer/particle/EntitySmokeFX.java diff --git a/client/src/client/renderer/particle/EntitySnowShovelFX.java b/client/src/main/java/client/renderer/particle/EntitySnowShovelFX.java similarity index 100% rename from client/src/client/renderer/particle/EntitySnowShovelFX.java rename to client/src/main/java/client/renderer/particle/EntitySnowShovelFX.java diff --git a/client/src/client/renderer/particle/EntitySpellParticleFX.java b/client/src/main/java/client/renderer/particle/EntitySpellParticleFX.java similarity index 100% rename from client/src/client/renderer/particle/EntitySpellParticleFX.java rename to client/src/main/java/client/renderer/particle/EntitySpellParticleFX.java diff --git a/client/src/client/renderer/particle/EntitySplashFX.java b/client/src/main/java/client/renderer/particle/EntitySplashFX.java similarity index 100% rename from client/src/client/renderer/particle/EntitySplashFX.java rename to client/src/main/java/client/renderer/particle/EntitySplashFX.java diff --git a/client/src/client/renderer/particle/EntitySuspendFX.java b/client/src/main/java/client/renderer/particle/EntitySuspendFX.java similarity index 100% rename from client/src/client/renderer/particle/EntitySuspendFX.java rename to client/src/main/java/client/renderer/particle/EntitySuspendFX.java diff --git a/client/src/client/renderer/particle/IParticleFactory.java b/client/src/main/java/client/renderer/particle/IParticleFactory.java similarity index 100% rename from client/src/client/renderer/particle/IParticleFactory.java rename to client/src/main/java/client/renderer/particle/IParticleFactory.java diff --git a/client/src/client/renderer/texture/ColormapLoader.java b/client/src/main/java/client/renderer/texture/ColormapLoader.java similarity index 100% rename from client/src/client/renderer/texture/ColormapLoader.java rename to client/src/main/java/client/renderer/texture/ColormapLoader.java diff --git a/client/src/client/renderer/texture/DynamicTexture.java b/client/src/main/java/client/renderer/texture/DynamicTexture.java similarity index 100% rename from client/src/client/renderer/texture/DynamicTexture.java rename to client/src/main/java/client/renderer/texture/DynamicTexture.java diff --git a/client/src/client/renderer/texture/EntityTexManager.java b/client/src/main/java/client/renderer/texture/EntityTexManager.java similarity index 100% rename from client/src/client/renderer/texture/EntityTexManager.java rename to client/src/main/java/client/renderer/texture/EntityTexManager.java diff --git a/client/src/client/renderer/texture/IIconCreator.java b/client/src/main/java/client/renderer/texture/IIconCreator.java similarity index 100% rename from client/src/client/renderer/texture/IIconCreator.java rename to client/src/main/java/client/renderer/texture/IIconCreator.java diff --git a/client/src/client/renderer/texture/LayeredColorMaskTexture.java b/client/src/main/java/client/renderer/texture/LayeredColorMaskTexture.java similarity index 100% rename from client/src/client/renderer/texture/LayeredColorMaskTexture.java rename to client/src/main/java/client/renderer/texture/LayeredColorMaskTexture.java diff --git a/client/src/client/renderer/texture/LayeredTexture.java b/client/src/main/java/client/renderer/texture/LayeredTexture.java similarity index 100% rename from client/src/client/renderer/texture/LayeredTexture.java rename to client/src/main/java/client/renderer/texture/LayeredTexture.java diff --git a/client/src/client/renderer/texture/SimpleTexture.java b/client/src/main/java/client/renderer/texture/SimpleTexture.java similarity index 100% rename from client/src/client/renderer/texture/SimpleTexture.java rename to client/src/main/java/client/renderer/texture/SimpleTexture.java diff --git a/client/src/client/renderer/texture/Stitcher.java b/client/src/main/java/client/renderer/texture/Stitcher.java similarity index 100% rename from client/src/client/renderer/texture/Stitcher.java rename to client/src/main/java/client/renderer/texture/Stitcher.java diff --git a/client/src/client/renderer/texture/Texture.java b/client/src/main/java/client/renderer/texture/Texture.java similarity index 100% rename from client/src/client/renderer/texture/Texture.java rename to client/src/main/java/client/renderer/texture/Texture.java diff --git a/client/src/client/renderer/texture/TextureAtlasSprite.java b/client/src/main/java/client/renderer/texture/TextureAtlasSprite.java similarity index 100% rename from client/src/client/renderer/texture/TextureAtlasSprite.java rename to client/src/main/java/client/renderer/texture/TextureAtlasSprite.java diff --git a/client/src/client/renderer/texture/TextureManager.java b/client/src/main/java/client/renderer/texture/TextureManager.java similarity index 100% rename from client/src/client/renderer/texture/TextureManager.java rename to client/src/main/java/client/renderer/texture/TextureManager.java diff --git a/client/src/client/renderer/texture/TextureMap.java b/client/src/main/java/client/renderer/texture/TextureMap.java similarity index 100% rename from client/src/client/renderer/texture/TextureMap.java rename to client/src/main/java/client/renderer/texture/TextureMap.java diff --git a/client/src/client/renderer/texture/TextureTicked.java b/client/src/main/java/client/renderer/texture/TextureTicked.java similarity index 100% rename from client/src/client/renderer/texture/TextureTicked.java rename to client/src/main/java/client/renderer/texture/TextureTicked.java diff --git a/client/src/client/renderer/texture/TextureUtil.java b/client/src/main/java/client/renderer/texture/TextureUtil.java similarity index 100% rename from client/src/client/renderer/texture/TextureUtil.java rename to client/src/main/java/client/renderer/texture/TextureUtil.java diff --git a/client/src/client/renderer/ticked/TextureFlamesFX1.java b/client/src/main/java/client/renderer/ticked/TextureFlamesFX1.java similarity index 100% rename from client/src/client/renderer/ticked/TextureFlamesFX1.java rename to client/src/main/java/client/renderer/ticked/TextureFlamesFX1.java diff --git a/client/src/client/renderer/ticked/TextureFlamesFX2.java b/client/src/main/java/client/renderer/ticked/TextureFlamesFX2.java similarity index 100% rename from client/src/client/renderer/ticked/TextureFlamesFX2.java rename to client/src/main/java/client/renderer/ticked/TextureFlamesFX2.java diff --git a/client/src/client/renderer/ticked/TextureFlamesFXMono1.java b/client/src/main/java/client/renderer/ticked/TextureFlamesFXMono1.java similarity index 100% rename from client/src/client/renderer/ticked/TextureFlamesFXMono1.java rename to client/src/main/java/client/renderer/ticked/TextureFlamesFXMono1.java diff --git a/client/src/client/renderer/ticked/TextureFlamesFXMono2.java b/client/src/main/java/client/renderer/ticked/TextureFlamesFXMono2.java similarity index 100% rename from client/src/client/renderer/ticked/TextureFlamesFXMono2.java rename to client/src/main/java/client/renderer/ticked/TextureFlamesFXMono2.java diff --git a/client/src/client/renderer/ticked/TextureLavaFX.java b/client/src/main/java/client/renderer/ticked/TextureLavaFX.java similarity index 100% rename from client/src/client/renderer/ticked/TextureLavaFX.java rename to client/src/main/java/client/renderer/ticked/TextureLavaFX.java diff --git a/client/src/client/renderer/ticked/TextureLavaFlowFX.java b/client/src/main/java/client/renderer/ticked/TextureLavaFlowFX.java similarity index 100% rename from client/src/client/renderer/ticked/TextureLavaFlowFX.java rename to client/src/main/java/client/renderer/ticked/TextureLavaFlowFX.java diff --git a/client/src/client/renderer/ticked/TextureWaterFX.java b/client/src/main/java/client/renderer/ticked/TextureWaterFX.java similarity index 100% rename from client/src/client/renderer/ticked/TextureWaterFX.java rename to client/src/main/java/client/renderer/ticked/TextureWaterFX.java diff --git a/client/src/client/renderer/ticked/TextureWaterFlowFX.java b/client/src/main/java/client/renderer/ticked/TextureWaterFlowFX.java similarity index 100% rename from client/src/client/renderer/ticked/TextureWaterFlowFX.java rename to client/src/main/java/client/renderer/ticked/TextureWaterFlowFX.java diff --git a/client/src/client/renderer/tileentity/TileEntityBannerRenderer.java b/client/src/main/java/client/renderer/tileentity/TileEntityBannerRenderer.java similarity index 100% rename from client/src/client/renderer/tileentity/TileEntityBannerRenderer.java rename to client/src/main/java/client/renderer/tileentity/TileEntityBannerRenderer.java diff --git a/client/src/client/renderer/tileentity/TileEntityChestRenderer.java b/client/src/main/java/client/renderer/tileentity/TileEntityChestRenderer.java similarity index 100% rename from client/src/client/renderer/tileentity/TileEntityChestRenderer.java rename to client/src/main/java/client/renderer/tileentity/TileEntityChestRenderer.java diff --git a/client/src/client/renderer/tileentity/TileEntityItemStackRenderer.java b/client/src/main/java/client/renderer/tileentity/TileEntityItemStackRenderer.java similarity index 100% rename from client/src/client/renderer/tileentity/TileEntityItemStackRenderer.java rename to client/src/main/java/client/renderer/tileentity/TileEntityItemStackRenderer.java diff --git a/client/src/client/renderer/tileentity/TileEntityMobSpawnerRenderer.java b/client/src/main/java/client/renderer/tileentity/TileEntityMobSpawnerRenderer.java similarity index 100% rename from client/src/client/renderer/tileentity/TileEntityMobSpawnerRenderer.java rename to client/src/main/java/client/renderer/tileentity/TileEntityMobSpawnerRenderer.java diff --git a/client/src/client/renderer/tileentity/TileEntityPistonRenderer.java b/client/src/main/java/client/renderer/tileentity/TileEntityPistonRenderer.java similarity index 100% rename from client/src/client/renderer/tileentity/TileEntityPistonRenderer.java rename to client/src/main/java/client/renderer/tileentity/TileEntityPistonRenderer.java diff --git a/client/src/client/renderer/tileentity/TileEntityRendererDispatcher.java b/client/src/main/java/client/renderer/tileentity/TileEntityRendererDispatcher.java similarity index 100% rename from client/src/client/renderer/tileentity/TileEntityRendererDispatcher.java rename to client/src/main/java/client/renderer/tileentity/TileEntityRendererDispatcher.java diff --git a/client/src/client/renderer/tileentity/TileEntitySignRenderer.java b/client/src/main/java/client/renderer/tileentity/TileEntitySignRenderer.java similarity index 100% rename from client/src/client/renderer/tileentity/TileEntitySignRenderer.java rename to client/src/main/java/client/renderer/tileentity/TileEntitySignRenderer.java diff --git a/client/src/client/renderer/tileentity/TileEntitySkullRenderer.java b/client/src/main/java/client/renderer/tileentity/TileEntitySkullRenderer.java similarity index 100% rename from client/src/client/renderer/tileentity/TileEntitySkullRenderer.java rename to client/src/main/java/client/renderer/tileentity/TileEntitySkullRenderer.java diff --git a/client/src/client/renderer/tileentity/TileEntitySpecialRenderer.java b/client/src/main/java/client/renderer/tileentity/TileEntitySpecialRenderer.java similarity index 100% rename from client/src/client/renderer/tileentity/TileEntitySpecialRenderer.java rename to client/src/main/java/client/renderer/tileentity/TileEntitySpecialRenderer.java diff --git a/client/src/client/util/FileUtils.java b/client/src/main/java/client/util/FileUtils.java similarity index 100% rename from client/src/client/util/FileUtils.java rename to client/src/main/java/client/util/FileUtils.java diff --git a/client/src/client/util/Message.java b/client/src/main/java/client/util/Message.java similarity index 100% rename from client/src/client/util/Message.java rename to client/src/main/java/client/util/Message.java diff --git a/client/src/client/util/PerfSection.java b/client/src/main/java/client/util/PerfSection.java similarity index 100% rename from client/src/client/util/PerfSection.java rename to client/src/main/java/client/util/PerfSection.java diff --git a/client/src/client/util/PlayerController.java b/client/src/main/java/client/util/PlayerController.java similarity index 100% rename from client/src/client/util/PlayerController.java rename to client/src/main/java/client/util/PlayerController.java diff --git a/client/src/client/util/SkinConverter.java b/client/src/main/java/client/util/SkinConverter.java similarity index 100% rename from client/src/client/util/SkinConverter.java rename to client/src/main/java/client/util/SkinConverter.java diff --git a/client/src/client/vars/BaseVar.java b/client/src/main/java/client/vars/BaseVar.java similarity index 100% rename from client/src/client/vars/BaseVar.java rename to client/src/main/java/client/vars/BaseVar.java diff --git a/client/src/client/vars/BoolVar.java b/client/src/main/java/client/vars/BoolVar.java similarity index 100% rename from client/src/client/vars/BoolVar.java rename to client/src/main/java/client/vars/BoolVar.java diff --git a/client/src/client/vars/CVar.java b/client/src/main/java/client/vars/CVar.java similarity index 100% rename from client/src/client/vars/CVar.java rename to client/src/main/java/client/vars/CVar.java diff --git a/client/src/client/vars/CVarCategory.java b/client/src/main/java/client/vars/CVarCategory.java similarity index 100% rename from client/src/client/vars/CVarCategory.java rename to client/src/main/java/client/vars/CVarCategory.java diff --git a/client/src/client/vars/ColorVar.java b/client/src/main/java/client/vars/ColorVar.java similarity index 100% rename from client/src/client/vars/ColorVar.java rename to client/src/main/java/client/vars/ColorVar.java diff --git a/client/src/client/vars/EnumVar.java b/client/src/main/java/client/vars/EnumVar.java similarity index 100% rename from client/src/client/vars/EnumVar.java rename to client/src/main/java/client/vars/EnumVar.java diff --git a/client/src/client/vars/FloatVar.java b/client/src/main/java/client/vars/FloatVar.java similarity index 100% rename from client/src/client/vars/FloatVar.java rename to client/src/main/java/client/vars/FloatVar.java diff --git a/client/src/client/vars/IntVar.java b/client/src/main/java/client/vars/IntVar.java similarity index 100% rename from client/src/client/vars/IntVar.java rename to client/src/main/java/client/vars/IntVar.java diff --git a/client/src/client/vars/StringVar.java b/client/src/main/java/client/vars/StringVar.java similarity index 100% rename from client/src/client/vars/StringVar.java rename to client/src/main/java/client/vars/StringVar.java diff --git a/client/src/client/vars/Variable.java b/client/src/main/java/client/vars/Variable.java similarity index 100% rename from client/src/client/vars/Variable.java rename to client/src/main/java/client/vars/Variable.java diff --git a/client/src/client/window/Bind.java b/client/src/main/java/client/window/Bind.java similarity index 100% rename from client/src/client/window/Bind.java rename to client/src/main/java/client/window/Bind.java diff --git a/client/src/client/window/Button.java b/client/src/main/java/client/window/Button.java similarity index 100% rename from client/src/client/window/Button.java rename to client/src/main/java/client/window/Button.java diff --git a/client/src/client/window/DisplayMode.java b/client/src/main/java/client/window/DisplayMode.java similarity index 100% rename from client/src/client/window/DisplayMode.java rename to client/src/main/java/client/window/DisplayMode.java diff --git a/client/src/client/window/Input.java b/client/src/main/java/client/window/Input.java similarity index 100% rename from client/src/client/window/Input.java rename to client/src/main/java/client/window/Input.java diff --git a/client/src/client/window/KeyEvent.java b/client/src/main/java/client/window/KeyEvent.java similarity index 100% rename from client/src/client/window/KeyEvent.java rename to client/src/main/java/client/window/KeyEvent.java diff --git a/client/src/client/window/Keysym.java b/client/src/main/java/client/window/Keysym.java similarity index 100% rename from client/src/client/window/Keysym.java rename to client/src/main/java/client/window/Keysym.java diff --git a/client/src/client/window/Wheel.java b/client/src/main/java/client/window/Wheel.java similarity index 100% rename from client/src/client/window/Wheel.java rename to client/src/main/java/client/window/Wheel.java diff --git a/client/src/client/window/Window.java b/client/src/main/java/client/window/Window.java similarity index 100% rename from client/src/client/window/Window.java rename to client/src/main/java/client/window/Window.java diff --git a/client/src/client/window/WindowAction.java b/client/src/main/java/client/window/WindowAction.java similarity index 100% rename from client/src/client/window/WindowAction.java rename to client/src/main/java/client/window/WindowAction.java diff --git a/client/src/client/window/WindowEvent.java b/client/src/main/java/client/window/WindowEvent.java similarity index 100% rename from client/src/client/window/WindowEvent.java rename to client/src/main/java/client/window/WindowEvent.java diff --git a/client/src/client/world/ChunkClient.java b/client/src/main/java/client/world/ChunkClient.java similarity index 100% rename from client/src/client/world/ChunkClient.java rename to client/src/main/java/client/world/ChunkClient.java diff --git a/client/src/client/world/ChunkEmpty.java b/client/src/main/java/client/world/ChunkEmpty.java similarity index 100% rename from client/src/client/world/ChunkEmpty.java rename to client/src/main/java/client/world/ChunkEmpty.java diff --git a/client/src/client/world/WorldClient.java b/client/src/main/java/client/world/WorldClient.java similarity index 100% rename from client/src/client/world/WorldClient.java rename to client/src/main/java/client/world/WorldClient.java diff --git a/client/data/sounds/anvil_break.ogg b/client/src/main/resources/sounds/anvil_break.ogg similarity index 100% rename from client/data/sounds/anvil_break.ogg rename to client/src/main/resources/sounds/anvil_break.ogg diff --git a/client/data/sounds/anvil_land.ogg b/client/src/main/resources/sounds/anvil_land.ogg similarity index 100% rename from client/data/sounds/anvil_land.ogg rename to client/src/main/resources/sounds/anvil_land.ogg diff --git a/client/data/sounds/anvil_use.ogg b/client/src/main/resources/sounds/anvil_use.ogg similarity index 100% rename from client/data/sounds/anvil_use.ogg rename to client/src/main/resources/sounds/anvil_use.ogg diff --git a/client/data/sounds/bat_death.ogg b/client/src/main/resources/sounds/bat_death.ogg similarity index 100% rename from client/data/sounds/bat_death.ogg rename to client/src/main/resources/sounds/bat_death.ogg diff --git a/client/data/sounds/bat_hurt1.ogg b/client/src/main/resources/sounds/bat_hurt1.ogg similarity index 100% rename from client/data/sounds/bat_hurt1.ogg rename to client/src/main/resources/sounds/bat_hurt1.ogg diff --git a/client/data/sounds/bat_hurt2.ogg b/client/src/main/resources/sounds/bat_hurt2.ogg similarity index 100% rename from client/data/sounds/bat_hurt2.ogg rename to client/src/main/resources/sounds/bat_hurt2.ogg diff --git a/client/data/sounds/bat_hurt3.ogg b/client/src/main/resources/sounds/bat_hurt3.ogg similarity index 100% rename from client/data/sounds/bat_hurt3.ogg rename to client/src/main/resources/sounds/bat_hurt3.ogg diff --git a/client/data/sounds/bat_hurt4.ogg b/client/src/main/resources/sounds/bat_hurt4.ogg similarity index 100% rename from client/data/sounds/bat_hurt4.ogg rename to client/src/main/resources/sounds/bat_hurt4.ogg diff --git a/client/data/sounds/bat_idle1.ogg b/client/src/main/resources/sounds/bat_idle1.ogg similarity index 100% rename from client/data/sounds/bat_idle1.ogg rename to client/src/main/resources/sounds/bat_idle1.ogg diff --git a/client/data/sounds/bat_idle2.ogg b/client/src/main/resources/sounds/bat_idle2.ogg similarity index 100% rename from client/data/sounds/bat_idle2.ogg rename to client/src/main/resources/sounds/bat_idle2.ogg diff --git a/client/data/sounds/bat_idle3.ogg b/client/src/main/resources/sounds/bat_idle3.ogg similarity index 100% rename from client/data/sounds/bat_idle3.ogg rename to client/src/main/resources/sounds/bat_idle3.ogg diff --git a/client/data/sounds/bat_idle4.ogg b/client/src/main/resources/sounds/bat_idle4.ogg similarity index 100% rename from client/data/sounds/bat_idle4.ogg rename to client/src/main/resources/sounds/bat_idle4.ogg diff --git a/client/data/sounds/bat_takeoff.ogg b/client/src/main/resources/sounds/bat_takeoff.ogg similarity index 100% rename from client/data/sounds/bat_takeoff.ogg rename to client/src/main/resources/sounds/bat_takeoff.ogg diff --git a/client/data/sounds/blast.ogg b/client/src/main/resources/sounds/blast.ogg similarity index 100% rename from client/data/sounds/blast.ogg rename to client/src/main/resources/sounds/blast.ogg diff --git a/client/data/sounds/blast_far.ogg b/client/src/main/resources/sounds/blast_far.ogg similarity index 100% rename from client/data/sounds/blast_far.ogg rename to client/src/main/resources/sounds/blast_far.ogg diff --git a/client/data/sounds/bow.ogg b/client/src/main/resources/sounds/bow.ogg similarity index 100% rename from client/data/sounds/bow.ogg rename to client/src/main/resources/sounds/bow.ogg diff --git a/client/data/sounds/bowhit1.ogg b/client/src/main/resources/sounds/bowhit1.ogg similarity index 100% rename from client/data/sounds/bowhit1.ogg rename to client/src/main/resources/sounds/bowhit1.ogg diff --git a/client/data/sounds/bowhit2.ogg b/client/src/main/resources/sounds/bowhit2.ogg similarity index 100% rename from client/data/sounds/bowhit2.ogg rename to client/src/main/resources/sounds/bowhit2.ogg diff --git a/client/data/sounds/bowhit3.ogg b/client/src/main/resources/sounds/bowhit3.ogg similarity index 100% rename from client/data/sounds/bowhit3.ogg rename to client/src/main/resources/sounds/bowhit3.ogg diff --git a/client/data/sounds/bowhit4.ogg b/client/src/main/resources/sounds/bowhit4.ogg similarity index 100% rename from client/data/sounds/bowhit4.ogg rename to client/src/main/resources/sounds/bowhit4.ogg diff --git a/client/data/sounds/break.ogg b/client/src/main/resources/sounds/break.ogg similarity index 100% rename from client/data/sounds/break.ogg rename to client/src/main/resources/sounds/break.ogg diff --git a/client/data/sounds/cat_hitt1.ogg b/client/src/main/resources/sounds/cat_hitt1.ogg similarity index 100% rename from client/data/sounds/cat_hitt1.ogg rename to client/src/main/resources/sounds/cat_hitt1.ogg diff --git a/client/data/sounds/cat_hitt2.ogg b/client/src/main/resources/sounds/cat_hitt2.ogg similarity index 100% rename from client/data/sounds/cat_hitt2.ogg rename to client/src/main/resources/sounds/cat_hitt2.ogg diff --git a/client/data/sounds/cat_hitt3.ogg b/client/src/main/resources/sounds/cat_hitt3.ogg similarity index 100% rename from client/data/sounds/cat_hitt3.ogg rename to client/src/main/resources/sounds/cat_hitt3.ogg diff --git a/client/data/sounds/cat_meow1.ogg b/client/src/main/resources/sounds/cat_meow1.ogg similarity index 100% rename from client/data/sounds/cat_meow1.ogg rename to client/src/main/resources/sounds/cat_meow1.ogg diff --git a/client/data/sounds/cat_meow2.ogg b/client/src/main/resources/sounds/cat_meow2.ogg similarity index 100% rename from client/data/sounds/cat_meow2.ogg rename to client/src/main/resources/sounds/cat_meow2.ogg diff --git a/client/data/sounds/cat_meow3.ogg b/client/src/main/resources/sounds/cat_meow3.ogg similarity index 100% rename from client/data/sounds/cat_meow3.ogg rename to client/src/main/resources/sounds/cat_meow3.ogg diff --git a/client/data/sounds/cat_meow4.ogg b/client/src/main/resources/sounds/cat_meow4.ogg similarity index 100% rename from client/data/sounds/cat_meow4.ogg rename to client/src/main/resources/sounds/cat_meow4.ogg diff --git a/client/data/sounds/cat_purreow1.ogg b/client/src/main/resources/sounds/cat_purreow1.ogg similarity index 100% rename from client/data/sounds/cat_purreow1.ogg rename to client/src/main/resources/sounds/cat_purreow1.ogg diff --git a/client/data/sounds/cat_purreow2.ogg b/client/src/main/resources/sounds/cat_purreow2.ogg similarity index 100% rename from client/data/sounds/cat_purreow2.ogg rename to client/src/main/resources/sounds/cat_purreow2.ogg diff --git a/client/data/sounds/chestclosed.ogg b/client/src/main/resources/sounds/chestclosed.ogg similarity index 100% rename from client/data/sounds/chestclosed.ogg rename to client/src/main/resources/sounds/chestclosed.ogg diff --git a/client/data/sounds/chestopen.ogg b/client/src/main/resources/sounds/chestopen.ogg similarity index 100% rename from client/data/sounds/chestopen.ogg rename to client/src/main/resources/sounds/chestopen.ogg diff --git a/client/data/sounds/chicken_hurt1.ogg b/client/src/main/resources/sounds/chicken_hurt1.ogg similarity index 100% rename from client/data/sounds/chicken_hurt1.ogg rename to client/src/main/resources/sounds/chicken_hurt1.ogg diff --git a/client/data/sounds/chicken_hurt2.ogg b/client/src/main/resources/sounds/chicken_hurt2.ogg similarity index 100% rename from client/data/sounds/chicken_hurt2.ogg rename to client/src/main/resources/sounds/chicken_hurt2.ogg diff --git a/client/data/sounds/chicken_say1.ogg b/client/src/main/resources/sounds/chicken_say1.ogg similarity index 100% rename from client/data/sounds/chicken_say1.ogg rename to client/src/main/resources/sounds/chicken_say1.ogg diff --git a/client/data/sounds/chicken_say2.ogg b/client/src/main/resources/sounds/chicken_say2.ogg similarity index 100% rename from client/data/sounds/chicken_say2.ogg rename to client/src/main/resources/sounds/chicken_say2.ogg diff --git a/client/data/sounds/chicken_say3.ogg b/client/src/main/resources/sounds/chicken_say3.ogg similarity index 100% rename from client/data/sounds/chicken_say3.ogg rename to client/src/main/resources/sounds/chicken_say3.ogg diff --git a/client/data/sounds/click.ogg b/client/src/main/resources/sounds/click.ogg similarity index 100% rename from client/data/sounds/click.ogg rename to client/src/main/resources/sounds/click.ogg diff --git a/client/data/sounds/cloth1.ogg b/client/src/main/resources/sounds/cloth1.ogg similarity index 100% rename from client/data/sounds/cloth1.ogg rename to client/src/main/resources/sounds/cloth1.ogg diff --git a/client/data/sounds/cloth2.ogg b/client/src/main/resources/sounds/cloth2.ogg similarity index 100% rename from client/data/sounds/cloth2.ogg rename to client/src/main/resources/sounds/cloth2.ogg diff --git a/client/data/sounds/cloth3.ogg b/client/src/main/resources/sounds/cloth3.ogg similarity index 100% rename from client/data/sounds/cloth3.ogg rename to client/src/main/resources/sounds/cloth3.ogg diff --git a/client/data/sounds/cloth4.ogg b/client/src/main/resources/sounds/cloth4.ogg similarity index 100% rename from client/data/sounds/cloth4.ogg rename to client/src/main/resources/sounds/cloth4.ogg diff --git a/client/data/sounds/cow_hurt1.ogg b/client/src/main/resources/sounds/cow_hurt1.ogg similarity index 100% rename from client/data/sounds/cow_hurt1.ogg rename to client/src/main/resources/sounds/cow_hurt1.ogg diff --git a/client/data/sounds/cow_hurt2.ogg b/client/src/main/resources/sounds/cow_hurt2.ogg similarity index 100% rename from client/data/sounds/cow_hurt2.ogg rename to client/src/main/resources/sounds/cow_hurt2.ogg diff --git a/client/data/sounds/cow_hurt3.ogg b/client/src/main/resources/sounds/cow_hurt3.ogg similarity index 100% rename from client/data/sounds/cow_hurt3.ogg rename to client/src/main/resources/sounds/cow_hurt3.ogg diff --git a/client/data/sounds/cow_say1.ogg b/client/src/main/resources/sounds/cow_say1.ogg similarity index 100% rename from client/data/sounds/cow_say1.ogg rename to client/src/main/resources/sounds/cow_say1.ogg diff --git a/client/data/sounds/cow_say2.ogg b/client/src/main/resources/sounds/cow_say2.ogg similarity index 100% rename from client/data/sounds/cow_say2.ogg rename to client/src/main/resources/sounds/cow_say2.ogg diff --git a/client/data/sounds/cow_say3.ogg b/client/src/main/resources/sounds/cow_say3.ogg similarity index 100% rename from client/data/sounds/cow_say3.ogg rename to client/src/main/resources/sounds/cow_say3.ogg diff --git a/client/data/sounds/cow_say4.ogg b/client/src/main/resources/sounds/cow_say4.ogg similarity index 100% rename from client/data/sounds/cow_say4.ogg rename to client/src/main/resources/sounds/cow_say4.ogg diff --git a/client/data/sounds/cut.ogg b/client/src/main/resources/sounds/cut.ogg similarity index 100% rename from client/data/sounds/cut.ogg rename to client/src/main/resources/sounds/cut.ogg diff --git a/client/data/sounds/door_close.ogg b/client/src/main/resources/sounds/door_close.ogg similarity index 100% rename from client/data/sounds/door_close.ogg rename to client/src/main/resources/sounds/door_close.ogg diff --git a/client/data/sounds/door_open.ogg b/client/src/main/resources/sounds/door_open.ogg similarity index 100% rename from client/data/sounds/door_open.ogg rename to client/src/main/resources/sounds/door_open.ogg diff --git a/client/data/sounds/dragon_growl1.ogg b/client/src/main/resources/sounds/dragon_growl1.ogg similarity index 100% rename from client/data/sounds/dragon_growl1.ogg rename to client/src/main/resources/sounds/dragon_growl1.ogg diff --git a/client/data/sounds/dragon_growl2.ogg b/client/src/main/resources/sounds/dragon_growl2.ogg similarity index 100% rename from client/data/sounds/dragon_growl2.ogg rename to client/src/main/resources/sounds/dragon_growl2.ogg diff --git a/client/data/sounds/dragon_growl3.ogg b/client/src/main/resources/sounds/dragon_growl3.ogg similarity index 100% rename from client/data/sounds/dragon_growl3.ogg rename to client/src/main/resources/sounds/dragon_growl3.ogg diff --git a/client/data/sounds/dragon_growl4.ogg b/client/src/main/resources/sounds/dragon_growl4.ogg similarity index 100% rename from client/data/sounds/dragon_growl4.ogg rename to client/src/main/resources/sounds/dragon_growl4.ogg diff --git a/client/data/sounds/dragon_wings1.ogg b/client/src/main/resources/sounds/dragon_wings1.ogg similarity index 100% rename from client/data/sounds/dragon_wings1.ogg rename to client/src/main/resources/sounds/dragon_wings1.ogg diff --git a/client/data/sounds/dragon_wings2.ogg b/client/src/main/resources/sounds/dragon_wings2.ogg similarity index 100% rename from client/data/sounds/dragon_wings2.ogg rename to client/src/main/resources/sounds/dragon_wings2.ogg diff --git a/client/data/sounds/dragon_wings3.ogg b/client/src/main/resources/sounds/dragon_wings3.ogg similarity index 100% rename from client/data/sounds/dragon_wings3.ogg rename to client/src/main/resources/sounds/dragon_wings3.ogg diff --git a/client/data/sounds/dragon_wings4.ogg b/client/src/main/resources/sounds/dragon_wings4.ogg similarity index 100% rename from client/data/sounds/dragon_wings4.ogg rename to client/src/main/resources/sounds/dragon_wings4.ogg diff --git a/client/data/sounds/dragon_wings5.ogg b/client/src/main/resources/sounds/dragon_wings5.ogg similarity index 100% rename from client/data/sounds/dragon_wings5.ogg rename to client/src/main/resources/sounds/dragon_wings5.ogg diff --git a/client/data/sounds/dragon_wings6.ogg b/client/src/main/resources/sounds/dragon_wings6.ogg similarity index 100% rename from client/data/sounds/dragon_wings6.ogg rename to client/src/main/resources/sounds/dragon_wings6.ogg diff --git a/client/data/sounds/drink.ogg b/client/src/main/resources/sounds/drink.ogg similarity index 100% rename from client/data/sounds/drink.ogg rename to client/src/main/resources/sounds/drink.ogg diff --git a/client/data/sounds/eat1.ogg b/client/src/main/resources/sounds/eat1.ogg similarity index 100% rename from client/data/sounds/eat1.ogg rename to client/src/main/resources/sounds/eat1.ogg diff --git a/client/data/sounds/eat2.ogg b/client/src/main/resources/sounds/eat2.ogg similarity index 100% rename from client/data/sounds/eat2.ogg rename to client/src/main/resources/sounds/eat2.ogg diff --git a/client/data/sounds/eat3.ogg b/client/src/main/resources/sounds/eat3.ogg similarity index 100% rename from client/data/sounds/eat3.ogg rename to client/src/main/resources/sounds/eat3.ogg diff --git a/client/data/sounds/explode1.ogg b/client/src/main/resources/sounds/explode1.ogg similarity index 100% rename from client/data/sounds/explode1.ogg rename to client/src/main/resources/sounds/explode1.ogg diff --git a/client/data/sounds/explode2.ogg b/client/src/main/resources/sounds/explode2.ogg similarity index 100% rename from client/data/sounds/explode2.ogg rename to client/src/main/resources/sounds/explode2.ogg diff --git a/client/data/sounds/explode3.ogg b/client/src/main/resources/sounds/explode3.ogg similarity index 100% rename from client/data/sounds/explode3.ogg rename to client/src/main/resources/sounds/explode3.ogg diff --git a/client/data/sounds/explode4.ogg b/client/src/main/resources/sounds/explode4.ogg similarity index 100% rename from client/data/sounds/explode4.ogg rename to client/src/main/resources/sounds/explode4.ogg diff --git a/client/data/sounds/fallbig1.ogg b/client/src/main/resources/sounds/fallbig1.ogg similarity index 100% rename from client/data/sounds/fallbig1.ogg rename to client/src/main/resources/sounds/fallbig1.ogg diff --git a/client/data/sounds/fallbig2.ogg b/client/src/main/resources/sounds/fallbig2.ogg similarity index 100% rename from client/data/sounds/fallbig2.ogg rename to client/src/main/resources/sounds/fallbig2.ogg diff --git a/client/data/sounds/fallsmall.ogg b/client/src/main/resources/sounds/fallsmall.ogg similarity index 100% rename from client/data/sounds/fallsmall.ogg rename to client/src/main/resources/sounds/fallsmall.ogg diff --git a/client/data/sounds/fire.ogg b/client/src/main/resources/sounds/fire.ogg similarity index 100% rename from client/data/sounds/fire.ogg rename to client/src/main/resources/sounds/fire.ogg diff --git a/client/data/sounds/fireball.ogg b/client/src/main/resources/sounds/fireball.ogg similarity index 100% rename from client/data/sounds/fireball.ogg rename to client/src/main/resources/sounds/fireball.ogg diff --git a/client/data/sounds/fizz.ogg b/client/src/main/resources/sounds/fizz.ogg similarity index 100% rename from client/data/sounds/fizz.ogg rename to client/src/main/resources/sounds/fizz.ogg diff --git a/client/data/sounds/fuse.ogg b/client/src/main/resources/sounds/fuse.ogg similarity index 100% rename from client/data/sounds/fuse.ogg rename to client/src/main/resources/sounds/fuse.ogg diff --git a/client/data/sounds/glass1.ogg b/client/src/main/resources/sounds/glass1.ogg similarity index 100% rename from client/data/sounds/glass1.ogg rename to client/src/main/resources/sounds/glass1.ogg diff --git a/client/data/sounds/glass2.ogg b/client/src/main/resources/sounds/glass2.ogg similarity index 100% rename from client/data/sounds/glass2.ogg rename to client/src/main/resources/sounds/glass2.ogg diff --git a/client/data/sounds/glass3.ogg b/client/src/main/resources/sounds/glass3.ogg similarity index 100% rename from client/data/sounds/glass3.ogg rename to client/src/main/resources/sounds/glass3.ogg diff --git a/client/data/sounds/grass1.ogg b/client/src/main/resources/sounds/grass1.ogg similarity index 100% rename from client/data/sounds/grass1.ogg rename to client/src/main/resources/sounds/grass1.ogg diff --git a/client/data/sounds/grass2.ogg b/client/src/main/resources/sounds/grass2.ogg similarity index 100% rename from client/data/sounds/grass2.ogg rename to client/src/main/resources/sounds/grass2.ogg diff --git a/client/data/sounds/grass3.ogg b/client/src/main/resources/sounds/grass3.ogg similarity index 100% rename from client/data/sounds/grass3.ogg rename to client/src/main/resources/sounds/grass3.ogg diff --git a/client/data/sounds/grass4.ogg b/client/src/main/resources/sounds/grass4.ogg similarity index 100% rename from client/data/sounds/grass4.ogg rename to client/src/main/resources/sounds/grass4.ogg diff --git a/client/data/sounds/gravel1.ogg b/client/src/main/resources/sounds/gravel1.ogg similarity index 100% rename from client/data/sounds/gravel1.ogg rename to client/src/main/resources/sounds/gravel1.ogg diff --git a/client/data/sounds/gravel2.ogg b/client/src/main/resources/sounds/gravel2.ogg similarity index 100% rename from client/data/sounds/gravel2.ogg rename to client/src/main/resources/sounds/gravel2.ogg diff --git a/client/data/sounds/gravel3.ogg b/client/src/main/resources/sounds/gravel3.ogg similarity index 100% rename from client/data/sounds/gravel3.ogg rename to client/src/main/resources/sounds/gravel3.ogg diff --git a/client/data/sounds/gravel4.ogg b/client/src/main/resources/sounds/gravel4.ogg similarity index 100% rename from client/data/sounds/gravel4.ogg rename to client/src/main/resources/sounds/gravel4.ogg diff --git a/client/data/sounds/hit1.ogg b/client/src/main/resources/sounds/hit1.ogg similarity index 100% rename from client/data/sounds/hit1.ogg rename to client/src/main/resources/sounds/hit1.ogg diff --git a/client/data/sounds/hit2.ogg b/client/src/main/resources/sounds/hit2.ogg similarity index 100% rename from client/data/sounds/hit2.ogg rename to client/src/main/resources/sounds/hit2.ogg diff --git a/client/data/sounds/hit3.ogg b/client/src/main/resources/sounds/hit3.ogg similarity index 100% rename from client/data/sounds/hit3.ogg rename to client/src/main/resources/sounds/hit3.ogg diff --git a/client/data/sounds/horse_angry.ogg b/client/src/main/resources/sounds/horse_angry.ogg similarity index 100% rename from client/data/sounds/horse_angry.ogg rename to client/src/main/resources/sounds/horse_angry.ogg diff --git a/client/data/sounds/horse_breathe1.ogg b/client/src/main/resources/sounds/horse_breathe1.ogg similarity index 100% rename from client/data/sounds/horse_breathe1.ogg rename to client/src/main/resources/sounds/horse_breathe1.ogg diff --git a/client/data/sounds/horse_breathe2.ogg b/client/src/main/resources/sounds/horse_breathe2.ogg similarity index 100% rename from client/data/sounds/horse_breathe2.ogg rename to client/src/main/resources/sounds/horse_breathe2.ogg diff --git a/client/data/sounds/horse_breathe3.ogg b/client/src/main/resources/sounds/horse_breathe3.ogg similarity index 100% rename from client/data/sounds/horse_breathe3.ogg rename to client/src/main/resources/sounds/horse_breathe3.ogg diff --git a/client/data/sounds/horse_death.ogg b/client/src/main/resources/sounds/horse_death.ogg similarity index 100% rename from client/data/sounds/horse_death.ogg rename to client/src/main/resources/sounds/horse_death.ogg diff --git a/client/data/sounds/horse_gallop1.ogg b/client/src/main/resources/sounds/horse_gallop1.ogg similarity index 100% rename from client/data/sounds/horse_gallop1.ogg rename to client/src/main/resources/sounds/horse_gallop1.ogg diff --git a/client/data/sounds/horse_gallop2.ogg b/client/src/main/resources/sounds/horse_gallop2.ogg similarity index 100% rename from client/data/sounds/horse_gallop2.ogg rename to client/src/main/resources/sounds/horse_gallop2.ogg diff --git a/client/data/sounds/horse_gallop3.ogg b/client/src/main/resources/sounds/horse_gallop3.ogg similarity index 100% rename from client/data/sounds/horse_gallop3.ogg rename to client/src/main/resources/sounds/horse_gallop3.ogg diff --git a/client/data/sounds/horse_gallop4.ogg b/client/src/main/resources/sounds/horse_gallop4.ogg similarity index 100% rename from client/data/sounds/horse_gallop4.ogg rename to client/src/main/resources/sounds/horse_gallop4.ogg diff --git a/client/data/sounds/horse_hit1.ogg b/client/src/main/resources/sounds/horse_hit1.ogg similarity index 100% rename from client/data/sounds/horse_hit1.ogg rename to client/src/main/resources/sounds/horse_hit1.ogg diff --git a/client/data/sounds/horse_hit2.ogg b/client/src/main/resources/sounds/horse_hit2.ogg similarity index 100% rename from client/data/sounds/horse_hit2.ogg rename to client/src/main/resources/sounds/horse_hit2.ogg diff --git a/client/data/sounds/horse_hit3.ogg b/client/src/main/resources/sounds/horse_hit3.ogg similarity index 100% rename from client/data/sounds/horse_hit3.ogg rename to client/src/main/resources/sounds/horse_hit3.ogg diff --git a/client/data/sounds/horse_hit4.ogg b/client/src/main/resources/sounds/horse_hit4.ogg similarity index 100% rename from client/data/sounds/horse_hit4.ogg rename to client/src/main/resources/sounds/horse_hit4.ogg diff --git a/client/data/sounds/horse_idle1.ogg b/client/src/main/resources/sounds/horse_idle1.ogg similarity index 100% rename from client/data/sounds/horse_idle1.ogg rename to client/src/main/resources/sounds/horse_idle1.ogg diff --git a/client/data/sounds/horse_idle2.ogg b/client/src/main/resources/sounds/horse_idle2.ogg similarity index 100% rename from client/data/sounds/horse_idle2.ogg rename to client/src/main/resources/sounds/horse_idle2.ogg diff --git a/client/data/sounds/horse_idle3.ogg b/client/src/main/resources/sounds/horse_idle3.ogg similarity index 100% rename from client/data/sounds/horse_idle3.ogg rename to client/src/main/resources/sounds/horse_idle3.ogg diff --git a/client/data/sounds/horse_jump.ogg b/client/src/main/resources/sounds/horse_jump.ogg similarity index 100% rename from client/data/sounds/horse_jump.ogg rename to client/src/main/resources/sounds/horse_jump.ogg diff --git a/client/data/sounds/horse_land.ogg b/client/src/main/resources/sounds/horse_land.ogg similarity index 100% rename from client/data/sounds/horse_land.ogg rename to client/src/main/resources/sounds/horse_land.ogg diff --git a/client/data/sounds/horse_soft1.ogg b/client/src/main/resources/sounds/horse_soft1.ogg similarity index 100% rename from client/data/sounds/horse_soft1.ogg rename to client/src/main/resources/sounds/horse_soft1.ogg diff --git a/client/data/sounds/horse_soft2.ogg b/client/src/main/resources/sounds/horse_soft2.ogg similarity index 100% rename from client/data/sounds/horse_soft2.ogg rename to client/src/main/resources/sounds/horse_soft2.ogg diff --git a/client/data/sounds/horse_soft3.ogg b/client/src/main/resources/sounds/horse_soft3.ogg similarity index 100% rename from client/data/sounds/horse_soft3.ogg rename to client/src/main/resources/sounds/horse_soft3.ogg diff --git a/client/data/sounds/horse_soft4.ogg b/client/src/main/resources/sounds/horse_soft4.ogg similarity index 100% rename from client/data/sounds/horse_soft4.ogg rename to client/src/main/resources/sounds/horse_soft4.ogg diff --git a/client/data/sounds/horse_soft5.ogg b/client/src/main/resources/sounds/horse_soft5.ogg similarity index 100% rename from client/data/sounds/horse_soft5.ogg rename to client/src/main/resources/sounds/horse_soft5.ogg diff --git a/client/data/sounds/horse_soft6.ogg b/client/src/main/resources/sounds/horse_soft6.ogg similarity index 100% rename from client/data/sounds/horse_soft6.ogg rename to client/src/main/resources/sounds/horse_soft6.ogg diff --git a/client/data/sounds/horse_wood1.ogg b/client/src/main/resources/sounds/horse_wood1.ogg similarity index 100% rename from client/data/sounds/horse_wood1.ogg rename to client/src/main/resources/sounds/horse_wood1.ogg diff --git a/client/data/sounds/horse_wood2.ogg b/client/src/main/resources/sounds/horse_wood2.ogg similarity index 100% rename from client/data/sounds/horse_wood2.ogg rename to client/src/main/resources/sounds/horse_wood2.ogg diff --git a/client/data/sounds/horse_wood3.ogg b/client/src/main/resources/sounds/horse_wood3.ogg similarity index 100% rename from client/data/sounds/horse_wood3.ogg rename to client/src/main/resources/sounds/horse_wood3.ogg diff --git a/client/data/sounds/horse_wood4.ogg b/client/src/main/resources/sounds/horse_wood4.ogg similarity index 100% rename from client/data/sounds/horse_wood4.ogg rename to client/src/main/resources/sounds/horse_wood4.ogg diff --git a/client/data/sounds/horse_wood5.ogg b/client/src/main/resources/sounds/horse_wood5.ogg similarity index 100% rename from client/data/sounds/horse_wood5.ogg rename to client/src/main/resources/sounds/horse_wood5.ogg diff --git a/client/data/sounds/horse_wood6.ogg b/client/src/main/resources/sounds/horse_wood6.ogg similarity index 100% rename from client/data/sounds/horse_wood6.ogg rename to client/src/main/resources/sounds/horse_wood6.ogg diff --git a/client/data/sounds/ignite.ogg b/client/src/main/resources/sounds/ignite.ogg similarity index 100% rename from client/data/sounds/ignite.ogg rename to client/src/main/resources/sounds/ignite.ogg diff --git a/client/data/sounds/large_blast.ogg b/client/src/main/resources/sounds/large_blast.ogg similarity index 100% rename from client/data/sounds/large_blast.ogg rename to client/src/main/resources/sounds/large_blast.ogg diff --git a/client/data/sounds/large_blast_far.ogg b/client/src/main/resources/sounds/large_blast_far.ogg similarity index 100% rename from client/data/sounds/large_blast_far.ogg rename to client/src/main/resources/sounds/large_blast_far.ogg diff --git a/client/data/sounds/launch.ogg b/client/src/main/resources/sounds/launch.ogg similarity index 100% rename from client/data/sounds/launch.ogg rename to client/src/main/resources/sounds/launch.ogg diff --git a/client/data/sounds/lava.ogg b/client/src/main/resources/sounds/lava.ogg similarity index 100% rename from client/data/sounds/lava.ogg rename to client/src/main/resources/sounds/lava.ogg diff --git a/client/data/sounds/lavapop.ogg b/client/src/main/resources/sounds/lavapop.ogg similarity index 100% rename from client/data/sounds/lavapop.ogg rename to client/src/main/resources/sounds/lavapop.ogg diff --git a/client/data/sounds/levelup.ogg b/client/src/main/resources/sounds/levelup.ogg similarity index 100% rename from client/data/sounds/levelup.ogg rename to client/src/main/resources/sounds/levelup.ogg diff --git a/client/data/sounds/magma.ogg b/client/src/main/resources/sounds/magma.ogg similarity index 100% rename from client/data/sounds/magma.ogg rename to client/src/main/resources/sounds/magma.ogg diff --git a/client/data/sounds/magmapop.ogg b/client/src/main/resources/sounds/magmapop.ogg similarity index 100% rename from client/data/sounds/magmapop.ogg rename to client/src/main/resources/sounds/magmapop.ogg diff --git a/client/data/sounds/metal1.ogg b/client/src/main/resources/sounds/metal1.ogg similarity index 100% rename from client/data/sounds/metal1.ogg rename to client/src/main/resources/sounds/metal1.ogg diff --git a/client/data/sounds/metal2.ogg b/client/src/main/resources/sounds/metal2.ogg similarity index 100% rename from client/data/sounds/metal2.ogg rename to client/src/main/resources/sounds/metal2.ogg diff --git a/client/data/sounds/metal3.ogg b/client/src/main/resources/sounds/metal3.ogg similarity index 100% rename from client/data/sounds/metal3.ogg rename to client/src/main/resources/sounds/metal3.ogg diff --git a/client/data/sounds/metalhit1.ogg b/client/src/main/resources/sounds/metalhit1.ogg similarity index 100% rename from client/data/sounds/metalhit1.ogg rename to client/src/main/resources/sounds/metalhit1.ogg diff --git a/client/data/sounds/metalhit2.ogg b/client/src/main/resources/sounds/metalhit2.ogg similarity index 100% rename from client/data/sounds/metalhit2.ogg rename to client/src/main/resources/sounds/metalhit2.ogg diff --git a/client/data/sounds/minecart_base.ogg b/client/src/main/resources/sounds/minecart_base.ogg similarity index 100% rename from client/data/sounds/minecart_base.ogg rename to client/src/main/resources/sounds/minecart_base.ogg diff --git a/client/data/sounds/minecart_inside.ogg b/client/src/main/resources/sounds/minecart_inside.ogg similarity index 100% rename from client/data/sounds/minecart_inside.ogg rename to client/src/main/resources/sounds/minecart_inside.ogg diff --git a/client/data/sounds/molten.ogg b/client/src/main/resources/sounds/molten.ogg similarity index 100% rename from client/data/sounds/molten.ogg rename to client/src/main/resources/sounds/molten.ogg diff --git a/client/data/sounds/note.ogg b/client/src/main/resources/sounds/note.ogg similarity index 100% rename from client/data/sounds/note.ogg rename to client/src/main/resources/sounds/note.ogg diff --git a/client/data/sounds/old_explode.ogg b/client/src/main/resources/sounds/old_explode.ogg similarity index 100% rename from client/data/sounds/old_explode.ogg rename to client/src/main/resources/sounds/old_explode.ogg diff --git a/client/data/sounds/orb.ogg b/client/src/main/resources/sounds/orb.ogg similarity index 100% rename from client/data/sounds/orb.ogg rename to client/src/main/resources/sounds/orb.ogg diff --git a/client/data/sounds/pig_death.ogg b/client/src/main/resources/sounds/pig_death.ogg similarity index 100% rename from client/data/sounds/pig_death.ogg rename to client/src/main/resources/sounds/pig_death.ogg diff --git a/client/data/sounds/pig_say1.ogg b/client/src/main/resources/sounds/pig_say1.ogg similarity index 100% rename from client/data/sounds/pig_say1.ogg rename to client/src/main/resources/sounds/pig_say1.ogg diff --git a/client/data/sounds/pig_say2.ogg b/client/src/main/resources/sounds/pig_say2.ogg similarity index 100% rename from client/data/sounds/pig_say2.ogg rename to client/src/main/resources/sounds/pig_say2.ogg diff --git a/client/data/sounds/pig_say3.ogg b/client/src/main/resources/sounds/pig_say3.ogg similarity index 100% rename from client/data/sounds/pig_say3.ogg rename to client/src/main/resources/sounds/pig_say3.ogg diff --git a/client/data/sounds/piston_in.ogg b/client/src/main/resources/sounds/piston_in.ogg similarity index 100% rename from client/data/sounds/piston_in.ogg rename to client/src/main/resources/sounds/piston_in.ogg diff --git a/client/data/sounds/piston_out.ogg b/client/src/main/resources/sounds/piston_out.ogg similarity index 100% rename from client/data/sounds/piston_out.ogg rename to client/src/main/resources/sounds/piston_out.ogg diff --git a/client/data/sounds/plop.ogg b/client/src/main/resources/sounds/plop.ogg similarity index 100% rename from client/data/sounds/plop.ogg rename to client/src/main/resources/sounds/plop.ogg diff --git a/client/data/sounds/pop.ogg b/client/src/main/resources/sounds/pop.ogg similarity index 100% rename from client/data/sounds/pop.ogg rename to client/src/main/resources/sounds/pop.ogg diff --git a/client/data/sounds/rabbit_bunnymurder.ogg b/client/src/main/resources/sounds/rabbit_bunnymurder.ogg similarity index 100% rename from client/data/sounds/rabbit_bunnymurder.ogg rename to client/src/main/resources/sounds/rabbit_bunnymurder.ogg diff --git a/client/data/sounds/rabbit_hop1.ogg b/client/src/main/resources/sounds/rabbit_hop1.ogg similarity index 100% rename from client/data/sounds/rabbit_hop1.ogg rename to client/src/main/resources/sounds/rabbit_hop1.ogg diff --git a/client/data/sounds/rabbit_hop2.ogg b/client/src/main/resources/sounds/rabbit_hop2.ogg similarity index 100% rename from client/data/sounds/rabbit_hop2.ogg rename to client/src/main/resources/sounds/rabbit_hop2.ogg diff --git a/client/data/sounds/rabbit_hop3.ogg b/client/src/main/resources/sounds/rabbit_hop3.ogg similarity index 100% rename from client/data/sounds/rabbit_hop3.ogg rename to client/src/main/resources/sounds/rabbit_hop3.ogg diff --git a/client/data/sounds/rabbit_hop4.ogg b/client/src/main/resources/sounds/rabbit_hop4.ogg similarity index 100% rename from client/data/sounds/rabbit_hop4.ogg rename to client/src/main/resources/sounds/rabbit_hop4.ogg diff --git a/client/data/sounds/rabbit_hurt1.ogg b/client/src/main/resources/sounds/rabbit_hurt1.ogg similarity index 100% rename from client/data/sounds/rabbit_hurt1.ogg rename to client/src/main/resources/sounds/rabbit_hurt1.ogg diff --git a/client/data/sounds/rabbit_hurt2.ogg b/client/src/main/resources/sounds/rabbit_hurt2.ogg similarity index 100% rename from client/data/sounds/rabbit_hurt2.ogg rename to client/src/main/resources/sounds/rabbit_hurt2.ogg diff --git a/client/data/sounds/rabbit_hurt3.ogg b/client/src/main/resources/sounds/rabbit_hurt3.ogg similarity index 100% rename from client/data/sounds/rabbit_hurt3.ogg rename to client/src/main/resources/sounds/rabbit_hurt3.ogg diff --git a/client/data/sounds/rabbit_hurt4.ogg b/client/src/main/resources/sounds/rabbit_hurt4.ogg similarity index 100% rename from client/data/sounds/rabbit_hurt4.ogg rename to client/src/main/resources/sounds/rabbit_hurt4.ogg diff --git a/client/data/sounds/rabbit_idle1.ogg b/client/src/main/resources/sounds/rabbit_idle1.ogg similarity index 100% rename from client/data/sounds/rabbit_idle1.ogg rename to client/src/main/resources/sounds/rabbit_idle1.ogg diff --git a/client/data/sounds/rabbit_idle2.ogg b/client/src/main/resources/sounds/rabbit_idle2.ogg similarity index 100% rename from client/data/sounds/rabbit_idle2.ogg rename to client/src/main/resources/sounds/rabbit_idle2.ogg diff --git a/client/data/sounds/rabbit_idle3.ogg b/client/src/main/resources/sounds/rabbit_idle3.ogg similarity index 100% rename from client/data/sounds/rabbit_idle3.ogg rename to client/src/main/resources/sounds/rabbit_idle3.ogg diff --git a/client/data/sounds/rabbit_idle4.ogg b/client/src/main/resources/sounds/rabbit_idle4.ogg similarity index 100% rename from client/data/sounds/rabbit_idle4.ogg rename to client/src/main/resources/sounds/rabbit_idle4.ogg diff --git a/client/data/sounds/rain1.ogg b/client/src/main/resources/sounds/rain1.ogg similarity index 100% rename from client/data/sounds/rain1.ogg rename to client/src/main/resources/sounds/rain1.ogg diff --git a/client/data/sounds/rain2.ogg b/client/src/main/resources/sounds/rain2.ogg similarity index 100% rename from client/data/sounds/rain2.ogg rename to client/src/main/resources/sounds/rain2.ogg diff --git a/client/data/sounds/rain3.ogg b/client/src/main/resources/sounds/rain3.ogg similarity index 100% rename from client/data/sounds/rain3.ogg rename to client/src/main/resources/sounds/rain3.ogg diff --git a/client/data/sounds/rain4.ogg b/client/src/main/resources/sounds/rain4.ogg similarity index 100% rename from client/data/sounds/rain4.ogg rename to client/src/main/resources/sounds/rain4.ogg diff --git a/client/data/sounds/sand1.ogg b/client/src/main/resources/sounds/sand1.ogg similarity index 100% rename from client/data/sounds/sand1.ogg rename to client/src/main/resources/sounds/sand1.ogg diff --git a/client/data/sounds/sand2.ogg b/client/src/main/resources/sounds/sand2.ogg similarity index 100% rename from client/data/sounds/sand2.ogg rename to client/src/main/resources/sounds/sand2.ogg diff --git a/client/data/sounds/sand3.ogg b/client/src/main/resources/sounds/sand3.ogg similarity index 100% rename from client/data/sounds/sand3.ogg rename to client/src/main/resources/sounds/sand3.ogg diff --git a/client/data/sounds/sand4.ogg b/client/src/main/resources/sounds/sand4.ogg similarity index 100% rename from client/data/sounds/sand4.ogg rename to client/src/main/resources/sounds/sand4.ogg diff --git a/client/data/sounds/sheep_say1.ogg b/client/src/main/resources/sounds/sheep_say1.ogg similarity index 100% rename from client/data/sounds/sheep_say1.ogg rename to client/src/main/resources/sounds/sheep_say1.ogg diff --git a/client/data/sounds/sheep_say2.ogg b/client/src/main/resources/sounds/sheep_say2.ogg similarity index 100% rename from client/data/sounds/sheep_say2.ogg rename to client/src/main/resources/sounds/sheep_say2.ogg diff --git a/client/data/sounds/sheep_say3.ogg b/client/src/main/resources/sounds/sheep_say3.ogg similarity index 100% rename from client/data/sounds/sheep_say3.ogg rename to client/src/main/resources/sounds/sheep_say3.ogg diff --git a/client/data/sounds/slime_attack1.ogg b/client/src/main/resources/sounds/slime_attack1.ogg similarity index 100% rename from client/data/sounds/slime_attack1.ogg rename to client/src/main/resources/sounds/slime_attack1.ogg diff --git a/client/data/sounds/slime_attack2.ogg b/client/src/main/resources/sounds/slime_attack2.ogg similarity index 100% rename from client/data/sounds/slime_attack2.ogg rename to client/src/main/resources/sounds/slime_attack2.ogg diff --git a/client/data/sounds/slime_big1.ogg b/client/src/main/resources/sounds/slime_big1.ogg similarity index 100% rename from client/data/sounds/slime_big1.ogg rename to client/src/main/resources/sounds/slime_big1.ogg diff --git a/client/data/sounds/slime_big2.ogg b/client/src/main/resources/sounds/slime_big2.ogg similarity index 100% rename from client/data/sounds/slime_big2.ogg rename to client/src/main/resources/sounds/slime_big2.ogg diff --git a/client/data/sounds/slime_big3.ogg b/client/src/main/resources/sounds/slime_big3.ogg similarity index 100% rename from client/data/sounds/slime_big3.ogg rename to client/src/main/resources/sounds/slime_big3.ogg diff --git a/client/data/sounds/slime_big4.ogg b/client/src/main/resources/sounds/slime_big4.ogg similarity index 100% rename from client/data/sounds/slime_big4.ogg rename to client/src/main/resources/sounds/slime_big4.ogg diff --git a/client/data/sounds/slime_small1.ogg b/client/src/main/resources/sounds/slime_small1.ogg similarity index 100% rename from client/data/sounds/slime_small1.ogg rename to client/src/main/resources/sounds/slime_small1.ogg diff --git a/client/data/sounds/slime_small2.ogg b/client/src/main/resources/sounds/slime_small2.ogg similarity index 100% rename from client/data/sounds/slime_small2.ogg rename to client/src/main/resources/sounds/slime_small2.ogg diff --git a/client/data/sounds/slime_small3.ogg b/client/src/main/resources/sounds/slime_small3.ogg similarity index 100% rename from client/data/sounds/slime_small3.ogg rename to client/src/main/resources/sounds/slime_small3.ogg diff --git a/client/data/sounds/slime_small4.ogg b/client/src/main/resources/sounds/slime_small4.ogg similarity index 100% rename from client/data/sounds/slime_small4.ogg rename to client/src/main/resources/sounds/slime_small4.ogg diff --git a/client/data/sounds/slime_small5.ogg b/client/src/main/resources/sounds/slime_small5.ogg similarity index 100% rename from client/data/sounds/slime_small5.ogg rename to client/src/main/resources/sounds/slime_small5.ogg diff --git a/client/data/sounds/snow1.ogg b/client/src/main/resources/sounds/snow1.ogg similarity index 100% rename from client/data/sounds/snow1.ogg rename to client/src/main/resources/sounds/snow1.ogg diff --git a/client/data/sounds/snow2.ogg b/client/src/main/resources/sounds/snow2.ogg similarity index 100% rename from client/data/sounds/snow2.ogg rename to client/src/main/resources/sounds/snow2.ogg diff --git a/client/data/sounds/snow3.ogg b/client/src/main/resources/sounds/snow3.ogg similarity index 100% rename from client/data/sounds/snow3.ogg rename to client/src/main/resources/sounds/snow3.ogg diff --git a/client/data/sounds/snow4.ogg b/client/src/main/resources/sounds/snow4.ogg similarity index 100% rename from client/data/sounds/snow4.ogg rename to client/src/main/resources/sounds/snow4.ogg diff --git a/client/data/sounds/spell.ogg b/client/src/main/resources/sounds/spell.ogg similarity index 100% rename from client/data/sounds/spell.ogg rename to client/src/main/resources/sounds/spell.ogg diff --git a/client/data/sounds/splash.ogg b/client/src/main/resources/sounds/splash.ogg similarity index 100% rename from client/data/sounds/splash.ogg rename to client/src/main/resources/sounds/splash.ogg diff --git a/client/data/sounds/stone1.ogg b/client/src/main/resources/sounds/stone1.ogg similarity index 100% rename from client/data/sounds/stone1.ogg rename to client/src/main/resources/sounds/stone1.ogg diff --git a/client/data/sounds/stone2.ogg b/client/src/main/resources/sounds/stone2.ogg similarity index 100% rename from client/data/sounds/stone2.ogg rename to client/src/main/resources/sounds/stone2.ogg diff --git a/client/data/sounds/stone3.ogg b/client/src/main/resources/sounds/stone3.ogg similarity index 100% rename from client/data/sounds/stone3.ogg rename to client/src/main/resources/sounds/stone3.ogg diff --git a/client/data/sounds/stone4.ogg b/client/src/main/resources/sounds/stone4.ogg similarity index 100% rename from client/data/sounds/stone4.ogg rename to client/src/main/resources/sounds/stone4.ogg diff --git a/client/data/sounds/teleport.ogg b/client/src/main/resources/sounds/teleport.ogg similarity index 100% rename from client/data/sounds/teleport.ogg rename to client/src/main/resources/sounds/teleport.ogg diff --git a/client/data/sounds/teleport_back.ogg b/client/src/main/resources/sounds/teleport_back.ogg similarity index 100% rename from client/data/sounds/teleport_back.ogg rename to client/src/main/resources/sounds/teleport_back.ogg diff --git a/client/data/sounds/thunder1.ogg b/client/src/main/resources/sounds/thunder1.ogg similarity index 100% rename from client/data/sounds/thunder1.ogg rename to client/src/main/resources/sounds/thunder1.ogg diff --git a/client/data/sounds/thunder2.ogg b/client/src/main/resources/sounds/thunder2.ogg similarity index 100% rename from client/data/sounds/thunder2.ogg rename to client/src/main/resources/sounds/thunder2.ogg diff --git a/client/data/sounds/thunder3.ogg b/client/src/main/resources/sounds/thunder3.ogg similarity index 100% rename from client/data/sounds/thunder3.ogg rename to client/src/main/resources/sounds/thunder3.ogg diff --git a/client/data/sounds/twinkle.ogg b/client/src/main/resources/sounds/twinkle.ogg similarity index 100% rename from client/data/sounds/twinkle.ogg rename to client/src/main/resources/sounds/twinkle.ogg diff --git a/client/data/sounds/twinkle_far.ogg b/client/src/main/resources/sounds/twinkle_far.ogg similarity index 100% rename from client/data/sounds/twinkle_far.ogg rename to client/src/main/resources/sounds/twinkle_far.ogg diff --git a/client/data/sounds/water.ogg b/client/src/main/resources/sounds/water.ogg similarity index 100% rename from client/data/sounds/water.ogg rename to client/src/main/resources/sounds/water.ogg diff --git a/client/data/sounds/wolf_bark1.ogg b/client/src/main/resources/sounds/wolf_bark1.ogg similarity index 100% rename from client/data/sounds/wolf_bark1.ogg rename to client/src/main/resources/sounds/wolf_bark1.ogg diff --git a/client/data/sounds/wolf_bark2.ogg b/client/src/main/resources/sounds/wolf_bark2.ogg similarity index 100% rename from client/data/sounds/wolf_bark2.ogg rename to client/src/main/resources/sounds/wolf_bark2.ogg diff --git a/client/data/sounds/wolf_bark3.ogg b/client/src/main/resources/sounds/wolf_bark3.ogg similarity index 100% rename from client/data/sounds/wolf_bark3.ogg rename to client/src/main/resources/sounds/wolf_bark3.ogg diff --git a/client/data/sounds/wolf_death.ogg b/client/src/main/resources/sounds/wolf_death.ogg similarity index 100% rename from client/data/sounds/wolf_death.ogg rename to client/src/main/resources/sounds/wolf_death.ogg diff --git a/client/data/sounds/wolf_growl1.ogg b/client/src/main/resources/sounds/wolf_growl1.ogg similarity index 100% rename from client/data/sounds/wolf_growl1.ogg rename to client/src/main/resources/sounds/wolf_growl1.ogg diff --git a/client/data/sounds/wolf_growl2.ogg b/client/src/main/resources/sounds/wolf_growl2.ogg similarity index 100% rename from client/data/sounds/wolf_growl2.ogg rename to client/src/main/resources/sounds/wolf_growl2.ogg diff --git a/client/data/sounds/wolf_growl3.ogg b/client/src/main/resources/sounds/wolf_growl3.ogg similarity index 100% rename from client/data/sounds/wolf_growl3.ogg rename to client/src/main/resources/sounds/wolf_growl3.ogg diff --git a/client/data/sounds/wolf_hurt1.ogg b/client/src/main/resources/sounds/wolf_hurt1.ogg similarity index 100% rename from client/data/sounds/wolf_hurt1.ogg rename to client/src/main/resources/sounds/wolf_hurt1.ogg diff --git a/client/data/sounds/wolf_hurt2.ogg b/client/src/main/resources/sounds/wolf_hurt2.ogg similarity index 100% rename from client/data/sounds/wolf_hurt2.ogg rename to client/src/main/resources/sounds/wolf_hurt2.ogg diff --git a/client/data/sounds/wolf_hurt3.ogg b/client/src/main/resources/sounds/wolf_hurt3.ogg similarity index 100% rename from client/data/sounds/wolf_hurt3.ogg rename to client/src/main/resources/sounds/wolf_hurt3.ogg diff --git a/client/data/sounds/wolf_panting.ogg b/client/src/main/resources/sounds/wolf_panting.ogg similarity index 100% rename from client/data/sounds/wolf_panting.ogg rename to client/src/main/resources/sounds/wolf_panting.ogg diff --git a/client/data/sounds/wolf_shake.ogg b/client/src/main/resources/sounds/wolf_shake.ogg similarity index 100% rename from client/data/sounds/wolf_shake.ogg rename to client/src/main/resources/sounds/wolf_shake.ogg diff --git a/client/data/sounds/wolf_whine.ogg b/client/src/main/resources/sounds/wolf_whine.ogg similarity index 100% rename from client/data/sounds/wolf_whine.ogg rename to client/src/main/resources/sounds/wolf_whine.ogg diff --git a/client/data/sounds/wood1.ogg b/client/src/main/resources/sounds/wood1.ogg similarity index 100% rename from client/data/sounds/wood1.ogg rename to client/src/main/resources/sounds/wood1.ogg diff --git a/client/data/sounds/wood2.ogg b/client/src/main/resources/sounds/wood2.ogg similarity index 100% rename from client/data/sounds/wood2.ogg rename to client/src/main/resources/sounds/wood2.ogg diff --git a/client/data/sounds/wood3.ogg b/client/src/main/resources/sounds/wood3.ogg similarity index 100% rename from client/data/sounds/wood3.ogg rename to client/src/main/resources/sounds/wood3.ogg diff --git a/client/data/sounds/wood4.ogg b/client/src/main/resources/sounds/wood4.ogg similarity index 100% rename from client/data/sounds/wood4.ogg rename to client/src/main/resources/sounds/wood4.ogg diff --git a/client/data/textures/armor/ardite_layer_1.png b/client/src/main/resources/textures/armor/ardite_layer_1.png similarity index 100% rename from client/data/textures/armor/ardite_layer_1.png rename to client/src/main/resources/textures/armor/ardite_layer_1.png diff --git a/client/data/textures/armor/ardite_layer_2.png b/client/src/main/resources/textures/armor/ardite_layer_2.png similarity index 100% rename from client/data/textures/armor/ardite_layer_2.png rename to client/src/main/resources/textures/armor/ardite_layer_2.png diff --git a/client/data/textures/armor/chain_layer_1.png b/client/src/main/resources/textures/armor/chain_layer_1.png similarity index 100% rename from client/data/textures/armor/chain_layer_1.png rename to client/src/main/resources/textures/armor/chain_layer_1.png diff --git a/client/data/textures/armor/chain_layer_2.png b/client/src/main/resources/textures/armor/chain_layer_2.png similarity index 100% rename from client/data/textures/armor/chain_layer_2.png rename to client/src/main/resources/textures/armor/chain_layer_2.png diff --git a/client/data/textures/armor/cloth_layer_1.png b/client/src/main/resources/textures/armor/cloth_layer_1.png similarity index 100% rename from client/data/textures/armor/cloth_layer_1.png rename to client/src/main/resources/textures/armor/cloth_layer_1.png diff --git a/client/data/textures/armor/cloth_layer_1_overlay.png b/client/src/main/resources/textures/armor/cloth_layer_1_overlay.png similarity index 100% rename from client/data/textures/armor/cloth_layer_1_overlay.png rename to client/src/main/resources/textures/armor/cloth_layer_1_overlay.png diff --git a/client/data/textures/armor/cloth_layer_2.png b/client/src/main/resources/textures/armor/cloth_layer_2.png similarity index 100% rename from client/data/textures/armor/cloth_layer_2.png rename to client/src/main/resources/textures/armor/cloth_layer_2.png diff --git a/client/data/textures/armor/cloth_layer_2_overlay.png b/client/src/main/resources/textures/armor/cloth_layer_2_overlay.png similarity index 100% rename from client/data/textures/armor/cloth_layer_2_overlay.png rename to client/src/main/resources/textures/armor/cloth_layer_2_overlay.png diff --git a/client/data/textures/armor/diamond_layer_1.png b/client/src/main/resources/textures/armor/diamond_layer_1.png similarity index 100% rename from client/data/textures/armor/diamond_layer_1.png rename to client/src/main/resources/textures/armor/diamond_layer_1.png diff --git a/client/data/textures/armor/diamond_layer_2.png b/client/src/main/resources/textures/armor/diamond_layer_2.png similarity index 100% rename from client/data/textures/armor/diamond_layer_2.png rename to client/src/main/resources/textures/armor/diamond_layer_2.png diff --git a/client/data/textures/armor/gold_layer_1.png b/client/src/main/resources/textures/armor/gold_layer_1.png similarity index 100% rename from client/data/textures/armor/gold_layer_1.png rename to client/src/main/resources/textures/armor/gold_layer_1.png diff --git a/client/data/textures/armor/gold_layer_2.png b/client/src/main/resources/textures/armor/gold_layer_2.png similarity index 100% rename from client/data/textures/armor/gold_layer_2.png rename to client/src/main/resources/textures/armor/gold_layer_2.png diff --git a/client/data/textures/armor/horse_armor_diamond.png b/client/src/main/resources/textures/armor/horse_armor_diamond.png similarity index 100% rename from client/data/textures/armor/horse_armor_diamond.png rename to client/src/main/resources/textures/armor/horse_armor_diamond.png diff --git a/client/data/textures/armor/horse_armor_gold.png b/client/src/main/resources/textures/armor/horse_armor_gold.png similarity index 100% rename from client/data/textures/armor/horse_armor_gold.png rename to client/src/main/resources/textures/armor/horse_armor_gold.png diff --git a/client/data/textures/armor/horse_armor_iron.png b/client/src/main/resources/textures/armor/horse_armor_iron.png similarity index 100% rename from client/data/textures/armor/horse_armor_iron.png rename to client/src/main/resources/textures/armor/horse_armor_iron.png diff --git a/client/data/textures/armor/iron_layer_1.png b/client/src/main/resources/textures/armor/iron_layer_1.png similarity index 100% rename from client/data/textures/armor/iron_layer_1.png rename to client/src/main/resources/textures/armor/iron_layer_1.png diff --git a/client/data/textures/armor/iron_layer_2.png b/client/src/main/resources/textures/armor/iron_layer_2.png similarity index 100% rename from client/data/textures/armor/iron_layer_2.png rename to client/src/main/resources/textures/armor/iron_layer_2.png diff --git a/client/data/textures/armor/leather_layer_1.png b/client/src/main/resources/textures/armor/leather_layer_1.png similarity index 100% rename from client/data/textures/armor/leather_layer_1.png rename to client/src/main/resources/textures/armor/leather_layer_1.png diff --git a/client/data/textures/armor/leather_layer_1_overlay.png b/client/src/main/resources/textures/armor/leather_layer_1_overlay.png similarity index 100% rename from client/data/textures/armor/leather_layer_1_overlay.png rename to client/src/main/resources/textures/armor/leather_layer_1_overlay.png diff --git a/client/data/textures/armor/leather_layer_2.png b/client/src/main/resources/textures/armor/leather_layer_2.png similarity index 100% rename from client/data/textures/armor/leather_layer_2.png rename to client/src/main/resources/textures/armor/leather_layer_2.png diff --git a/client/data/textures/armor/leather_layer_2_overlay.png b/client/src/main/resources/textures/armor/leather_layer_2_overlay.png similarity index 100% rename from client/data/textures/armor/leather_layer_2_overlay.png rename to client/src/main/resources/textures/armor/leather_layer_2_overlay.png diff --git a/client/data/textures/armor/nichun_layer_1.png b/client/src/main/resources/textures/armor/nichun_layer_1.png similarity index 100% rename from client/data/textures/armor/nichun_layer_1.png rename to client/src/main/resources/textures/armor/nichun_layer_1.png diff --git a/client/data/textures/armor/nichun_layer_2.png b/client/src/main/resources/textures/armor/nichun_layer_2.png similarity index 100% rename from client/data/textures/armor/nichun_layer_2.png rename to client/src/main/resources/textures/armor/nichun_layer_2.png diff --git a/client/data/textures/armor/thetium_layer_1.png b/client/src/main/resources/textures/armor/thetium_layer_1.png similarity index 100% rename from client/data/textures/armor/thetium_layer_1.png rename to client/src/main/resources/textures/armor/thetium_layer_1.png diff --git a/client/data/textures/armor/thetium_layer_2.png b/client/src/main/resources/textures/armor/thetium_layer_2.png similarity index 100% rename from client/data/textures/armor/thetium_layer_2.png rename to client/src/main/resources/textures/armor/thetium_layer_2.png diff --git a/client/data/textures/background.png b/client/src/main/resources/textures/background.png similarity index 100% rename from client/data/textures/background.png rename to client/src/main/resources/textures/background.png diff --git a/client/data/textures/blocks/acacia_door_bottom.png b/client/src/main/resources/textures/blocks/acacia_door_bottom.png similarity index 100% rename from client/data/textures/blocks/acacia_door_bottom.png rename to client/src/main/resources/textures/blocks/acacia_door_bottom.png diff --git a/client/data/textures/blocks/acacia_door_top.png b/client/src/main/resources/textures/blocks/acacia_door_top.png similarity index 100% rename from client/data/textures/blocks/acacia_door_top.png rename to client/src/main/resources/textures/blocks/acacia_door_top.png diff --git a/client/data/textures/blocks/acacia_leaves_autumn.png b/client/src/main/resources/textures/blocks/acacia_leaves_autumn.png similarity index 100% rename from client/data/textures/blocks/acacia_leaves_autumn.png rename to client/src/main/resources/textures/blocks/acacia_leaves_autumn.png diff --git a/client/data/textures/blocks/acacia_leaves_snowy.png b/client/src/main/resources/textures/blocks/acacia_leaves_snowy.png similarity index 100% rename from client/data/textures/blocks/acacia_leaves_snowy.png rename to client/src/main/resources/textures/blocks/acacia_leaves_snowy.png diff --git a/client/data/textures/blocks/acacia_leaves_spring.png b/client/src/main/resources/textures/blocks/acacia_leaves_spring.png similarity index 100% rename from client/data/textures/blocks/acacia_leaves_spring.png rename to client/src/main/resources/textures/blocks/acacia_leaves_spring.png diff --git a/client/data/textures/blocks/acacia_leaves_summer.png b/client/src/main/resources/textures/blocks/acacia_leaves_summer.png similarity index 100% rename from client/data/textures/blocks/acacia_leaves_summer.png rename to client/src/main/resources/textures/blocks/acacia_leaves_summer.png diff --git a/client/data/textures/blocks/acacia_leaves_winter.png b/client/src/main/resources/textures/blocks/acacia_leaves_winter.png similarity index 100% rename from client/data/textures/blocks/acacia_leaves_winter.png rename to client/src/main/resources/textures/blocks/acacia_leaves_winter.png diff --git a/client/data/textures/blocks/acacia_log_bark.png b/client/src/main/resources/textures/blocks/acacia_log_bark.png similarity index 100% rename from client/data/textures/blocks/acacia_log_bark.png rename to client/src/main/resources/textures/blocks/acacia_log_bark.png diff --git a/client/data/textures/blocks/acacia_log_top.png b/client/src/main/resources/textures/blocks/acacia_log_top.png similarity index 100% rename from client/data/textures/blocks/acacia_log_top.png rename to client/src/main/resources/textures/blocks/acacia_log_top.png diff --git a/client/data/textures/blocks/acacia_planks.png b/client/src/main/resources/textures/blocks/acacia_planks.png similarity index 100% rename from client/data/textures/blocks/acacia_planks.png rename to client/src/main/resources/textures/blocks/acacia_planks.png diff --git a/client/data/textures/blocks/acacia_sapling.png b/client/src/main/resources/textures/blocks/acacia_sapling.png similarity index 100% rename from client/data/textures/blocks/acacia_sapling.png rename to client/src/main/resources/textures/blocks/acacia_sapling.png diff --git a/client/data/textures/blocks/acid_flow.png b/client/src/main/resources/textures/blocks/acid_flow.png similarity index 100% rename from client/data/textures/blocks/acid_flow.png rename to client/src/main/resources/textures/blocks/acid_flow.png diff --git a/client/data/textures/blocks/acid_still.png b/client/src/main/resources/textures/blocks/acid_still.png similarity index 100% rename from client/data/textures/blocks/acid_still.png rename to client/src/main/resources/textures/blocks/acid_still.png diff --git a/client/data/textures/blocks/activator_rail.png b/client/src/main/resources/textures/blocks/activator_rail.png similarity index 100% rename from client/data/textures/blocks/activator_rail.png rename to client/src/main/resources/textures/blocks/activator_rail.png diff --git a/client/data/textures/blocks/activator_rail_powered.png b/client/src/main/resources/textures/blocks/activator_rail_powered.png similarity index 100% rename from client/data/textures/blocks/activator_rail_powered.png rename to client/src/main/resources/textures/blocks/activator_rail_powered.png diff --git a/client/data/textures/blocks/allium.png b/client/src/main/resources/textures/blocks/allium.png similarity index 100% rename from client/data/textures/blocks/allium.png rename to client/src/main/resources/textures/blocks/allium.png diff --git a/client/data/textures/blocks/aluminium_block.png b/client/src/main/resources/textures/blocks/aluminium_block.png similarity index 100% rename from client/data/textures/blocks/aluminium_block.png rename to client/src/main/resources/textures/blocks/aluminium_block.png diff --git a/client/data/textures/blocks/aluminium_ore.png b/client/src/main/resources/textures/blocks/aluminium_ore.png similarity index 100% rename from client/data/textures/blocks/aluminium_ore.png rename to client/src/main/resources/textures/blocks/aluminium_ore.png diff --git a/client/data/textures/blocks/antimony_block.png b/client/src/main/resources/textures/blocks/antimony_block.png similarity index 100% rename from client/data/textures/blocks/antimony_block.png rename to client/src/main/resources/textures/blocks/antimony_block.png diff --git a/client/data/textures/blocks/antimony_ore.png b/client/src/main/resources/textures/blocks/antimony_ore.png similarity index 100% rename from client/data/textures/blocks/antimony_ore.png rename to client/src/main/resources/textures/blocks/antimony_ore.png diff --git a/client/data/textures/blocks/anvil_base.png b/client/src/main/resources/textures/blocks/anvil_base.png similarity index 100% rename from client/data/textures/blocks/anvil_base.png rename to client/src/main/resources/textures/blocks/anvil_base.png diff --git a/client/data/textures/blocks/anvil_top_0.png b/client/src/main/resources/textures/blocks/anvil_top_0.png similarity index 100% rename from client/data/textures/blocks/anvil_top_0.png rename to client/src/main/resources/textures/blocks/anvil_top_0.png diff --git a/client/data/textures/blocks/anvil_top_1.png b/client/src/main/resources/textures/blocks/anvil_top_1.png similarity index 100% rename from client/data/textures/blocks/anvil_top_1.png rename to client/src/main/resources/textures/blocks/anvil_top_1.png diff --git a/client/data/textures/blocks/anvil_top_2.png b/client/src/main/resources/textures/blocks/anvil_top_2.png similarity index 100% rename from client/data/textures/blocks/anvil_top_2.png rename to client/src/main/resources/textures/blocks/anvil_top_2.png diff --git a/client/data/textures/blocks/ardite_block.png b/client/src/main/resources/textures/blocks/ardite_block.png similarity index 100% rename from client/data/textures/blocks/ardite_block.png rename to client/src/main/resources/textures/blocks/ardite_block.png diff --git a/client/data/textures/blocks/ardite_ore.png b/client/src/main/resources/textures/blocks/ardite_ore.png similarity index 100% rename from client/data/textures/blocks/ardite_ore.png rename to client/src/main/resources/textures/blocks/ardite_ore.png diff --git a/client/data/textures/blocks/arsenic_block.png b/client/src/main/resources/textures/blocks/arsenic_block.png similarity index 100% rename from client/data/textures/blocks/arsenic_block.png rename to client/src/main/resources/textures/blocks/arsenic_block.png diff --git a/client/data/textures/blocks/arsenic_ore.png b/client/src/main/resources/textures/blocks/arsenic_ore.png similarity index 100% rename from client/data/textures/blocks/arsenic_ore.png rename to client/src/main/resources/textures/blocks/arsenic_ore.png diff --git a/client/data/textures/blocks/ash.png b/client/src/main/resources/textures/blocks/ash.png similarity index 100% rename from client/data/textures/blocks/ash.png rename to client/src/main/resources/textures/blocks/ash.png diff --git a/client/data/textures/blocks/banner.png b/client/src/main/resources/textures/blocks/banner.png similarity index 100% rename from client/data/textures/blocks/banner.png rename to client/src/main/resources/textures/blocks/banner.png diff --git a/client/data/textures/blocks/banner_base.png b/client/src/main/resources/textures/blocks/banner_base.png similarity index 100% rename from client/data/textures/blocks/banner_base.png rename to client/src/main/resources/textures/blocks/banner_base.png diff --git a/client/data/textures/blocks/banner_border.png b/client/src/main/resources/textures/blocks/banner_border.png similarity index 100% rename from client/data/textures/blocks/banner_border.png rename to client/src/main/resources/textures/blocks/banner_border.png diff --git a/client/data/textures/blocks/banner_bricks.png b/client/src/main/resources/textures/blocks/banner_bricks.png similarity index 100% rename from client/data/textures/blocks/banner_bricks.png rename to client/src/main/resources/textures/blocks/banner_bricks.png diff --git a/client/data/textures/blocks/banner_circle.png b/client/src/main/resources/textures/blocks/banner_circle.png similarity index 100% rename from client/data/textures/blocks/banner_circle.png rename to client/src/main/resources/textures/blocks/banner_circle.png diff --git a/client/data/textures/blocks/banner_cross.png b/client/src/main/resources/textures/blocks/banner_cross.png similarity index 100% rename from client/data/textures/blocks/banner_cross.png rename to client/src/main/resources/textures/blocks/banner_cross.png diff --git a/client/data/textures/blocks/banner_curly_border.png b/client/src/main/resources/textures/blocks/banner_curly_border.png similarity index 100% rename from client/data/textures/blocks/banner_curly_border.png rename to client/src/main/resources/textures/blocks/banner_curly_border.png diff --git a/client/data/textures/blocks/banner_diagonal_left.png b/client/src/main/resources/textures/blocks/banner_diagonal_left.png similarity index 100% rename from client/data/textures/blocks/banner_diagonal_left.png rename to client/src/main/resources/textures/blocks/banner_diagonal_left.png diff --git a/client/data/textures/blocks/banner_diagonal_right.png b/client/src/main/resources/textures/blocks/banner_diagonal_right.png similarity index 100% rename from client/data/textures/blocks/banner_diagonal_right.png rename to client/src/main/resources/textures/blocks/banner_diagonal_right.png diff --git a/client/data/textures/blocks/banner_diagonal_up_left.png b/client/src/main/resources/textures/blocks/banner_diagonal_up_left.png similarity index 100% rename from client/data/textures/blocks/banner_diagonal_up_left.png rename to client/src/main/resources/textures/blocks/banner_diagonal_up_left.png diff --git a/client/data/textures/blocks/banner_diagonal_up_right.png b/client/src/main/resources/textures/blocks/banner_diagonal_up_right.png similarity index 100% rename from client/data/textures/blocks/banner_diagonal_up_right.png rename to client/src/main/resources/textures/blocks/banner_diagonal_up_right.png diff --git a/client/data/textures/blocks/banner_flower.png b/client/src/main/resources/textures/blocks/banner_flower.png similarity index 100% rename from client/data/textures/blocks/banner_flower.png rename to client/src/main/resources/textures/blocks/banner_flower.png diff --git a/client/data/textures/blocks/banner_gradient.png b/client/src/main/resources/textures/blocks/banner_gradient.png similarity index 100% rename from client/data/textures/blocks/banner_gradient.png rename to client/src/main/resources/textures/blocks/banner_gradient.png diff --git a/client/data/textures/blocks/banner_gradient_up.png b/client/src/main/resources/textures/blocks/banner_gradient_up.png similarity index 100% rename from client/data/textures/blocks/banner_gradient_up.png rename to client/src/main/resources/textures/blocks/banner_gradient_up.png diff --git a/client/data/textures/blocks/banner_half_horizontal.png b/client/src/main/resources/textures/blocks/banner_half_horizontal.png similarity index 100% rename from client/data/textures/blocks/banner_half_horizontal.png rename to client/src/main/resources/textures/blocks/banner_half_horizontal.png diff --git a/client/data/textures/blocks/banner_half_horizontal_bottom.png b/client/src/main/resources/textures/blocks/banner_half_horizontal_bottom.png similarity index 100% rename from client/data/textures/blocks/banner_half_horizontal_bottom.png rename to client/src/main/resources/textures/blocks/banner_half_horizontal_bottom.png diff --git a/client/data/textures/blocks/banner_half_vertical.png b/client/src/main/resources/textures/blocks/banner_half_vertical.png similarity index 100% rename from client/data/textures/blocks/banner_half_vertical.png rename to client/src/main/resources/textures/blocks/banner_half_vertical.png diff --git a/client/data/textures/blocks/banner_half_vertical_right.png b/client/src/main/resources/textures/blocks/banner_half_vertical_right.png similarity index 100% rename from client/data/textures/blocks/banner_half_vertical_right.png rename to client/src/main/resources/textures/blocks/banner_half_vertical_right.png diff --git a/client/data/textures/blocks/banner_rhombus.png b/client/src/main/resources/textures/blocks/banner_rhombus.png similarity index 100% rename from client/data/textures/blocks/banner_rhombus.png rename to client/src/main/resources/textures/blocks/banner_rhombus.png diff --git a/client/data/textures/blocks/banner_rune.png b/client/src/main/resources/textures/blocks/banner_rune.png similarity index 100% rename from client/data/textures/blocks/banner_rune.png rename to client/src/main/resources/textures/blocks/banner_rune.png diff --git a/client/data/textures/blocks/banner_skull.png b/client/src/main/resources/textures/blocks/banner_skull.png similarity index 100% rename from client/data/textures/blocks/banner_skull.png rename to client/src/main/resources/textures/blocks/banner_skull.png diff --git a/client/data/textures/blocks/banner_small_stripes.png b/client/src/main/resources/textures/blocks/banner_small_stripes.png similarity index 100% rename from client/data/textures/blocks/banner_small_stripes.png rename to client/src/main/resources/textures/blocks/banner_small_stripes.png diff --git a/client/data/textures/blocks/banner_square_bottom_left.png b/client/src/main/resources/textures/blocks/banner_square_bottom_left.png similarity index 100% rename from client/data/textures/blocks/banner_square_bottom_left.png rename to client/src/main/resources/textures/blocks/banner_square_bottom_left.png diff --git a/client/data/textures/blocks/banner_square_bottom_right.png b/client/src/main/resources/textures/blocks/banner_square_bottom_right.png similarity index 100% rename from client/data/textures/blocks/banner_square_bottom_right.png rename to client/src/main/resources/textures/blocks/banner_square_bottom_right.png diff --git a/client/data/textures/blocks/banner_square_top_left.png b/client/src/main/resources/textures/blocks/banner_square_top_left.png similarity index 100% rename from client/data/textures/blocks/banner_square_top_left.png rename to client/src/main/resources/textures/blocks/banner_square_top_left.png diff --git a/client/data/textures/blocks/banner_square_top_right.png b/client/src/main/resources/textures/blocks/banner_square_top_right.png similarity index 100% rename from client/data/textures/blocks/banner_square_top_right.png rename to client/src/main/resources/textures/blocks/banner_square_top_right.png diff --git a/client/data/textures/blocks/banner_straight_cross.png b/client/src/main/resources/textures/blocks/banner_straight_cross.png similarity index 100% rename from client/data/textures/blocks/banner_straight_cross.png rename to client/src/main/resources/textures/blocks/banner_straight_cross.png diff --git a/client/data/textures/blocks/banner_stripe_bottom.png b/client/src/main/resources/textures/blocks/banner_stripe_bottom.png similarity index 100% rename from client/data/textures/blocks/banner_stripe_bottom.png rename to client/src/main/resources/textures/blocks/banner_stripe_bottom.png diff --git a/client/data/textures/blocks/banner_stripe_center.png b/client/src/main/resources/textures/blocks/banner_stripe_center.png similarity index 100% rename from client/data/textures/blocks/banner_stripe_center.png rename to client/src/main/resources/textures/blocks/banner_stripe_center.png diff --git a/client/data/textures/blocks/banner_stripe_downleft.png b/client/src/main/resources/textures/blocks/banner_stripe_downleft.png similarity index 100% rename from client/data/textures/blocks/banner_stripe_downleft.png rename to client/src/main/resources/textures/blocks/banner_stripe_downleft.png diff --git a/client/data/textures/blocks/banner_stripe_downright.png b/client/src/main/resources/textures/blocks/banner_stripe_downright.png similarity index 100% rename from client/data/textures/blocks/banner_stripe_downright.png rename to client/src/main/resources/textures/blocks/banner_stripe_downright.png diff --git a/client/data/textures/blocks/banner_stripe_left.png b/client/src/main/resources/textures/blocks/banner_stripe_left.png similarity index 100% rename from client/data/textures/blocks/banner_stripe_left.png rename to client/src/main/resources/textures/blocks/banner_stripe_left.png diff --git a/client/data/textures/blocks/banner_stripe_middle.png b/client/src/main/resources/textures/blocks/banner_stripe_middle.png similarity index 100% rename from client/data/textures/blocks/banner_stripe_middle.png rename to client/src/main/resources/textures/blocks/banner_stripe_middle.png diff --git a/client/data/textures/blocks/banner_stripe_right.png b/client/src/main/resources/textures/blocks/banner_stripe_right.png similarity index 100% rename from client/data/textures/blocks/banner_stripe_right.png rename to client/src/main/resources/textures/blocks/banner_stripe_right.png diff --git a/client/data/textures/blocks/banner_stripe_top.png b/client/src/main/resources/textures/blocks/banner_stripe_top.png similarity index 100% rename from client/data/textures/blocks/banner_stripe_top.png rename to client/src/main/resources/textures/blocks/banner_stripe_top.png diff --git a/client/data/textures/blocks/banner_thing.png b/client/src/main/resources/textures/blocks/banner_thing.png similarity index 100% rename from client/data/textures/blocks/banner_thing.png rename to client/src/main/resources/textures/blocks/banner_thing.png diff --git a/client/data/textures/blocks/banner_triangle_bottom.png b/client/src/main/resources/textures/blocks/banner_triangle_bottom.png similarity index 100% rename from client/data/textures/blocks/banner_triangle_bottom.png rename to client/src/main/resources/textures/blocks/banner_triangle_bottom.png diff --git a/client/data/textures/blocks/banner_triangle_top.png b/client/src/main/resources/textures/blocks/banner_triangle_top.png similarity index 100% rename from client/data/textures/blocks/banner_triangle_top.png rename to client/src/main/resources/textures/blocks/banner_triangle_top.png diff --git a/client/data/textures/blocks/banner_triangles_bottom.png b/client/src/main/resources/textures/blocks/banner_triangles_bottom.png similarity index 100% rename from client/data/textures/blocks/banner_triangles_bottom.png rename to client/src/main/resources/textures/blocks/banner_triangles_bottom.png diff --git a/client/data/textures/blocks/banner_triangles_top.png b/client/src/main/resources/textures/blocks/banner_triangles_top.png similarity index 100% rename from client/data/textures/blocks/banner_triangles_top.png rename to client/src/main/resources/textures/blocks/banner_triangles_top.png diff --git a/client/data/textures/blocks/beacon.png b/client/src/main/resources/textures/blocks/beacon.png similarity index 100% rename from client/data/textures/blocks/beacon.png rename to client/src/main/resources/textures/blocks/beacon.png diff --git a/client/data/textures/blocks/beacon_beam.png b/client/src/main/resources/textures/blocks/beacon_beam.png similarity index 100% rename from client/data/textures/blocks/beacon_beam.png rename to client/src/main/resources/textures/blocks/beacon_beam.png diff --git a/client/data/textures/blocks/bedrock.png b/client/src/main/resources/textures/blocks/bedrock.png similarity index 100% rename from client/data/textures/blocks/bedrock.png rename to client/src/main/resources/textures/blocks/bedrock.png diff --git a/client/data/textures/blocks/birch_door_bottom.png b/client/src/main/resources/textures/blocks/birch_door_bottom.png similarity index 100% rename from client/data/textures/blocks/birch_door_bottom.png rename to client/src/main/resources/textures/blocks/birch_door_bottom.png diff --git a/client/data/textures/blocks/birch_door_top.png b/client/src/main/resources/textures/blocks/birch_door_top.png similarity index 100% rename from client/data/textures/blocks/birch_door_top.png rename to client/src/main/resources/textures/blocks/birch_door_top.png diff --git a/client/data/textures/blocks/birch_leaves_autumn.png b/client/src/main/resources/textures/blocks/birch_leaves_autumn.png similarity index 100% rename from client/data/textures/blocks/birch_leaves_autumn.png rename to client/src/main/resources/textures/blocks/birch_leaves_autumn.png diff --git a/client/data/textures/blocks/birch_leaves_snowy.png b/client/src/main/resources/textures/blocks/birch_leaves_snowy.png similarity index 100% rename from client/data/textures/blocks/birch_leaves_snowy.png rename to client/src/main/resources/textures/blocks/birch_leaves_snowy.png diff --git a/client/data/textures/blocks/birch_leaves_spring.png b/client/src/main/resources/textures/blocks/birch_leaves_spring.png similarity index 100% rename from client/data/textures/blocks/birch_leaves_spring.png rename to client/src/main/resources/textures/blocks/birch_leaves_spring.png diff --git a/client/data/textures/blocks/birch_leaves_summer.png b/client/src/main/resources/textures/blocks/birch_leaves_summer.png similarity index 100% rename from client/data/textures/blocks/birch_leaves_summer.png rename to client/src/main/resources/textures/blocks/birch_leaves_summer.png diff --git a/client/data/textures/blocks/birch_leaves_winter.png b/client/src/main/resources/textures/blocks/birch_leaves_winter.png similarity index 100% rename from client/data/textures/blocks/birch_leaves_winter.png rename to client/src/main/resources/textures/blocks/birch_leaves_winter.png diff --git a/client/data/textures/blocks/birch_log_bark.png b/client/src/main/resources/textures/blocks/birch_log_bark.png similarity index 100% rename from client/data/textures/blocks/birch_log_bark.png rename to client/src/main/resources/textures/blocks/birch_log_bark.png diff --git a/client/data/textures/blocks/birch_log_top.png b/client/src/main/resources/textures/blocks/birch_log_top.png similarity index 100% rename from client/data/textures/blocks/birch_log_top.png rename to client/src/main/resources/textures/blocks/birch_log_top.png diff --git a/client/data/textures/blocks/birch_planks.png b/client/src/main/resources/textures/blocks/birch_planks.png similarity index 100% rename from client/data/textures/blocks/birch_planks.png rename to client/src/main/resources/textures/blocks/birch_planks.png diff --git a/client/data/textures/blocks/birch_sapling.png b/client/src/main/resources/textures/blocks/birch_sapling.png similarity index 100% rename from client/data/textures/blocks/birch_sapling.png rename to client/src/main/resources/textures/blocks/birch_sapling.png diff --git a/client/data/textures/blocks/bismuth_block.png b/client/src/main/resources/textures/blocks/bismuth_block.png similarity index 100% rename from client/data/textures/blocks/bismuth_block.png rename to client/src/main/resources/textures/blocks/bismuth_block.png diff --git a/client/data/textures/blocks/bismuth_ore.png b/client/src/main/resources/textures/blocks/bismuth_ore.png similarity index 100% rename from client/data/textures/blocks/bismuth_ore.png rename to client/src/main/resources/textures/blocks/bismuth_ore.png diff --git a/client/data/textures/blocks/black_bed_foot_end.png b/client/src/main/resources/textures/blocks/black_bed_foot_end.png similarity index 100% rename from client/data/textures/blocks/black_bed_foot_end.png rename to client/src/main/resources/textures/blocks/black_bed_foot_end.png diff --git a/client/data/textures/blocks/black_bed_foot_side.png b/client/src/main/resources/textures/blocks/black_bed_foot_side.png similarity index 100% rename from client/data/textures/blocks/black_bed_foot_side.png rename to client/src/main/resources/textures/blocks/black_bed_foot_side.png diff --git a/client/data/textures/blocks/black_bed_foot_top.png b/client/src/main/resources/textures/blocks/black_bed_foot_top.png similarity index 100% rename from client/data/textures/blocks/black_bed_foot_top.png rename to client/src/main/resources/textures/blocks/black_bed_foot_top.png diff --git a/client/data/textures/blocks/black_bed_head_end.png b/client/src/main/resources/textures/blocks/black_bed_head_end.png similarity index 100% rename from client/data/textures/blocks/black_bed_head_end.png rename to client/src/main/resources/textures/blocks/black_bed_head_end.png diff --git a/client/data/textures/blocks/black_bed_head_side.png b/client/src/main/resources/textures/blocks/black_bed_head_side.png similarity index 100% rename from client/data/textures/blocks/black_bed_head_side.png rename to client/src/main/resources/textures/blocks/black_bed_head_side.png diff --git a/client/data/textures/blocks/black_bed_head_top.png b/client/src/main/resources/textures/blocks/black_bed_head_top.png similarity index 100% rename from client/data/textures/blocks/black_bed_head_top.png rename to client/src/main/resources/textures/blocks/black_bed_head_top.png diff --git a/client/data/textures/blocks/black_brick.png b/client/src/main/resources/textures/blocks/black_brick.png similarity index 100% rename from client/data/textures/blocks/black_brick.png rename to client/src/main/resources/textures/blocks/black_brick.png diff --git a/client/data/textures/blocks/black_glass.png b/client/src/main/resources/textures/blocks/black_glass.png similarity index 100% rename from client/data/textures/blocks/black_glass.png rename to client/src/main/resources/textures/blocks/black_glass.png diff --git a/client/data/textures/blocks/black_glass_pane.png b/client/src/main/resources/textures/blocks/black_glass_pane.png similarity index 100% rename from client/data/textures/blocks/black_glass_pane.png rename to client/src/main/resources/textures/blocks/black_glass_pane.png diff --git a/client/data/textures/blocks/black_lotus.png b/client/src/main/resources/textures/blocks/black_lotus.png similarity index 100% rename from client/data/textures/blocks/black_lotus.png rename to client/src/main/resources/textures/blocks/black_lotus.png diff --git a/client/data/textures/blocks/black_metal_block.png b/client/src/main/resources/textures/blocks/black_metal_block.png similarity index 100% rename from client/data/textures/blocks/black_metal_block.png rename to client/src/main/resources/textures/blocks/black_metal_block.png diff --git a/client/data/textures/blocks/black_metal_ore.png b/client/src/main/resources/textures/blocks/black_metal_ore.png similarity index 100% rename from client/data/textures/blocks/black_metal_ore.png rename to client/src/main/resources/textures/blocks/black_metal_ore.png diff --git a/client/data/textures/blocks/black_quartz_block_bottom.png b/client/src/main/resources/textures/blocks/black_quartz_block_bottom.png similarity index 100% rename from client/data/textures/blocks/black_quartz_block_bottom.png rename to client/src/main/resources/textures/blocks/black_quartz_block_bottom.png diff --git a/client/data/textures/blocks/black_quartz_block_chiseled.png b/client/src/main/resources/textures/blocks/black_quartz_block_chiseled.png similarity index 100% rename from client/data/textures/blocks/black_quartz_block_chiseled.png rename to client/src/main/resources/textures/blocks/black_quartz_block_chiseled.png diff --git a/client/data/textures/blocks/black_quartz_block_chiseled_top.png b/client/src/main/resources/textures/blocks/black_quartz_block_chiseled_top.png similarity index 100% rename from client/data/textures/blocks/black_quartz_block_chiseled_top.png rename to client/src/main/resources/textures/blocks/black_quartz_block_chiseled_top.png diff --git a/client/data/textures/blocks/black_quartz_block_lines.png b/client/src/main/resources/textures/blocks/black_quartz_block_lines.png similarity index 100% rename from client/data/textures/blocks/black_quartz_block_lines.png rename to client/src/main/resources/textures/blocks/black_quartz_block_lines.png diff --git a/client/data/textures/blocks/black_quartz_block_lines_top.png b/client/src/main/resources/textures/blocks/black_quartz_block_lines_top.png similarity index 100% rename from client/data/textures/blocks/black_quartz_block_lines_top.png rename to client/src/main/resources/textures/blocks/black_quartz_block_lines_top.png diff --git a/client/data/textures/blocks/black_quartz_block_side.png b/client/src/main/resources/textures/blocks/black_quartz_block_side.png similarity index 100% rename from client/data/textures/blocks/black_quartz_block_side.png rename to client/src/main/resources/textures/blocks/black_quartz_block_side.png diff --git a/client/data/textures/blocks/black_quartz_ore.png b/client/src/main/resources/textures/blocks/black_quartz_ore.png similarity index 100% rename from client/data/textures/blocks/black_quartz_ore.png rename to client/src/main/resources/textures/blocks/black_quartz_ore.png diff --git a/client/data/textures/blocks/black_quartz_top.png b/client/src/main/resources/textures/blocks/black_quartz_top.png similarity index 100% rename from client/data/textures/blocks/black_quartz_top.png rename to client/src/main/resources/textures/blocks/black_quartz_top.png diff --git a/client/data/textures/blocks/black_stained_hardened_clay.png b/client/src/main/resources/textures/blocks/black_stained_hardened_clay.png similarity index 100% rename from client/data/textures/blocks/black_stained_hardened_clay.png rename to client/src/main/resources/textures/blocks/black_stained_hardened_clay.png diff --git a/client/data/textures/blocks/black_wool.png b/client/src/main/resources/textures/blocks/black_wool.png similarity index 100% rename from client/data/textures/blocks/black_wool.png rename to client/src/main/resources/textures/blocks/black_wool.png diff --git a/client/data/textures/blocks/blackened_cobble.png b/client/src/main/resources/textures/blocks/blackened_cobble.png similarity index 100% rename from client/data/textures/blocks/blackened_cobble.png rename to client/src/main/resources/textures/blocks/blackened_cobble.png diff --git a/client/data/textures/blocks/blackened_dirt.png b/client/src/main/resources/textures/blocks/blackened_dirt.png similarity index 100% rename from client/data/textures/blocks/blackened_dirt.png rename to client/src/main/resources/textures/blocks/blackened_dirt.png diff --git a/client/data/textures/blocks/blackened_soil_side.png b/client/src/main/resources/textures/blocks/blackened_soil_side.png similarity index 100% rename from client/data/textures/blocks/blackened_soil_side.png rename to client/src/main/resources/textures/blocks/blackened_soil_side.png diff --git a/client/data/textures/blocks/blackened_soil_top.png b/client/src/main/resources/textures/blocks/blackened_soil_top.png similarity index 100% rename from client/data/textures/blocks/blackened_soil_top.png rename to client/src/main/resources/textures/blocks/blackened_soil_top.png diff --git a/client/data/textures/blocks/blackened_stone.png b/client/src/main/resources/textures/blocks/blackened_stone.png similarity index 100% rename from client/data/textures/blocks/blackened_stone.png rename to client/src/main/resources/textures/blocks/blackened_stone.png diff --git a/client/data/textures/blocks/blackwood_door_bottom.png b/client/src/main/resources/textures/blocks/blackwood_door_bottom.png similarity index 100% rename from client/data/textures/blocks/blackwood_door_bottom.png rename to client/src/main/resources/textures/blocks/blackwood_door_bottom.png diff --git a/client/data/textures/blocks/blackwood_door_top.png b/client/src/main/resources/textures/blocks/blackwood_door_top.png similarity index 100% rename from client/data/textures/blocks/blackwood_door_top.png rename to client/src/main/resources/textures/blocks/blackwood_door_top.png diff --git a/client/data/textures/blocks/blackwood_leaves_autumn.png b/client/src/main/resources/textures/blocks/blackwood_leaves_autumn.png similarity index 100% rename from client/data/textures/blocks/blackwood_leaves_autumn.png rename to client/src/main/resources/textures/blocks/blackwood_leaves_autumn.png diff --git a/client/data/textures/blocks/blackwood_leaves_snowy.png b/client/src/main/resources/textures/blocks/blackwood_leaves_snowy.png similarity index 100% rename from client/data/textures/blocks/blackwood_leaves_snowy.png rename to client/src/main/resources/textures/blocks/blackwood_leaves_snowy.png diff --git a/client/data/textures/blocks/blackwood_leaves_spring.png b/client/src/main/resources/textures/blocks/blackwood_leaves_spring.png similarity index 100% rename from client/data/textures/blocks/blackwood_leaves_spring.png rename to client/src/main/resources/textures/blocks/blackwood_leaves_spring.png diff --git a/client/data/textures/blocks/blackwood_leaves_summer.png b/client/src/main/resources/textures/blocks/blackwood_leaves_summer.png similarity index 100% rename from client/data/textures/blocks/blackwood_leaves_summer.png rename to client/src/main/resources/textures/blocks/blackwood_leaves_summer.png diff --git a/client/data/textures/blocks/blackwood_leaves_winter.png b/client/src/main/resources/textures/blocks/blackwood_leaves_winter.png similarity index 100% rename from client/data/textures/blocks/blackwood_leaves_winter.png rename to client/src/main/resources/textures/blocks/blackwood_leaves_winter.png diff --git a/client/data/textures/blocks/blackwood_log_bark.png b/client/src/main/resources/textures/blocks/blackwood_log_bark.png similarity index 100% rename from client/data/textures/blocks/blackwood_log_bark.png rename to client/src/main/resources/textures/blocks/blackwood_log_bark.png diff --git a/client/data/textures/blocks/blackwood_log_top.png b/client/src/main/resources/textures/blocks/blackwood_log_top.png similarity index 100% rename from client/data/textures/blocks/blackwood_log_top.png rename to client/src/main/resources/textures/blocks/blackwood_log_top.png diff --git a/client/data/textures/blocks/blackwood_planks.png b/client/src/main/resources/textures/blocks/blackwood_planks.png similarity index 100% rename from client/data/textures/blocks/blackwood_planks.png rename to client/src/main/resources/textures/blocks/blackwood_planks.png diff --git a/client/data/textures/blocks/blackwood_sapling.png b/client/src/main/resources/textures/blocks/blackwood_sapling.png similarity index 100% rename from client/data/textures/blocks/blackwood_sapling.png rename to client/src/main/resources/textures/blocks/blackwood_sapling.png diff --git a/client/data/textures/blocks/blood_brick.png b/client/src/main/resources/textures/blocks/blood_brick.png similarity index 100% rename from client/data/textures/blocks/blood_brick.png rename to client/src/main/resources/textures/blocks/blood_brick.png diff --git a/client/data/textures/blocks/blood_flow.png b/client/src/main/resources/textures/blocks/blood_flow.png similarity index 100% rename from client/data/textures/blocks/blood_flow.png rename to client/src/main/resources/textures/blocks/blood_flow.png diff --git a/client/data/textures/blocks/blood_still.png b/client/src/main/resources/textures/blocks/blood_still.png similarity index 100% rename from client/data/textures/blocks/blood_still.png rename to client/src/main/resources/textures/blocks/blood_still.png diff --git a/client/data/textures/blocks/blue_glass.png b/client/src/main/resources/textures/blocks/blue_glass.png similarity index 100% rename from client/data/textures/blocks/blue_glass.png rename to client/src/main/resources/textures/blocks/blue_glass.png diff --git a/client/data/textures/blocks/blue_glass_pane.png b/client/src/main/resources/textures/blocks/blue_glass_pane.png similarity index 100% rename from client/data/textures/blocks/blue_glass_pane.png rename to client/src/main/resources/textures/blocks/blue_glass_pane.png diff --git a/client/data/textures/blocks/blue_mushroom.png b/client/src/main/resources/textures/blocks/blue_mushroom.png similarity index 100% rename from client/data/textures/blocks/blue_mushroom.png rename to client/src/main/resources/textures/blocks/blue_mushroom.png diff --git a/client/data/textures/blocks/blue_orchid.png b/client/src/main/resources/textures/blocks/blue_orchid.png similarity index 100% rename from client/data/textures/blocks/blue_orchid.png rename to client/src/main/resources/textures/blocks/blue_orchid.png diff --git a/client/data/textures/blocks/blue_stained_hardened_clay.png b/client/src/main/resources/textures/blocks/blue_stained_hardened_clay.png similarity index 100% rename from client/data/textures/blocks/blue_stained_hardened_clay.png rename to client/src/main/resources/textures/blocks/blue_stained_hardened_clay.png diff --git a/client/data/textures/blocks/blue_wool.png b/client/src/main/resources/textures/blocks/blue_wool.png similarity index 100% rename from client/data/textures/blocks/blue_wool.png rename to client/src/main/resources/textures/blocks/blue_wool.png diff --git a/client/data/textures/blocks/bookshelf.png b/client/src/main/resources/textures/blocks/bookshelf.png similarity index 100% rename from client/data/textures/blocks/bookshelf.png rename to client/src/main/resources/textures/blocks/bookshelf.png diff --git a/client/data/textures/blocks/brewing_stand.png b/client/src/main/resources/textures/blocks/brewing_stand.png similarity index 100% rename from client/data/textures/blocks/brewing_stand.png rename to client/src/main/resources/textures/blocks/brewing_stand.png diff --git a/client/data/textures/blocks/brewing_stand_base.png b/client/src/main/resources/textures/blocks/brewing_stand_base.png similarity index 100% rename from client/data/textures/blocks/brewing_stand_base.png rename to client/src/main/resources/textures/blocks/brewing_stand_base.png diff --git a/client/data/textures/blocks/brick_block.png b/client/src/main/resources/textures/blocks/brick_block.png similarity index 100% rename from client/data/textures/blocks/brick_block.png rename to client/src/main/resources/textures/blocks/brick_block.png diff --git a/client/data/textures/blocks/brown_glass.png b/client/src/main/resources/textures/blocks/brown_glass.png similarity index 100% rename from client/data/textures/blocks/brown_glass.png rename to client/src/main/resources/textures/blocks/brown_glass.png diff --git a/client/data/textures/blocks/brown_glass_pane.png b/client/src/main/resources/textures/blocks/brown_glass_pane.png similarity index 100% rename from client/data/textures/blocks/brown_glass_pane.png rename to client/src/main/resources/textures/blocks/brown_glass_pane.png diff --git a/client/data/textures/blocks/brown_mushroom.png b/client/src/main/resources/textures/blocks/brown_mushroom.png similarity index 100% rename from client/data/textures/blocks/brown_mushroom.png rename to client/src/main/resources/textures/blocks/brown_mushroom.png diff --git a/client/data/textures/blocks/brown_mushroom_block_cap.png b/client/src/main/resources/textures/blocks/brown_mushroom_block_cap.png similarity index 100% rename from client/data/textures/blocks/brown_mushroom_block_cap.png rename to client/src/main/resources/textures/blocks/brown_mushroom_block_cap.png diff --git a/client/data/textures/blocks/brown_mushroom_block_inside.png b/client/src/main/resources/textures/blocks/brown_mushroom_block_inside.png similarity index 100% rename from client/data/textures/blocks/brown_mushroom_block_inside.png rename to client/src/main/resources/textures/blocks/brown_mushroom_block_inside.png diff --git a/client/data/textures/blocks/brown_mushroom_block_stem.png b/client/src/main/resources/textures/blocks/brown_mushroom_block_stem.png similarity index 100% rename from client/data/textures/blocks/brown_mushroom_block_stem.png rename to client/src/main/resources/textures/blocks/brown_mushroom_block_stem.png diff --git a/client/data/textures/blocks/brown_stained_hardened_clay.png b/client/src/main/resources/textures/blocks/brown_stained_hardened_clay.png similarity index 100% rename from client/data/textures/blocks/brown_stained_hardened_clay.png rename to client/src/main/resources/textures/blocks/brown_stained_hardened_clay.png diff --git a/client/data/textures/blocks/brown_wool.png b/client/src/main/resources/textures/blocks/brown_wool.png similarity index 100% rename from client/data/textures/blocks/brown_wool.png rename to client/src/main/resources/textures/blocks/brown_wool.png diff --git a/client/data/textures/blocks/cactus_bottom.png b/client/src/main/resources/textures/blocks/cactus_bottom.png similarity index 100% rename from client/data/textures/blocks/cactus_bottom.png rename to client/src/main/resources/textures/blocks/cactus_bottom.png diff --git a/client/data/textures/blocks/cactus_side.png b/client/src/main/resources/textures/blocks/cactus_side.png similarity index 100% rename from client/data/textures/blocks/cactus_side.png rename to client/src/main/resources/textures/blocks/cactus_side.png diff --git a/client/data/textures/blocks/cactus_top.png b/client/src/main/resources/textures/blocks/cactus_top.png similarity index 100% rename from client/data/textures/blocks/cactus_top.png rename to client/src/main/resources/textures/blocks/cactus_top.png diff --git a/client/data/textures/blocks/cake_bottom.png b/client/src/main/resources/textures/blocks/cake_bottom.png similarity index 100% rename from client/data/textures/blocks/cake_bottom.png rename to client/src/main/resources/textures/blocks/cake_bottom.png diff --git a/client/data/textures/blocks/cake_inner.png b/client/src/main/resources/textures/blocks/cake_inner.png similarity index 100% rename from client/data/textures/blocks/cake_inner.png rename to client/src/main/resources/textures/blocks/cake_inner.png diff --git a/client/data/textures/blocks/cake_side.png b/client/src/main/resources/textures/blocks/cake_side.png similarity index 100% rename from client/data/textures/blocks/cake_side.png rename to client/src/main/resources/textures/blocks/cake_side.png diff --git a/client/data/textures/blocks/cake_top.png b/client/src/main/resources/textures/blocks/cake_top.png similarity index 100% rename from client/data/textures/blocks/cake_top.png rename to client/src/main/resources/textures/blocks/cake_top.png diff --git a/client/data/textures/blocks/calcium_block.png b/client/src/main/resources/textures/blocks/calcium_block.png similarity index 100% rename from client/data/textures/blocks/calcium_block.png rename to client/src/main/resources/textures/blocks/calcium_block.png diff --git a/client/data/textures/blocks/calcium_ore.png b/client/src/main/resources/textures/blocks/calcium_ore.png similarity index 100% rename from client/data/textures/blocks/calcium_ore.png rename to client/src/main/resources/textures/blocks/calcium_ore.png diff --git a/client/data/textures/blocks/carrot_0.png b/client/src/main/resources/textures/blocks/carrot_0.png similarity index 100% rename from client/data/textures/blocks/carrot_0.png rename to client/src/main/resources/textures/blocks/carrot_0.png diff --git a/client/data/textures/blocks/carrot_1.png b/client/src/main/resources/textures/blocks/carrot_1.png similarity index 100% rename from client/data/textures/blocks/carrot_1.png rename to client/src/main/resources/textures/blocks/carrot_1.png diff --git a/client/data/textures/blocks/carrot_2.png b/client/src/main/resources/textures/blocks/carrot_2.png similarity index 100% rename from client/data/textures/blocks/carrot_2.png rename to client/src/main/resources/textures/blocks/carrot_2.png diff --git a/client/data/textures/blocks/carrot_3.png b/client/src/main/resources/textures/blocks/carrot_3.png similarity index 100% rename from client/data/textures/blocks/carrot_3.png rename to client/src/main/resources/textures/blocks/carrot_3.png diff --git a/client/data/textures/blocks/cauldron_bottom.png b/client/src/main/resources/textures/blocks/cauldron_bottom.png similarity index 100% rename from client/data/textures/blocks/cauldron_bottom.png rename to client/src/main/resources/textures/blocks/cauldron_bottom.png diff --git a/client/data/textures/blocks/cauldron_inner.png b/client/src/main/resources/textures/blocks/cauldron_inner.png similarity index 100% rename from client/data/textures/blocks/cauldron_inner.png rename to client/src/main/resources/textures/blocks/cauldron_inner.png diff --git a/client/data/textures/blocks/cauldron_side.png b/client/src/main/resources/textures/blocks/cauldron_side.png similarity index 100% rename from client/data/textures/blocks/cauldron_side.png rename to client/src/main/resources/textures/blocks/cauldron_side.png diff --git a/client/data/textures/blocks/cauldron_top.png b/client/src/main/resources/textures/blocks/cauldron_top.png similarity index 100% rename from client/data/textures/blocks/cauldron_top.png rename to client/src/main/resources/textures/blocks/cauldron_top.png diff --git a/client/data/textures/blocks/cell_rock.png b/client/src/main/resources/textures/blocks/cell_rock.png similarity index 100% rename from client/data/textures/blocks/cell_rock.png rename to client/src/main/resources/textures/blocks/cell_rock.png diff --git a/client/data/textures/blocks/cherry_door_bottom.png b/client/src/main/resources/textures/blocks/cherry_door_bottom.png similarity index 100% rename from client/data/textures/blocks/cherry_door_bottom.png rename to client/src/main/resources/textures/blocks/cherry_door_bottom.png diff --git a/client/data/textures/blocks/cherry_door_top.png b/client/src/main/resources/textures/blocks/cherry_door_top.png similarity index 100% rename from client/data/textures/blocks/cherry_door_top.png rename to client/src/main/resources/textures/blocks/cherry_door_top.png diff --git a/client/data/textures/blocks/cherry_leaves_autumn.png b/client/src/main/resources/textures/blocks/cherry_leaves_autumn.png similarity index 100% rename from client/data/textures/blocks/cherry_leaves_autumn.png rename to client/src/main/resources/textures/blocks/cherry_leaves_autumn.png diff --git a/client/data/textures/blocks/cherry_leaves_snowy.png b/client/src/main/resources/textures/blocks/cherry_leaves_snowy.png similarity index 100% rename from client/data/textures/blocks/cherry_leaves_snowy.png rename to client/src/main/resources/textures/blocks/cherry_leaves_snowy.png diff --git a/client/data/textures/blocks/cherry_leaves_spring.png b/client/src/main/resources/textures/blocks/cherry_leaves_spring.png similarity index 100% rename from client/data/textures/blocks/cherry_leaves_spring.png rename to client/src/main/resources/textures/blocks/cherry_leaves_spring.png diff --git a/client/data/textures/blocks/cherry_leaves_summer.png b/client/src/main/resources/textures/blocks/cherry_leaves_summer.png similarity index 100% rename from client/data/textures/blocks/cherry_leaves_summer.png rename to client/src/main/resources/textures/blocks/cherry_leaves_summer.png diff --git a/client/data/textures/blocks/cherry_leaves_winter.png b/client/src/main/resources/textures/blocks/cherry_leaves_winter.png similarity index 100% rename from client/data/textures/blocks/cherry_leaves_winter.png rename to client/src/main/resources/textures/blocks/cherry_leaves_winter.png diff --git a/client/data/textures/blocks/cherry_log_bark.png b/client/src/main/resources/textures/blocks/cherry_log_bark.png similarity index 100% rename from client/data/textures/blocks/cherry_log_bark.png rename to client/src/main/resources/textures/blocks/cherry_log_bark.png diff --git a/client/data/textures/blocks/cherry_log_top.png b/client/src/main/resources/textures/blocks/cherry_log_top.png similarity index 100% rename from client/data/textures/blocks/cherry_log_top.png rename to client/src/main/resources/textures/blocks/cherry_log_top.png diff --git a/client/data/textures/blocks/cherry_planks.png b/client/src/main/resources/textures/blocks/cherry_planks.png similarity index 100% rename from client/data/textures/blocks/cherry_planks.png rename to client/src/main/resources/textures/blocks/cherry_planks.png diff --git a/client/data/textures/blocks/cherry_sapling.png b/client/src/main/resources/textures/blocks/cherry_sapling.png similarity index 100% rename from client/data/textures/blocks/cherry_sapling.png rename to client/src/main/resources/textures/blocks/cherry_sapling.png diff --git a/client/data/textures/blocks/chest_normal.png b/client/src/main/resources/textures/blocks/chest_normal.png similarity index 100% rename from client/data/textures/blocks/chest_normal.png rename to client/src/main/resources/textures/blocks/chest_normal.png diff --git a/client/data/textures/blocks/chest_normal_double.png b/client/src/main/resources/textures/blocks/chest_normal_double.png similarity index 100% rename from client/data/textures/blocks/chest_normal_double.png rename to client/src/main/resources/textures/blocks/chest_normal_double.png diff --git a/client/data/textures/blocks/chest_trapped.png b/client/src/main/resources/textures/blocks/chest_trapped.png similarity index 100% rename from client/data/textures/blocks/chest_trapped.png rename to client/src/main/resources/textures/blocks/chest_trapped.png diff --git a/client/data/textures/blocks/chest_trapped_double.png b/client/src/main/resources/textures/blocks/chest_trapped_double.png similarity index 100% rename from client/data/textures/blocks/chest_trapped_double.png rename to client/src/main/resources/textures/blocks/chest_trapped_double.png diff --git a/client/data/textures/blocks/chrome_block.png b/client/src/main/resources/textures/blocks/chrome_block.png similarity index 100% rename from client/data/textures/blocks/chrome_block.png rename to client/src/main/resources/textures/blocks/chrome_block.png diff --git a/client/data/textures/blocks/chrome_ore.png b/client/src/main/resources/textures/blocks/chrome_ore.png similarity index 100% rename from client/data/textures/blocks/chrome_ore.png rename to client/src/main/resources/textures/blocks/chrome_ore.png diff --git a/client/data/textures/blocks/cinnabar_block.png b/client/src/main/resources/textures/blocks/cinnabar_block.png similarity index 100% rename from client/data/textures/blocks/cinnabar_block.png rename to client/src/main/resources/textures/blocks/cinnabar_block.png diff --git a/client/data/textures/blocks/cinnabar_ore.png b/client/src/main/resources/textures/blocks/cinnabar_ore.png similarity index 100% rename from client/data/textures/blocks/cinnabar_ore.png rename to client/src/main/resources/textures/blocks/cinnabar_ore.png diff --git a/client/data/textures/blocks/clay.png b/client/src/main/resources/textures/blocks/clay.png similarity index 100% rename from client/data/textures/blocks/clay.png rename to client/src/main/resources/textures/blocks/clay.png diff --git a/client/data/textures/blocks/coal_block.png b/client/src/main/resources/textures/blocks/coal_block.png similarity index 100% rename from client/data/textures/blocks/coal_block.png rename to client/src/main/resources/textures/blocks/coal_block.png diff --git a/client/data/textures/blocks/coal_ore.png b/client/src/main/resources/textures/blocks/coal_ore.png similarity index 100% rename from client/data/textures/blocks/coal_ore.png rename to client/src/main/resources/textures/blocks/coal_ore.png diff --git a/client/data/textures/blocks/coarse_dirt.png b/client/src/main/resources/textures/blocks/coarse_dirt.png similarity index 100% rename from client/data/textures/blocks/coarse_dirt.png rename to client/src/main/resources/textures/blocks/coarse_dirt.png diff --git a/client/data/textures/blocks/cobalt_block.png b/client/src/main/resources/textures/blocks/cobalt_block.png similarity index 100% rename from client/data/textures/blocks/cobalt_block.png rename to client/src/main/resources/textures/blocks/cobalt_block.png diff --git a/client/data/textures/blocks/cobalt_ore.png b/client/src/main/resources/textures/blocks/cobalt_ore.png similarity index 100% rename from client/data/textures/blocks/cobalt_ore.png rename to client/src/main/resources/textures/blocks/cobalt_ore.png diff --git a/client/data/textures/blocks/cobblestone.png b/client/src/main/resources/textures/blocks/cobblestone.png similarity index 100% rename from client/data/textures/blocks/cobblestone.png rename to client/src/main/resources/textures/blocks/cobblestone.png diff --git a/client/data/textures/blocks/cocoa_0.png b/client/src/main/resources/textures/blocks/cocoa_0.png similarity index 100% rename from client/data/textures/blocks/cocoa_0.png rename to client/src/main/resources/textures/blocks/cocoa_0.png diff --git a/client/data/textures/blocks/cocoa_1.png b/client/src/main/resources/textures/blocks/cocoa_1.png similarity index 100% rename from client/data/textures/blocks/cocoa_1.png rename to client/src/main/resources/textures/blocks/cocoa_1.png diff --git a/client/data/textures/blocks/cocoa_2.png b/client/src/main/resources/textures/blocks/cocoa_2.png similarity index 100% rename from client/data/textures/blocks/cocoa_2.png rename to client/src/main/resources/textures/blocks/cocoa_2.png diff --git a/client/data/textures/blocks/comparator_off.png b/client/src/main/resources/textures/blocks/comparator_off.png similarity index 100% rename from client/data/textures/blocks/comparator_off.png rename to client/src/main/resources/textures/blocks/comparator_off.png diff --git a/client/data/textures/blocks/comparator_on.png b/client/src/main/resources/textures/blocks/comparator_on.png similarity index 100% rename from client/data/textures/blocks/comparator_on.png rename to client/src/main/resources/textures/blocks/comparator_on.png diff --git a/client/data/textures/blocks/control_block.png b/client/src/main/resources/textures/blocks/control_block.png similarity index 100% rename from client/data/textures/blocks/control_block.png rename to client/src/main/resources/textures/blocks/control_block.png diff --git a/client/data/textures/blocks/copper_block.png b/client/src/main/resources/textures/blocks/copper_block.png similarity index 100% rename from client/data/textures/blocks/copper_block.png rename to client/src/main/resources/textures/blocks/copper_block.png diff --git a/client/data/textures/blocks/copper_ore.png b/client/src/main/resources/textures/blocks/copper_ore.png similarity index 100% rename from client/data/textures/blocks/copper_ore.png rename to client/src/main/resources/textures/blocks/copper_ore.png diff --git a/client/data/textures/blocks/core.png b/client/src/main/resources/textures/blocks/core.png similarity index 100% rename from client/data/textures/blocks/core.png rename to client/src/main/resources/textures/blocks/core.png diff --git a/client/data/textures/blocks/crafting_table_front.png b/client/src/main/resources/textures/blocks/crafting_table_front.png similarity index 100% rename from client/data/textures/blocks/crafting_table_front.png rename to client/src/main/resources/textures/blocks/crafting_table_front.png diff --git a/client/data/textures/blocks/crafting_table_side.png b/client/src/main/resources/textures/blocks/crafting_table_side.png similarity index 100% rename from client/data/textures/blocks/crafting_table_side.png rename to client/src/main/resources/textures/blocks/crafting_table_side.png diff --git a/client/data/textures/blocks/crafting_table_top.png b/client/src/main/resources/textures/blocks/crafting_table_top.png similarity index 100% rename from client/data/textures/blocks/crafting_table_top.png rename to client/src/main/resources/textures/blocks/crafting_table_top.png diff --git a/client/data/textures/blocks/cyan_glass.png b/client/src/main/resources/textures/blocks/cyan_glass.png similarity index 100% rename from client/data/textures/blocks/cyan_glass.png rename to client/src/main/resources/textures/blocks/cyan_glass.png diff --git a/client/data/textures/blocks/cyan_glass_pane.png b/client/src/main/resources/textures/blocks/cyan_glass_pane.png similarity index 100% rename from client/data/textures/blocks/cyan_glass_pane.png rename to client/src/main/resources/textures/blocks/cyan_glass_pane.png diff --git a/client/data/textures/blocks/cyan_stained_hardened_clay.png b/client/src/main/resources/textures/blocks/cyan_stained_hardened_clay.png similarity index 100% rename from client/data/textures/blocks/cyan_stained_hardened_clay.png rename to client/src/main/resources/textures/blocks/cyan_stained_hardened_clay.png diff --git a/client/data/textures/blocks/cyan_wool.png b/client/src/main/resources/textures/blocks/cyan_wool.png similarity index 100% rename from client/data/textures/blocks/cyan_wool.png rename to client/src/main/resources/textures/blocks/cyan_wool.png diff --git a/client/data/textures/blocks/dandelion.png b/client/src/main/resources/textures/blocks/dandelion.png similarity index 100% rename from client/data/textures/blocks/dandelion.png rename to client/src/main/resources/textures/blocks/dandelion.png diff --git a/client/data/textures/blocks/dark_oak_door_bottom.png b/client/src/main/resources/textures/blocks/dark_oak_door_bottom.png similarity index 100% rename from client/data/textures/blocks/dark_oak_door_bottom.png rename to client/src/main/resources/textures/blocks/dark_oak_door_bottom.png diff --git a/client/data/textures/blocks/dark_oak_door_top.png b/client/src/main/resources/textures/blocks/dark_oak_door_top.png similarity index 100% rename from client/data/textures/blocks/dark_oak_door_top.png rename to client/src/main/resources/textures/blocks/dark_oak_door_top.png diff --git a/client/data/textures/blocks/dark_oak_leaves_autumn.png b/client/src/main/resources/textures/blocks/dark_oak_leaves_autumn.png similarity index 100% rename from client/data/textures/blocks/dark_oak_leaves_autumn.png rename to client/src/main/resources/textures/blocks/dark_oak_leaves_autumn.png diff --git a/client/data/textures/blocks/dark_oak_leaves_snowy.png b/client/src/main/resources/textures/blocks/dark_oak_leaves_snowy.png similarity index 100% rename from client/data/textures/blocks/dark_oak_leaves_snowy.png rename to client/src/main/resources/textures/blocks/dark_oak_leaves_snowy.png diff --git a/client/data/textures/blocks/dark_oak_leaves_spring.png b/client/src/main/resources/textures/blocks/dark_oak_leaves_spring.png similarity index 100% rename from client/data/textures/blocks/dark_oak_leaves_spring.png rename to client/src/main/resources/textures/blocks/dark_oak_leaves_spring.png diff --git a/client/data/textures/blocks/dark_oak_leaves_summer.png b/client/src/main/resources/textures/blocks/dark_oak_leaves_summer.png similarity index 100% rename from client/data/textures/blocks/dark_oak_leaves_summer.png rename to client/src/main/resources/textures/blocks/dark_oak_leaves_summer.png diff --git a/client/data/textures/blocks/dark_oak_leaves_winter.png b/client/src/main/resources/textures/blocks/dark_oak_leaves_winter.png similarity index 100% rename from client/data/textures/blocks/dark_oak_leaves_winter.png rename to client/src/main/resources/textures/blocks/dark_oak_leaves_winter.png diff --git a/client/data/textures/blocks/dark_oak_log_bark.png b/client/src/main/resources/textures/blocks/dark_oak_log_bark.png similarity index 100% rename from client/data/textures/blocks/dark_oak_log_bark.png rename to client/src/main/resources/textures/blocks/dark_oak_log_bark.png diff --git a/client/data/textures/blocks/dark_oak_log_top.png b/client/src/main/resources/textures/blocks/dark_oak_log_top.png similarity index 100% rename from client/data/textures/blocks/dark_oak_log_top.png rename to client/src/main/resources/textures/blocks/dark_oak_log_top.png diff --git a/client/data/textures/blocks/dark_oak_planks.png b/client/src/main/resources/textures/blocks/dark_oak_planks.png similarity index 100% rename from client/data/textures/blocks/dark_oak_planks.png rename to client/src/main/resources/textures/blocks/dark_oak_planks.png diff --git a/client/data/textures/blocks/dark_oak_sapling.png b/client/src/main/resources/textures/blocks/dark_oak_sapling.png similarity index 100% rename from client/data/textures/blocks/dark_oak_sapling.png rename to client/src/main/resources/textures/blocks/dark_oak_sapling.png diff --git a/client/data/textures/blocks/darkstone.png b/client/src/main/resources/textures/blocks/darkstone.png similarity index 100% rename from client/data/textures/blocks/darkstone.png rename to client/src/main/resources/textures/blocks/darkstone.png diff --git a/client/data/textures/blocks/daylight_detector_inverted_top.png b/client/src/main/resources/textures/blocks/daylight_detector_inverted_top.png similarity index 100% rename from client/data/textures/blocks/daylight_detector_inverted_top.png rename to client/src/main/resources/textures/blocks/daylight_detector_inverted_top.png diff --git a/client/data/textures/blocks/daylight_detector_side.png b/client/src/main/resources/textures/blocks/daylight_detector_side.png similarity index 100% rename from client/data/textures/blocks/daylight_detector_side.png rename to client/src/main/resources/textures/blocks/daylight_detector_side.png diff --git a/client/data/textures/blocks/daylight_detector_top.png b/client/src/main/resources/textures/blocks/daylight_detector_top.png similarity index 100% rename from client/data/textures/blocks/daylight_detector_top.png rename to client/src/main/resources/textures/blocks/daylight_detector_top.png diff --git a/client/data/textures/blocks/deadbush.png b/client/src/main/resources/textures/blocks/deadbush.png similarity index 100% rename from client/data/textures/blocks/deadbush.png rename to client/src/main/resources/textures/blocks/deadbush.png diff --git a/client/data/textures/blocks/destroy_stage_0.png b/client/src/main/resources/textures/blocks/destroy_stage_0.png similarity index 100% rename from client/data/textures/blocks/destroy_stage_0.png rename to client/src/main/resources/textures/blocks/destroy_stage_0.png diff --git a/client/data/textures/blocks/destroy_stage_1.png b/client/src/main/resources/textures/blocks/destroy_stage_1.png similarity index 100% rename from client/data/textures/blocks/destroy_stage_1.png rename to client/src/main/resources/textures/blocks/destroy_stage_1.png diff --git a/client/data/textures/blocks/destroy_stage_2.png b/client/src/main/resources/textures/blocks/destroy_stage_2.png similarity index 100% rename from client/data/textures/blocks/destroy_stage_2.png rename to client/src/main/resources/textures/blocks/destroy_stage_2.png diff --git a/client/data/textures/blocks/destroy_stage_3.png b/client/src/main/resources/textures/blocks/destroy_stage_3.png similarity index 100% rename from client/data/textures/blocks/destroy_stage_3.png rename to client/src/main/resources/textures/blocks/destroy_stage_3.png diff --git a/client/data/textures/blocks/destroy_stage_4.png b/client/src/main/resources/textures/blocks/destroy_stage_4.png similarity index 100% rename from client/data/textures/blocks/destroy_stage_4.png rename to client/src/main/resources/textures/blocks/destroy_stage_4.png diff --git a/client/data/textures/blocks/destroy_stage_5.png b/client/src/main/resources/textures/blocks/destroy_stage_5.png similarity index 100% rename from client/data/textures/blocks/destroy_stage_5.png rename to client/src/main/resources/textures/blocks/destroy_stage_5.png diff --git a/client/data/textures/blocks/destroy_stage_6.png b/client/src/main/resources/textures/blocks/destroy_stage_6.png similarity index 100% rename from client/data/textures/blocks/destroy_stage_6.png rename to client/src/main/resources/textures/blocks/destroy_stage_6.png diff --git a/client/data/textures/blocks/destroy_stage_7.png b/client/src/main/resources/textures/blocks/destroy_stage_7.png similarity index 100% rename from client/data/textures/blocks/destroy_stage_7.png rename to client/src/main/resources/textures/blocks/destroy_stage_7.png diff --git a/client/data/textures/blocks/destroy_stage_8.png b/client/src/main/resources/textures/blocks/destroy_stage_8.png similarity index 100% rename from client/data/textures/blocks/destroy_stage_8.png rename to client/src/main/resources/textures/blocks/destroy_stage_8.png diff --git a/client/data/textures/blocks/destroy_stage_9.png b/client/src/main/resources/textures/blocks/destroy_stage_9.png similarity index 100% rename from client/data/textures/blocks/destroy_stage_9.png rename to client/src/main/resources/textures/blocks/destroy_stage_9.png diff --git a/client/data/textures/blocks/detector_rail.png b/client/src/main/resources/textures/blocks/detector_rail.png similarity index 100% rename from client/data/textures/blocks/detector_rail.png rename to client/src/main/resources/textures/blocks/detector_rail.png diff --git a/client/data/textures/blocks/detector_rail_powered.png b/client/src/main/resources/textures/blocks/detector_rail_powered.png similarity index 100% rename from client/data/textures/blocks/detector_rail_powered.png rename to client/src/main/resources/textures/blocks/detector_rail_powered.png diff --git a/client/data/textures/blocks/diamond_block.png b/client/src/main/resources/textures/blocks/diamond_block.png similarity index 100% rename from client/data/textures/blocks/diamond_block.png rename to client/src/main/resources/textures/blocks/diamond_block.png diff --git a/client/data/textures/blocks/diamond_ore.png b/client/src/main/resources/textures/blocks/diamond_ore.png similarity index 100% rename from client/data/textures/blocks/diamond_ore.png rename to client/src/main/resources/textures/blocks/diamond_ore.png diff --git a/client/data/textures/blocks/dirt.png b/client/src/main/resources/textures/blocks/dirt.png similarity index 100% rename from client/data/textures/blocks/dirt.png rename to client/src/main/resources/textures/blocks/dirt.png diff --git a/client/data/textures/blocks/dirt_podzol_side.png b/client/src/main/resources/textures/blocks/dirt_podzol_side.png similarity index 100% rename from client/data/textures/blocks/dirt_podzol_side.png rename to client/src/main/resources/textures/blocks/dirt_podzol_side.png diff --git a/client/data/textures/blocks/dirt_podzol_top.png b/client/src/main/resources/textures/blocks/dirt_podzol_top.png similarity index 100% rename from client/data/textures/blocks/dirt_podzol_top.png rename to client/src/main/resources/textures/blocks/dirt_podzol_top.png diff --git a/client/data/textures/blocks/dispenser_front_horizontal.png b/client/src/main/resources/textures/blocks/dispenser_front_horizontal.png similarity index 100% rename from client/data/textures/blocks/dispenser_front_horizontal.png rename to client/src/main/resources/textures/blocks/dispenser_front_horizontal.png diff --git a/client/data/textures/blocks/dispenser_front_vertical.png b/client/src/main/resources/textures/blocks/dispenser_front_vertical.png similarity index 100% rename from client/data/textures/blocks/dispenser_front_vertical.png rename to client/src/main/resources/textures/blocks/dispenser_front_vertical.png diff --git a/client/data/textures/blocks/double_fern_bottom.png b/client/src/main/resources/textures/blocks/double_fern_bottom.png similarity index 100% rename from client/data/textures/blocks/double_fern_bottom.png rename to client/src/main/resources/textures/blocks/double_fern_bottom.png diff --git a/client/data/textures/blocks/double_fern_top.png b/client/src/main/resources/textures/blocks/double_fern_top.png similarity index 100% rename from client/data/textures/blocks/double_fern_top.png rename to client/src/main/resources/textures/blocks/double_fern_top.png diff --git a/client/data/textures/blocks/double_grass_bottom.png b/client/src/main/resources/textures/blocks/double_grass_bottom.png similarity index 100% rename from client/data/textures/blocks/double_grass_bottom.png rename to client/src/main/resources/textures/blocks/double_grass_bottom.png diff --git a/client/data/textures/blocks/double_grass_top.png b/client/src/main/resources/textures/blocks/double_grass_top.png similarity index 100% rename from client/data/textures/blocks/double_grass_top.png rename to client/src/main/resources/textures/blocks/double_grass_top.png diff --git a/client/data/textures/blocks/double_rose_bottom.png b/client/src/main/resources/textures/blocks/double_rose_bottom.png similarity index 100% rename from client/data/textures/blocks/double_rose_bottom.png rename to client/src/main/resources/textures/blocks/double_rose_bottom.png diff --git a/client/data/textures/blocks/double_rose_top.png b/client/src/main/resources/textures/blocks/double_rose_top.png similarity index 100% rename from client/data/textures/blocks/double_rose_top.png rename to client/src/main/resources/textures/blocks/double_rose_top.png diff --git a/client/data/textures/blocks/double_stone_top.png b/client/src/main/resources/textures/blocks/double_stone_top.png similarity index 100% rename from client/data/textures/blocks/double_stone_top.png rename to client/src/main/resources/textures/blocks/double_stone_top.png diff --git a/client/data/textures/blocks/dragon_egg.png b/client/src/main/resources/textures/blocks/dragon_egg.png similarity index 100% rename from client/data/textures/blocks/dragon_egg.png rename to client/src/main/resources/textures/blocks/dragon_egg.png diff --git a/client/data/textures/blocks/dropper_front_horizontal.png b/client/src/main/resources/textures/blocks/dropper_front_horizontal.png similarity index 100% rename from client/data/textures/blocks/dropper_front_horizontal.png rename to client/src/main/resources/textures/blocks/dropper_front_horizontal.png diff --git a/client/data/textures/blocks/dropper_front_vertical.png b/client/src/main/resources/textures/blocks/dropper_front_vertical.png similarity index 100% rename from client/data/textures/blocks/dropper_front_vertical.png rename to client/src/main/resources/textures/blocks/dropper_front_vertical.png diff --git a/client/data/textures/blocks/dry_leaves.png b/client/src/main/resources/textures/blocks/dry_leaves.png similarity index 100% rename from client/data/textures/blocks/dry_leaves.png rename to client/src/main/resources/textures/blocks/dry_leaves.png diff --git a/client/data/textures/blocks/emerald_block.png b/client/src/main/resources/textures/blocks/emerald_block.png similarity index 100% rename from client/data/textures/blocks/emerald_block.png rename to client/src/main/resources/textures/blocks/emerald_block.png diff --git a/client/data/textures/blocks/emerald_ore.png b/client/src/main/resources/textures/blocks/emerald_ore.png similarity index 100% rename from client/data/textures/blocks/emerald_ore.png rename to client/src/main/resources/textures/blocks/emerald_ore.png diff --git a/client/data/textures/blocks/enchanting_table_bottom.png b/client/src/main/resources/textures/blocks/enchanting_table_bottom.png similarity index 100% rename from client/data/textures/blocks/enchanting_table_bottom.png rename to client/src/main/resources/textures/blocks/enchanting_table_bottom.png diff --git a/client/data/textures/blocks/enchanting_table_side.png b/client/src/main/resources/textures/blocks/enchanting_table_side.png similarity index 100% rename from client/data/textures/blocks/enchanting_table_side.png rename to client/src/main/resources/textures/blocks/enchanting_table_side.png diff --git a/client/data/textures/blocks/enchanting_table_top.png b/client/src/main/resources/textures/blocks/enchanting_table_top.png similarity index 100% rename from client/data/textures/blocks/enchanting_table_top.png rename to client/src/main/resources/textures/blocks/enchanting_table_top.png diff --git a/client/data/textures/blocks/farmland_0.png b/client/src/main/resources/textures/blocks/farmland_0.png similarity index 100% rename from client/data/textures/blocks/farmland_0.png rename to client/src/main/resources/textures/blocks/farmland_0.png diff --git a/client/data/textures/blocks/farmland_1.png b/client/src/main/resources/textures/blocks/farmland_1.png similarity index 100% rename from client/data/textures/blocks/farmland_1.png rename to client/src/main/resources/textures/blocks/farmland_1.png diff --git a/client/data/textures/blocks/farmland_2.png b/client/src/main/resources/textures/blocks/farmland_2.png similarity index 100% rename from client/data/textures/blocks/farmland_2.png rename to client/src/main/resources/textures/blocks/farmland_2.png diff --git a/client/data/textures/blocks/farmland_3.png b/client/src/main/resources/textures/blocks/farmland_3.png similarity index 100% rename from client/data/textures/blocks/farmland_3.png rename to client/src/main/resources/textures/blocks/farmland_3.png diff --git a/client/data/textures/blocks/farmland_4.png b/client/src/main/resources/textures/blocks/farmland_4.png similarity index 100% rename from client/data/textures/blocks/farmland_4.png rename to client/src/main/resources/textures/blocks/farmland_4.png diff --git a/client/data/textures/blocks/farmland_5.png b/client/src/main/resources/textures/blocks/farmland_5.png similarity index 100% rename from client/data/textures/blocks/farmland_5.png rename to client/src/main/resources/textures/blocks/farmland_5.png diff --git a/client/data/textures/blocks/farmland_6.png b/client/src/main/resources/textures/blocks/farmland_6.png similarity index 100% rename from client/data/textures/blocks/farmland_6.png rename to client/src/main/resources/textures/blocks/farmland_6.png diff --git a/client/data/textures/blocks/farmland_7.png b/client/src/main/resources/textures/blocks/farmland_7.png similarity index 100% rename from client/data/textures/blocks/farmland_7.png rename to client/src/main/resources/textures/blocks/farmland_7.png diff --git a/client/data/textures/blocks/fern.png b/client/src/main/resources/textures/blocks/fern.png similarity index 100% rename from client/data/textures/blocks/fern.png rename to client/src/main/resources/textures/blocks/fern.png diff --git a/client/data/textures/blocks/floor_portal.png b/client/src/main/resources/textures/blocks/floor_portal.png similarity index 100% rename from client/data/textures/blocks/floor_portal.png rename to client/src/main/resources/textures/blocks/floor_portal.png diff --git a/client/data/textures/blocks/floor_tiles.png b/client/src/main/resources/textures/blocks/floor_tiles.png similarity index 100% rename from client/data/textures/blocks/floor_tiles.png rename to client/src/main/resources/textures/blocks/floor_tiles.png diff --git a/client/data/textures/blocks/floor_tiles_black.png b/client/src/main/resources/textures/blocks/floor_tiles_black.png similarity index 100% rename from client/data/textures/blocks/floor_tiles_black.png rename to client/src/main/resources/textures/blocks/floor_tiles_black.png diff --git a/client/data/textures/blocks/floor_tiles_red.png b/client/src/main/resources/textures/blocks/floor_tiles_red.png similarity index 100% rename from client/data/textures/blocks/floor_tiles_red.png rename to client/src/main/resources/textures/blocks/floor_tiles_red.png diff --git a/client/data/textures/blocks/floor_tiles_white.png b/client/src/main/resources/textures/blocks/floor_tiles_white.png similarity index 100% rename from client/data/textures/blocks/floor_tiles_white.png rename to client/src/main/resources/textures/blocks/floor_tiles_white.png diff --git a/client/data/textures/blocks/flower_paeonia.png b/client/src/main/resources/textures/blocks/flower_paeonia.png similarity index 100% rename from client/data/textures/blocks/flower_paeonia.png rename to client/src/main/resources/textures/blocks/flower_paeonia.png diff --git a/client/data/textures/blocks/flower_pot.png b/client/src/main/resources/textures/blocks/flower_pot.png similarity index 100% rename from client/data/textures/blocks/flower_pot.png rename to client/src/main/resources/textures/blocks/flower_pot.png diff --git a/client/data/textures/blocks/furnace_front_off.png b/client/src/main/resources/textures/blocks/furnace_front_off.png similarity index 100% rename from client/data/textures/blocks/furnace_front_off.png rename to client/src/main/resources/textures/blocks/furnace_front_off.png diff --git a/client/data/textures/blocks/furnace_front_on.png b/client/src/main/resources/textures/blocks/furnace_front_on.png similarity index 100% rename from client/data/textures/blocks/furnace_front_on.png rename to client/src/main/resources/textures/blocks/furnace_front_on.png diff --git a/client/data/textures/blocks/furnace_side.png b/client/src/main/resources/textures/blocks/furnace_side.png similarity index 100% rename from client/data/textures/blocks/furnace_side.png rename to client/src/main/resources/textures/blocks/furnace_side.png diff --git a/client/data/textures/blocks/furnace_top.png b/client/src/main/resources/textures/blocks/furnace_top.png similarity index 100% rename from client/data/textures/blocks/furnace_top.png rename to client/src/main/resources/textures/blocks/furnace_top.png diff --git a/client/data/textures/blocks/glass.png b/client/src/main/resources/textures/blocks/glass.png similarity index 100% rename from client/data/textures/blocks/glass.png rename to client/src/main/resources/textures/blocks/glass.png diff --git a/client/data/textures/blocks/glass_pane.png b/client/src/main/resources/textures/blocks/glass_pane.png similarity index 100% rename from client/data/textures/blocks/glass_pane.png rename to client/src/main/resources/textures/blocks/glass_pane.png diff --git a/client/data/textures/blocks/glowstone.png b/client/src/main/resources/textures/blocks/glowstone.png similarity index 100% rename from client/data/textures/blocks/glowstone.png rename to client/src/main/resources/textures/blocks/glowstone.png diff --git a/client/data/textures/blocks/gold_block.png b/client/src/main/resources/textures/blocks/gold_block.png similarity index 100% rename from client/data/textures/blocks/gold_block.png rename to client/src/main/resources/textures/blocks/gold_block.png diff --git a/client/data/textures/blocks/gold_ore.png b/client/src/main/resources/textures/blocks/gold_ore.png similarity index 100% rename from client/data/textures/blocks/gold_ore.png rename to client/src/main/resources/textures/blocks/gold_ore.png diff --git a/client/data/textures/blocks/golden_rail.png b/client/src/main/resources/textures/blocks/golden_rail.png similarity index 100% rename from client/data/textures/blocks/golden_rail.png rename to client/src/main/resources/textures/blocks/golden_rail.png diff --git a/client/data/textures/blocks/golden_rail_powered.png b/client/src/main/resources/textures/blocks/golden_rail_powered.png similarity index 100% rename from client/data/textures/blocks/golden_rail_powered.png rename to client/src/main/resources/textures/blocks/golden_rail_powered.png diff --git a/client/data/textures/blocks/goo_flow.png b/client/src/main/resources/textures/blocks/goo_flow.png similarity index 100% rename from client/data/textures/blocks/goo_flow.png rename to client/src/main/resources/textures/blocks/goo_flow.png diff --git a/client/data/textures/blocks/goo_still.png b/client/src/main/resources/textures/blocks/goo_still.png similarity index 100% rename from client/data/textures/blocks/goo_still.png rename to client/src/main/resources/textures/blocks/goo_still.png diff --git a/client/data/textures/blocks/grass_side.png b/client/src/main/resources/textures/blocks/grass_side.png similarity index 100% rename from client/data/textures/blocks/grass_side.png rename to client/src/main/resources/textures/blocks/grass_side.png diff --git a/client/data/textures/blocks/grass_side_overlay.png b/client/src/main/resources/textures/blocks/grass_side_overlay.png similarity index 100% rename from client/data/textures/blocks/grass_side_overlay.png rename to client/src/main/resources/textures/blocks/grass_side_overlay.png diff --git a/client/data/textures/blocks/grass_side_snowed.png b/client/src/main/resources/textures/blocks/grass_side_snowed.png similarity index 100% rename from client/data/textures/blocks/grass_side_snowed.png rename to client/src/main/resources/textures/blocks/grass_side_snowed.png diff --git a/client/data/textures/blocks/grass_top.png b/client/src/main/resources/textures/blocks/grass_top.png similarity index 100% rename from client/data/textures/blocks/grass_top.png rename to client/src/main/resources/textures/blocks/grass_top.png diff --git a/client/data/textures/blocks/gravel.png b/client/src/main/resources/textures/blocks/gravel.png similarity index 100% rename from client/data/textures/blocks/gravel.png rename to client/src/main/resources/textures/blocks/gravel.png diff --git a/client/data/textures/blocks/gravel_new.png b/client/src/main/resources/textures/blocks/gravel_new.png similarity index 100% rename from client/data/textures/blocks/gravel_new.png rename to client/src/main/resources/textures/blocks/gravel_new.png diff --git a/client/data/textures/blocks/gray_glass.png b/client/src/main/resources/textures/blocks/gray_glass.png similarity index 100% rename from client/data/textures/blocks/gray_glass.png rename to client/src/main/resources/textures/blocks/gray_glass.png diff --git a/client/data/textures/blocks/gray_glass_pane.png b/client/src/main/resources/textures/blocks/gray_glass_pane.png similarity index 100% rename from client/data/textures/blocks/gray_glass_pane.png rename to client/src/main/resources/textures/blocks/gray_glass_pane.png diff --git a/client/data/textures/blocks/gray_stained_hardened_clay.png b/client/src/main/resources/textures/blocks/gray_stained_hardened_clay.png similarity index 100% rename from client/data/textures/blocks/gray_stained_hardened_clay.png rename to client/src/main/resources/textures/blocks/gray_stained_hardened_clay.png diff --git a/client/data/textures/blocks/gray_wool.png b/client/src/main/resources/textures/blocks/gray_wool.png similarity index 100% rename from client/data/textures/blocks/gray_wool.png rename to client/src/main/resources/textures/blocks/gray_wool.png diff --git a/client/data/textures/blocks/green_glass.png b/client/src/main/resources/textures/blocks/green_glass.png similarity index 100% rename from client/data/textures/blocks/green_glass.png rename to client/src/main/resources/textures/blocks/green_glass.png diff --git a/client/data/textures/blocks/green_glass_pane.png b/client/src/main/resources/textures/blocks/green_glass_pane.png similarity index 100% rename from client/data/textures/blocks/green_glass_pane.png rename to client/src/main/resources/textures/blocks/green_glass_pane.png diff --git a/client/data/textures/blocks/green_stained_hardened_clay.png b/client/src/main/resources/textures/blocks/green_stained_hardened_clay.png similarity index 100% rename from client/data/textures/blocks/green_stained_hardened_clay.png rename to client/src/main/resources/textures/blocks/green_stained_hardened_clay.png diff --git a/client/data/textures/blocks/green_wool.png b/client/src/main/resources/textures/blocks/green_wool.png similarity index 100% rename from client/data/textures/blocks/green_wool.png rename to client/src/main/resources/textures/blocks/green_wool.png diff --git a/client/data/textures/blocks/gyriyn_block.png b/client/src/main/resources/textures/blocks/gyriyn_block.png similarity index 100% rename from client/data/textures/blocks/gyriyn_block.png rename to client/src/main/resources/textures/blocks/gyriyn_block.png diff --git a/client/data/textures/blocks/gyriyn_ore.png b/client/src/main/resources/textures/blocks/gyriyn_ore.png similarity index 100% rename from client/data/textures/blocks/gyriyn_ore.png rename to client/src/main/resources/textures/blocks/gyriyn_ore.png diff --git a/client/data/textures/blocks/hardened_clay.png b/client/src/main/resources/textures/blocks/hardened_clay.png similarity index 100% rename from client/data/textures/blocks/hardened_clay.png rename to client/src/main/resources/textures/blocks/hardened_clay.png diff --git a/client/data/textures/blocks/hay_block_side.png b/client/src/main/resources/textures/blocks/hay_block_side.png similarity index 100% rename from client/data/textures/blocks/hay_block_side.png rename to client/src/main/resources/textures/blocks/hay_block_side.png diff --git a/client/data/textures/blocks/hay_block_top.png b/client/src/main/resources/textures/blocks/hay_block_top.png similarity index 100% rename from client/data/textures/blocks/hay_block_top.png rename to client/src/main/resources/textures/blocks/hay_block_top.png diff --git a/client/data/textures/blocks/hellrock.png b/client/src/main/resources/textures/blocks/hellrock.png similarity index 100% rename from client/data/textures/blocks/hellrock.png rename to client/src/main/resources/textures/blocks/hellrock.png diff --git a/client/data/textures/blocks/hopper_inside.png b/client/src/main/resources/textures/blocks/hopper_inside.png similarity index 100% rename from client/data/textures/blocks/hopper_inside.png rename to client/src/main/resources/textures/blocks/hopper_inside.png diff --git a/client/data/textures/blocks/hopper_outside.png b/client/src/main/resources/textures/blocks/hopper_outside.png similarity index 100% rename from client/data/textures/blocks/hopper_outside.png rename to client/src/main/resources/textures/blocks/hopper_outside.png diff --git a/client/data/textures/blocks/hopper_top.png b/client/src/main/resources/textures/blocks/hopper_top.png similarity index 100% rename from client/data/textures/blocks/hopper_top.png rename to client/src/main/resources/textures/blocks/hopper_top.png diff --git a/client/data/textures/blocks/houstonia.png b/client/src/main/resources/textures/blocks/houstonia.png similarity index 100% rename from client/data/textures/blocks/houstonia.png rename to client/src/main/resources/textures/blocks/houstonia.png diff --git a/client/data/textures/blocks/hydrogen_flow.png b/client/src/main/resources/textures/blocks/hydrogen_flow.png similarity index 100% rename from client/data/textures/blocks/hydrogen_flow.png rename to client/src/main/resources/textures/blocks/hydrogen_flow.png diff --git a/client/data/textures/blocks/hydrogen_still.png b/client/src/main/resources/textures/blocks/hydrogen_still.png similarity index 100% rename from client/data/textures/blocks/hydrogen_still.png rename to client/src/main/resources/textures/blocks/hydrogen_still.png diff --git a/client/data/textures/blocks/ice.png b/client/src/main/resources/textures/blocks/ice.png similarity index 100% rename from client/data/textures/blocks/ice.png rename to client/src/main/resources/textures/blocks/ice.png diff --git a/client/data/textures/blocks/iodine_block.png b/client/src/main/resources/textures/blocks/iodine_block.png similarity index 100% rename from client/data/textures/blocks/iodine_block.png rename to client/src/main/resources/textures/blocks/iodine_block.png diff --git a/client/data/textures/blocks/iodine_ore.png b/client/src/main/resources/textures/blocks/iodine_ore.png similarity index 100% rename from client/data/textures/blocks/iodine_ore.png rename to client/src/main/resources/textures/blocks/iodine_ore.png diff --git a/client/data/textures/blocks/iron_bars.png b/client/src/main/resources/textures/blocks/iron_bars.png similarity index 100% rename from client/data/textures/blocks/iron_bars.png rename to client/src/main/resources/textures/blocks/iron_bars.png diff --git a/client/data/textures/blocks/iron_block.png b/client/src/main/resources/textures/blocks/iron_block.png similarity index 100% rename from client/data/textures/blocks/iron_block.png rename to client/src/main/resources/textures/blocks/iron_block.png diff --git a/client/data/textures/blocks/iron_door_bottom.png b/client/src/main/resources/textures/blocks/iron_door_bottom.png similarity index 100% rename from client/data/textures/blocks/iron_door_bottom.png rename to client/src/main/resources/textures/blocks/iron_door_bottom.png diff --git a/client/data/textures/blocks/iron_door_top.png b/client/src/main/resources/textures/blocks/iron_door_top.png similarity index 100% rename from client/data/textures/blocks/iron_door_top.png rename to client/src/main/resources/textures/blocks/iron_door_top.png diff --git a/client/data/textures/blocks/iron_ore.png b/client/src/main/resources/textures/blocks/iron_ore.png similarity index 100% rename from client/data/textures/blocks/iron_ore.png rename to client/src/main/resources/textures/blocks/iron_ore.png diff --git a/client/data/textures/blocks/iron_trapdoor.png b/client/src/main/resources/textures/blocks/iron_trapdoor.png similarity index 100% rename from client/data/textures/blocks/iron_trapdoor.png rename to client/src/main/resources/textures/blocks/iron_trapdoor.png diff --git a/client/data/textures/blocks/itemframe_background.png b/client/src/main/resources/textures/blocks/itemframe_background.png similarity index 100% rename from client/data/textures/blocks/itemframe_background.png rename to client/src/main/resources/textures/blocks/itemframe_background.png diff --git a/client/data/textures/blocks/jukebox_side.png b/client/src/main/resources/textures/blocks/jukebox_side.png similarity index 100% rename from client/data/textures/blocks/jukebox_side.png rename to client/src/main/resources/textures/blocks/jukebox_side.png diff --git a/client/data/textures/blocks/jukebox_top.png b/client/src/main/resources/textures/blocks/jukebox_top.png similarity index 100% rename from client/data/textures/blocks/jukebox_top.png rename to client/src/main/resources/textures/blocks/jukebox_top.png diff --git a/client/data/textures/blocks/jungle_door_bottom.png b/client/src/main/resources/textures/blocks/jungle_door_bottom.png similarity index 100% rename from client/data/textures/blocks/jungle_door_bottom.png rename to client/src/main/resources/textures/blocks/jungle_door_bottom.png diff --git a/client/data/textures/blocks/jungle_door_top.png b/client/src/main/resources/textures/blocks/jungle_door_top.png similarity index 100% rename from client/data/textures/blocks/jungle_door_top.png rename to client/src/main/resources/textures/blocks/jungle_door_top.png diff --git a/client/data/textures/blocks/jungle_leaves_autumn.png b/client/src/main/resources/textures/blocks/jungle_leaves_autumn.png similarity index 100% rename from client/data/textures/blocks/jungle_leaves_autumn.png rename to client/src/main/resources/textures/blocks/jungle_leaves_autumn.png diff --git a/client/data/textures/blocks/jungle_leaves_snowy.png b/client/src/main/resources/textures/blocks/jungle_leaves_snowy.png similarity index 100% rename from client/data/textures/blocks/jungle_leaves_snowy.png rename to client/src/main/resources/textures/blocks/jungle_leaves_snowy.png diff --git a/client/data/textures/blocks/jungle_leaves_spring.png b/client/src/main/resources/textures/blocks/jungle_leaves_spring.png similarity index 100% rename from client/data/textures/blocks/jungle_leaves_spring.png rename to client/src/main/resources/textures/blocks/jungle_leaves_spring.png diff --git a/client/data/textures/blocks/jungle_leaves_summer.png b/client/src/main/resources/textures/blocks/jungle_leaves_summer.png similarity index 100% rename from client/data/textures/blocks/jungle_leaves_summer.png rename to client/src/main/resources/textures/blocks/jungle_leaves_summer.png diff --git a/client/data/textures/blocks/jungle_leaves_winter.png b/client/src/main/resources/textures/blocks/jungle_leaves_winter.png similarity index 100% rename from client/data/textures/blocks/jungle_leaves_winter.png rename to client/src/main/resources/textures/blocks/jungle_leaves_winter.png diff --git a/client/data/textures/blocks/jungle_log_bark.png b/client/src/main/resources/textures/blocks/jungle_log_bark.png similarity index 100% rename from client/data/textures/blocks/jungle_log_bark.png rename to client/src/main/resources/textures/blocks/jungle_log_bark.png diff --git a/client/data/textures/blocks/jungle_log_top.png b/client/src/main/resources/textures/blocks/jungle_log_top.png similarity index 100% rename from client/data/textures/blocks/jungle_log_top.png rename to client/src/main/resources/textures/blocks/jungle_log_top.png diff --git a/client/data/textures/blocks/jungle_planks.png b/client/src/main/resources/textures/blocks/jungle_planks.png similarity index 100% rename from client/data/textures/blocks/jungle_planks.png rename to client/src/main/resources/textures/blocks/jungle_planks.png diff --git a/client/data/textures/blocks/jungle_sapling.png b/client/src/main/resources/textures/blocks/jungle_sapling.png similarity index 100% rename from client/data/textures/blocks/jungle_sapling.png rename to client/src/main/resources/textures/blocks/jungle_sapling.png diff --git a/client/data/textures/blocks/ladder.png b/client/src/main/resources/textures/blocks/ladder.png similarity index 100% rename from client/data/textures/blocks/ladder.png rename to client/src/main/resources/textures/blocks/ladder.png diff --git a/client/data/textures/blocks/lamp.png b/client/src/main/resources/textures/blocks/lamp.png similarity index 100% rename from client/data/textures/blocks/lamp.png rename to client/src/main/resources/textures/blocks/lamp.png diff --git a/client/data/textures/blocks/lapis_block.png b/client/src/main/resources/textures/blocks/lapis_block.png similarity index 100% rename from client/data/textures/blocks/lapis_block.png rename to client/src/main/resources/textures/blocks/lapis_block.png diff --git a/client/data/textures/blocks/lapis_ore.png b/client/src/main/resources/textures/blocks/lapis_ore.png similarity index 100% rename from client/data/textures/blocks/lapis_ore.png rename to client/src/main/resources/textures/blocks/lapis_ore.png diff --git a/client/data/textures/blocks/lava_flow.png b/client/src/main/resources/textures/blocks/lava_flow.png similarity index 100% rename from client/data/textures/blocks/lava_flow.png rename to client/src/main/resources/textures/blocks/lava_flow.png diff --git a/client/data/textures/blocks/lava_still.png b/client/src/main/resources/textures/blocks/lava_still.png similarity index 100% rename from client/data/textures/blocks/lava_still.png rename to client/src/main/resources/textures/blocks/lava_still.png diff --git a/client/data/textures/blocks/lead_block.png b/client/src/main/resources/textures/blocks/lead_block.png similarity index 100% rename from client/data/textures/blocks/lead_block.png rename to client/src/main/resources/textures/blocks/lead_block.png diff --git a/client/data/textures/blocks/lead_ore.png b/client/src/main/resources/textures/blocks/lead_ore.png similarity index 100% rename from client/data/textures/blocks/lead_ore.png rename to client/src/main/resources/textures/blocks/lead_ore.png diff --git a/client/data/textures/blocks/lever.png b/client/src/main/resources/textures/blocks/lever.png similarity index 100% rename from client/data/textures/blocks/lever.png rename to client/src/main/resources/textures/blocks/lever.png diff --git a/client/data/textures/blocks/light_blue_glass.png b/client/src/main/resources/textures/blocks/light_blue_glass.png similarity index 100% rename from client/data/textures/blocks/light_blue_glass.png rename to client/src/main/resources/textures/blocks/light_blue_glass.png diff --git a/client/data/textures/blocks/light_blue_glass_pane.png b/client/src/main/resources/textures/blocks/light_blue_glass_pane.png similarity index 100% rename from client/data/textures/blocks/light_blue_glass_pane.png rename to client/src/main/resources/textures/blocks/light_blue_glass_pane.png diff --git a/client/data/textures/blocks/light_blue_stained_hardened_clay.png b/client/src/main/resources/textures/blocks/light_blue_stained_hardened_clay.png similarity index 100% rename from client/data/textures/blocks/light_blue_stained_hardened_clay.png rename to client/src/main/resources/textures/blocks/light_blue_stained_hardened_clay.png diff --git a/client/data/textures/blocks/light_blue_wool.png b/client/src/main/resources/textures/blocks/light_blue_wool.png similarity index 100% rename from client/data/textures/blocks/light_blue_wool.png rename to client/src/main/resources/textures/blocks/light_blue_wool.png diff --git a/client/data/textures/blocks/lime_glass.png b/client/src/main/resources/textures/blocks/lime_glass.png similarity index 100% rename from client/data/textures/blocks/lime_glass.png rename to client/src/main/resources/textures/blocks/lime_glass.png diff --git a/client/data/textures/blocks/lime_glass_pane.png b/client/src/main/resources/textures/blocks/lime_glass_pane.png similarity index 100% rename from client/data/textures/blocks/lime_glass_pane.png rename to client/src/main/resources/textures/blocks/lime_glass_pane.png diff --git a/client/data/textures/blocks/lime_stained_hardened_clay.png b/client/src/main/resources/textures/blocks/lime_stained_hardened_clay.png similarity index 100% rename from client/data/textures/blocks/lime_stained_hardened_clay.png rename to client/src/main/resources/textures/blocks/lime_stained_hardened_clay.png diff --git a/client/data/textures/blocks/lime_wool.png b/client/src/main/resources/textures/blocks/lime_wool.png similarity index 100% rename from client/data/textures/blocks/lime_wool.png rename to client/src/main/resources/textures/blocks/lime_wool.png diff --git a/client/data/textures/blocks/lit_redstone_lamp.png b/client/src/main/resources/textures/blocks/lit_redstone_lamp.png similarity index 100% rename from client/data/textures/blocks/lit_redstone_lamp.png rename to client/src/main/resources/textures/blocks/lit_redstone_lamp.png diff --git a/client/data/textures/blocks/lithium_block.png b/client/src/main/resources/textures/blocks/lithium_block.png similarity index 100% rename from client/data/textures/blocks/lithium_block.png rename to client/src/main/resources/textures/blocks/lithium_block.png diff --git a/client/data/textures/blocks/lithium_ore.png b/client/src/main/resources/textures/blocks/lithium_ore.png similarity index 100% rename from client/data/textures/blocks/lithium_ore.png rename to client/src/main/resources/textures/blocks/lithium_ore.png diff --git a/client/data/textures/blocks/magenta_glass.png b/client/src/main/resources/textures/blocks/magenta_glass.png similarity index 100% rename from client/data/textures/blocks/magenta_glass.png rename to client/src/main/resources/textures/blocks/magenta_glass.png diff --git a/client/data/textures/blocks/magenta_glass_pane.png b/client/src/main/resources/textures/blocks/magenta_glass_pane.png similarity index 100% rename from client/data/textures/blocks/magenta_glass_pane.png rename to client/src/main/resources/textures/blocks/magenta_glass_pane.png diff --git a/client/data/textures/blocks/magenta_stained_hardened_clay.png b/client/src/main/resources/textures/blocks/magenta_stained_hardened_clay.png similarity index 100% rename from client/data/textures/blocks/magenta_stained_hardened_clay.png rename to client/src/main/resources/textures/blocks/magenta_stained_hardened_clay.png diff --git a/client/data/textures/blocks/magenta_wool.png b/client/src/main/resources/textures/blocks/magenta_wool.png similarity index 100% rename from client/data/textures/blocks/magenta_wool.png rename to client/src/main/resources/textures/blocks/magenta_wool.png diff --git a/client/data/textures/blocks/magnesium_block.png b/client/src/main/resources/textures/blocks/magnesium_block.png similarity index 100% rename from client/data/textures/blocks/magnesium_block.png rename to client/src/main/resources/textures/blocks/magnesium_block.png diff --git a/client/data/textures/blocks/magnesium_ore.png b/client/src/main/resources/textures/blocks/magnesium_ore.png similarity index 100% rename from client/data/textures/blocks/magnesium_ore.png rename to client/src/main/resources/textures/blocks/magnesium_ore.png diff --git a/client/data/textures/blocks/manganese_block.png b/client/src/main/resources/textures/blocks/manganese_block.png similarity index 100% rename from client/data/textures/blocks/manganese_block.png rename to client/src/main/resources/textures/blocks/manganese_block.png diff --git a/client/data/textures/blocks/manganese_ore.png b/client/src/main/resources/textures/blocks/manganese_ore.png similarity index 100% rename from client/data/textures/blocks/manganese_ore.png rename to client/src/main/resources/textures/blocks/manganese_ore.png diff --git a/client/data/textures/blocks/maple_door_bottom.png b/client/src/main/resources/textures/blocks/maple_door_bottom.png similarity index 100% rename from client/data/textures/blocks/maple_door_bottom.png rename to client/src/main/resources/textures/blocks/maple_door_bottom.png diff --git a/client/data/textures/blocks/maple_door_top.png b/client/src/main/resources/textures/blocks/maple_door_top.png similarity index 100% rename from client/data/textures/blocks/maple_door_top.png rename to client/src/main/resources/textures/blocks/maple_door_top.png diff --git a/client/data/textures/blocks/maple_leaves_autumn.png b/client/src/main/resources/textures/blocks/maple_leaves_autumn.png similarity index 100% rename from client/data/textures/blocks/maple_leaves_autumn.png rename to client/src/main/resources/textures/blocks/maple_leaves_autumn.png diff --git a/client/data/textures/blocks/maple_leaves_snowy.png b/client/src/main/resources/textures/blocks/maple_leaves_snowy.png similarity index 100% rename from client/data/textures/blocks/maple_leaves_snowy.png rename to client/src/main/resources/textures/blocks/maple_leaves_snowy.png diff --git a/client/data/textures/blocks/maple_leaves_spring.png b/client/src/main/resources/textures/blocks/maple_leaves_spring.png similarity index 100% rename from client/data/textures/blocks/maple_leaves_spring.png rename to client/src/main/resources/textures/blocks/maple_leaves_spring.png diff --git a/client/data/textures/blocks/maple_leaves_summer.png b/client/src/main/resources/textures/blocks/maple_leaves_summer.png similarity index 100% rename from client/data/textures/blocks/maple_leaves_summer.png rename to client/src/main/resources/textures/blocks/maple_leaves_summer.png diff --git a/client/data/textures/blocks/maple_leaves_winter.png b/client/src/main/resources/textures/blocks/maple_leaves_winter.png similarity index 100% rename from client/data/textures/blocks/maple_leaves_winter.png rename to client/src/main/resources/textures/blocks/maple_leaves_winter.png diff --git a/client/data/textures/blocks/maple_log_bark.png b/client/src/main/resources/textures/blocks/maple_log_bark.png similarity index 100% rename from client/data/textures/blocks/maple_log_bark.png rename to client/src/main/resources/textures/blocks/maple_log_bark.png diff --git a/client/data/textures/blocks/maple_log_top.png b/client/src/main/resources/textures/blocks/maple_log_top.png similarity index 100% rename from client/data/textures/blocks/maple_log_top.png rename to client/src/main/resources/textures/blocks/maple_log_top.png diff --git a/client/data/textures/blocks/maple_planks.png b/client/src/main/resources/textures/blocks/maple_planks.png similarity index 100% rename from client/data/textures/blocks/maple_planks.png rename to client/src/main/resources/textures/blocks/maple_planks.png diff --git a/client/data/textures/blocks/maple_sapling.png b/client/src/main/resources/textures/blocks/maple_sapling.png similarity index 100% rename from client/data/textures/blocks/maple_sapling.png rename to client/src/main/resources/textures/blocks/maple_sapling.png diff --git a/client/data/textures/blocks/melon_side.png b/client/src/main/resources/textures/blocks/melon_side.png similarity index 100% rename from client/data/textures/blocks/melon_side.png rename to client/src/main/resources/textures/blocks/melon_side.png diff --git a/client/data/textures/blocks/melon_stem.png b/client/src/main/resources/textures/blocks/melon_stem.png similarity index 100% rename from client/data/textures/blocks/melon_stem.png rename to client/src/main/resources/textures/blocks/melon_stem.png diff --git a/client/data/textures/blocks/melon_stem_connected.png b/client/src/main/resources/textures/blocks/melon_stem_connected.png similarity index 100% rename from client/data/textures/blocks/melon_stem_connected.png rename to client/src/main/resources/textures/blocks/melon_stem_connected.png diff --git a/client/data/textures/blocks/melon_top.png b/client/src/main/resources/textures/blocks/melon_top.png similarity index 100% rename from client/data/textures/blocks/melon_top.png rename to client/src/main/resources/textures/blocks/melon_top.png diff --git a/client/data/textures/blocks/mercury_flow.png b/client/src/main/resources/textures/blocks/mercury_flow.png similarity index 100% rename from client/data/textures/blocks/mercury_flow.png rename to client/src/main/resources/textures/blocks/mercury_flow.png diff --git a/client/data/textures/blocks/mercury_still.png b/client/src/main/resources/textures/blocks/mercury_still.png similarity index 100% rename from client/data/textures/blocks/mercury_still.png rename to client/src/main/resources/textures/blocks/mercury_still.png diff --git a/client/data/textures/blocks/mob_spawner.png b/client/src/main/resources/textures/blocks/mob_spawner.png similarity index 100% rename from client/data/textures/blocks/mob_spawner.png rename to client/src/main/resources/textures/blocks/mob_spawner.png diff --git a/client/data/textures/blocks/moon_cheese.png b/client/src/main/resources/textures/blocks/moon_cheese.png similarity index 100% rename from client/data/textures/blocks/moon_cheese.png rename to client/src/main/resources/textures/blocks/moon_cheese.png diff --git a/client/data/textures/blocks/moon_rock.png b/client/src/main/resources/textures/blocks/moon_rock.png similarity index 100% rename from client/data/textures/blocks/moon_rock.png rename to client/src/main/resources/textures/blocks/moon_rock.png diff --git a/client/data/textures/blocks/mossy_cobblestone.png b/client/src/main/resources/textures/blocks/mossy_cobblestone.png similarity index 100% rename from client/data/textures/blocks/mossy_cobblestone.png rename to client/src/main/resources/textures/blocks/mossy_cobblestone.png diff --git a/client/data/textures/blocks/mycelium_side.png b/client/src/main/resources/textures/blocks/mycelium_side.png similarity index 100% rename from client/data/textures/blocks/mycelium_side.png rename to client/src/main/resources/textures/blocks/mycelium_side.png diff --git a/client/data/textures/blocks/mycelium_top.png b/client/src/main/resources/textures/blocks/mycelium_top.png similarity index 100% rename from client/data/textures/blocks/mycelium_top.png rename to client/src/main/resources/textures/blocks/mycelium_top.png diff --git a/client/data/textures/blocks/neodymium_block.png b/client/src/main/resources/textures/blocks/neodymium_block.png similarity index 100% rename from client/data/textures/blocks/neodymium_block.png rename to client/src/main/resources/textures/blocks/neodymium_block.png diff --git a/client/data/textures/blocks/neodymium_ore.png b/client/src/main/resources/textures/blocks/neodymium_ore.png similarity index 100% rename from client/data/textures/blocks/neodymium_ore.png rename to client/src/main/resources/textures/blocks/neodymium_ore.png diff --git a/client/data/textures/blocks/neptunium_block.png b/client/src/main/resources/textures/blocks/neptunium_block.png similarity index 100% rename from client/data/textures/blocks/neptunium_block.png rename to client/src/main/resources/textures/blocks/neptunium_block.png diff --git a/client/data/textures/blocks/neptunium_ore.png b/client/src/main/resources/textures/blocks/neptunium_ore.png similarity index 100% rename from client/data/textures/blocks/neptunium_ore.png rename to client/src/main/resources/textures/blocks/neptunium_ore.png diff --git a/client/data/textures/blocks/nichun_block.png b/client/src/main/resources/textures/blocks/nichun_block.png similarity index 100% rename from client/data/textures/blocks/nichun_block.png rename to client/src/main/resources/textures/blocks/nichun_block.png diff --git a/client/data/textures/blocks/nichun_ore.png b/client/src/main/resources/textures/blocks/nichun_ore.png similarity index 100% rename from client/data/textures/blocks/nichun_ore.png rename to client/src/main/resources/textures/blocks/nichun_ore.png diff --git a/client/data/textures/blocks/nickel_block.png b/client/src/main/resources/textures/blocks/nickel_block.png similarity index 100% rename from client/data/textures/blocks/nickel_block.png rename to client/src/main/resources/textures/blocks/nickel_block.png diff --git a/client/data/textures/blocks/nickel_ore.png b/client/src/main/resources/textures/blocks/nickel_ore.png similarity index 100% rename from client/data/textures/blocks/nickel_ore.png rename to client/src/main/resources/textures/blocks/nickel_ore.png diff --git a/client/data/textures/blocks/noteblock.png b/client/src/main/resources/textures/blocks/noteblock.png similarity index 100% rename from client/data/textures/blocks/noteblock.png rename to client/src/main/resources/textures/blocks/noteblock.png diff --git a/client/data/textures/blocks/nukage_flow.png b/client/src/main/resources/textures/blocks/nukage_flow.png similarity index 100% rename from client/data/textures/blocks/nukage_flow.png rename to client/src/main/resources/textures/blocks/nukage_flow.png diff --git a/client/data/textures/blocks/nukage_still.png b/client/src/main/resources/textures/blocks/nukage_still.png similarity index 100% rename from client/data/textures/blocks/nukage_still.png rename to client/src/main/resources/textures/blocks/nukage_still.png diff --git a/client/data/textures/blocks/nuke_bottom.png b/client/src/main/resources/textures/blocks/nuke_bottom.png similarity index 100% rename from client/data/textures/blocks/nuke_bottom.png rename to client/src/main/resources/textures/blocks/nuke_bottom.png diff --git a/client/data/textures/blocks/nuke_side.png b/client/src/main/resources/textures/blocks/nuke_side.png similarity index 100% rename from client/data/textures/blocks/nuke_side.png rename to client/src/main/resources/textures/blocks/nuke_side.png diff --git a/client/data/textures/blocks/nuke_top.png b/client/src/main/resources/textures/blocks/nuke_top.png similarity index 100% rename from client/data/textures/blocks/nuke_top.png rename to client/src/main/resources/textures/blocks/nuke_top.png diff --git a/client/data/textures/blocks/oak_door_bottom.png b/client/src/main/resources/textures/blocks/oak_door_bottom.png similarity index 100% rename from client/data/textures/blocks/oak_door_bottom.png rename to client/src/main/resources/textures/blocks/oak_door_bottom.png diff --git a/client/data/textures/blocks/oak_door_top.png b/client/src/main/resources/textures/blocks/oak_door_top.png similarity index 100% rename from client/data/textures/blocks/oak_door_top.png rename to client/src/main/resources/textures/blocks/oak_door_top.png diff --git a/client/data/textures/blocks/oak_leaves_autumn.png b/client/src/main/resources/textures/blocks/oak_leaves_autumn.png similarity index 100% rename from client/data/textures/blocks/oak_leaves_autumn.png rename to client/src/main/resources/textures/blocks/oak_leaves_autumn.png diff --git a/client/data/textures/blocks/oak_leaves_snowy.png b/client/src/main/resources/textures/blocks/oak_leaves_snowy.png similarity index 100% rename from client/data/textures/blocks/oak_leaves_snowy.png rename to client/src/main/resources/textures/blocks/oak_leaves_snowy.png diff --git a/client/data/textures/blocks/oak_leaves_spring.png b/client/src/main/resources/textures/blocks/oak_leaves_spring.png similarity index 100% rename from client/data/textures/blocks/oak_leaves_spring.png rename to client/src/main/resources/textures/blocks/oak_leaves_spring.png diff --git a/client/data/textures/blocks/oak_leaves_summer.png b/client/src/main/resources/textures/blocks/oak_leaves_summer.png similarity index 100% rename from client/data/textures/blocks/oak_leaves_summer.png rename to client/src/main/resources/textures/blocks/oak_leaves_summer.png diff --git a/client/data/textures/blocks/oak_leaves_winter.png b/client/src/main/resources/textures/blocks/oak_leaves_winter.png similarity index 100% rename from client/data/textures/blocks/oak_leaves_winter.png rename to client/src/main/resources/textures/blocks/oak_leaves_winter.png diff --git a/client/data/textures/blocks/oak_log_bark.png b/client/src/main/resources/textures/blocks/oak_log_bark.png similarity index 100% rename from client/data/textures/blocks/oak_log_bark.png rename to client/src/main/resources/textures/blocks/oak_log_bark.png diff --git a/client/data/textures/blocks/oak_log_top.png b/client/src/main/resources/textures/blocks/oak_log_top.png similarity index 100% rename from client/data/textures/blocks/oak_log_top.png rename to client/src/main/resources/textures/blocks/oak_log_top.png diff --git a/client/data/textures/blocks/oak_planks.png b/client/src/main/resources/textures/blocks/oak_planks.png similarity index 100% rename from client/data/textures/blocks/oak_planks.png rename to client/src/main/resources/textures/blocks/oak_planks.png diff --git a/client/data/textures/blocks/oak_sapling.png b/client/src/main/resources/textures/blocks/oak_sapling.png similarity index 100% rename from client/data/textures/blocks/oak_sapling.png rename to client/src/main/resources/textures/blocks/oak_sapling.png diff --git a/client/data/textures/blocks/obsidian.png b/client/src/main/resources/textures/blocks/obsidian.png similarity index 100% rename from client/data/textures/blocks/obsidian.png rename to client/src/main/resources/textures/blocks/obsidian.png diff --git a/client/data/textures/blocks/orange_glass.png b/client/src/main/resources/textures/blocks/orange_glass.png similarity index 100% rename from client/data/textures/blocks/orange_glass.png rename to client/src/main/resources/textures/blocks/orange_glass.png diff --git a/client/data/textures/blocks/orange_glass_pane.png b/client/src/main/resources/textures/blocks/orange_glass_pane.png similarity index 100% rename from client/data/textures/blocks/orange_glass_pane.png rename to client/src/main/resources/textures/blocks/orange_glass_pane.png diff --git a/client/data/textures/blocks/orange_stained_hardened_clay.png b/client/src/main/resources/textures/blocks/orange_stained_hardened_clay.png similarity index 100% rename from client/data/textures/blocks/orange_stained_hardened_clay.png rename to client/src/main/resources/textures/blocks/orange_stained_hardened_clay.png diff --git a/client/data/textures/blocks/orange_tulip.png b/client/src/main/resources/textures/blocks/orange_tulip.png similarity index 100% rename from client/data/textures/blocks/orange_tulip.png rename to client/src/main/resources/textures/blocks/orange_tulip.png diff --git a/client/data/textures/blocks/orange_wool.png b/client/src/main/resources/textures/blocks/orange_wool.png similarity index 100% rename from client/data/textures/blocks/orange_wool.png rename to client/src/main/resources/textures/blocks/orange_wool.png diff --git a/client/data/textures/blocks/oxeye_daisy.png b/client/src/main/resources/textures/blocks/oxeye_daisy.png similarity index 100% rename from client/data/textures/blocks/oxeye_daisy.png rename to client/src/main/resources/textures/blocks/oxeye_daisy.png diff --git a/client/data/textures/blocks/packed_ice.png b/client/src/main/resources/textures/blocks/packed_ice.png similarity index 100% rename from client/data/textures/blocks/packed_ice.png rename to client/src/main/resources/textures/blocks/packed_ice.png diff --git a/client/data/textures/blocks/paeonia_bottom.png b/client/src/main/resources/textures/blocks/paeonia_bottom.png similarity index 100% rename from client/data/textures/blocks/paeonia_bottom.png rename to client/src/main/resources/textures/blocks/paeonia_bottom.png diff --git a/client/data/textures/blocks/paeonia_top.png b/client/src/main/resources/textures/blocks/paeonia_top.png similarity index 100% rename from client/data/textures/blocks/paeonia_top.png rename to client/src/main/resources/textures/blocks/paeonia_top.png diff --git a/client/data/textures/blocks/palladium_block.png b/client/src/main/resources/textures/blocks/palladium_block.png similarity index 100% rename from client/data/textures/blocks/palladium_block.png rename to client/src/main/resources/textures/blocks/palladium_block.png diff --git a/client/data/textures/blocks/palladium_ore.png b/client/src/main/resources/textures/blocks/palladium_ore.png similarity index 100% rename from client/data/textures/blocks/palladium_ore.png rename to client/src/main/resources/textures/blocks/palladium_ore.png diff --git a/client/data/textures/blocks/pentagram.png b/client/src/main/resources/textures/blocks/pentagram.png similarity index 100% rename from client/data/textures/blocks/pentagram.png rename to client/src/main/resources/textures/blocks/pentagram.png diff --git a/client/data/textures/blocks/phosphor_block.png b/client/src/main/resources/textures/blocks/phosphor_block.png similarity index 100% rename from client/data/textures/blocks/phosphor_block.png rename to client/src/main/resources/textures/blocks/phosphor_block.png diff --git a/client/data/textures/blocks/phosphor_ore.png b/client/src/main/resources/textures/blocks/phosphor_ore.png similarity index 100% rename from client/data/textures/blocks/phosphor_ore.png rename to client/src/main/resources/textures/blocks/phosphor_ore.png diff --git a/client/data/textures/blocks/pink_glass.png b/client/src/main/resources/textures/blocks/pink_glass.png similarity index 100% rename from client/data/textures/blocks/pink_glass.png rename to client/src/main/resources/textures/blocks/pink_glass.png diff --git a/client/data/textures/blocks/pink_glass_pane.png b/client/src/main/resources/textures/blocks/pink_glass_pane.png similarity index 100% rename from client/data/textures/blocks/pink_glass_pane.png rename to client/src/main/resources/textures/blocks/pink_glass_pane.png diff --git a/client/data/textures/blocks/pink_stained_hardened_clay.png b/client/src/main/resources/textures/blocks/pink_stained_hardened_clay.png similarity index 100% rename from client/data/textures/blocks/pink_stained_hardened_clay.png rename to client/src/main/resources/textures/blocks/pink_stained_hardened_clay.png diff --git a/client/data/textures/blocks/pink_tulip.png b/client/src/main/resources/textures/blocks/pink_tulip.png similarity index 100% rename from client/data/textures/blocks/pink_tulip.png rename to client/src/main/resources/textures/blocks/pink_tulip.png diff --git a/client/data/textures/blocks/pink_wool.png b/client/src/main/resources/textures/blocks/pink_wool.png similarity index 100% rename from client/data/textures/blocks/pink_wool.png rename to client/src/main/resources/textures/blocks/pink_wool.png diff --git a/client/data/textures/blocks/piston_bottom.png b/client/src/main/resources/textures/blocks/piston_bottom.png similarity index 100% rename from client/data/textures/blocks/piston_bottom.png rename to client/src/main/resources/textures/blocks/piston_bottom.png diff --git a/client/data/textures/blocks/piston_inner.png b/client/src/main/resources/textures/blocks/piston_inner.png similarity index 100% rename from client/data/textures/blocks/piston_inner.png rename to client/src/main/resources/textures/blocks/piston_inner.png diff --git a/client/data/textures/blocks/piston_side.png b/client/src/main/resources/textures/blocks/piston_side.png similarity index 100% rename from client/data/textures/blocks/piston_side.png rename to client/src/main/resources/textures/blocks/piston_side.png diff --git a/client/data/textures/blocks/piston_top.png b/client/src/main/resources/textures/blocks/piston_top.png similarity index 100% rename from client/data/textures/blocks/piston_top.png rename to client/src/main/resources/textures/blocks/piston_top.png diff --git a/client/data/textures/blocks/piston_top_sticky.png b/client/src/main/resources/textures/blocks/piston_top_sticky.png similarity index 100% rename from client/data/textures/blocks/piston_top_sticky.png rename to client/src/main/resources/textures/blocks/piston_top_sticky.png diff --git a/client/data/textures/blocks/platinum_block.png b/client/src/main/resources/textures/blocks/platinum_block.png similarity index 100% rename from client/data/textures/blocks/platinum_block.png rename to client/src/main/resources/textures/blocks/platinum_block.png diff --git a/client/data/textures/blocks/platinum_ore.png b/client/src/main/resources/textures/blocks/platinum_ore.png similarity index 100% rename from client/data/textures/blocks/platinum_ore.png rename to client/src/main/resources/textures/blocks/platinum_ore.png diff --git a/client/data/textures/blocks/plutonium_block.png b/client/src/main/resources/textures/blocks/plutonium_block.png similarity index 100% rename from client/data/textures/blocks/plutonium_block.png rename to client/src/main/resources/textures/blocks/plutonium_block.png diff --git a/client/data/textures/blocks/plutonium_ore.png b/client/src/main/resources/textures/blocks/plutonium_ore.png similarity index 100% rename from client/data/textures/blocks/plutonium_ore.png rename to client/src/main/resources/textures/blocks/plutonium_ore.png diff --git a/client/data/textures/blocks/poppy.png b/client/src/main/resources/textures/blocks/poppy.png similarity index 100% rename from client/data/textures/blocks/poppy.png rename to client/src/main/resources/textures/blocks/poppy.png diff --git a/client/data/textures/blocks/portal.png b/client/src/main/resources/textures/blocks/portal.png similarity index 100% rename from client/data/textures/blocks/portal.png rename to client/src/main/resources/textures/blocks/portal.png diff --git a/client/data/textures/blocks/portal_frame_bottom.png b/client/src/main/resources/textures/blocks/portal_frame_bottom.png similarity index 100% rename from client/data/textures/blocks/portal_frame_bottom.png rename to client/src/main/resources/textures/blocks/portal_frame_bottom.png diff --git a/client/data/textures/blocks/portal_frame_orb.png b/client/src/main/resources/textures/blocks/portal_frame_orb.png similarity index 100% rename from client/data/textures/blocks/portal_frame_orb.png rename to client/src/main/resources/textures/blocks/portal_frame_orb.png diff --git a/client/data/textures/blocks/portal_frame_side.png b/client/src/main/resources/textures/blocks/portal_frame_side.png similarity index 100% rename from client/data/textures/blocks/portal_frame_side.png rename to client/src/main/resources/textures/blocks/portal_frame_side.png diff --git a/client/data/textures/blocks/portal_frame_top.png b/client/src/main/resources/textures/blocks/portal_frame_top.png similarity index 100% rename from client/data/textures/blocks/portal_frame_top.png rename to client/src/main/resources/textures/blocks/portal_frame_top.png diff --git a/client/data/textures/blocks/potassium_block.png b/client/src/main/resources/textures/blocks/potassium_block.png similarity index 100% rename from client/data/textures/blocks/potassium_block.png rename to client/src/main/resources/textures/blocks/potassium_block.png diff --git a/client/data/textures/blocks/potassium_ore.png b/client/src/main/resources/textures/blocks/potassium_ore.png similarity index 100% rename from client/data/textures/blocks/potassium_ore.png rename to client/src/main/resources/textures/blocks/potassium_ore.png diff --git a/client/data/textures/blocks/potato_0.png b/client/src/main/resources/textures/blocks/potato_0.png similarity index 100% rename from client/data/textures/blocks/potato_0.png rename to client/src/main/resources/textures/blocks/potato_0.png diff --git a/client/data/textures/blocks/potato_1.png b/client/src/main/resources/textures/blocks/potato_1.png similarity index 100% rename from client/data/textures/blocks/potato_1.png rename to client/src/main/resources/textures/blocks/potato_1.png diff --git a/client/data/textures/blocks/potato_2.png b/client/src/main/resources/textures/blocks/potato_2.png similarity index 100% rename from client/data/textures/blocks/potato_2.png rename to client/src/main/resources/textures/blocks/potato_2.png diff --git a/client/data/textures/blocks/potato_3.png b/client/src/main/resources/textures/blocks/potato_3.png similarity index 100% rename from client/data/textures/blocks/potato_3.png rename to client/src/main/resources/textures/blocks/potato_3.png diff --git a/client/data/textures/blocks/praseodymium_block.png b/client/src/main/resources/textures/blocks/praseodymium_block.png similarity index 100% rename from client/data/textures/blocks/praseodymium_block.png rename to client/src/main/resources/textures/blocks/praseodymium_block.png diff --git a/client/data/textures/blocks/praseodymium_ore.png b/client/src/main/resources/textures/blocks/praseodymium_ore.png similarity index 100% rename from client/data/textures/blocks/praseodymium_ore.png rename to client/src/main/resources/textures/blocks/praseodymium_ore.png diff --git a/client/data/textures/blocks/pumpkin_face_off.png b/client/src/main/resources/textures/blocks/pumpkin_face_off.png similarity index 100% rename from client/data/textures/blocks/pumpkin_face_off.png rename to client/src/main/resources/textures/blocks/pumpkin_face_off.png diff --git a/client/data/textures/blocks/pumpkin_face_on.png b/client/src/main/resources/textures/blocks/pumpkin_face_on.png similarity index 100% rename from client/data/textures/blocks/pumpkin_face_on.png rename to client/src/main/resources/textures/blocks/pumpkin_face_on.png diff --git a/client/data/textures/blocks/pumpkin_side.png b/client/src/main/resources/textures/blocks/pumpkin_side.png similarity index 100% rename from client/data/textures/blocks/pumpkin_side.png rename to client/src/main/resources/textures/blocks/pumpkin_side.png diff --git a/client/data/textures/blocks/pumpkin_stem.png b/client/src/main/resources/textures/blocks/pumpkin_stem.png similarity index 100% rename from client/data/textures/blocks/pumpkin_stem.png rename to client/src/main/resources/textures/blocks/pumpkin_stem.png diff --git a/client/data/textures/blocks/pumpkin_stem_connected.png b/client/src/main/resources/textures/blocks/pumpkin_stem_connected.png similarity index 100% rename from client/data/textures/blocks/pumpkin_stem_connected.png rename to client/src/main/resources/textures/blocks/pumpkin_stem_connected.png diff --git a/client/data/textures/blocks/pumpkin_top.png b/client/src/main/resources/textures/blocks/pumpkin_top.png similarity index 100% rename from client/data/textures/blocks/pumpkin_top.png rename to client/src/main/resources/textures/blocks/pumpkin_top.png diff --git a/client/data/textures/blocks/purple_bed_foot_end.png b/client/src/main/resources/textures/blocks/purple_bed_foot_end.png similarity index 100% rename from client/data/textures/blocks/purple_bed_foot_end.png rename to client/src/main/resources/textures/blocks/purple_bed_foot_end.png diff --git a/client/data/textures/blocks/purple_bed_foot_side.png b/client/src/main/resources/textures/blocks/purple_bed_foot_side.png similarity index 100% rename from client/data/textures/blocks/purple_bed_foot_side.png rename to client/src/main/resources/textures/blocks/purple_bed_foot_side.png diff --git a/client/data/textures/blocks/purple_bed_foot_top.png b/client/src/main/resources/textures/blocks/purple_bed_foot_top.png similarity index 100% rename from client/data/textures/blocks/purple_bed_foot_top.png rename to client/src/main/resources/textures/blocks/purple_bed_foot_top.png diff --git a/client/data/textures/blocks/purple_bed_head_end.png b/client/src/main/resources/textures/blocks/purple_bed_head_end.png similarity index 100% rename from client/data/textures/blocks/purple_bed_head_end.png rename to client/src/main/resources/textures/blocks/purple_bed_head_end.png diff --git a/client/data/textures/blocks/purple_bed_head_side.png b/client/src/main/resources/textures/blocks/purple_bed_head_side.png similarity index 100% rename from client/data/textures/blocks/purple_bed_head_side.png rename to client/src/main/resources/textures/blocks/purple_bed_head_side.png diff --git a/client/data/textures/blocks/purple_bed_head_top.png b/client/src/main/resources/textures/blocks/purple_bed_head_top.png similarity index 100% rename from client/data/textures/blocks/purple_bed_head_top.png rename to client/src/main/resources/textures/blocks/purple_bed_head_top.png diff --git a/client/data/textures/blocks/purple_glass.png b/client/src/main/resources/textures/blocks/purple_glass.png similarity index 100% rename from client/data/textures/blocks/purple_glass.png rename to client/src/main/resources/textures/blocks/purple_glass.png diff --git a/client/data/textures/blocks/purple_glass_pane.png b/client/src/main/resources/textures/blocks/purple_glass_pane.png similarity index 100% rename from client/data/textures/blocks/purple_glass_pane.png rename to client/src/main/resources/textures/blocks/purple_glass_pane.png diff --git a/client/data/textures/blocks/purple_stained_hardened_clay.png b/client/src/main/resources/textures/blocks/purple_stained_hardened_clay.png similarity index 100% rename from client/data/textures/blocks/purple_stained_hardened_clay.png rename to client/src/main/resources/textures/blocks/purple_stained_hardened_clay.png diff --git a/client/data/textures/blocks/purple_wool.png b/client/src/main/resources/textures/blocks/purple_wool.png similarity index 100% rename from client/data/textures/blocks/purple_wool.png rename to client/src/main/resources/textures/blocks/purple_wool.png diff --git a/client/data/textures/blocks/quartz_block_bottom.png b/client/src/main/resources/textures/blocks/quartz_block_bottom.png similarity index 100% rename from client/data/textures/blocks/quartz_block_bottom.png rename to client/src/main/resources/textures/blocks/quartz_block_bottom.png diff --git a/client/data/textures/blocks/quartz_block_chiseled.png b/client/src/main/resources/textures/blocks/quartz_block_chiseled.png similarity index 100% rename from client/data/textures/blocks/quartz_block_chiseled.png rename to client/src/main/resources/textures/blocks/quartz_block_chiseled.png diff --git a/client/data/textures/blocks/quartz_block_chiseled_top.png b/client/src/main/resources/textures/blocks/quartz_block_chiseled_top.png similarity index 100% rename from client/data/textures/blocks/quartz_block_chiseled_top.png rename to client/src/main/resources/textures/blocks/quartz_block_chiseled_top.png diff --git a/client/data/textures/blocks/quartz_block_lines.png b/client/src/main/resources/textures/blocks/quartz_block_lines.png similarity index 100% rename from client/data/textures/blocks/quartz_block_lines.png rename to client/src/main/resources/textures/blocks/quartz_block_lines.png diff --git a/client/data/textures/blocks/quartz_block_lines_top.png b/client/src/main/resources/textures/blocks/quartz_block_lines_top.png similarity index 100% rename from client/data/textures/blocks/quartz_block_lines_top.png rename to client/src/main/resources/textures/blocks/quartz_block_lines_top.png diff --git a/client/data/textures/blocks/quartz_block_side.png b/client/src/main/resources/textures/blocks/quartz_block_side.png similarity index 100% rename from client/data/textures/blocks/quartz_block_side.png rename to client/src/main/resources/textures/blocks/quartz_block_side.png diff --git a/client/data/textures/blocks/quartz_ore.png b/client/src/main/resources/textures/blocks/quartz_ore.png similarity index 100% rename from client/data/textures/blocks/quartz_ore.png rename to client/src/main/resources/textures/blocks/quartz_ore.png diff --git a/client/data/textures/blocks/quartz_top.png b/client/src/main/resources/textures/blocks/quartz_top.png similarity index 100% rename from client/data/textures/blocks/quartz_top.png rename to client/src/main/resources/textures/blocks/quartz_top.png diff --git a/client/data/textures/blocks/radium_block.png b/client/src/main/resources/textures/blocks/radium_block.png similarity index 100% rename from client/data/textures/blocks/radium_block.png rename to client/src/main/resources/textures/blocks/radium_block.png diff --git a/client/data/textures/blocks/radium_ore.png b/client/src/main/resources/textures/blocks/radium_ore.png similarity index 100% rename from client/data/textures/blocks/radium_ore.png rename to client/src/main/resources/textures/blocks/radium_ore.png diff --git a/client/data/textures/blocks/rail.png b/client/src/main/resources/textures/blocks/rail.png similarity index 100% rename from client/data/textures/blocks/rail.png rename to client/src/main/resources/textures/blocks/rail.png diff --git a/client/data/textures/blocks/rail_turned.png b/client/src/main/resources/textures/blocks/rail_turned.png similarity index 100% rename from client/data/textures/blocks/rail_turned.png rename to client/src/main/resources/textures/blocks/rail_turned.png diff --git a/client/data/textures/blocks/red_bed_foot_end.png b/client/src/main/resources/textures/blocks/red_bed_foot_end.png similarity index 100% rename from client/data/textures/blocks/red_bed_foot_end.png rename to client/src/main/resources/textures/blocks/red_bed_foot_end.png diff --git a/client/data/textures/blocks/red_bed_foot_side.png b/client/src/main/resources/textures/blocks/red_bed_foot_side.png similarity index 100% rename from client/data/textures/blocks/red_bed_foot_side.png rename to client/src/main/resources/textures/blocks/red_bed_foot_side.png diff --git a/client/data/textures/blocks/red_bed_foot_top.png b/client/src/main/resources/textures/blocks/red_bed_foot_top.png similarity index 100% rename from client/data/textures/blocks/red_bed_foot_top.png rename to client/src/main/resources/textures/blocks/red_bed_foot_top.png diff --git a/client/data/textures/blocks/red_bed_head_end.png b/client/src/main/resources/textures/blocks/red_bed_head_end.png similarity index 100% rename from client/data/textures/blocks/red_bed_head_end.png rename to client/src/main/resources/textures/blocks/red_bed_head_end.png diff --git a/client/data/textures/blocks/red_bed_head_side.png b/client/src/main/resources/textures/blocks/red_bed_head_side.png similarity index 100% rename from client/data/textures/blocks/red_bed_head_side.png rename to client/src/main/resources/textures/blocks/red_bed_head_side.png diff --git a/client/data/textures/blocks/red_bed_head_top.png b/client/src/main/resources/textures/blocks/red_bed_head_top.png similarity index 100% rename from client/data/textures/blocks/red_bed_head_top.png rename to client/src/main/resources/textures/blocks/red_bed_head_top.png diff --git a/client/data/textures/blocks/red_button.png b/client/src/main/resources/textures/blocks/red_button.png similarity index 100% rename from client/data/textures/blocks/red_button.png rename to client/src/main/resources/textures/blocks/red_button.png diff --git a/client/data/textures/blocks/red_glass.png b/client/src/main/resources/textures/blocks/red_glass.png similarity index 100% rename from client/data/textures/blocks/red_glass.png rename to client/src/main/resources/textures/blocks/red_glass.png diff --git a/client/data/textures/blocks/red_glass_pane.png b/client/src/main/resources/textures/blocks/red_glass_pane.png similarity index 100% rename from client/data/textures/blocks/red_glass_pane.png rename to client/src/main/resources/textures/blocks/red_glass_pane.png diff --git a/client/data/textures/blocks/red_mushroom.png b/client/src/main/resources/textures/blocks/red_mushroom.png similarity index 100% rename from client/data/textures/blocks/red_mushroom.png rename to client/src/main/resources/textures/blocks/red_mushroom.png diff --git a/client/data/textures/blocks/red_mushroom_block_cap.png b/client/src/main/resources/textures/blocks/red_mushroom_block_cap.png similarity index 100% rename from client/data/textures/blocks/red_mushroom_block_cap.png rename to client/src/main/resources/textures/blocks/red_mushroom_block_cap.png diff --git a/client/data/textures/blocks/red_mushroom_block_inside.png b/client/src/main/resources/textures/blocks/red_mushroom_block_inside.png similarity index 100% rename from client/data/textures/blocks/red_mushroom_block_inside.png rename to client/src/main/resources/textures/blocks/red_mushroom_block_inside.png diff --git a/client/data/textures/blocks/red_mushroom_block_stem.png b/client/src/main/resources/textures/blocks/red_mushroom_block_stem.png similarity index 100% rename from client/data/textures/blocks/red_mushroom_block_stem.png rename to client/src/main/resources/textures/blocks/red_mushroom_block_stem.png diff --git a/client/data/textures/blocks/red_sand.png b/client/src/main/resources/textures/blocks/red_sand.png similarity index 100% rename from client/data/textures/blocks/red_sand.png rename to client/src/main/resources/textures/blocks/red_sand.png diff --git a/client/data/textures/blocks/red_stained_hardened_clay.png b/client/src/main/resources/textures/blocks/red_stained_hardened_clay.png similarity index 100% rename from client/data/textures/blocks/red_stained_hardened_clay.png rename to client/src/main/resources/textures/blocks/red_stained_hardened_clay.png diff --git a/client/data/textures/blocks/red_tulip.png b/client/src/main/resources/textures/blocks/red_tulip.png similarity index 100% rename from client/data/textures/blocks/red_tulip.png rename to client/src/main/resources/textures/blocks/red_tulip.png diff --git a/client/data/textures/blocks/red_wool.png b/client/src/main/resources/textures/blocks/red_wool.png similarity index 100% rename from client/data/textures/blocks/red_wool.png rename to client/src/main/resources/textures/blocks/red_wool.png diff --git a/client/data/textures/blocks/redstone_block.png b/client/src/main/resources/textures/blocks/redstone_block.png similarity index 100% rename from client/data/textures/blocks/redstone_block.png rename to client/src/main/resources/textures/blocks/redstone_block.png diff --git a/client/data/textures/blocks/redstone_dust_cross.png b/client/src/main/resources/textures/blocks/redstone_dust_cross.png similarity index 100% rename from client/data/textures/blocks/redstone_dust_cross.png rename to client/src/main/resources/textures/blocks/redstone_dust_cross.png diff --git a/client/data/textures/blocks/redstone_dust_cross_overlay.png b/client/src/main/resources/textures/blocks/redstone_dust_cross_overlay.png similarity index 100% rename from client/data/textures/blocks/redstone_dust_cross_overlay.png rename to client/src/main/resources/textures/blocks/redstone_dust_cross_overlay.png diff --git a/client/data/textures/blocks/redstone_dust_line.png b/client/src/main/resources/textures/blocks/redstone_dust_line.png similarity index 100% rename from client/data/textures/blocks/redstone_dust_line.png rename to client/src/main/resources/textures/blocks/redstone_dust_line.png diff --git a/client/data/textures/blocks/redstone_dust_line_overlay.png b/client/src/main/resources/textures/blocks/redstone_dust_line_overlay.png similarity index 100% rename from client/data/textures/blocks/redstone_dust_line_overlay.png rename to client/src/main/resources/textures/blocks/redstone_dust_line_overlay.png diff --git a/client/data/textures/blocks/redstone_lamp.png b/client/src/main/resources/textures/blocks/redstone_lamp.png similarity index 100% rename from client/data/textures/blocks/redstone_lamp.png rename to client/src/main/resources/textures/blocks/redstone_lamp.png diff --git a/client/data/textures/blocks/redstone_ore.png b/client/src/main/resources/textures/blocks/redstone_ore.png similarity index 100% rename from client/data/textures/blocks/redstone_ore.png rename to client/src/main/resources/textures/blocks/redstone_ore.png diff --git a/client/data/textures/blocks/redstone_torch.png b/client/src/main/resources/textures/blocks/redstone_torch.png similarity index 100% rename from client/data/textures/blocks/redstone_torch.png rename to client/src/main/resources/textures/blocks/redstone_torch.png diff --git a/client/data/textures/blocks/reeds.png b/client/src/main/resources/textures/blocks/reeds.png similarity index 100% rename from client/data/textures/blocks/reeds.png rename to client/src/main/resources/textures/blocks/reeds.png diff --git a/client/data/textures/blocks/repeater_off.png b/client/src/main/resources/textures/blocks/repeater_off.png similarity index 100% rename from client/data/textures/blocks/repeater_off.png rename to client/src/main/resources/textures/blocks/repeater_off.png diff --git a/client/data/textures/blocks/repeater_on.png b/client/src/main/resources/textures/blocks/repeater_on.png similarity index 100% rename from client/data/textures/blocks/repeater_on.png rename to client/src/main/resources/textures/blocks/repeater_on.png diff --git a/client/data/textures/blocks/rock.png b/client/src/main/resources/textures/blocks/rock.png similarity index 100% rename from client/data/textures/blocks/rock.png rename to client/src/main/resources/textures/blocks/rock.png diff --git a/client/data/textures/blocks/rose.png b/client/src/main/resources/textures/blocks/rose.png similarity index 100% rename from client/data/textures/blocks/rose.png rename to client/src/main/resources/textures/blocks/rose.png diff --git a/client/data/textures/blocks/ruby_block.png b/client/src/main/resources/textures/blocks/ruby_block.png similarity index 100% rename from client/data/textures/blocks/ruby_block.png rename to client/src/main/resources/textures/blocks/ruby_block.png diff --git a/client/data/textures/blocks/ruby_ore.png b/client/src/main/resources/textures/blocks/ruby_ore.png similarity index 100% rename from client/data/textures/blocks/ruby_ore.png rename to client/src/main/resources/textures/blocks/ruby_ore.png diff --git a/client/data/textures/blocks/sand.png b/client/src/main/resources/textures/blocks/sand.png similarity index 100% rename from client/data/textures/blocks/sand.png rename to client/src/main/resources/textures/blocks/sand.png diff --git a/client/data/textures/blocks/sandstone_all.png b/client/src/main/resources/textures/blocks/sandstone_all.png similarity index 100% rename from client/data/textures/blocks/sandstone_all.png rename to client/src/main/resources/textures/blocks/sandstone_all.png diff --git a/client/data/textures/blocks/sandstone_bottom.png b/client/src/main/resources/textures/blocks/sandstone_bottom.png similarity index 100% rename from client/data/textures/blocks/sandstone_bottom.png rename to client/src/main/resources/textures/blocks/sandstone_bottom.png diff --git a/client/data/textures/blocks/sandstone_carved.png b/client/src/main/resources/textures/blocks/sandstone_carved.png similarity index 100% rename from client/data/textures/blocks/sandstone_carved.png rename to client/src/main/resources/textures/blocks/sandstone_carved.png diff --git a/client/data/textures/blocks/sandstone_normal.png b/client/src/main/resources/textures/blocks/sandstone_normal.png similarity index 100% rename from client/data/textures/blocks/sandstone_normal.png rename to client/src/main/resources/textures/blocks/sandstone_normal.png diff --git a/client/data/textures/blocks/sandstone_smooth.png b/client/src/main/resources/textures/blocks/sandstone_smooth.png similarity index 100% rename from client/data/textures/blocks/sandstone_smooth.png rename to client/src/main/resources/textures/blocks/sandstone_smooth.png diff --git a/client/data/textures/blocks/selenium_block.png b/client/src/main/resources/textures/blocks/selenium_block.png similarity index 100% rename from client/data/textures/blocks/selenium_block.png rename to client/src/main/resources/textures/blocks/selenium_block.png diff --git a/client/data/textures/blocks/selenium_ore.png b/client/src/main/resources/textures/blocks/selenium_ore.png similarity index 100% rename from client/data/textures/blocks/selenium_ore.png rename to client/src/main/resources/textures/blocks/selenium_ore.png diff --git a/client/data/textures/blocks/sign.png b/client/src/main/resources/textures/blocks/sign.png similarity index 100% rename from client/data/textures/blocks/sign.png rename to client/src/main/resources/textures/blocks/sign.png diff --git a/client/data/textures/blocks/silicon_block.png b/client/src/main/resources/textures/blocks/silicon_block.png similarity index 100% rename from client/data/textures/blocks/silicon_block.png rename to client/src/main/resources/textures/blocks/silicon_block.png diff --git a/client/data/textures/blocks/silicon_ore.png b/client/src/main/resources/textures/blocks/silicon_ore.png similarity index 100% rename from client/data/textures/blocks/silicon_ore.png rename to client/src/main/resources/textures/blocks/silicon_ore.png diff --git a/client/data/textures/blocks/silver_block.png b/client/src/main/resources/textures/blocks/silver_block.png similarity index 100% rename from client/data/textures/blocks/silver_block.png rename to client/src/main/resources/textures/blocks/silver_block.png diff --git a/client/data/textures/blocks/silver_glass.png b/client/src/main/resources/textures/blocks/silver_glass.png similarity index 100% rename from client/data/textures/blocks/silver_glass.png rename to client/src/main/resources/textures/blocks/silver_glass.png diff --git a/client/data/textures/blocks/silver_glass_pane.png b/client/src/main/resources/textures/blocks/silver_glass_pane.png similarity index 100% rename from client/data/textures/blocks/silver_glass_pane.png rename to client/src/main/resources/textures/blocks/silver_glass_pane.png diff --git a/client/data/textures/blocks/silver_ore.png b/client/src/main/resources/textures/blocks/silver_ore.png similarity index 100% rename from client/data/textures/blocks/silver_ore.png rename to client/src/main/resources/textures/blocks/silver_ore.png diff --git a/client/data/textures/blocks/silver_stained_hardened_clay.png b/client/src/main/resources/textures/blocks/silver_stained_hardened_clay.png similarity index 100% rename from client/data/textures/blocks/silver_stained_hardened_clay.png rename to client/src/main/resources/textures/blocks/silver_stained_hardened_clay.png diff --git a/client/data/textures/blocks/silver_wool.png b/client/src/main/resources/textures/blocks/silver_wool.png similarity index 100% rename from client/data/textures/blocks/silver_wool.png rename to client/src/main/resources/textures/blocks/silver_wool.png diff --git a/client/data/textures/blocks/slime.png b/client/src/main/resources/textures/blocks/slime.png similarity index 100% rename from client/data/textures/blocks/slime.png rename to client/src/main/resources/textures/blocks/slime.png diff --git a/client/data/textures/blocks/slime_flow.png b/client/src/main/resources/textures/blocks/slime_flow.png similarity index 100% rename from client/data/textures/blocks/slime_flow.png rename to client/src/main/resources/textures/blocks/slime_flow.png diff --git a/client/data/textures/blocks/slime_still.png b/client/src/main/resources/textures/blocks/slime_still.png similarity index 100% rename from client/data/textures/blocks/slime_still.png rename to client/src/main/resources/textures/blocks/slime_still.png diff --git a/client/data/textures/blocks/smooth_rock.png b/client/src/main/resources/textures/blocks/smooth_rock.png similarity index 100% rename from client/data/textures/blocks/smooth_rock.png rename to client/src/main/resources/textures/blocks/smooth_rock.png diff --git a/client/data/textures/blocks/snow.png b/client/src/main/resources/textures/blocks/snow.png similarity index 100% rename from client/data/textures/blocks/snow.png rename to client/src/main/resources/textures/blocks/snow.png diff --git a/client/data/textures/blocks/sodium_block.png b/client/src/main/resources/textures/blocks/sodium_block.png similarity index 100% rename from client/data/textures/blocks/sodium_block.png rename to client/src/main/resources/textures/blocks/sodium_block.png diff --git a/client/data/textures/blocks/sodium_ore.png b/client/src/main/resources/textures/blocks/sodium_ore.png similarity index 100% rename from client/data/textures/blocks/sodium_ore.png rename to client/src/main/resources/textures/blocks/sodium_ore.png diff --git a/client/data/textures/blocks/soul_sand.png b/client/src/main/resources/textures/blocks/soul_sand.png similarity index 100% rename from client/data/textures/blocks/soul_sand.png rename to client/src/main/resources/textures/blocks/soul_sand.png diff --git a/client/data/textures/blocks/soul_wart_0.png b/client/src/main/resources/textures/blocks/soul_wart_0.png similarity index 100% rename from client/data/textures/blocks/soul_wart_0.png rename to client/src/main/resources/textures/blocks/soul_wart_0.png diff --git a/client/data/textures/blocks/soul_wart_1.png b/client/src/main/resources/textures/blocks/soul_wart_1.png similarity index 100% rename from client/data/textures/blocks/soul_wart_1.png rename to client/src/main/resources/textures/blocks/soul_wart_1.png diff --git a/client/data/textures/blocks/soul_wart_2.png b/client/src/main/resources/textures/blocks/soul_wart_2.png similarity index 100% rename from client/data/textures/blocks/soul_wart_2.png rename to client/src/main/resources/textures/blocks/soul_wart_2.png diff --git a/client/data/textures/blocks/sponge.png b/client/src/main/resources/textures/blocks/sponge.png similarity index 100% rename from client/data/textures/blocks/sponge.png rename to client/src/main/resources/textures/blocks/sponge.png diff --git a/client/data/textures/blocks/spruce_door_bottom.png b/client/src/main/resources/textures/blocks/spruce_door_bottom.png similarity index 100% rename from client/data/textures/blocks/spruce_door_bottom.png rename to client/src/main/resources/textures/blocks/spruce_door_bottom.png diff --git a/client/data/textures/blocks/spruce_door_top.png b/client/src/main/resources/textures/blocks/spruce_door_top.png similarity index 100% rename from client/data/textures/blocks/spruce_door_top.png rename to client/src/main/resources/textures/blocks/spruce_door_top.png diff --git a/client/data/textures/blocks/spruce_leaves_autumn.png b/client/src/main/resources/textures/blocks/spruce_leaves_autumn.png similarity index 100% rename from client/data/textures/blocks/spruce_leaves_autumn.png rename to client/src/main/resources/textures/blocks/spruce_leaves_autumn.png diff --git a/client/data/textures/blocks/spruce_leaves_snowy.png b/client/src/main/resources/textures/blocks/spruce_leaves_snowy.png similarity index 100% rename from client/data/textures/blocks/spruce_leaves_snowy.png rename to client/src/main/resources/textures/blocks/spruce_leaves_snowy.png diff --git a/client/data/textures/blocks/spruce_leaves_spring.png b/client/src/main/resources/textures/blocks/spruce_leaves_spring.png similarity index 100% rename from client/data/textures/blocks/spruce_leaves_spring.png rename to client/src/main/resources/textures/blocks/spruce_leaves_spring.png diff --git a/client/data/textures/blocks/spruce_leaves_summer.png b/client/src/main/resources/textures/blocks/spruce_leaves_summer.png similarity index 100% rename from client/data/textures/blocks/spruce_leaves_summer.png rename to client/src/main/resources/textures/blocks/spruce_leaves_summer.png diff --git a/client/data/textures/blocks/spruce_leaves_winter.png b/client/src/main/resources/textures/blocks/spruce_leaves_winter.png similarity index 100% rename from client/data/textures/blocks/spruce_leaves_winter.png rename to client/src/main/resources/textures/blocks/spruce_leaves_winter.png diff --git a/client/data/textures/blocks/spruce_log_bark.png b/client/src/main/resources/textures/blocks/spruce_log_bark.png similarity index 100% rename from client/data/textures/blocks/spruce_log_bark.png rename to client/src/main/resources/textures/blocks/spruce_log_bark.png diff --git a/client/data/textures/blocks/spruce_log_top.png b/client/src/main/resources/textures/blocks/spruce_log_top.png similarity index 100% rename from client/data/textures/blocks/spruce_log_top.png rename to client/src/main/resources/textures/blocks/spruce_log_top.png diff --git a/client/data/textures/blocks/spruce_planks.png b/client/src/main/resources/textures/blocks/spruce_planks.png similarity index 100% rename from client/data/textures/blocks/spruce_planks.png rename to client/src/main/resources/textures/blocks/spruce_planks.png diff --git a/client/data/textures/blocks/spruce_sapling.png b/client/src/main/resources/textures/blocks/spruce_sapling.png similarity index 100% rename from client/data/textures/blocks/spruce_sapling.png rename to client/src/main/resources/textures/blocks/spruce_sapling.png diff --git a/client/data/textures/blocks/stone.png b/client/src/main/resources/textures/blocks/stone.png similarity index 100% rename from client/data/textures/blocks/stone.png rename to client/src/main/resources/textures/blocks/stone.png diff --git a/client/data/textures/blocks/stone_slab_side.png b/client/src/main/resources/textures/blocks/stone_slab_side.png similarity index 100% rename from client/data/textures/blocks/stone_slab_side.png rename to client/src/main/resources/textures/blocks/stone_slab_side.png diff --git a/client/data/textures/blocks/stonebrick_chiseled.png b/client/src/main/resources/textures/blocks/stonebrick_chiseled.png similarity index 100% rename from client/data/textures/blocks/stonebrick_chiseled.png rename to client/src/main/resources/textures/blocks/stonebrick_chiseled.png diff --git a/client/data/textures/blocks/stonebrick_cracked.png b/client/src/main/resources/textures/blocks/stonebrick_cracked.png similarity index 100% rename from client/data/textures/blocks/stonebrick_cracked.png rename to client/src/main/resources/textures/blocks/stonebrick_cracked.png diff --git a/client/data/textures/blocks/stonebrick_default.png b/client/src/main/resources/textures/blocks/stonebrick_default.png similarity index 100% rename from client/data/textures/blocks/stonebrick_default.png rename to client/src/main/resources/textures/blocks/stonebrick_default.png diff --git a/client/data/textures/blocks/stonebrick_mossy.png b/client/src/main/resources/textures/blocks/stonebrick_mossy.png similarity index 100% rename from client/data/textures/blocks/stonebrick_mossy.png rename to client/src/main/resources/textures/blocks/stonebrick_mossy.png diff --git a/client/data/textures/blocks/sulfur_block.png b/client/src/main/resources/textures/blocks/sulfur_block.png similarity index 100% rename from client/data/textures/blocks/sulfur_block.png rename to client/src/main/resources/textures/blocks/sulfur_block.png diff --git a/client/data/textures/blocks/sulfur_ore.png b/client/src/main/resources/textures/blocks/sulfur_ore.png similarity index 100% rename from client/data/textures/blocks/sulfur_ore.png rename to client/src/main/resources/textures/blocks/sulfur_ore.png diff --git a/client/data/textures/blocks/sunflower_back.png b/client/src/main/resources/textures/blocks/sunflower_back.png similarity index 100% rename from client/data/textures/blocks/sunflower_back.png rename to client/src/main/resources/textures/blocks/sunflower_back.png diff --git a/client/data/textures/blocks/sunflower_bottom.png b/client/src/main/resources/textures/blocks/sunflower_bottom.png similarity index 100% rename from client/data/textures/blocks/sunflower_bottom.png rename to client/src/main/resources/textures/blocks/sunflower_bottom.png diff --git a/client/data/textures/blocks/sunflower_front.png b/client/src/main/resources/textures/blocks/sunflower_front.png similarity index 100% rename from client/data/textures/blocks/sunflower_front.png rename to client/src/main/resources/textures/blocks/sunflower_front.png diff --git a/client/data/textures/blocks/sunflower_top.png b/client/src/main/resources/textures/blocks/sunflower_top.png similarity index 100% rename from client/data/textures/blocks/sunflower_top.png rename to client/src/main/resources/textures/blocks/sunflower_top.png diff --git a/client/data/textures/blocks/syringa_bottom.png b/client/src/main/resources/textures/blocks/syringa_bottom.png similarity index 100% rename from client/data/textures/blocks/syringa_bottom.png rename to client/src/main/resources/textures/blocks/syringa_bottom.png diff --git a/client/data/textures/blocks/syringa_top.png b/client/src/main/resources/textures/blocks/syringa_top.png similarity index 100% rename from client/data/textures/blocks/syringa_top.png rename to client/src/main/resources/textures/blocks/syringa_top.png diff --git a/client/data/textures/blocks/tall_grass.png b/client/src/main/resources/textures/blocks/tall_grass.png similarity index 100% rename from client/data/textures/blocks/tall_grass.png rename to client/src/main/resources/textures/blocks/tall_grass.png diff --git a/client/data/textures/blocks/thetium_block.png b/client/src/main/resources/textures/blocks/thetium_block.png similarity index 100% rename from client/data/textures/blocks/thetium_block.png rename to client/src/main/resources/textures/blocks/thetium_block.png diff --git a/client/data/textures/blocks/thetium_ore.png b/client/src/main/resources/textures/blocks/thetium_ore.png similarity index 100% rename from client/data/textures/blocks/thetium_ore.png rename to client/src/main/resources/textures/blocks/thetium_ore.png diff --git a/client/data/textures/blocks/tian.png b/client/src/main/resources/textures/blocks/tian.png similarity index 100% rename from client/data/textures/blocks/tian.png rename to client/src/main/resources/textures/blocks/tian.png diff --git a/client/data/textures/blocks/tian_door_bottom.png b/client/src/main/resources/textures/blocks/tian_door_bottom.png similarity index 100% rename from client/data/textures/blocks/tian_door_bottom.png rename to client/src/main/resources/textures/blocks/tian_door_bottom.png diff --git a/client/data/textures/blocks/tian_door_top.png b/client/src/main/resources/textures/blocks/tian_door_top.png similarity index 100% rename from client/data/textures/blocks/tian_door_top.png rename to client/src/main/resources/textures/blocks/tian_door_top.png diff --git a/client/data/textures/blocks/tian_leaves_autumn.png b/client/src/main/resources/textures/blocks/tian_leaves_autumn.png similarity index 100% rename from client/data/textures/blocks/tian_leaves_autumn.png rename to client/src/main/resources/textures/blocks/tian_leaves_autumn.png diff --git a/client/data/textures/blocks/tian_leaves_snowy.png b/client/src/main/resources/textures/blocks/tian_leaves_snowy.png similarity index 100% rename from client/data/textures/blocks/tian_leaves_snowy.png rename to client/src/main/resources/textures/blocks/tian_leaves_snowy.png diff --git a/client/data/textures/blocks/tian_leaves_spring.png b/client/src/main/resources/textures/blocks/tian_leaves_spring.png similarity index 100% rename from client/data/textures/blocks/tian_leaves_spring.png rename to client/src/main/resources/textures/blocks/tian_leaves_spring.png diff --git a/client/data/textures/blocks/tian_leaves_summer.png b/client/src/main/resources/textures/blocks/tian_leaves_summer.png similarity index 100% rename from client/data/textures/blocks/tian_leaves_summer.png rename to client/src/main/resources/textures/blocks/tian_leaves_summer.png diff --git a/client/data/textures/blocks/tian_leaves_winter.png b/client/src/main/resources/textures/blocks/tian_leaves_winter.png similarity index 100% rename from client/data/textures/blocks/tian_leaves_winter.png rename to client/src/main/resources/textures/blocks/tian_leaves_winter.png diff --git a/client/data/textures/blocks/tian_log_bark.png b/client/src/main/resources/textures/blocks/tian_log_bark.png similarity index 100% rename from client/data/textures/blocks/tian_log_bark.png rename to client/src/main/resources/textures/blocks/tian_log_bark.png diff --git a/client/data/textures/blocks/tian_log_top.png b/client/src/main/resources/textures/blocks/tian_log_top.png similarity index 100% rename from client/data/textures/blocks/tian_log_top.png rename to client/src/main/resources/textures/blocks/tian_log_top.png diff --git a/client/data/textures/blocks/tian_planks.png b/client/src/main/resources/textures/blocks/tian_planks.png similarity index 100% rename from client/data/textures/blocks/tian_planks.png rename to client/src/main/resources/textures/blocks/tian_planks.png diff --git a/client/data/textures/blocks/tian_reactor_bottom.png b/client/src/main/resources/textures/blocks/tian_reactor_bottom.png similarity index 100% rename from client/data/textures/blocks/tian_reactor_bottom.png rename to client/src/main/resources/textures/blocks/tian_reactor_bottom.png diff --git a/client/data/textures/blocks/tian_reactor_front.png b/client/src/main/resources/textures/blocks/tian_reactor_front.png similarity index 100% rename from client/data/textures/blocks/tian_reactor_front.png rename to client/src/main/resources/textures/blocks/tian_reactor_front.png diff --git a/client/data/textures/blocks/tian_reactor_side.png b/client/src/main/resources/textures/blocks/tian_reactor_side.png similarity index 100% rename from client/data/textures/blocks/tian_reactor_side.png rename to client/src/main/resources/textures/blocks/tian_reactor_side.png diff --git a/client/data/textures/blocks/tian_reactor_top.png b/client/src/main/resources/textures/blocks/tian_reactor_top.png similarity index 100% rename from client/data/textures/blocks/tian_reactor_top.png rename to client/src/main/resources/textures/blocks/tian_reactor_top.png diff --git a/client/data/textures/blocks/tian_sapling.png b/client/src/main/resources/textures/blocks/tian_sapling.png similarity index 100% rename from client/data/textures/blocks/tian_sapling.png rename to client/src/main/resources/textures/blocks/tian_sapling.png diff --git a/client/data/textures/blocks/tian_soil_side.png b/client/src/main/resources/textures/blocks/tian_soil_side.png similarity index 100% rename from client/data/textures/blocks/tian_soil_side.png rename to client/src/main/resources/textures/blocks/tian_soil_side.png diff --git a/client/data/textures/blocks/tian_soil_side_snowed.png b/client/src/main/resources/textures/blocks/tian_soil_side_snowed.png similarity index 100% rename from client/data/textures/blocks/tian_soil_side_snowed.png rename to client/src/main/resources/textures/blocks/tian_soil_side_snowed.png diff --git a/client/data/textures/blocks/tian_soil_top.png b/client/src/main/resources/textures/blocks/tian_soil_top.png similarity index 100% rename from client/data/textures/blocks/tian_soil_top.png rename to client/src/main/resources/textures/blocks/tian_soil_top.png diff --git a/client/data/textures/blocks/tin_block.png b/client/src/main/resources/textures/blocks/tin_block.png similarity index 100% rename from client/data/textures/blocks/tin_block.png rename to client/src/main/resources/textures/blocks/tin_block.png diff --git a/client/data/textures/blocks/tin_ore.png b/client/src/main/resources/textures/blocks/tin_ore.png similarity index 100% rename from client/data/textures/blocks/tin_ore.png rename to client/src/main/resources/textures/blocks/tin_ore.png diff --git a/client/data/textures/blocks/titanium_block.png b/client/src/main/resources/textures/blocks/titanium_block.png similarity index 100% rename from client/data/textures/blocks/titanium_block.png rename to client/src/main/resources/textures/blocks/titanium_block.png diff --git a/client/data/textures/blocks/titanium_ore.png b/client/src/main/resources/textures/blocks/titanium_ore.png similarity index 100% rename from client/data/textures/blocks/titanium_ore.png rename to client/src/main/resources/textures/blocks/titanium_ore.png diff --git a/client/data/textures/blocks/tnt_bottom.png b/client/src/main/resources/textures/blocks/tnt_bottom.png similarity index 100% rename from client/data/textures/blocks/tnt_bottom.png rename to client/src/main/resources/textures/blocks/tnt_bottom.png diff --git a/client/data/textures/blocks/tnt_bottom_1.png b/client/src/main/resources/textures/blocks/tnt_bottom_1.png similarity index 100% rename from client/data/textures/blocks/tnt_bottom_1.png rename to client/src/main/resources/textures/blocks/tnt_bottom_1.png diff --git a/client/data/textures/blocks/tnt_bottom_2.png b/client/src/main/resources/textures/blocks/tnt_bottom_2.png similarity index 100% rename from client/data/textures/blocks/tnt_bottom_2.png rename to client/src/main/resources/textures/blocks/tnt_bottom_2.png diff --git a/client/data/textures/blocks/tnt_bottom_3.png b/client/src/main/resources/textures/blocks/tnt_bottom_3.png similarity index 100% rename from client/data/textures/blocks/tnt_bottom_3.png rename to client/src/main/resources/textures/blocks/tnt_bottom_3.png diff --git a/client/data/textures/blocks/tnt_bottom_4.png b/client/src/main/resources/textures/blocks/tnt_bottom_4.png similarity index 100% rename from client/data/textures/blocks/tnt_bottom_4.png rename to client/src/main/resources/textures/blocks/tnt_bottom_4.png diff --git a/client/data/textures/blocks/tnt_bottom_5.png b/client/src/main/resources/textures/blocks/tnt_bottom_5.png similarity index 100% rename from client/data/textures/blocks/tnt_bottom_5.png rename to client/src/main/resources/textures/blocks/tnt_bottom_5.png diff --git a/client/data/textures/blocks/tnt_bottom_6.png b/client/src/main/resources/textures/blocks/tnt_bottom_6.png similarity index 100% rename from client/data/textures/blocks/tnt_bottom_6.png rename to client/src/main/resources/textures/blocks/tnt_bottom_6.png diff --git a/client/data/textures/blocks/tnt_bottom_7.png b/client/src/main/resources/textures/blocks/tnt_bottom_7.png similarity index 100% rename from client/data/textures/blocks/tnt_bottom_7.png rename to client/src/main/resources/textures/blocks/tnt_bottom_7.png diff --git a/client/data/textures/blocks/tnt_side.png b/client/src/main/resources/textures/blocks/tnt_side.png similarity index 100% rename from client/data/textures/blocks/tnt_side.png rename to client/src/main/resources/textures/blocks/tnt_side.png diff --git a/client/data/textures/blocks/tnt_side_1.png b/client/src/main/resources/textures/blocks/tnt_side_1.png similarity index 100% rename from client/data/textures/blocks/tnt_side_1.png rename to client/src/main/resources/textures/blocks/tnt_side_1.png diff --git a/client/data/textures/blocks/tnt_side_2.png b/client/src/main/resources/textures/blocks/tnt_side_2.png similarity index 100% rename from client/data/textures/blocks/tnt_side_2.png rename to client/src/main/resources/textures/blocks/tnt_side_2.png diff --git a/client/data/textures/blocks/tnt_side_3.png b/client/src/main/resources/textures/blocks/tnt_side_3.png similarity index 100% rename from client/data/textures/blocks/tnt_side_3.png rename to client/src/main/resources/textures/blocks/tnt_side_3.png diff --git a/client/data/textures/blocks/tnt_side_4.png b/client/src/main/resources/textures/blocks/tnt_side_4.png similarity index 100% rename from client/data/textures/blocks/tnt_side_4.png rename to client/src/main/resources/textures/blocks/tnt_side_4.png diff --git a/client/data/textures/blocks/tnt_side_5.png b/client/src/main/resources/textures/blocks/tnt_side_5.png similarity index 100% rename from client/data/textures/blocks/tnt_side_5.png rename to client/src/main/resources/textures/blocks/tnt_side_5.png diff --git a/client/data/textures/blocks/tnt_side_6.png b/client/src/main/resources/textures/blocks/tnt_side_6.png similarity index 100% rename from client/data/textures/blocks/tnt_side_6.png rename to client/src/main/resources/textures/blocks/tnt_side_6.png diff --git a/client/data/textures/blocks/tnt_side_7.png b/client/src/main/resources/textures/blocks/tnt_side_7.png similarity index 100% rename from client/data/textures/blocks/tnt_side_7.png rename to client/src/main/resources/textures/blocks/tnt_side_7.png diff --git a/client/data/textures/blocks/tnt_top.png b/client/src/main/resources/textures/blocks/tnt_top.png similarity index 100% rename from client/data/textures/blocks/tnt_top.png rename to client/src/main/resources/textures/blocks/tnt_top.png diff --git a/client/data/textures/blocks/tnt_top_1.png b/client/src/main/resources/textures/blocks/tnt_top_1.png similarity index 100% rename from client/data/textures/blocks/tnt_top_1.png rename to client/src/main/resources/textures/blocks/tnt_top_1.png diff --git a/client/data/textures/blocks/tnt_top_2.png b/client/src/main/resources/textures/blocks/tnt_top_2.png similarity index 100% rename from client/data/textures/blocks/tnt_top_2.png rename to client/src/main/resources/textures/blocks/tnt_top_2.png diff --git a/client/data/textures/blocks/tnt_top_3.png b/client/src/main/resources/textures/blocks/tnt_top_3.png similarity index 100% rename from client/data/textures/blocks/tnt_top_3.png rename to client/src/main/resources/textures/blocks/tnt_top_3.png diff --git a/client/data/textures/blocks/tnt_top_4.png b/client/src/main/resources/textures/blocks/tnt_top_4.png similarity index 100% rename from client/data/textures/blocks/tnt_top_4.png rename to client/src/main/resources/textures/blocks/tnt_top_4.png diff --git a/client/data/textures/blocks/tnt_top_5.png b/client/src/main/resources/textures/blocks/tnt_top_5.png similarity index 100% rename from client/data/textures/blocks/tnt_top_5.png rename to client/src/main/resources/textures/blocks/tnt_top_5.png diff --git a/client/data/textures/blocks/tnt_top_6.png b/client/src/main/resources/textures/blocks/tnt_top_6.png similarity index 100% rename from client/data/textures/blocks/tnt_top_6.png rename to client/src/main/resources/textures/blocks/tnt_top_6.png diff --git a/client/data/textures/blocks/tnt_top_7.png b/client/src/main/resources/textures/blocks/tnt_top_7.png similarity index 100% rename from client/data/textures/blocks/tnt_top_7.png rename to client/src/main/resources/textures/blocks/tnt_top_7.png diff --git a/client/data/textures/blocks/torch.png b/client/src/main/resources/textures/blocks/torch.png similarity index 100% rename from client/data/textures/blocks/torch.png rename to client/src/main/resources/textures/blocks/torch.png diff --git a/client/data/textures/blocks/trapdoor.png b/client/src/main/resources/textures/blocks/trapdoor.png similarity index 100% rename from client/data/textures/blocks/trapdoor.png rename to client/src/main/resources/textures/blocks/trapdoor.png diff --git a/client/data/textures/blocks/trip_wire.png b/client/src/main/resources/textures/blocks/trip_wire.png similarity index 100% rename from client/data/textures/blocks/trip_wire.png rename to client/src/main/resources/textures/blocks/trip_wire.png diff --git a/client/data/textures/blocks/tripwire_hook.png b/client/src/main/resources/textures/blocks/tripwire_hook.png similarity index 100% rename from client/data/textures/blocks/tripwire_hook.png rename to client/src/main/resources/textures/blocks/tripwire_hook.png diff --git a/client/data/textures/blocks/tungsten_block.png b/client/src/main/resources/textures/blocks/tungsten_block.png similarity index 100% rename from client/data/textures/blocks/tungsten_block.png rename to client/src/main/resources/textures/blocks/tungsten_block.png diff --git a/client/data/textures/blocks/tungsten_ore.png b/client/src/main/resources/textures/blocks/tungsten_ore.png similarity index 100% rename from client/data/textures/blocks/tungsten_ore.png rename to client/src/main/resources/textures/blocks/tungsten_ore.png diff --git a/client/data/textures/blocks/unlit_redstone_torch.png b/client/src/main/resources/textures/blocks/unlit_redstone_torch.png similarity index 100% rename from client/data/textures/blocks/unlit_redstone_torch.png rename to client/src/main/resources/textures/blocks/unlit_redstone_torch.png diff --git a/client/data/textures/blocks/uranium_block.png b/client/src/main/resources/textures/blocks/uranium_block.png similarity index 100% rename from client/data/textures/blocks/uranium_block.png rename to client/src/main/resources/textures/blocks/uranium_block.png diff --git a/client/data/textures/blocks/uranium_ore.png b/client/src/main/resources/textures/blocks/uranium_ore.png similarity index 100% rename from client/data/textures/blocks/uranium_ore.png rename to client/src/main/resources/textures/blocks/uranium_ore.png diff --git a/client/data/textures/blocks/vanadium_block.png b/client/src/main/resources/textures/blocks/vanadium_block.png similarity index 100% rename from client/data/textures/blocks/vanadium_block.png rename to client/src/main/resources/textures/blocks/vanadium_block.png diff --git a/client/data/textures/blocks/vanadium_ore.png b/client/src/main/resources/textures/blocks/vanadium_ore.png similarity index 100% rename from client/data/textures/blocks/vanadium_ore.png rename to client/src/main/resources/textures/blocks/vanadium_ore.png diff --git a/client/data/textures/blocks/vine.png b/client/src/main/resources/textures/blocks/vine.png similarity index 100% rename from client/data/textures/blocks/vine.png rename to client/src/main/resources/textures/blocks/vine.png diff --git a/client/data/textures/blocks/warp_chest_front.png b/client/src/main/resources/textures/blocks/warp_chest_front.png similarity index 100% rename from client/data/textures/blocks/warp_chest_front.png rename to client/src/main/resources/textures/blocks/warp_chest_front.png diff --git a/client/data/textures/blocks/warp_chest_side.png b/client/src/main/resources/textures/blocks/warp_chest_side.png similarity index 100% rename from client/data/textures/blocks/warp_chest_side.png rename to client/src/main/resources/textures/blocks/warp_chest_side.png diff --git a/client/data/textures/blocks/warp_chest_top.png b/client/src/main/resources/textures/blocks/warp_chest_top.png similarity index 100% rename from client/data/textures/blocks/warp_chest_top.png rename to client/src/main/resources/textures/blocks/warp_chest_top.png diff --git a/client/data/textures/blocks/waterlily.png b/client/src/main/resources/textures/blocks/waterlily.png similarity index 100% rename from client/data/textures/blocks/waterlily.png rename to client/src/main/resources/textures/blocks/waterlily.png diff --git a/client/data/textures/blocks/web.png b/client/src/main/resources/textures/blocks/web.png similarity index 100% rename from client/data/textures/blocks/web.png rename to client/src/main/resources/textures/blocks/web.png diff --git a/client/data/textures/blocks/wheat_0.png b/client/src/main/resources/textures/blocks/wheat_0.png similarity index 100% rename from client/data/textures/blocks/wheat_0.png rename to client/src/main/resources/textures/blocks/wheat_0.png diff --git a/client/data/textures/blocks/wheat_1.png b/client/src/main/resources/textures/blocks/wheat_1.png similarity index 100% rename from client/data/textures/blocks/wheat_1.png rename to client/src/main/resources/textures/blocks/wheat_1.png diff --git a/client/data/textures/blocks/wheat_2.png b/client/src/main/resources/textures/blocks/wheat_2.png similarity index 100% rename from client/data/textures/blocks/wheat_2.png rename to client/src/main/resources/textures/blocks/wheat_2.png diff --git a/client/data/textures/blocks/wheat_3.png b/client/src/main/resources/textures/blocks/wheat_3.png similarity index 100% rename from client/data/textures/blocks/wheat_3.png rename to client/src/main/resources/textures/blocks/wheat_3.png diff --git a/client/data/textures/blocks/wheat_4.png b/client/src/main/resources/textures/blocks/wheat_4.png similarity index 100% rename from client/data/textures/blocks/wheat_4.png rename to client/src/main/resources/textures/blocks/wheat_4.png diff --git a/client/data/textures/blocks/wheat_5.png b/client/src/main/resources/textures/blocks/wheat_5.png similarity index 100% rename from client/data/textures/blocks/wheat_5.png rename to client/src/main/resources/textures/blocks/wheat_5.png diff --git a/client/data/textures/blocks/wheat_6.png b/client/src/main/resources/textures/blocks/wheat_6.png similarity index 100% rename from client/data/textures/blocks/wheat_6.png rename to client/src/main/resources/textures/blocks/wheat_6.png diff --git a/client/data/textures/blocks/wheat_7.png b/client/src/main/resources/textures/blocks/wheat_7.png similarity index 100% rename from client/data/textures/blocks/wheat_7.png rename to client/src/main/resources/textures/blocks/wheat_7.png diff --git a/client/data/textures/blocks/white_bed_foot_end.png b/client/src/main/resources/textures/blocks/white_bed_foot_end.png similarity index 100% rename from client/data/textures/blocks/white_bed_foot_end.png rename to client/src/main/resources/textures/blocks/white_bed_foot_end.png diff --git a/client/data/textures/blocks/white_bed_foot_side.png b/client/src/main/resources/textures/blocks/white_bed_foot_side.png similarity index 100% rename from client/data/textures/blocks/white_bed_foot_side.png rename to client/src/main/resources/textures/blocks/white_bed_foot_side.png diff --git a/client/data/textures/blocks/white_bed_foot_top.png b/client/src/main/resources/textures/blocks/white_bed_foot_top.png similarity index 100% rename from client/data/textures/blocks/white_bed_foot_top.png rename to client/src/main/resources/textures/blocks/white_bed_foot_top.png diff --git a/client/data/textures/blocks/white_bed_head_end.png b/client/src/main/resources/textures/blocks/white_bed_head_end.png similarity index 100% rename from client/data/textures/blocks/white_bed_head_end.png rename to client/src/main/resources/textures/blocks/white_bed_head_end.png diff --git a/client/data/textures/blocks/white_bed_head_side.png b/client/src/main/resources/textures/blocks/white_bed_head_side.png similarity index 100% rename from client/data/textures/blocks/white_bed_head_side.png rename to client/src/main/resources/textures/blocks/white_bed_head_side.png diff --git a/client/data/textures/blocks/white_bed_head_top.png b/client/src/main/resources/textures/blocks/white_bed_head_top.png similarity index 100% rename from client/data/textures/blocks/white_bed_head_top.png rename to client/src/main/resources/textures/blocks/white_bed_head_top.png diff --git a/client/data/textures/blocks/white_glass.png b/client/src/main/resources/textures/blocks/white_glass.png similarity index 100% rename from client/data/textures/blocks/white_glass.png rename to client/src/main/resources/textures/blocks/white_glass.png diff --git a/client/data/textures/blocks/white_glass_pane.png b/client/src/main/resources/textures/blocks/white_glass_pane.png similarity index 100% rename from client/data/textures/blocks/white_glass_pane.png rename to client/src/main/resources/textures/blocks/white_glass_pane.png diff --git a/client/data/textures/blocks/white_stained_hardened_clay.png b/client/src/main/resources/textures/blocks/white_stained_hardened_clay.png similarity index 100% rename from client/data/textures/blocks/white_stained_hardened_clay.png rename to client/src/main/resources/textures/blocks/white_stained_hardened_clay.png diff --git a/client/data/textures/blocks/white_tulip.png b/client/src/main/resources/textures/blocks/white_tulip.png similarity index 100% rename from client/data/textures/blocks/white_tulip.png rename to client/src/main/resources/textures/blocks/white_tulip.png diff --git a/client/data/textures/blocks/white_wool.png b/client/src/main/resources/textures/blocks/white_wool.png similarity index 100% rename from client/data/textures/blocks/white_wool.png rename to client/src/main/resources/textures/blocks/white_wool.png diff --git a/client/data/textures/blocks/yellow_glass.png b/client/src/main/resources/textures/blocks/yellow_glass.png similarity index 100% rename from client/data/textures/blocks/yellow_glass.png rename to client/src/main/resources/textures/blocks/yellow_glass.png diff --git a/client/data/textures/blocks/yellow_glass_pane.png b/client/src/main/resources/textures/blocks/yellow_glass_pane.png similarity index 100% rename from client/data/textures/blocks/yellow_glass_pane.png rename to client/src/main/resources/textures/blocks/yellow_glass_pane.png diff --git a/client/data/textures/blocks/yellow_stained_hardened_clay.png b/client/src/main/resources/textures/blocks/yellow_stained_hardened_clay.png similarity index 100% rename from client/data/textures/blocks/yellow_stained_hardened_clay.png rename to client/src/main/resources/textures/blocks/yellow_stained_hardened_clay.png diff --git a/client/data/textures/blocks/yellow_wool.png b/client/src/main/resources/textures/blocks/yellow_wool.png similarity index 100% rename from client/data/textures/blocks/yellow_wool.png rename to client/src/main/resources/textures/blocks/yellow_wool.png diff --git a/client/data/textures/blocks/zinc_block.png b/client/src/main/resources/textures/blocks/zinc_block.png similarity index 100% rename from client/data/textures/blocks/zinc_block.png rename to client/src/main/resources/textures/blocks/zinc_block.png diff --git a/client/data/textures/blocks/zinc_ore.png b/client/src/main/resources/textures/blocks/zinc_ore.png similarity index 100% rename from client/data/textures/blocks/zinc_ore.png rename to client/src/main/resources/textures/blocks/zinc_ore.png diff --git a/client/data/textures/entity/alucard_1.png b/client/src/main/resources/textures/entity/alucard_1.png similarity index 100% rename from client/data/textures/entity/alucard_1.png rename to client/src/main/resources/textures/entity/alucard_1.png diff --git a/client/data/textures/entity/alucard_2.png b/client/src/main/resources/textures/entity/alucard_2.png similarity index 100% rename from client/data/textures/entity/alucard_2.png rename to client/src/main/resources/textures/entity/alucard_2.png diff --git a/client/data/textures/entity/arachnoid.png b/client/src/main/resources/textures/entity/arachnoid.png similarity index 100% rename from client/data/textures/entity/arachnoid.png rename to client/src/main/resources/textures/entity/arachnoid.png diff --git a/client/data/textures/entity/arrow.png b/client/src/main/resources/textures/entity/arrow.png similarity index 100% rename from client/data/textures/entity/arrow.png rename to client/src/main/resources/textures/entity/arrow.png diff --git a/client/data/textures/entity/bat.png b/client/src/main/resources/textures/entity/bat.png similarity index 100% rename from client/data/textures/entity/bat.png rename to client/src/main/resources/textures/entity/bat.png diff --git a/client/data/textures/entity/bloodelf.png b/client/src/main/resources/textures/entity/bloodelf.png similarity index 100% rename from client/data/textures/entity/bloodelf.png rename to client/src/main/resources/textures/entity/bloodelf.png diff --git a/client/data/textures/entity/boat.png b/client/src/main/resources/textures/entity/boat.png similarity index 100% rename from client/data/textures/entity/boat.png rename to client/src/main/resources/textures/entity/boat.png diff --git a/client/data/textures/entity/box.png b/client/src/main/resources/textures/entity/box.png similarity index 100% rename from client/data/textures/entity/box.png rename to client/src/main/resources/textures/entity/box.png diff --git a/client/data/textures/entity/box_brittle.png b/client/src/main/resources/textures/entity/box_brittle.png similarity index 100% rename from client/data/textures/entity/box_brittle.png rename to client/src/main/resources/textures/entity/box_brittle.png diff --git a/client/data/textures/entity/bullet.png b/client/src/main/resources/textures/entity/bullet.png similarity index 100% rename from client/data/textures/entity/bullet.png rename to client/src/main/resources/textures/entity/bullet.png diff --git a/client/data/textures/entity/cape_bloodelf.png b/client/src/main/resources/textures/entity/cape_bloodelf.png similarity index 100% rename from client/data/textures/entity/cape_bloodelf.png rename to client/src/main/resources/textures/entity/cape_bloodelf.png diff --git a/client/data/textures/entity/cat_black.png b/client/src/main/resources/textures/entity/cat_black.png similarity index 100% rename from client/data/textures/entity/cat_black.png rename to client/src/main/resources/textures/entity/cat_black.png diff --git a/client/data/textures/entity/cat_ocelot.png b/client/src/main/resources/textures/entity/cat_ocelot.png similarity index 100% rename from client/data/textures/entity/cat_ocelot.png rename to client/src/main/resources/textures/entity/cat_ocelot.png diff --git a/client/data/textures/entity/cat_red.png b/client/src/main/resources/textures/entity/cat_red.png similarity index 100% rename from client/data/textures/entity/cat_red.png rename to client/src/main/resources/textures/entity/cat_red.png diff --git a/client/data/textures/entity/cat_siamese.png b/client/src/main/resources/textures/entity/cat_siamese.png similarity index 100% rename from client/data/textures/entity/cat_siamese.png rename to client/src/main/resources/textures/entity/cat_siamese.png diff --git a/client/data/textures/entity/char.png b/client/src/main/resources/textures/entity/char.png similarity index 100% rename from client/data/textures/entity/char.png rename to client/src/main/resources/textures/entity/char.png diff --git a/client/data/textures/entity/charge.png b/client/src/main/resources/textures/entity/charge.png similarity index 100% rename from client/data/textures/entity/charge.png rename to client/src/main/resources/textures/entity/charge.png diff --git a/client/data/textures/entity/chicken.png b/client/src/main/resources/textures/entity/chicken.png similarity index 100% rename from client/data/textures/entity/chicken.png rename to client/src/main/resources/textures/entity/chicken.png diff --git a/client/data/textures/entity/cow.png b/client/src/main/resources/textures/entity/cow.png similarity index 100% rename from client/data/textures/entity/cow.png rename to client/src/main/resources/textures/entity/cow.png diff --git a/client/data/textures/entity/crystal.png b/client/src/main/resources/textures/entity/crystal.png similarity index 100% rename from client/data/textures/entity/crystal.png rename to client/src/main/resources/textures/entity/crystal.png diff --git a/client/data/textures/entity/crystal_beam.png b/client/src/main/resources/textures/entity/crystal_beam.png similarity index 100% rename from client/data/textures/entity/crystal_beam.png rename to client/src/main/resources/textures/entity/crystal_beam.png diff --git a/client/data/textures/entity/darkmage.png b/client/src/main/resources/textures/entity/darkmage.png similarity index 100% rename from client/data/textures/entity/darkmage.png rename to client/src/main/resources/textures/entity/darkmage.png diff --git a/client/data/textures/entity/donkey.png b/client/src/main/resources/textures/entity/donkey.png similarity index 100% rename from client/data/textures/entity/donkey.png rename to client/src/main/resources/textures/entity/donkey.png diff --git a/client/data/textures/entity/dracula_1.png b/client/src/main/resources/textures/entity/dracula_1.png similarity index 100% rename from client/data/textures/entity/dracula_1.png rename to client/src/main/resources/textures/entity/dracula_1.png diff --git a/client/data/textures/entity/dracula_2.png b/client/src/main/resources/textures/entity/dracula_2.png similarity index 100% rename from client/data/textures/entity/dracula_2.png rename to client/src/main/resources/textures/entity/dracula_2.png diff --git a/client/data/textures/entity/dracula_3.png b/client/src/main/resources/textures/entity/dracula_3.png similarity index 100% rename from client/data/textures/entity/dracula_3.png rename to client/src/main/resources/textures/entity/dracula_3.png diff --git a/client/data/textures/entity/dracula_4.png b/client/src/main/resources/textures/entity/dracula_4.png similarity index 100% rename from client/data/textures/entity/dracula_4.png rename to client/src/main/resources/textures/entity/dracula_4.png diff --git a/client/data/textures/entity/dracula_5.png b/client/src/main/resources/textures/entity/dracula_5.png similarity index 100% rename from client/data/textures/entity/dracula_5.png rename to client/src/main/resources/textures/entity/dracula_5.png diff --git a/client/data/textures/entity/dracula_6.png b/client/src/main/resources/textures/entity/dracula_6.png similarity index 100% rename from client/data/textures/entity/dracula_6.png rename to client/src/main/resources/textures/entity/dracula_6.png diff --git a/client/data/textures/entity/dragon.png b/client/src/main/resources/textures/entity/dragon.png similarity index 100% rename from client/data/textures/entity/dragon.png rename to client/src/main/resources/textures/entity/dragon.png diff --git a/client/data/textures/entity/dragon_eyes.png b/client/src/main/resources/textures/entity/dragon_eyes.png similarity index 100% rename from client/data/textures/entity/dragon_eyes.png rename to client/src/main/resources/textures/entity/dragon_eyes.png diff --git a/client/data/textures/entity/dwarf.png b/client/src/main/resources/textures/entity/dwarf.png similarity index 100% rename from client/data/textures/entity/dwarf.png rename to client/src/main/resources/textures/entity/dwarf.png diff --git a/client/data/textures/entity/experience_orb.png b/client/src/main/resources/textures/entity/experience_orb.png similarity index 100% rename from client/data/textures/entity/experience_orb.png rename to client/src/main/resources/textures/entity/experience_orb.png diff --git a/client/data/textures/entity/explosion.png b/client/src/main/resources/textures/entity/explosion.png similarity index 100% rename from client/data/textures/entity/explosion.png rename to client/src/main/resources/textures/entity/explosion.png diff --git a/client/data/textures/entity/firedemon.png b/client/src/main/resources/textures/entity/firedemon.png similarity index 100% rename from client/data/textures/entity/firedemon.png rename to client/src/main/resources/textures/entity/firedemon.png diff --git a/client/data/textures/entity/gargoyle.png b/client/src/main/resources/textures/entity/gargoyle.png similarity index 100% rename from client/data/textures/entity/gargoyle.png rename to client/src/main/resources/textures/entity/gargoyle.png diff --git a/client/data/textures/entity/goblin.png b/client/src/main/resources/textures/entity/goblin.png similarity index 100% rename from client/data/textures/entity/goblin.png rename to client/src/main/resources/textures/entity/goblin.png diff --git a/client/data/textures/entity/hacker.png b/client/src/main/resources/textures/entity/hacker.png similarity index 100% rename from client/data/textures/entity/hacker.png rename to client/src/main/resources/textures/entity/hacker.png diff --git a/client/data/textures/entity/haunter.png b/client/src/main/resources/textures/entity/haunter.png similarity index 100% rename from client/data/textures/entity/haunter.png rename to client/src/main/resources/textures/entity/haunter.png diff --git a/client/data/textures/entity/herobrine.png b/client/src/main/resources/textures/entity/herobrine.png similarity index 100% rename from client/data/textures/entity/herobrine.png rename to client/src/main/resources/textures/entity/herobrine.png diff --git a/client/data/textures/entity/highelf.png b/client/src/main/resources/textures/entity/highelf.png similarity index 100% rename from client/data/textures/entity/highelf.png rename to client/src/main/resources/textures/entity/highelf.png diff --git a/client/data/textures/entity/horse_black.png b/client/src/main/resources/textures/entity/horse_black.png similarity index 100% rename from client/data/textures/entity/horse_black.png rename to client/src/main/resources/textures/entity/horse_black.png diff --git a/client/data/textures/entity/horse_brown.png b/client/src/main/resources/textures/entity/horse_brown.png similarity index 100% rename from client/data/textures/entity/horse_brown.png rename to client/src/main/resources/textures/entity/horse_brown.png diff --git a/client/data/textures/entity/horse_chestnut.png b/client/src/main/resources/textures/entity/horse_chestnut.png similarity index 100% rename from client/data/textures/entity/horse_chestnut.png rename to client/src/main/resources/textures/entity/horse_chestnut.png diff --git a/client/data/textures/entity/horse_creamy.png b/client/src/main/resources/textures/entity/horse_creamy.png similarity index 100% rename from client/data/textures/entity/horse_creamy.png rename to client/src/main/resources/textures/entity/horse_creamy.png diff --git a/client/data/textures/entity/horse_darkbrown.png b/client/src/main/resources/textures/entity/horse_darkbrown.png similarity index 100% rename from client/data/textures/entity/horse_darkbrown.png rename to client/src/main/resources/textures/entity/horse_darkbrown.png diff --git a/client/data/textures/entity/horse_gray.png b/client/src/main/resources/textures/entity/horse_gray.png similarity index 100% rename from client/data/textures/entity/horse_gray.png rename to client/src/main/resources/textures/entity/horse_gray.png diff --git a/client/data/textures/entity/horse_markings_blackdots.png b/client/src/main/resources/textures/entity/horse_markings_blackdots.png similarity index 100% rename from client/data/textures/entity/horse_markings_blackdots.png rename to client/src/main/resources/textures/entity/horse_markings_blackdots.png diff --git a/client/data/textures/entity/horse_markings_white.png b/client/src/main/resources/textures/entity/horse_markings_white.png similarity index 100% rename from client/data/textures/entity/horse_markings_white.png rename to client/src/main/resources/textures/entity/horse_markings_white.png diff --git a/client/data/textures/entity/horse_markings_whitedots.png b/client/src/main/resources/textures/entity/horse_markings_whitedots.png similarity index 100% rename from client/data/textures/entity/horse_markings_whitedots.png rename to client/src/main/resources/textures/entity/horse_markings_whitedots.png diff --git a/client/data/textures/entity/horse_markings_whitefield.png b/client/src/main/resources/textures/entity/horse_markings_whitefield.png similarity index 100% rename from client/data/textures/entity/horse_markings_whitefield.png rename to client/src/main/resources/textures/entity/horse_markings_whitefield.png diff --git a/client/data/textures/entity/horse_skeleton.png b/client/src/main/resources/textures/entity/horse_skeleton.png similarity index 100% rename from client/data/textures/entity/horse_skeleton.png rename to client/src/main/resources/textures/entity/horse_skeleton.png diff --git a/client/data/textures/entity/horse_white.png b/client/src/main/resources/textures/entity/horse_white.png similarity index 100% rename from client/data/textures/entity/horse_white.png rename to client/src/main/resources/textures/entity/horse_white.png diff --git a/client/data/textures/entity/horse_zombie.png b/client/src/main/resources/textures/entity/horse_zombie.png similarity index 100% rename from client/data/textures/entity/horse_zombie.png rename to client/src/main/resources/textures/entity/horse_zombie.png diff --git a/client/data/textures/entity/jiang_cheng.png b/client/src/main/resources/textures/entity/jiang_cheng.png similarity index 100% rename from client/data/textures/entity/jiang_cheng.png rename to client/src/main/resources/textures/entity/jiang_cheng.png diff --git a/client/data/textures/entity/knight_1.png b/client/src/main/resources/textures/entity/knight_1.png similarity index 100% rename from client/data/textures/entity/knight_1.png rename to client/src/main/resources/textures/entity/knight_1.png diff --git a/client/data/textures/entity/knight_2.png b/client/src/main/resources/textures/entity/knight_2.png similarity index 100% rename from client/data/textures/entity/knight_2.png rename to client/src/main/resources/textures/entity/knight_2.png diff --git a/client/data/textures/entity/knight_3.png b/client/src/main/resources/textures/entity/knight_3.png similarity index 100% rename from client/data/textures/entity/knight_3.png rename to client/src/main/resources/textures/entity/knight_3.png diff --git a/client/data/textures/entity/knight_4.png b/client/src/main/resources/textures/entity/knight_4.png similarity index 100% rename from client/data/textures/entity/knight_4.png rename to client/src/main/resources/textures/entity/knight_4.png diff --git a/client/data/textures/entity/knight_5.png b/client/src/main/resources/textures/entity/knight_5.png similarity index 100% rename from client/data/textures/entity/knight_5.png rename to client/src/main/resources/textures/entity/knight_5.png diff --git a/client/data/textures/entity/knight_6.png b/client/src/main/resources/textures/entity/knight_6.png similarity index 100% rename from client/data/textures/entity/knight_6.png rename to client/src/main/resources/textures/entity/knight_6.png diff --git a/client/data/textures/entity/knight_7.png b/client/src/main/resources/textures/entity/knight_7.png similarity index 100% rename from client/data/textures/entity/knight_7.png rename to client/src/main/resources/textures/entity/knight_7.png diff --git a/client/data/textures/entity/knight_8.png b/client/src/main/resources/textures/entity/knight_8.png similarity index 100% rename from client/data/textures/entity/knight_8.png rename to client/src/main/resources/textures/entity/knight_8.png diff --git a/client/data/textures/entity/lan_wangji.png b/client/src/main/resources/textures/entity/lan_wangji.png similarity index 100% rename from client/data/textures/entity/lan_wangji.png rename to client/src/main/resources/textures/entity/lan_wangji.png diff --git a/client/data/textures/entity/lead_knot.png b/client/src/main/resources/textures/entity/lead_knot.png similarity index 100% rename from client/data/textures/entity/lead_knot.png rename to client/src/main/resources/textures/entity/lead_knot.png diff --git a/client/data/textures/entity/luo_binghe.png b/client/src/main/resources/textures/entity/luo_binghe.png similarity index 100% rename from client/data/textures/entity/luo_binghe.png rename to client/src/main/resources/textures/entity/luo_binghe.png diff --git a/client/data/textures/entity/mage_1.png b/client/src/main/resources/textures/entity/mage_1.png similarity index 100% rename from client/data/textures/entity/mage_1.png rename to client/src/main/resources/textures/entity/mage_1.png diff --git a/client/data/textures/entity/mage_2.png b/client/src/main/resources/textures/entity/mage_2.png similarity index 100% rename from client/data/textures/entity/mage_2.png rename to client/src/main/resources/textures/entity/mage_2.png diff --git a/client/data/textures/entity/mage_3.png b/client/src/main/resources/textures/entity/mage_3.png similarity index 100% rename from client/data/textures/entity/mage_3.png rename to client/src/main/resources/textures/entity/mage_3.png diff --git a/client/data/textures/entity/mage_4.png b/client/src/main/resources/textures/entity/mage_4.png similarity index 100% rename from client/data/textures/entity/mage_4.png rename to client/src/main/resources/textures/entity/mage_4.png diff --git a/client/data/textures/entity/mage_5.png b/client/src/main/resources/textures/entity/mage_5.png similarity index 100% rename from client/data/textures/entity/mage_5.png rename to client/src/main/resources/textures/entity/mage_5.png diff --git a/client/data/textures/entity/mage_6.png b/client/src/main/resources/textures/entity/mage_6.png similarity index 100% rename from client/data/textures/entity/mage_6.png rename to client/src/main/resources/textures/entity/mage_6.png diff --git a/client/data/textures/entity/magma.png b/client/src/main/resources/textures/entity/magma.png similarity index 100% rename from client/data/textures/entity/magma.png rename to client/src/main/resources/textures/entity/magma.png diff --git a/client/data/textures/entity/marine.png b/client/src/main/resources/textures/entity/marine.png similarity index 100% rename from client/data/textures/entity/marine.png rename to client/src/main/resources/textures/entity/marine.png diff --git a/client/data/textures/entity/marine_black_templar.png b/client/src/main/resources/textures/entity/marine_black_templar.png similarity index 100% rename from client/data/textures/entity/marine_black_templar.png rename to client/src/main/resources/textures/entity/marine_black_templar.png diff --git a/client/data/textures/entity/metalhead.png b/client/src/main/resources/textures/entity/metalhead.png similarity index 100% rename from client/data/textures/entity/metalhead.png rename to client/src/main/resources/textures/entity/metalhead.png diff --git a/client/data/textures/entity/metalhead_1.png b/client/src/main/resources/textures/entity/metalhead_1.png similarity index 100% rename from client/data/textures/entity/metalhead_1.png rename to client/src/main/resources/textures/entity/metalhead_1.png diff --git a/client/data/textures/entity/metalhead_10.png b/client/src/main/resources/textures/entity/metalhead_10.png similarity index 100% rename from client/data/textures/entity/metalhead_10.png rename to client/src/main/resources/textures/entity/metalhead_10.png diff --git a/client/data/textures/entity/metalhead_11.png b/client/src/main/resources/textures/entity/metalhead_11.png similarity index 100% rename from client/data/textures/entity/metalhead_11.png rename to client/src/main/resources/textures/entity/metalhead_11.png diff --git a/client/data/textures/entity/metalhead_12.png b/client/src/main/resources/textures/entity/metalhead_12.png similarity index 100% rename from client/data/textures/entity/metalhead_12.png rename to client/src/main/resources/textures/entity/metalhead_12.png diff --git a/client/data/textures/entity/metalhead_13.png b/client/src/main/resources/textures/entity/metalhead_13.png similarity index 100% rename from client/data/textures/entity/metalhead_13.png rename to client/src/main/resources/textures/entity/metalhead_13.png diff --git a/client/data/textures/entity/metalhead_14.png b/client/src/main/resources/textures/entity/metalhead_14.png similarity index 100% rename from client/data/textures/entity/metalhead_14.png rename to client/src/main/resources/textures/entity/metalhead_14.png diff --git a/client/data/textures/entity/metalhead_2.png b/client/src/main/resources/textures/entity/metalhead_2.png similarity index 100% rename from client/data/textures/entity/metalhead_2.png rename to client/src/main/resources/textures/entity/metalhead_2.png diff --git a/client/data/textures/entity/metalhead_3.png b/client/src/main/resources/textures/entity/metalhead_3.png similarity index 100% rename from client/data/textures/entity/metalhead_3.png rename to client/src/main/resources/textures/entity/metalhead_3.png diff --git a/client/data/textures/entity/metalhead_4.png b/client/src/main/resources/textures/entity/metalhead_4.png similarity index 100% rename from client/data/textures/entity/metalhead_4.png rename to client/src/main/resources/textures/entity/metalhead_4.png diff --git a/client/data/textures/entity/metalhead_5.png b/client/src/main/resources/textures/entity/metalhead_5.png similarity index 100% rename from client/data/textures/entity/metalhead_5.png rename to client/src/main/resources/textures/entity/metalhead_5.png diff --git a/client/data/textures/entity/metalhead_6.png b/client/src/main/resources/textures/entity/metalhead_6.png similarity index 100% rename from client/data/textures/entity/metalhead_6.png rename to client/src/main/resources/textures/entity/metalhead_6.png diff --git a/client/data/textures/entity/metalhead_7.png b/client/src/main/resources/textures/entity/metalhead_7.png similarity index 100% rename from client/data/textures/entity/metalhead_7.png rename to client/src/main/resources/textures/entity/metalhead_7.png diff --git a/client/data/textures/entity/metalhead_8.png b/client/src/main/resources/textures/entity/metalhead_8.png similarity index 100% rename from client/data/textures/entity/metalhead_8.png rename to client/src/main/resources/textures/entity/metalhead_8.png diff --git a/client/data/textures/entity/metalhead_9.png b/client/src/main/resources/textures/entity/metalhead_9.png similarity index 100% rename from client/data/textures/entity/metalhead_9.png rename to client/src/main/resources/textures/entity/metalhead_9.png diff --git a/client/data/textures/entity/minecart.png b/client/src/main/resources/textures/entity/minecart.png similarity index 100% rename from client/data/textures/entity/minecart.png rename to client/src/main/resources/textures/entity/minecart.png diff --git a/client/data/textures/entity/mooshroom.png b/client/src/main/resources/textures/entity/mooshroom.png similarity index 100% rename from client/data/textures/entity/mooshroom.png rename to client/src/main/resources/textures/entity/mooshroom.png diff --git a/client/data/textures/entity/mouse.png b/client/src/main/resources/textures/entity/mouse.png similarity index 100% rename from client/data/textures/entity/mouse.png rename to client/src/main/resources/textures/entity/mouse.png diff --git a/client/data/textures/entity/mule.png b/client/src/main/resources/textures/entity/mule.png similarity index 100% rename from client/data/textures/entity/mule.png rename to client/src/main/resources/textures/entity/mule.png diff --git a/client/data/textures/entity/orc_1.png b/client/src/main/resources/textures/entity/orc_1.png similarity index 100% rename from client/data/textures/entity/orc_1.png rename to client/src/main/resources/textures/entity/orc_1.png diff --git a/client/data/textures/entity/orc_10.png b/client/src/main/resources/textures/entity/orc_10.png similarity index 100% rename from client/data/textures/entity/orc_10.png rename to client/src/main/resources/textures/entity/orc_10.png diff --git a/client/data/textures/entity/orc_11.png b/client/src/main/resources/textures/entity/orc_11.png similarity index 100% rename from client/data/textures/entity/orc_11.png rename to client/src/main/resources/textures/entity/orc_11.png diff --git a/client/data/textures/entity/orc_12.png b/client/src/main/resources/textures/entity/orc_12.png similarity index 100% rename from client/data/textures/entity/orc_12.png rename to client/src/main/resources/textures/entity/orc_12.png diff --git a/client/data/textures/entity/orc_2.png b/client/src/main/resources/textures/entity/orc_2.png similarity index 100% rename from client/data/textures/entity/orc_2.png rename to client/src/main/resources/textures/entity/orc_2.png diff --git a/client/data/textures/entity/orc_3.png b/client/src/main/resources/textures/entity/orc_3.png similarity index 100% rename from client/data/textures/entity/orc_3.png rename to client/src/main/resources/textures/entity/orc_3.png diff --git a/client/data/textures/entity/orc_4.png b/client/src/main/resources/textures/entity/orc_4.png similarity index 100% rename from client/data/textures/entity/orc_4.png rename to client/src/main/resources/textures/entity/orc_4.png diff --git a/client/data/textures/entity/orc_5.png b/client/src/main/resources/textures/entity/orc_5.png similarity index 100% rename from client/data/textures/entity/orc_5.png rename to client/src/main/resources/textures/entity/orc_5.png diff --git a/client/data/textures/entity/orc_6.png b/client/src/main/resources/textures/entity/orc_6.png similarity index 100% rename from client/data/textures/entity/orc_6.png rename to client/src/main/resources/textures/entity/orc_6.png diff --git a/client/data/textures/entity/orc_7.png b/client/src/main/resources/textures/entity/orc_7.png similarity index 100% rename from client/data/textures/entity/orc_7.png rename to client/src/main/resources/textures/entity/orc_7.png diff --git a/client/data/textures/entity/orc_8.png b/client/src/main/resources/textures/entity/orc_8.png similarity index 100% rename from client/data/textures/entity/orc_8.png rename to client/src/main/resources/textures/entity/orc_8.png diff --git a/client/data/textures/entity/orc_9.png b/client/src/main/resources/textures/entity/orc_9.png similarity index 100% rename from client/data/textures/entity/orc_9.png rename to client/src/main/resources/textures/entity/orc_9.png diff --git a/client/data/textures/entity/peasant_1.png b/client/src/main/resources/textures/entity/peasant_1.png similarity index 100% rename from client/data/textures/entity/peasant_1.png rename to client/src/main/resources/textures/entity/peasant_1.png diff --git a/client/data/textures/entity/peasant_2.png b/client/src/main/resources/textures/entity/peasant_2.png similarity index 100% rename from client/data/textures/entity/peasant_2.png rename to client/src/main/resources/textures/entity/peasant_2.png diff --git a/client/data/textures/entity/peasant_3.png b/client/src/main/resources/textures/entity/peasant_3.png similarity index 100% rename from client/data/textures/entity/peasant_3.png rename to client/src/main/resources/textures/entity/peasant_3.png diff --git a/client/data/textures/entity/peasant_4.png b/client/src/main/resources/textures/entity/peasant_4.png similarity index 100% rename from client/data/textures/entity/peasant_4.png rename to client/src/main/resources/textures/entity/peasant_4.png diff --git a/client/data/textures/entity/peasant_5.png b/client/src/main/resources/textures/entity/peasant_5.png similarity index 100% rename from client/data/textures/entity/peasant_5.png rename to client/src/main/resources/textures/entity/peasant_5.png diff --git a/client/data/textures/entity/peasant_6.png b/client/src/main/resources/textures/entity/peasant_6.png similarity index 100% rename from client/data/textures/entity/peasant_6.png rename to client/src/main/resources/textures/entity/peasant_6.png diff --git a/client/data/textures/entity/pig.png b/client/src/main/resources/textures/entity/pig.png similarity index 100% rename from client/data/textures/entity/pig.png rename to client/src/main/resources/textures/entity/pig.png diff --git a/client/data/textures/entity/pig_saddle.png b/client/src/main/resources/textures/entity/pig_saddle.png similarity index 100% rename from client/data/textures/entity/pig_saddle.png rename to client/src/main/resources/textures/entity/pig_saddle.png diff --git a/client/data/textures/entity/power_rod.png b/client/src/main/resources/textures/entity/power_rod.png similarity index 100% rename from client/data/textures/entity/power_rod.png rename to client/src/main/resources/textures/entity/power_rod.png diff --git a/client/data/textures/entity/rabbit_black.png b/client/src/main/resources/textures/entity/rabbit_black.png similarity index 100% rename from client/data/textures/entity/rabbit_black.png rename to client/src/main/resources/textures/entity/rabbit_black.png diff --git a/client/data/textures/entity/rabbit_black_splotched.png b/client/src/main/resources/textures/entity/rabbit_black_splotched.png similarity index 100% rename from client/data/textures/entity/rabbit_black_splotched.png rename to client/src/main/resources/textures/entity/rabbit_black_splotched.png diff --git a/client/data/textures/entity/rabbit_brown.png b/client/src/main/resources/textures/entity/rabbit_brown.png similarity index 100% rename from client/data/textures/entity/rabbit_brown.png rename to client/src/main/resources/textures/entity/rabbit_brown.png diff --git a/client/data/textures/entity/rabbit_caerbannog.png b/client/src/main/resources/textures/entity/rabbit_caerbannog.png similarity index 100% rename from client/data/textures/entity/rabbit_caerbannog.png rename to client/src/main/resources/textures/entity/rabbit_caerbannog.png diff --git a/client/data/textures/entity/rabbit_dark.png b/client/src/main/resources/textures/entity/rabbit_dark.png similarity index 100% rename from client/data/textures/entity/rabbit_dark.png rename to client/src/main/resources/textures/entity/rabbit_dark.png diff --git a/client/data/textures/entity/rabbit_dark_gray.png b/client/src/main/resources/textures/entity/rabbit_dark_gray.png similarity index 100% rename from client/data/textures/entity/rabbit_dark_gray.png rename to client/src/main/resources/textures/entity/rabbit_dark_gray.png diff --git a/client/data/textures/entity/rabbit_gold.png b/client/src/main/resources/textures/entity/rabbit_gold.png similarity index 100% rename from client/data/textures/entity/rabbit_gold.png rename to client/src/main/resources/textures/entity/rabbit_gold.png diff --git a/client/data/textures/entity/rabbit_gray.png b/client/src/main/resources/textures/entity/rabbit_gray.png similarity index 100% rename from client/data/textures/entity/rabbit_gray.png rename to client/src/main/resources/textures/entity/rabbit_gray.png diff --git a/client/data/textures/entity/rabbit_salt.png b/client/src/main/resources/textures/entity/rabbit_salt.png similarity index 100% rename from client/data/textures/entity/rabbit_salt.png rename to client/src/main/resources/textures/entity/rabbit_salt.png diff --git a/client/data/textures/entity/rabbit_toast.png b/client/src/main/resources/textures/entity/rabbit_toast.png similarity index 100% rename from client/data/textures/entity/rabbit_toast.png rename to client/src/main/resources/textures/entity/rabbit_toast.png diff --git a/client/data/textures/entity/rabbit_white.png b/client/src/main/resources/textures/entity/rabbit_white.png similarity index 100% rename from client/data/textures/entity/rabbit_white.png rename to client/src/main/resources/textures/entity/rabbit_white.png diff --git a/client/data/textures/entity/rabbit_white_splotched.png b/client/src/main/resources/textures/entity/rabbit_white_splotched.png similarity index 100% rename from client/data/textures/entity/rabbit_white_splotched.png rename to client/src/main/resources/textures/entity/rabbit_white_splotched.png diff --git a/client/data/textures/entity/sen.png b/client/src/main/resources/textures/entity/sen.png similarity index 100% rename from client/data/textures/entity/sen.png rename to client/src/main/resources/textures/entity/sen.png diff --git a/client/data/textures/entity/sheep.png b/client/src/main/resources/textures/entity/sheep.png similarity index 100% rename from client/data/textures/entity/sheep.png rename to client/src/main/resources/textures/entity/sheep.png diff --git a/client/data/textures/entity/sheep_fur.png b/client/src/main/resources/textures/entity/sheep_fur.png similarity index 100% rename from client/data/textures/entity/sheep_fur.png rename to client/src/main/resources/textures/entity/sheep_fur.png diff --git a/client/data/textures/entity/shen_qingqiu.png b/client/src/main/resources/textures/entity/shen_qingqiu.png similarity index 100% rename from client/data/textures/entity/shen_qingqiu.png rename to client/src/main/resources/textures/entity/shen_qingqiu.png diff --git a/client/data/textures/entity/skull.png b/client/src/main/resources/textures/entity/skull.png similarity index 100% rename from client/data/textures/entity/skull.png rename to client/src/main/resources/textures/entity/skull.png diff --git a/client/data/textures/entity/slime.png b/client/src/main/resources/textures/entity/slime.png similarity index 100% rename from client/data/textures/entity/slime.png rename to client/src/main/resources/textures/entity/slime.png diff --git a/client/data/textures/entity/spirit.png b/client/src/main/resources/textures/entity/spirit.png similarity index 100% rename from client/data/textures/entity/spirit.png rename to client/src/main/resources/textures/entity/spirit.png diff --git a/client/data/textures/entity/squid.png b/client/src/main/resources/textures/entity/squid.png similarity index 100% rename from client/data/textures/entity/squid.png rename to client/src/main/resources/textures/entity/squid.png diff --git a/client/data/textures/entity/thranduil.png b/client/src/main/resources/textures/entity/thranduil.png similarity index 100% rename from client/data/textures/entity/thranduil.png rename to client/src/main/resources/textures/entity/thranduil.png diff --git a/client/data/textures/entity/tiefling.png b/client/src/main/resources/textures/entity/tiefling.png similarity index 100% rename from client/data/textures/entity/tiefling.png rename to client/src/main/resources/textures/entity/tiefling.png diff --git a/client/data/textures/entity/trollface.png b/client/src/main/resources/textures/entity/trollface.png similarity index 100% rename from client/data/textures/entity/trollface.png rename to client/src/main/resources/textures/entity/trollface.png diff --git a/client/data/textures/entity/undead_1.png b/client/src/main/resources/textures/entity/undead_1.png similarity index 100% rename from client/data/textures/entity/undead_1.png rename to client/src/main/resources/textures/entity/undead_1.png diff --git a/client/data/textures/entity/undead_2.png b/client/src/main/resources/textures/entity/undead_2.png similarity index 100% rename from client/data/textures/entity/undead_2.png rename to client/src/main/resources/textures/entity/undead_2.png diff --git a/client/data/textures/entity/undead_3.png b/client/src/main/resources/textures/entity/undead_3.png similarity index 100% rename from client/data/textures/entity/undead_3.png rename to client/src/main/resources/textures/entity/undead_3.png diff --git a/client/data/textures/entity/undead_4.png b/client/src/main/resources/textures/entity/undead_4.png similarity index 100% rename from client/data/textures/entity/undead_4.png rename to client/src/main/resources/textures/entity/undead_4.png diff --git a/client/data/textures/entity/unknown.png b/client/src/main/resources/textures/entity/unknown.png similarity index 100% rename from client/data/textures/entity/unknown.png rename to client/src/main/resources/textures/entity/unknown.png diff --git a/client/data/textures/entity/vampire_1.png b/client/src/main/resources/textures/entity/vampire_1.png similarity index 100% rename from client/data/textures/entity/vampire_1.png rename to client/src/main/resources/textures/entity/vampire_1.png diff --git a/client/data/textures/entity/vampire_2.png b/client/src/main/resources/textures/entity/vampire_2.png similarity index 100% rename from client/data/textures/entity/vampire_2.png rename to client/src/main/resources/textures/entity/vampire_2.png diff --git a/client/data/textures/entity/vampire_3.png b/client/src/main/resources/textures/entity/vampire_3.png similarity index 100% rename from client/data/textures/entity/vampire_3.png rename to client/src/main/resources/textures/entity/vampire_3.png diff --git a/client/data/textures/entity/vampire_4.png b/client/src/main/resources/textures/entity/vampire_4.png similarity index 100% rename from client/data/textures/entity/vampire_4.png rename to client/src/main/resources/textures/entity/vampire_4.png diff --git a/client/data/textures/entity/vampire_5.png b/client/src/main/resources/textures/entity/vampire_5.png similarity index 100% rename from client/data/textures/entity/vampire_5.png rename to client/src/main/resources/textures/entity/vampire_5.png diff --git a/client/data/textures/entity/vampire_6.png b/client/src/main/resources/textures/entity/vampire_6.png similarity index 100% rename from client/data/textures/entity/vampire_6.png rename to client/src/main/resources/textures/entity/vampire_6.png diff --git a/client/data/textures/entity/vampire_7.png b/client/src/main/resources/textures/entity/vampire_7.png similarity index 100% rename from client/data/textures/entity/vampire_7.png rename to client/src/main/resources/textures/entity/vampire_7.png diff --git a/client/data/textures/entity/vampire_8.png b/client/src/main/resources/textures/entity/vampire_8.png similarity index 100% rename from client/data/textures/entity/vampire_8.png rename to client/src/main/resources/textures/entity/vampire_8.png diff --git a/client/data/textures/entity/wei_wuxian.png b/client/src/main/resources/textures/entity/wei_wuxian.png similarity index 100% rename from client/data/textures/entity/wei_wuxian.png rename to client/src/main/resources/textures/entity/wei_wuxian.png diff --git a/client/data/textures/entity/wolf.png b/client/src/main/resources/textures/entity/wolf.png similarity index 100% rename from client/data/textures/entity/wolf.png rename to client/src/main/resources/textures/entity/wolf.png diff --git a/client/data/textures/entity/wolf_angry.png b/client/src/main/resources/textures/entity/wolf_angry.png similarity index 100% rename from client/data/textures/entity/wolf_angry.png rename to client/src/main/resources/textures/entity/wolf_angry.png diff --git a/client/data/textures/entity/wolf_collar.png b/client/src/main/resources/textures/entity/wolf_collar.png similarity index 100% rename from client/data/textures/entity/wolf_collar.png rename to client/src/main/resources/textures/entity/wolf_collar.png diff --git a/client/data/textures/entity/wolf_tame.png b/client/src/main/resources/textures/entity/wolf_tame.png similarity index 100% rename from client/data/textures/entity/wolf_tame.png rename to client/src/main/resources/textures/entity/wolf_tame.png diff --git a/client/data/textures/entity/woodelf.png b/client/src/main/resources/textures/entity/woodelf.png similarity index 100% rename from client/data/textures/entity/woodelf.png rename to client/src/main/resources/textures/entity/woodelf.png diff --git a/client/data/textures/entity/zombie_1.png b/client/src/main/resources/textures/entity/zombie_1.png similarity index 100% rename from client/data/textures/entity/zombie_1.png rename to client/src/main/resources/textures/entity/zombie_1.png diff --git a/client/data/textures/entity/zombie_2.png b/client/src/main/resources/textures/entity/zombie_2.png similarity index 100% rename from client/data/textures/entity/zombie_2.png rename to client/src/main/resources/textures/entity/zombie_2.png diff --git a/client/data/textures/entity/zombie_3.png b/client/src/main/resources/textures/entity/zombie_3.png similarity index 100% rename from client/data/textures/entity/zombie_3.png rename to client/src/main/resources/textures/entity/zombie_3.png diff --git a/client/data/textures/entity/zombie_4.png b/client/src/main/resources/textures/entity/zombie_4.png similarity index 100% rename from client/data/textures/entity/zombie_4.png rename to client/src/main/resources/textures/entity/zombie_4.png diff --git a/client/data/textures/entity/zombie_5.png b/client/src/main/resources/textures/entity/zombie_5.png similarity index 100% rename from client/data/textures/entity/zombie_5.png rename to client/src/main/resources/textures/entity/zombie_5.png diff --git a/client/data/textures/entity/zombie_6.png b/client/src/main/resources/textures/entity/zombie_6.png similarity index 100% rename from client/data/textures/entity/zombie_6.png rename to client/src/main/resources/textures/entity/zombie_6.png diff --git a/client/data/textures/font.png b/client/src/main/resources/textures/font.png similarity index 100% rename from client/data/textures/font.png rename to client/src/main/resources/textures/font.png diff --git a/client/data/textures/glint.png b/client/src/main/resources/textures/glint.png similarity index 100% rename from client/data/textures/glint.png rename to client/src/main/resources/textures/glint.png diff --git a/client/data/textures/items/acacia_door.png b/client/src/main/resources/textures/items/acacia_door.png similarity index 100% rename from client/data/textures/items/acacia_door.png rename to client/src/main/resources/textures/items/acacia_door.png diff --git a/client/data/textures/items/acid_bucket.png b/client/src/main/resources/textures/items/acid_bucket.png similarity index 100% rename from client/data/textures/items/acid_bucket.png rename to client/src/main/resources/textures/items/acid_bucket.png diff --git a/client/data/textures/items/ahrd_fragment.png b/client/src/main/resources/textures/items/ahrd_fragment.png similarity index 100% rename from client/data/textures/items/ahrd_fragment.png rename to client/src/main/resources/textures/items/ahrd_fragment.png diff --git a/client/data/textures/items/aluminium_ingot.png b/client/src/main/resources/textures/items/aluminium_ingot.png similarity index 100% rename from client/data/textures/items/aluminium_ingot.png rename to client/src/main/resources/textures/items/aluminium_ingot.png diff --git a/client/data/textures/items/antimony_powder.png b/client/src/main/resources/textures/items/antimony_powder.png similarity index 100% rename from client/data/textures/items/antimony_powder.png rename to client/src/main/resources/textures/items/antimony_powder.png diff --git a/client/data/textures/items/apple.png b/client/src/main/resources/textures/items/apple.png similarity index 100% rename from client/data/textures/items/apple.png rename to client/src/main/resources/textures/items/apple.png diff --git a/client/data/textures/items/ardite_boots.png b/client/src/main/resources/textures/items/ardite_boots.png similarity index 100% rename from client/data/textures/items/ardite_boots.png rename to client/src/main/resources/textures/items/ardite_boots.png diff --git a/client/data/textures/items/ardite_chestplate.png b/client/src/main/resources/textures/items/ardite_chestplate.png similarity index 100% rename from client/data/textures/items/ardite_chestplate.png rename to client/src/main/resources/textures/items/ardite_chestplate.png diff --git a/client/data/textures/items/ardite_helmet.png b/client/src/main/resources/textures/items/ardite_helmet.png similarity index 100% rename from client/data/textures/items/ardite_helmet.png rename to client/src/main/resources/textures/items/ardite_helmet.png diff --git a/client/data/textures/items/ardite_leggings.png b/client/src/main/resources/textures/items/ardite_leggings.png similarity index 100% rename from client/data/textures/items/ardite_leggings.png rename to client/src/main/resources/textures/items/ardite_leggings.png diff --git a/client/data/textures/items/ardite_sword.png b/client/src/main/resources/textures/items/ardite_sword.png similarity index 100% rename from client/data/textures/items/ardite_sword.png rename to client/src/main/resources/textures/items/ardite_sword.png diff --git a/client/data/textures/items/arrow.png b/client/src/main/resources/textures/items/arrow.png similarity index 100% rename from client/data/textures/items/arrow.png rename to client/src/main/resources/textures/items/arrow.png diff --git a/client/data/textures/items/arsenic_powder.png b/client/src/main/resources/textures/items/arsenic_powder.png similarity index 100% rename from client/data/textures/items/arsenic_powder.png rename to client/src/main/resources/textures/items/arsenic_powder.png diff --git a/client/data/textures/items/baked_potato.png b/client/src/main/resources/textures/items/baked_potato.png similarity index 100% rename from client/data/textures/items/baked_potato.png rename to client/src/main/resources/textures/items/baked_potato.png diff --git a/client/data/textures/items/banhammer.png b/client/src/main/resources/textures/items/banhammer.png similarity index 100% rename from client/data/textures/items/banhammer.png rename to client/src/main/resources/textures/items/banhammer.png diff --git a/client/data/textures/items/beef.png b/client/src/main/resources/textures/items/beef.png similarity index 100% rename from client/data/textures/items/beef.png rename to client/src/main/resources/textures/items/beef.png diff --git a/client/data/textures/items/birch_door.png b/client/src/main/resources/textures/items/birch_door.png similarity index 100% rename from client/data/textures/items/birch_door.png rename to client/src/main/resources/textures/items/birch_door.png diff --git a/client/data/textures/items/bismuth_ingot.png b/client/src/main/resources/textures/items/bismuth_ingot.png similarity index 100% rename from client/data/textures/items/bismuth_ingot.png rename to client/src/main/resources/textures/items/bismuth_ingot.png diff --git a/client/data/textures/items/black_bed.png b/client/src/main/resources/textures/items/black_bed.png similarity index 100% rename from client/data/textures/items/black_bed.png rename to client/src/main/resources/textures/items/black_bed.png diff --git a/client/data/textures/items/black_metal_ingot.png b/client/src/main/resources/textures/items/black_metal_ingot.png similarity index 100% rename from client/data/textures/items/black_metal_ingot.png rename to client/src/main/resources/textures/items/black_metal_ingot.png diff --git a/client/data/textures/items/black_quartz.png b/client/src/main/resources/textures/items/black_quartz.png similarity index 100% rename from client/data/textures/items/black_quartz.png rename to client/src/main/resources/textures/items/black_quartz.png diff --git a/client/data/textures/items/blackbrick.png b/client/src/main/resources/textures/items/blackbrick.png similarity index 100% rename from client/data/textures/items/blackbrick.png rename to client/src/main/resources/textures/items/blackbrick.png diff --git a/client/data/textures/items/blackwood_door.png b/client/src/main/resources/textures/items/blackwood_door.png similarity index 100% rename from client/data/textures/items/blackwood_door.png rename to client/src/main/resources/textures/items/blackwood_door.png diff --git a/client/data/textures/items/blaze_powder.png b/client/src/main/resources/textures/items/blaze_powder.png similarity index 100% rename from client/data/textures/items/blaze_powder.png rename to client/src/main/resources/textures/items/blaze_powder.png diff --git a/client/data/textures/items/blaze_rod.png b/client/src/main/resources/textures/items/blaze_rod.png similarity index 100% rename from client/data/textures/items/blaze_rod.png rename to client/src/main/resources/textures/items/blaze_rod.png diff --git a/client/data/textures/items/blood_bucket.png b/client/src/main/resources/textures/items/blood_bucket.png similarity index 100% rename from client/data/textures/items/blood_bucket.png rename to client/src/main/resources/textures/items/blood_bucket.png diff --git a/client/data/textures/items/bloodbrick.png b/client/src/main/resources/textures/items/bloodbrick.png similarity index 100% rename from client/data/textures/items/bloodbrick.png rename to client/src/main/resources/textures/items/bloodbrick.png diff --git a/client/data/textures/items/boat.png b/client/src/main/resources/textures/items/boat.png similarity index 100% rename from client/data/textures/items/boat.png rename to client/src/main/resources/textures/items/boat.png diff --git a/client/data/textures/items/bolt.png b/client/src/main/resources/textures/items/bolt.png similarity index 100% rename from client/data/textures/items/bolt.png rename to client/src/main/resources/textures/items/bolt.png diff --git a/client/data/textures/items/boltgun.png b/client/src/main/resources/textures/items/boltgun.png similarity index 100% rename from client/data/textures/items/boltgun.png rename to client/src/main/resources/textures/items/boltgun.png diff --git a/client/data/textures/items/bone.png b/client/src/main/resources/textures/items/bone.png similarity index 100% rename from client/data/textures/items/bone.png rename to client/src/main/resources/textures/items/bone.png diff --git a/client/data/textures/items/book.png b/client/src/main/resources/textures/items/book.png similarity index 100% rename from client/data/textures/items/book.png rename to client/src/main/resources/textures/items/book.png diff --git a/client/data/textures/items/bow.png b/client/src/main/resources/textures/items/bow.png similarity index 100% rename from client/data/textures/items/bow.png rename to client/src/main/resources/textures/items/bow.png diff --git a/client/data/textures/items/bow_pulling_0.png b/client/src/main/resources/textures/items/bow_pulling_0.png similarity index 100% rename from client/data/textures/items/bow_pulling_0.png rename to client/src/main/resources/textures/items/bow_pulling_0.png diff --git a/client/data/textures/items/bow_pulling_1.png b/client/src/main/resources/textures/items/bow_pulling_1.png similarity index 100% rename from client/data/textures/items/bow_pulling_1.png rename to client/src/main/resources/textures/items/bow_pulling_1.png diff --git a/client/data/textures/items/bow_pulling_2.png b/client/src/main/resources/textures/items/bow_pulling_2.png similarity index 100% rename from client/data/textures/items/bow_pulling_2.png rename to client/src/main/resources/textures/items/bow_pulling_2.png diff --git a/client/data/textures/items/bowl.png b/client/src/main/resources/textures/items/bowl.png similarity index 100% rename from client/data/textures/items/bowl.png rename to client/src/main/resources/textures/items/bowl.png diff --git a/client/data/textures/items/bread.png b/client/src/main/resources/textures/items/bread.png similarity index 100% rename from client/data/textures/items/bread.png rename to client/src/main/resources/textures/items/bread.png diff --git a/client/data/textures/items/brewing_stand.png b/client/src/main/resources/textures/items/brewing_stand.png similarity index 100% rename from client/data/textures/items/brewing_stand.png rename to client/src/main/resources/textures/items/brewing_stand.png diff --git a/client/data/textures/items/brick.png b/client/src/main/resources/textures/items/brick.png similarity index 100% rename from client/data/textures/items/brick.png rename to client/src/main/resources/textures/items/brick.png diff --git a/client/data/textures/items/bucket.png b/client/src/main/resources/textures/items/bucket.png similarity index 100% rename from client/data/textures/items/bucket.png rename to client/src/main/resources/textures/items/bucket.png diff --git a/client/data/textures/items/burning_soul.png b/client/src/main/resources/textures/items/burning_soul.png similarity index 100% rename from client/data/textures/items/burning_soul.png rename to client/src/main/resources/textures/items/burning_soul.png diff --git a/client/data/textures/items/cake.png b/client/src/main/resources/textures/items/cake.png similarity index 100% rename from client/data/textures/items/cake.png rename to client/src/main/resources/textures/items/cake.png diff --git a/client/data/textures/items/calcium_powder.png b/client/src/main/resources/textures/items/calcium_powder.png similarity index 100% rename from client/data/textures/items/calcium_powder.png rename to client/src/main/resources/textures/items/calcium_powder.png diff --git a/client/data/textures/items/camera.png b/client/src/main/resources/textures/items/camera.png similarity index 100% rename from client/data/textures/items/camera.png rename to client/src/main/resources/textures/items/camera.png diff --git a/client/data/textures/items/carrot.png b/client/src/main/resources/textures/items/carrot.png similarity index 100% rename from client/data/textures/items/carrot.png rename to client/src/main/resources/textures/items/carrot.png diff --git a/client/data/textures/items/carrot_on_a_stick.png b/client/src/main/resources/textures/items/carrot_on_a_stick.png similarity index 100% rename from client/data/textures/items/carrot_on_a_stick.png rename to client/src/main/resources/textures/items/carrot_on_a_stick.png diff --git a/client/data/textures/items/cauldron.png b/client/src/main/resources/textures/items/cauldron.png similarity index 100% rename from client/data/textures/items/cauldron.png rename to client/src/main/resources/textures/items/cauldron.png diff --git a/client/data/textures/items/chain.png b/client/src/main/resources/textures/items/chain.png similarity index 100% rename from client/data/textures/items/chain.png rename to client/src/main/resources/textures/items/chain.png diff --git a/client/data/textures/items/chain_boots.png b/client/src/main/resources/textures/items/chain_boots.png similarity index 100% rename from client/data/textures/items/chain_boots.png rename to client/src/main/resources/textures/items/chain_boots.png diff --git a/client/data/textures/items/chain_chestplate.png b/client/src/main/resources/textures/items/chain_chestplate.png similarity index 100% rename from client/data/textures/items/chain_chestplate.png rename to client/src/main/resources/textures/items/chain_chestplate.png diff --git a/client/data/textures/items/chain_helmet.png b/client/src/main/resources/textures/items/chain_helmet.png similarity index 100% rename from client/data/textures/items/chain_helmet.png rename to client/src/main/resources/textures/items/chain_helmet.png diff --git a/client/data/textures/items/chain_leggings.png b/client/src/main/resources/textures/items/chain_leggings.png similarity index 100% rename from client/data/textures/items/chain_leggings.png rename to client/src/main/resources/textures/items/chain_leggings.png diff --git a/client/data/textures/items/charcoal.png b/client/src/main/resources/textures/items/charcoal.png similarity index 100% rename from client/data/textures/items/charcoal.png rename to client/src/main/resources/textures/items/charcoal.png diff --git a/client/data/textures/items/charge_crystal.png b/client/src/main/resources/textures/items/charge_crystal.png similarity index 100% rename from client/data/textures/items/charge_crystal.png rename to client/src/main/resources/textures/items/charge_crystal.png diff --git a/client/data/textures/items/charged_orb.png b/client/src/main/resources/textures/items/charged_orb.png similarity index 100% rename from client/data/textures/items/charged_orb.png rename to client/src/main/resources/textures/items/charged_orb.png diff --git a/client/data/textures/items/cherry_door.png b/client/src/main/resources/textures/items/cherry_door.png similarity index 100% rename from client/data/textures/items/cherry_door.png rename to client/src/main/resources/textures/items/cherry_door.png diff --git a/client/data/textures/items/chest_minecart.png b/client/src/main/resources/textures/items/chest_minecart.png similarity index 100% rename from client/data/textures/items/chest_minecart.png rename to client/src/main/resources/textures/items/chest_minecart.png diff --git a/client/data/textures/items/chick_magnet.png b/client/src/main/resources/textures/items/chick_magnet.png similarity index 100% rename from client/data/textures/items/chick_magnet.png rename to client/src/main/resources/textures/items/chick_magnet.png diff --git a/client/data/textures/items/chicken.png b/client/src/main/resources/textures/items/chicken.png similarity index 100% rename from client/data/textures/items/chicken.png rename to client/src/main/resources/textures/items/chicken.png diff --git a/client/data/textures/items/chrome_ingot.png b/client/src/main/resources/textures/items/chrome_ingot.png similarity index 100% rename from client/data/textures/items/chrome_ingot.png rename to client/src/main/resources/textures/items/chrome_ingot.png diff --git a/client/data/textures/items/cinnabar.png b/client/src/main/resources/textures/items/cinnabar.png similarity index 100% rename from client/data/textures/items/cinnabar.png rename to client/src/main/resources/textures/items/cinnabar.png diff --git a/client/data/textures/items/clay_ball.png b/client/src/main/resources/textures/items/clay_ball.png similarity index 100% rename from client/data/textures/items/clay_ball.png rename to client/src/main/resources/textures/items/clay_ball.png diff --git a/client/data/textures/items/clock.png b/client/src/main/resources/textures/items/clock.png similarity index 100% rename from client/data/textures/items/clock.png rename to client/src/main/resources/textures/items/clock.png diff --git a/client/data/textures/items/cloth_boots.png b/client/src/main/resources/textures/items/cloth_boots.png similarity index 100% rename from client/data/textures/items/cloth_boots.png rename to client/src/main/resources/textures/items/cloth_boots.png diff --git a/client/data/textures/items/cloth_boots_overlay.png b/client/src/main/resources/textures/items/cloth_boots_overlay.png similarity index 100% rename from client/data/textures/items/cloth_boots_overlay.png rename to client/src/main/resources/textures/items/cloth_boots_overlay.png diff --git a/client/data/textures/items/cloth_chestplate.png b/client/src/main/resources/textures/items/cloth_chestplate.png similarity index 100% rename from client/data/textures/items/cloth_chestplate.png rename to client/src/main/resources/textures/items/cloth_chestplate.png diff --git a/client/data/textures/items/cloth_chestplate_overlay.png b/client/src/main/resources/textures/items/cloth_chestplate_overlay.png similarity index 100% rename from client/data/textures/items/cloth_chestplate_overlay.png rename to client/src/main/resources/textures/items/cloth_chestplate_overlay.png diff --git a/client/data/textures/items/cloth_helmet.png b/client/src/main/resources/textures/items/cloth_helmet.png similarity index 100% rename from client/data/textures/items/cloth_helmet.png rename to client/src/main/resources/textures/items/cloth_helmet.png diff --git a/client/data/textures/items/cloth_helmet_overlay.png b/client/src/main/resources/textures/items/cloth_helmet_overlay.png similarity index 100% rename from client/data/textures/items/cloth_helmet_overlay.png rename to client/src/main/resources/textures/items/cloth_helmet_overlay.png diff --git a/client/data/textures/items/cloth_leggings.png b/client/src/main/resources/textures/items/cloth_leggings.png similarity index 100% rename from client/data/textures/items/cloth_leggings.png rename to client/src/main/resources/textures/items/cloth_leggings.png diff --git a/client/data/textures/items/cloth_leggings_overlay.png b/client/src/main/resources/textures/items/cloth_leggings_overlay.png similarity index 100% rename from client/data/textures/items/cloth_leggings_overlay.png rename to client/src/main/resources/textures/items/cloth_leggings_overlay.png diff --git a/client/data/textures/items/clownfish.png b/client/src/main/resources/textures/items/clownfish.png similarity index 100% rename from client/data/textures/items/clownfish.png rename to client/src/main/resources/textures/items/clownfish.png diff --git a/client/data/textures/items/coal.png b/client/src/main/resources/textures/items/coal.png similarity index 100% rename from client/data/textures/items/coal.png rename to client/src/main/resources/textures/items/coal.png diff --git a/client/data/textures/items/cobalt_ingot.png b/client/src/main/resources/textures/items/cobalt_ingot.png similarity index 100% rename from client/data/textures/items/cobalt_ingot.png rename to client/src/main/resources/textures/items/cobalt_ingot.png diff --git a/client/data/textures/items/cod.png b/client/src/main/resources/textures/items/cod.png similarity index 100% rename from client/data/textures/items/cod.png rename to client/src/main/resources/textures/items/cod.png diff --git a/client/data/textures/items/comparator.png b/client/src/main/resources/textures/items/comparator.png similarity index 100% rename from client/data/textures/items/comparator.png rename to client/src/main/resources/textures/items/comparator.png diff --git a/client/data/textures/items/cooked_beef.png b/client/src/main/resources/textures/items/cooked_beef.png similarity index 100% rename from client/data/textures/items/cooked_beef.png rename to client/src/main/resources/textures/items/cooked_beef.png diff --git a/client/data/textures/items/cooked_chicken.png b/client/src/main/resources/textures/items/cooked_chicken.png similarity index 100% rename from client/data/textures/items/cooked_chicken.png rename to client/src/main/resources/textures/items/cooked_chicken.png diff --git a/client/data/textures/items/cooked_cod.png b/client/src/main/resources/textures/items/cooked_cod.png similarity index 100% rename from client/data/textures/items/cooked_cod.png rename to client/src/main/resources/textures/items/cooked_cod.png diff --git a/client/data/textures/items/cooked_porkchop.png b/client/src/main/resources/textures/items/cooked_porkchop.png similarity index 100% rename from client/data/textures/items/cooked_porkchop.png rename to client/src/main/resources/textures/items/cooked_porkchop.png diff --git a/client/data/textures/items/cooked_salmon.png b/client/src/main/resources/textures/items/cooked_salmon.png similarity index 100% rename from client/data/textures/items/cooked_salmon.png rename to client/src/main/resources/textures/items/cooked_salmon.png diff --git a/client/data/textures/items/cookie.png b/client/src/main/resources/textures/items/cookie.png similarity index 100% rename from client/data/textures/items/cookie.png rename to client/src/main/resources/textures/items/cookie.png diff --git a/client/data/textures/items/copper_ingot.png b/client/src/main/resources/textures/items/copper_ingot.png similarity index 100% rename from client/data/textures/items/copper_ingot.png rename to client/src/main/resources/textures/items/copper_ingot.png diff --git a/client/data/textures/items/dark_lighter.png b/client/src/main/resources/textures/items/dark_lighter.png similarity index 100% rename from client/data/textures/items/dark_lighter.png rename to client/src/main/resources/textures/items/dark_lighter.png diff --git a/client/data/textures/items/dark_oak_door.png b/client/src/main/resources/textures/items/dark_oak_door.png similarity index 100% rename from client/data/textures/items/dark_oak_door.png rename to client/src/main/resources/textures/items/dark_oak_door.png diff --git a/client/data/textures/items/darkstone_fragment.png b/client/src/main/resources/textures/items/darkstone_fragment.png similarity index 100% rename from client/data/textures/items/darkstone_fragment.png rename to client/src/main/resources/textures/items/darkstone_fragment.png diff --git a/client/data/textures/items/diamond.png b/client/src/main/resources/textures/items/diamond.png similarity index 100% rename from client/data/textures/items/diamond.png rename to client/src/main/resources/textures/items/diamond.png diff --git a/client/data/textures/items/diamond_axe.png b/client/src/main/resources/textures/items/diamond_axe.png similarity index 100% rename from client/data/textures/items/diamond_axe.png rename to client/src/main/resources/textures/items/diamond_axe.png diff --git a/client/data/textures/items/diamond_boots.png b/client/src/main/resources/textures/items/diamond_boots.png similarity index 100% rename from client/data/textures/items/diamond_boots.png rename to client/src/main/resources/textures/items/diamond_boots.png diff --git a/client/data/textures/items/diamond_chestplate.png b/client/src/main/resources/textures/items/diamond_chestplate.png similarity index 100% rename from client/data/textures/items/diamond_chestplate.png rename to client/src/main/resources/textures/items/diamond_chestplate.png diff --git a/client/data/textures/items/diamond_helmet.png b/client/src/main/resources/textures/items/diamond_helmet.png similarity index 100% rename from client/data/textures/items/diamond_helmet.png rename to client/src/main/resources/textures/items/diamond_helmet.png diff --git a/client/data/textures/items/diamond_hoe.png b/client/src/main/resources/textures/items/diamond_hoe.png similarity index 100% rename from client/data/textures/items/diamond_hoe.png rename to client/src/main/resources/textures/items/diamond_hoe.png diff --git a/client/data/textures/items/diamond_horse_armor.png b/client/src/main/resources/textures/items/diamond_horse_armor.png similarity index 100% rename from client/data/textures/items/diamond_horse_armor.png rename to client/src/main/resources/textures/items/diamond_horse_armor.png diff --git a/client/data/textures/items/diamond_leggings.png b/client/src/main/resources/textures/items/diamond_leggings.png similarity index 100% rename from client/data/textures/items/diamond_leggings.png rename to client/src/main/resources/textures/items/diamond_leggings.png diff --git a/client/data/textures/items/diamond_pickaxe.png b/client/src/main/resources/textures/items/diamond_pickaxe.png similarity index 100% rename from client/data/textures/items/diamond_pickaxe.png rename to client/src/main/resources/textures/items/diamond_pickaxe.png diff --git a/client/data/textures/items/diamond_shears.png b/client/src/main/resources/textures/items/diamond_shears.png similarity index 100% rename from client/data/textures/items/diamond_shears.png rename to client/src/main/resources/textures/items/diamond_shears.png diff --git a/client/data/textures/items/diamond_shovel.png b/client/src/main/resources/textures/items/diamond_shovel.png similarity index 100% rename from client/data/textures/items/diamond_shovel.png rename to client/src/main/resources/textures/items/diamond_shovel.png diff --git a/client/data/textures/items/diamond_sword.png b/client/src/main/resources/textures/items/diamond_sword.png similarity index 100% rename from client/data/textures/items/diamond_sword.png rename to client/src/main/resources/textures/items/diamond_sword.png diff --git a/client/data/textures/items/die_d10_side.png b/client/src/main/resources/textures/items/die_d10_side.png similarity index 100% rename from client/data/textures/items/die_d10_side.png rename to client/src/main/resources/textures/items/die_d10_side.png diff --git a/client/data/textures/items/die_d10_top.png b/client/src/main/resources/textures/items/die_d10_top.png similarity index 100% rename from client/data/textures/items/die_d10_top.png rename to client/src/main/resources/textures/items/die_d10_top.png diff --git a/client/data/textures/items/die_d12_side.png b/client/src/main/resources/textures/items/die_d12_side.png similarity index 100% rename from client/data/textures/items/die_d12_side.png rename to client/src/main/resources/textures/items/die_d12_side.png diff --git a/client/data/textures/items/die_d12_top.png b/client/src/main/resources/textures/items/die_d12_top.png similarity index 100% rename from client/data/textures/items/die_d12_top.png rename to client/src/main/resources/textures/items/die_d12_top.png diff --git a/client/data/textures/items/die_d20_side.png b/client/src/main/resources/textures/items/die_d20_side.png similarity index 100% rename from client/data/textures/items/die_d20_side.png rename to client/src/main/resources/textures/items/die_d20_side.png diff --git a/client/data/textures/items/die_d20_top.png b/client/src/main/resources/textures/items/die_d20_top.png similarity index 100% rename from client/data/textures/items/die_d20_top.png rename to client/src/main/resources/textures/items/die_d20_top.png diff --git a/client/data/textures/items/die_d4_side.png b/client/src/main/resources/textures/items/die_d4_side.png similarity index 100% rename from client/data/textures/items/die_d4_side.png rename to client/src/main/resources/textures/items/die_d4_side.png diff --git a/client/data/textures/items/die_d4_top.png b/client/src/main/resources/textures/items/die_d4_top.png similarity index 100% rename from client/data/textures/items/die_d4_top.png rename to client/src/main/resources/textures/items/die_d4_top.png diff --git a/client/data/textures/items/die_d6_side.png b/client/src/main/resources/textures/items/die_d6_side.png similarity index 100% rename from client/data/textures/items/die_d6_side.png rename to client/src/main/resources/textures/items/die_d6_side.png diff --git a/client/data/textures/items/die_d6_top.png b/client/src/main/resources/textures/items/die_d6_top.png similarity index 100% rename from client/data/textures/items/die_d6_top.png rename to client/src/main/resources/textures/items/die_d6_top.png diff --git a/client/data/textures/items/die_d8_side.png b/client/src/main/resources/textures/items/die_d8_side.png similarity index 100% rename from client/data/textures/items/die_d8_side.png rename to client/src/main/resources/textures/items/die_d8_side.png diff --git a/client/data/textures/items/die_d8_top.png b/client/src/main/resources/textures/items/die_d8_top.png similarity index 100% rename from client/data/textures/items/die_d8_top.png rename to client/src/main/resources/textures/items/die_d8_top.png diff --git a/client/data/textures/items/dye_black.png b/client/src/main/resources/textures/items/dye_black.png similarity index 100% rename from client/data/textures/items/dye_black.png rename to client/src/main/resources/textures/items/dye_black.png diff --git a/client/data/textures/items/dye_blue.png b/client/src/main/resources/textures/items/dye_blue.png similarity index 100% rename from client/data/textures/items/dye_blue.png rename to client/src/main/resources/textures/items/dye_blue.png diff --git a/client/data/textures/items/dye_brown.png b/client/src/main/resources/textures/items/dye_brown.png similarity index 100% rename from client/data/textures/items/dye_brown.png rename to client/src/main/resources/textures/items/dye_brown.png diff --git a/client/data/textures/items/dye_cyan.png b/client/src/main/resources/textures/items/dye_cyan.png similarity index 100% rename from client/data/textures/items/dye_cyan.png rename to client/src/main/resources/textures/items/dye_cyan.png diff --git a/client/data/textures/items/dye_gray.png b/client/src/main/resources/textures/items/dye_gray.png similarity index 100% rename from client/data/textures/items/dye_gray.png rename to client/src/main/resources/textures/items/dye_gray.png diff --git a/client/data/textures/items/dye_green.png b/client/src/main/resources/textures/items/dye_green.png similarity index 100% rename from client/data/textures/items/dye_green.png rename to client/src/main/resources/textures/items/dye_green.png diff --git a/client/data/textures/items/dye_light_blue.png b/client/src/main/resources/textures/items/dye_light_blue.png similarity index 100% rename from client/data/textures/items/dye_light_blue.png rename to client/src/main/resources/textures/items/dye_light_blue.png diff --git a/client/data/textures/items/dye_lime.png b/client/src/main/resources/textures/items/dye_lime.png similarity index 100% rename from client/data/textures/items/dye_lime.png rename to client/src/main/resources/textures/items/dye_lime.png diff --git a/client/data/textures/items/dye_magenta.png b/client/src/main/resources/textures/items/dye_magenta.png similarity index 100% rename from client/data/textures/items/dye_magenta.png rename to client/src/main/resources/textures/items/dye_magenta.png diff --git a/client/data/textures/items/dye_orange.png b/client/src/main/resources/textures/items/dye_orange.png similarity index 100% rename from client/data/textures/items/dye_orange.png rename to client/src/main/resources/textures/items/dye_orange.png diff --git a/client/data/textures/items/dye_pink.png b/client/src/main/resources/textures/items/dye_pink.png similarity index 100% rename from client/data/textures/items/dye_pink.png rename to client/src/main/resources/textures/items/dye_pink.png diff --git a/client/data/textures/items/dye_purple.png b/client/src/main/resources/textures/items/dye_purple.png similarity index 100% rename from client/data/textures/items/dye_purple.png rename to client/src/main/resources/textures/items/dye_purple.png diff --git a/client/data/textures/items/dye_red.png b/client/src/main/resources/textures/items/dye_red.png similarity index 100% rename from client/data/textures/items/dye_red.png rename to client/src/main/resources/textures/items/dye_red.png diff --git a/client/data/textures/items/dye_silver.png b/client/src/main/resources/textures/items/dye_silver.png similarity index 100% rename from client/data/textures/items/dye_silver.png rename to client/src/main/resources/textures/items/dye_silver.png diff --git a/client/data/textures/items/dye_white.png b/client/src/main/resources/textures/items/dye_white.png similarity index 100% rename from client/data/textures/items/dye_white.png rename to client/src/main/resources/textures/items/dye_white.png diff --git a/client/data/textures/items/dye_yellow.png b/client/src/main/resources/textures/items/dye_yellow.png similarity index 100% rename from client/data/textures/items/dye_yellow.png rename to client/src/main/resources/textures/items/dye_yellow.png diff --git a/client/data/textures/items/dynamite.png b/client/src/main/resources/textures/items/dynamite.png similarity index 100% rename from client/data/textures/items/dynamite.png rename to client/src/main/resources/textures/items/dynamite.png diff --git a/client/data/textures/items/dynamite_1.png b/client/src/main/resources/textures/items/dynamite_1.png similarity index 100% rename from client/data/textures/items/dynamite_1.png rename to client/src/main/resources/textures/items/dynamite_1.png diff --git a/client/data/textures/items/dynamite_2.png b/client/src/main/resources/textures/items/dynamite_2.png similarity index 100% rename from client/data/textures/items/dynamite_2.png rename to client/src/main/resources/textures/items/dynamite_2.png diff --git a/client/data/textures/items/dynamite_3.png b/client/src/main/resources/textures/items/dynamite_3.png similarity index 100% rename from client/data/textures/items/dynamite_3.png rename to client/src/main/resources/textures/items/dynamite_3.png diff --git a/client/data/textures/items/dynamite_4.png b/client/src/main/resources/textures/items/dynamite_4.png similarity index 100% rename from client/data/textures/items/dynamite_4.png rename to client/src/main/resources/textures/items/dynamite_4.png diff --git a/client/data/textures/items/dynamite_5.png b/client/src/main/resources/textures/items/dynamite_5.png similarity index 100% rename from client/data/textures/items/dynamite_5.png rename to client/src/main/resources/textures/items/dynamite_5.png diff --git a/client/data/textures/items/dynamite_6.png b/client/src/main/resources/textures/items/dynamite_6.png similarity index 100% rename from client/data/textures/items/dynamite_6.png rename to client/src/main/resources/textures/items/dynamite_6.png diff --git a/client/data/textures/items/dynamite_7.png b/client/src/main/resources/textures/items/dynamite_7.png similarity index 100% rename from client/data/textures/items/dynamite_7.png rename to client/src/main/resources/textures/items/dynamite_7.png diff --git a/client/data/textures/items/egg.png b/client/src/main/resources/textures/items/egg.png similarity index 100% rename from client/data/textures/items/egg.png rename to client/src/main/resources/textures/items/egg.png diff --git a/client/data/textures/items/emerald.png b/client/src/main/resources/textures/items/emerald.png similarity index 100% rename from client/data/textures/items/emerald.png rename to client/src/main/resources/textures/items/emerald.png diff --git a/client/data/textures/items/empty_armor_slot_boots.png b/client/src/main/resources/textures/items/empty_armor_slot_boots.png similarity index 100% rename from client/data/textures/items/empty_armor_slot_boots.png rename to client/src/main/resources/textures/items/empty_armor_slot_boots.png diff --git a/client/data/textures/items/empty_armor_slot_chestplate.png b/client/src/main/resources/textures/items/empty_armor_slot_chestplate.png similarity index 100% rename from client/data/textures/items/empty_armor_slot_chestplate.png rename to client/src/main/resources/textures/items/empty_armor_slot_chestplate.png diff --git a/client/data/textures/items/empty_armor_slot_helmet.png b/client/src/main/resources/textures/items/empty_armor_slot_helmet.png similarity index 100% rename from client/data/textures/items/empty_armor_slot_helmet.png rename to client/src/main/resources/textures/items/empty_armor_slot_helmet.png diff --git a/client/data/textures/items/empty_armor_slot_leggings.png b/client/src/main/resources/textures/items/empty_armor_slot_leggings.png similarity index 100% rename from client/data/textures/items/empty_armor_slot_leggings.png rename to client/src/main/resources/textures/items/empty_armor_slot_leggings.png diff --git a/client/data/textures/items/enchanted_book.png b/client/src/main/resources/textures/items/enchanted_book.png similarity index 100% rename from client/data/textures/items/enchanted_book.png rename to client/src/main/resources/textures/items/enchanted_book.png diff --git a/client/data/textures/items/experience_bottle.png b/client/src/main/resources/textures/items/experience_bottle.png similarity index 100% rename from client/data/textures/items/experience_bottle.png rename to client/src/main/resources/textures/items/experience_bottle.png diff --git a/client/data/textures/items/exterminator.png b/client/src/main/resources/textures/items/exterminator.png similarity index 100% rename from client/data/textures/items/exterminator.png rename to client/src/main/resources/textures/items/exterminator.png diff --git a/client/data/textures/items/feather.png b/client/src/main/resources/textures/items/feather.png similarity index 100% rename from client/data/textures/items/feather.png rename to client/src/main/resources/textures/items/feather.png diff --git a/client/data/textures/items/fermented_spider_eye.png b/client/src/main/resources/textures/items/fermented_spider_eye.png similarity index 100% rename from client/data/textures/items/fermented_spider_eye.png rename to client/src/main/resources/textures/items/fermented_spider_eye.png diff --git a/client/data/textures/items/filled_map.png b/client/src/main/resources/textures/items/filled_map.png similarity index 100% rename from client/data/textures/items/filled_map.png rename to client/src/main/resources/textures/items/filled_map.png diff --git a/client/data/textures/items/fire_charge.png b/client/src/main/resources/textures/items/fire_charge.png similarity index 100% rename from client/data/textures/items/fire_charge.png rename to client/src/main/resources/textures/items/fire_charge.png diff --git a/client/data/textures/items/firework_charge.png b/client/src/main/resources/textures/items/firework_charge.png similarity index 100% rename from client/data/textures/items/firework_charge.png rename to client/src/main/resources/textures/items/firework_charge.png diff --git a/client/data/textures/items/firework_charge_overlay.png b/client/src/main/resources/textures/items/firework_charge_overlay.png similarity index 100% rename from client/data/textures/items/firework_charge_overlay.png rename to client/src/main/resources/textures/items/firework_charge_overlay.png diff --git a/client/data/textures/items/fireworks.png b/client/src/main/resources/textures/items/fireworks.png similarity index 100% rename from client/data/textures/items/fireworks.png rename to client/src/main/resources/textures/items/fireworks.png diff --git a/client/data/textures/items/fishing_rod.png b/client/src/main/resources/textures/items/fishing_rod.png similarity index 100% rename from client/data/textures/items/fishing_rod.png rename to client/src/main/resources/textures/items/fishing_rod.png diff --git a/client/data/textures/items/fishing_rod_cast.png b/client/src/main/resources/textures/items/fishing_rod_cast.png similarity index 100% rename from client/data/textures/items/fishing_rod_cast.png rename to client/src/main/resources/textures/items/fishing_rod_cast.png diff --git a/client/data/textures/items/flint.png b/client/src/main/resources/textures/items/flint.png similarity index 100% rename from client/data/textures/items/flint.png rename to client/src/main/resources/textures/items/flint.png diff --git a/client/data/textures/items/flint_and_steel.png b/client/src/main/resources/textures/items/flint_and_steel.png similarity index 100% rename from client/data/textures/items/flint_and_steel.png rename to client/src/main/resources/textures/items/flint_and_steel.png diff --git a/client/data/textures/items/flower_pot.png b/client/src/main/resources/textures/items/flower_pot.png similarity index 100% rename from client/data/textures/items/flower_pot.png rename to client/src/main/resources/textures/items/flower_pot.png diff --git a/client/data/textures/items/furnace_minecart.png b/client/src/main/resources/textures/items/furnace_minecart.png similarity index 100% rename from client/data/textures/items/furnace_minecart.png rename to client/src/main/resources/textures/items/furnace_minecart.png diff --git a/client/data/textures/items/ghast_tear.png b/client/src/main/resources/textures/items/ghast_tear.png similarity index 100% rename from client/data/textures/items/ghast_tear.png rename to client/src/main/resources/textures/items/ghast_tear.png diff --git a/client/data/textures/items/ghi_fragment.png b/client/src/main/resources/textures/items/ghi_fragment.png similarity index 100% rename from client/data/textures/items/ghi_fragment.png rename to client/src/main/resources/textures/items/ghi_fragment.png diff --git a/client/data/textures/items/glowstone_dust.png b/client/src/main/resources/textures/items/glowstone_dust.png similarity index 100% rename from client/data/textures/items/glowstone_dust.png rename to client/src/main/resources/textures/items/glowstone_dust.png diff --git a/client/data/textures/items/gold_axe.png b/client/src/main/resources/textures/items/gold_axe.png similarity index 100% rename from client/data/textures/items/gold_axe.png rename to client/src/main/resources/textures/items/gold_axe.png diff --git a/client/data/textures/items/gold_boots.png b/client/src/main/resources/textures/items/gold_boots.png similarity index 100% rename from client/data/textures/items/gold_boots.png rename to client/src/main/resources/textures/items/gold_boots.png diff --git a/client/data/textures/items/gold_chestplate.png b/client/src/main/resources/textures/items/gold_chestplate.png similarity index 100% rename from client/data/textures/items/gold_chestplate.png rename to client/src/main/resources/textures/items/gold_chestplate.png diff --git a/client/data/textures/items/gold_helmet.png b/client/src/main/resources/textures/items/gold_helmet.png similarity index 100% rename from client/data/textures/items/gold_helmet.png rename to client/src/main/resources/textures/items/gold_helmet.png diff --git a/client/data/textures/items/gold_hoe.png b/client/src/main/resources/textures/items/gold_hoe.png similarity index 100% rename from client/data/textures/items/gold_hoe.png rename to client/src/main/resources/textures/items/gold_hoe.png diff --git a/client/data/textures/items/gold_horse_armor.png b/client/src/main/resources/textures/items/gold_horse_armor.png similarity index 100% rename from client/data/textures/items/gold_horse_armor.png rename to client/src/main/resources/textures/items/gold_horse_armor.png diff --git a/client/data/textures/items/gold_ingot.png b/client/src/main/resources/textures/items/gold_ingot.png similarity index 100% rename from client/data/textures/items/gold_ingot.png rename to client/src/main/resources/textures/items/gold_ingot.png diff --git a/client/data/textures/items/gold_leggings.png b/client/src/main/resources/textures/items/gold_leggings.png similarity index 100% rename from client/data/textures/items/gold_leggings.png rename to client/src/main/resources/textures/items/gold_leggings.png diff --git a/client/data/textures/items/gold_nugget.png b/client/src/main/resources/textures/items/gold_nugget.png similarity index 100% rename from client/data/textures/items/gold_nugget.png rename to client/src/main/resources/textures/items/gold_nugget.png diff --git a/client/data/textures/items/gold_pickaxe.png b/client/src/main/resources/textures/items/gold_pickaxe.png similarity index 100% rename from client/data/textures/items/gold_pickaxe.png rename to client/src/main/resources/textures/items/gold_pickaxe.png diff --git a/client/data/textures/items/gold_shears.png b/client/src/main/resources/textures/items/gold_shears.png similarity index 100% rename from client/data/textures/items/gold_shears.png rename to client/src/main/resources/textures/items/gold_shears.png diff --git a/client/data/textures/items/gold_shovel.png b/client/src/main/resources/textures/items/gold_shovel.png similarity index 100% rename from client/data/textures/items/gold_shovel.png rename to client/src/main/resources/textures/items/gold_shovel.png diff --git a/client/data/textures/items/gold_sword.png b/client/src/main/resources/textures/items/gold_sword.png similarity index 100% rename from client/data/textures/items/gold_sword.png rename to client/src/main/resources/textures/items/gold_sword.png diff --git a/client/data/textures/items/golden_apple.png b/client/src/main/resources/textures/items/golden_apple.png similarity index 100% rename from client/data/textures/items/golden_apple.png rename to client/src/main/resources/textures/items/golden_apple.png diff --git a/client/data/textures/items/golden_carrot.png b/client/src/main/resources/textures/items/golden_carrot.png similarity index 100% rename from client/data/textures/items/golden_carrot.png rename to client/src/main/resources/textures/items/golden_carrot.png diff --git a/client/data/textures/items/goo_bucket.png b/client/src/main/resources/textures/items/goo_bucket.png similarity index 100% rename from client/data/textures/items/goo_bucket.png rename to client/src/main/resources/textures/items/goo_bucket.png diff --git a/client/data/textures/items/gunpowder.png b/client/src/main/resources/textures/items/gunpowder.png similarity index 100% rename from client/data/textures/items/gunpowder.png rename to client/src/main/resources/textures/items/gunpowder.png diff --git a/client/data/textures/items/gyriyn_axe.png b/client/src/main/resources/textures/items/gyriyn_axe.png similarity index 100% rename from client/data/textures/items/gyriyn_axe.png rename to client/src/main/resources/textures/items/gyriyn_axe.png diff --git a/client/data/textures/items/gyriyn_hoe.png b/client/src/main/resources/textures/items/gyriyn_hoe.png similarity index 100% rename from client/data/textures/items/gyriyn_hoe.png rename to client/src/main/resources/textures/items/gyriyn_hoe.png diff --git a/client/data/textures/items/gyriyn_pickaxe.png b/client/src/main/resources/textures/items/gyriyn_pickaxe.png similarity index 100% rename from client/data/textures/items/gyriyn_pickaxe.png rename to client/src/main/resources/textures/items/gyriyn_pickaxe.png diff --git a/client/data/textures/items/gyriyn_shears.png b/client/src/main/resources/textures/items/gyriyn_shears.png similarity index 100% rename from client/data/textures/items/gyriyn_shears.png rename to client/src/main/resources/textures/items/gyriyn_shears.png diff --git a/client/data/textures/items/gyriyn_shovel.png b/client/src/main/resources/textures/items/gyriyn_shovel.png similarity index 100% rename from client/data/textures/items/gyriyn_shovel.png rename to client/src/main/resources/textures/items/gyriyn_shovel.png diff --git a/client/data/textures/items/hopper.png b/client/src/main/resources/textures/items/hopper.png similarity index 100% rename from client/data/textures/items/hopper.png rename to client/src/main/resources/textures/items/hopper.png diff --git a/client/data/textures/items/hopper_minecart.png b/client/src/main/resources/textures/items/hopper_minecart.png similarity index 100% rename from client/data/textures/items/hopper_minecart.png rename to client/src/main/resources/textures/items/hopper_minecart.png diff --git a/client/data/textures/items/hydrogen_bucket.png b/client/src/main/resources/textures/items/hydrogen_bucket.png similarity index 100% rename from client/data/textures/items/hydrogen_bucket.png rename to client/src/main/resources/textures/items/hydrogen_bucket.png diff --git a/client/data/textures/items/info_wand.png b/client/src/main/resources/textures/items/info_wand.png similarity index 100% rename from client/data/textures/items/info_wand.png rename to client/src/main/resources/textures/items/info_wand.png diff --git a/client/data/textures/items/iodine_powder.png b/client/src/main/resources/textures/items/iodine_powder.png similarity index 100% rename from client/data/textures/items/iodine_powder.png rename to client/src/main/resources/textures/items/iodine_powder.png diff --git a/client/data/textures/items/iron_axe.png b/client/src/main/resources/textures/items/iron_axe.png similarity index 100% rename from client/data/textures/items/iron_axe.png rename to client/src/main/resources/textures/items/iron_axe.png diff --git a/client/data/textures/items/iron_boots.png b/client/src/main/resources/textures/items/iron_boots.png similarity index 100% rename from client/data/textures/items/iron_boots.png rename to client/src/main/resources/textures/items/iron_boots.png diff --git a/client/data/textures/items/iron_chestplate.png b/client/src/main/resources/textures/items/iron_chestplate.png similarity index 100% rename from client/data/textures/items/iron_chestplate.png rename to client/src/main/resources/textures/items/iron_chestplate.png diff --git a/client/data/textures/items/iron_door.png b/client/src/main/resources/textures/items/iron_door.png similarity index 100% rename from client/data/textures/items/iron_door.png rename to client/src/main/resources/textures/items/iron_door.png diff --git a/client/data/textures/items/iron_helmet.png b/client/src/main/resources/textures/items/iron_helmet.png similarity index 100% rename from client/data/textures/items/iron_helmet.png rename to client/src/main/resources/textures/items/iron_helmet.png diff --git a/client/data/textures/items/iron_hoe.png b/client/src/main/resources/textures/items/iron_hoe.png similarity index 100% rename from client/data/textures/items/iron_hoe.png rename to client/src/main/resources/textures/items/iron_hoe.png diff --git a/client/data/textures/items/iron_horse_armor.png b/client/src/main/resources/textures/items/iron_horse_armor.png similarity index 100% rename from client/data/textures/items/iron_horse_armor.png rename to client/src/main/resources/textures/items/iron_horse_armor.png diff --git a/client/data/textures/items/iron_ingot.png b/client/src/main/resources/textures/items/iron_ingot.png similarity index 100% rename from client/data/textures/items/iron_ingot.png rename to client/src/main/resources/textures/items/iron_ingot.png diff --git a/client/data/textures/items/iron_leggings.png b/client/src/main/resources/textures/items/iron_leggings.png similarity index 100% rename from client/data/textures/items/iron_leggings.png rename to client/src/main/resources/textures/items/iron_leggings.png diff --git a/client/data/textures/items/iron_pickaxe.png b/client/src/main/resources/textures/items/iron_pickaxe.png similarity index 100% rename from client/data/textures/items/iron_pickaxe.png rename to client/src/main/resources/textures/items/iron_pickaxe.png diff --git a/client/data/textures/items/iron_shears.png b/client/src/main/resources/textures/items/iron_shears.png similarity index 100% rename from client/data/textures/items/iron_shears.png rename to client/src/main/resources/textures/items/iron_shears.png diff --git a/client/data/textures/items/iron_shovel.png b/client/src/main/resources/textures/items/iron_shovel.png similarity index 100% rename from client/data/textures/items/iron_shovel.png rename to client/src/main/resources/textures/items/iron_shovel.png diff --git a/client/data/textures/items/iron_sword.png b/client/src/main/resources/textures/items/iron_sword.png similarity index 100% rename from client/data/textures/items/iron_sword.png rename to client/src/main/resources/textures/items/iron_sword.png diff --git a/client/data/textures/items/item_frame.png b/client/src/main/resources/textures/items/item_frame.png similarity index 100% rename from client/data/textures/items/item_frame.png rename to client/src/main/resources/textures/items/item_frame.png diff --git a/client/data/textures/items/jungle_door.png b/client/src/main/resources/textures/items/jungle_door.png similarity index 100% rename from client/data/textures/items/jungle_door.png rename to client/src/main/resources/textures/items/jungle_door.png diff --git a/client/data/textures/items/key.png b/client/src/main/resources/textures/items/key.png similarity index 100% rename from client/data/textures/items/key.png rename to client/src/main/resources/textures/items/key.png diff --git a/client/data/textures/items/lava_bucket.png b/client/src/main/resources/textures/items/lava_bucket.png similarity index 100% rename from client/data/textures/items/lava_bucket.png rename to client/src/main/resources/textures/items/lava_bucket.png diff --git a/client/data/textures/items/lead.png b/client/src/main/resources/textures/items/lead.png similarity index 100% rename from client/data/textures/items/lead.png rename to client/src/main/resources/textures/items/lead.png diff --git a/client/data/textures/items/lead_ingot.png b/client/src/main/resources/textures/items/lead_ingot.png similarity index 100% rename from client/data/textures/items/lead_ingot.png rename to client/src/main/resources/textures/items/lead_ingot.png diff --git a/client/data/textures/items/leather.png b/client/src/main/resources/textures/items/leather.png similarity index 100% rename from client/data/textures/items/leather.png rename to client/src/main/resources/textures/items/leather.png diff --git a/client/data/textures/items/leather_boots.png b/client/src/main/resources/textures/items/leather_boots.png similarity index 100% rename from client/data/textures/items/leather_boots.png rename to client/src/main/resources/textures/items/leather_boots.png diff --git a/client/data/textures/items/leather_boots_overlay.png b/client/src/main/resources/textures/items/leather_boots_overlay.png similarity index 100% rename from client/data/textures/items/leather_boots_overlay.png rename to client/src/main/resources/textures/items/leather_boots_overlay.png diff --git a/client/data/textures/items/leather_chestplate.png b/client/src/main/resources/textures/items/leather_chestplate.png similarity index 100% rename from client/data/textures/items/leather_chestplate.png rename to client/src/main/resources/textures/items/leather_chestplate.png diff --git a/client/data/textures/items/leather_chestplate_overlay.png b/client/src/main/resources/textures/items/leather_chestplate_overlay.png similarity index 100% rename from client/data/textures/items/leather_chestplate_overlay.png rename to client/src/main/resources/textures/items/leather_chestplate_overlay.png diff --git a/client/data/textures/items/leather_helmet.png b/client/src/main/resources/textures/items/leather_helmet.png similarity index 100% rename from client/data/textures/items/leather_helmet.png rename to client/src/main/resources/textures/items/leather_helmet.png diff --git a/client/data/textures/items/leather_helmet_overlay.png b/client/src/main/resources/textures/items/leather_helmet_overlay.png similarity index 100% rename from client/data/textures/items/leather_helmet_overlay.png rename to client/src/main/resources/textures/items/leather_helmet_overlay.png diff --git a/client/data/textures/items/leather_leggings.png b/client/src/main/resources/textures/items/leather_leggings.png similarity index 100% rename from client/data/textures/items/leather_leggings.png rename to client/src/main/resources/textures/items/leather_leggings.png diff --git a/client/data/textures/items/leather_leggings_overlay.png b/client/src/main/resources/textures/items/leather_leggings_overlay.png similarity index 100% rename from client/data/textures/items/leather_leggings_overlay.png rename to client/src/main/resources/textures/items/leather_leggings_overlay.png diff --git a/client/data/textures/items/lightning_wand.png b/client/src/main/resources/textures/items/lightning_wand.png similarity index 100% rename from client/data/textures/items/lightning_wand.png rename to client/src/main/resources/textures/items/lightning_wand.png diff --git a/client/data/textures/items/lithium_ingot.png b/client/src/main/resources/textures/items/lithium_ingot.png similarity index 100% rename from client/data/textures/items/lithium_ingot.png rename to client/src/main/resources/textures/items/lithium_ingot.png diff --git a/client/data/textures/items/magma_bucket.png b/client/src/main/resources/textures/items/magma_bucket.png similarity index 100% rename from client/data/textures/items/magma_bucket.png rename to client/src/main/resources/textures/items/magma_bucket.png diff --git a/client/data/textures/items/magma_cream.png b/client/src/main/resources/textures/items/magma_cream.png similarity index 100% rename from client/data/textures/items/magma_cream.png rename to client/src/main/resources/textures/items/magma_cream.png diff --git a/client/data/textures/items/magnesium_powder.png b/client/src/main/resources/textures/items/magnesium_powder.png similarity index 100% rename from client/data/textures/items/magnesium_powder.png rename to client/src/main/resources/textures/items/magnesium_powder.png diff --git a/client/data/textures/items/magnet.png b/client/src/main/resources/textures/items/magnet.png similarity index 100% rename from client/data/textures/items/magnet.png rename to client/src/main/resources/textures/items/magnet.png diff --git a/client/data/textures/items/manganese_ingot.png b/client/src/main/resources/textures/items/manganese_ingot.png similarity index 100% rename from client/data/textures/items/manganese_ingot.png rename to client/src/main/resources/textures/items/manganese_ingot.png diff --git a/client/data/textures/items/map.png b/client/src/main/resources/textures/items/map.png similarity index 100% rename from client/data/textures/items/map.png rename to client/src/main/resources/textures/items/map.png diff --git a/client/data/textures/items/maple_door.png b/client/src/main/resources/textures/items/maple_door.png similarity index 100% rename from client/data/textures/items/maple_door.png rename to client/src/main/resources/textures/items/maple_door.png diff --git a/client/data/textures/items/melon.png b/client/src/main/resources/textures/items/melon.png similarity index 100% rename from client/data/textures/items/melon.png rename to client/src/main/resources/textures/items/melon.png diff --git a/client/data/textures/items/melon_stem.png b/client/src/main/resources/textures/items/melon_stem.png similarity index 100% rename from client/data/textures/items/melon_stem.png rename to client/src/main/resources/textures/items/melon_stem.png diff --git a/client/data/textures/items/mercury_bucket.png b/client/src/main/resources/textures/items/mercury_bucket.png similarity index 100% rename from client/data/textures/items/mercury_bucket.png rename to client/src/main/resources/textures/items/mercury_bucket.png diff --git a/client/data/textures/items/milk_bucket.png b/client/src/main/resources/textures/items/milk_bucket.png similarity index 100% rename from client/data/textures/items/milk_bucket.png rename to client/src/main/resources/textures/items/milk_bucket.png diff --git a/client/data/textures/items/minecart.png b/client/src/main/resources/textures/items/minecart.png similarity index 100% rename from client/data/textures/items/minecart.png rename to client/src/main/resources/textures/items/minecart.png diff --git a/client/data/textures/items/minecart_command_block.png b/client/src/main/resources/textures/items/minecart_command_block.png similarity index 100% rename from client/data/textures/items/minecart_command_block.png rename to client/src/main/resources/textures/items/minecart_command_block.png diff --git a/client/data/textures/items/mushroom_stew.png b/client/src/main/resources/textures/items/mushroom_stew.png similarity index 100% rename from client/data/textures/items/mushroom_stew.png rename to client/src/main/resources/textures/items/mushroom_stew.png diff --git a/client/data/textures/items/mutton_cooked.png b/client/src/main/resources/textures/items/mutton_cooked.png similarity index 100% rename from client/data/textures/items/mutton_cooked.png rename to client/src/main/resources/textures/items/mutton_cooked.png diff --git a/client/data/textures/items/mutton_raw.png b/client/src/main/resources/textures/items/mutton_raw.png similarity index 100% rename from client/data/textures/items/mutton_raw.png rename to client/src/main/resources/textures/items/mutton_raw.png diff --git a/client/data/textures/items/name_tag.png b/client/src/main/resources/textures/items/name_tag.png similarity index 100% rename from client/data/textures/items/name_tag.png rename to client/src/main/resources/textures/items/name_tag.png diff --git a/client/data/textures/items/navigator.png b/client/src/main/resources/textures/items/navigator.png similarity index 100% rename from client/data/textures/items/navigator.png rename to client/src/main/resources/textures/items/navigator.png diff --git a/client/data/textures/items/neodymium_ingot.png b/client/src/main/resources/textures/items/neodymium_ingot.png similarity index 100% rename from client/data/textures/items/neodymium_ingot.png rename to client/src/main/resources/textures/items/neodymium_ingot.png diff --git a/client/data/textures/items/neptunium_ingot.png b/client/src/main/resources/textures/items/neptunium_ingot.png similarity index 100% rename from client/data/textures/items/neptunium_ingot.png rename to client/src/main/resources/textures/items/neptunium_ingot.png diff --git a/client/data/textures/items/nichun_axe.png b/client/src/main/resources/textures/items/nichun_axe.png similarity index 100% rename from client/data/textures/items/nichun_axe.png rename to client/src/main/resources/textures/items/nichun_axe.png diff --git a/client/data/textures/items/nichun_boots.png b/client/src/main/resources/textures/items/nichun_boots.png similarity index 100% rename from client/data/textures/items/nichun_boots.png rename to client/src/main/resources/textures/items/nichun_boots.png diff --git a/client/data/textures/items/nichun_chestplate.png b/client/src/main/resources/textures/items/nichun_chestplate.png similarity index 100% rename from client/data/textures/items/nichun_chestplate.png rename to client/src/main/resources/textures/items/nichun_chestplate.png diff --git a/client/data/textures/items/nichun_helmet.png b/client/src/main/resources/textures/items/nichun_helmet.png similarity index 100% rename from client/data/textures/items/nichun_helmet.png rename to client/src/main/resources/textures/items/nichun_helmet.png diff --git a/client/data/textures/items/nichun_hoe.png b/client/src/main/resources/textures/items/nichun_hoe.png similarity index 100% rename from client/data/textures/items/nichun_hoe.png rename to client/src/main/resources/textures/items/nichun_hoe.png diff --git a/client/data/textures/items/nichun_leggings.png b/client/src/main/resources/textures/items/nichun_leggings.png similarity index 100% rename from client/data/textures/items/nichun_leggings.png rename to client/src/main/resources/textures/items/nichun_leggings.png diff --git a/client/data/textures/items/nichun_pickaxe.png b/client/src/main/resources/textures/items/nichun_pickaxe.png similarity index 100% rename from client/data/textures/items/nichun_pickaxe.png rename to client/src/main/resources/textures/items/nichun_pickaxe.png diff --git a/client/data/textures/items/nichun_shears.png b/client/src/main/resources/textures/items/nichun_shears.png similarity index 100% rename from client/data/textures/items/nichun_shears.png rename to client/src/main/resources/textures/items/nichun_shears.png diff --git a/client/data/textures/items/nichun_shovel.png b/client/src/main/resources/textures/items/nichun_shovel.png similarity index 100% rename from client/data/textures/items/nichun_shovel.png rename to client/src/main/resources/textures/items/nichun_shovel.png diff --git a/client/data/textures/items/nichun_sword.png b/client/src/main/resources/textures/items/nichun_sword.png similarity index 100% rename from client/data/textures/items/nichun_sword.png rename to client/src/main/resources/textures/items/nichun_sword.png diff --git a/client/data/textures/items/nickel_ingot.png b/client/src/main/resources/textures/items/nickel_ingot.png similarity index 100% rename from client/data/textures/items/nickel_ingot.png rename to client/src/main/resources/textures/items/nickel_ingot.png diff --git a/client/data/textures/items/nieh_fragment.png b/client/src/main/resources/textures/items/nieh_fragment.png similarity index 100% rename from client/data/textures/items/nieh_fragment.png rename to client/src/main/resources/textures/items/nieh_fragment.png diff --git a/client/data/textures/items/npc_spawner.png b/client/src/main/resources/textures/items/npc_spawner.png similarity index 100% rename from client/data/textures/items/npc_spawner.png rename to client/src/main/resources/textures/items/npc_spawner.png diff --git a/client/data/textures/items/npc_spawner_overlay.png b/client/src/main/resources/textures/items/npc_spawner_overlay.png similarity index 100% rename from client/data/textures/items/npc_spawner_overlay.png rename to client/src/main/resources/textures/items/npc_spawner_overlay.png diff --git a/client/data/textures/items/nukage_bucket.png b/client/src/main/resources/textures/items/nukage_bucket.png similarity index 100% rename from client/data/textures/items/nukage_bucket.png rename to client/src/main/resources/textures/items/nukage_bucket.png diff --git a/client/data/textures/items/oak_door.png b/client/src/main/resources/textures/items/oak_door.png similarity index 100% rename from client/data/textures/items/oak_door.png rename to client/src/main/resources/textures/items/oak_door.png diff --git a/client/data/textures/items/orb.png b/client/src/main/resources/textures/items/orb.png similarity index 100% rename from client/data/textures/items/orb.png rename to client/src/main/resources/textures/items/orb.png diff --git a/client/data/textures/items/painting.png b/client/src/main/resources/textures/items/painting.png similarity index 100% rename from client/data/textures/items/painting.png rename to client/src/main/resources/textures/items/painting.png diff --git a/client/data/textures/items/palladium_ingot.png b/client/src/main/resources/textures/items/palladium_ingot.png similarity index 100% rename from client/data/textures/items/palladium_ingot.png rename to client/src/main/resources/textures/items/palladium_ingot.png diff --git a/client/data/textures/items/paper.png b/client/src/main/resources/textures/items/paper.png similarity index 100% rename from client/data/textures/items/paper.png rename to client/src/main/resources/textures/items/paper.png diff --git a/client/data/textures/items/phosphor_powder.png b/client/src/main/resources/textures/items/phosphor_powder.png similarity index 100% rename from client/data/textures/items/phosphor_powder.png rename to client/src/main/resources/textures/items/phosphor_powder.png diff --git a/client/data/textures/items/platinum_ingot.png b/client/src/main/resources/textures/items/platinum_ingot.png similarity index 100% rename from client/data/textures/items/platinum_ingot.png rename to client/src/main/resources/textures/items/platinum_ingot.png diff --git a/client/data/textures/items/plutonium_ingot.png b/client/src/main/resources/textures/items/plutonium_ingot.png similarity index 100% rename from client/data/textures/items/plutonium_ingot.png rename to client/src/main/resources/textures/items/plutonium_ingot.png diff --git a/client/data/textures/items/poisonous_potato.png b/client/src/main/resources/textures/items/poisonous_potato.png similarity index 100% rename from client/data/textures/items/poisonous_potato.png rename to client/src/main/resources/textures/items/poisonous_potato.png diff --git a/client/data/textures/items/porkchop.png b/client/src/main/resources/textures/items/porkchop.png similarity index 100% rename from client/data/textures/items/porkchop.png rename to client/src/main/resources/textures/items/porkchop.png diff --git a/client/data/textures/items/potassium_powder.png b/client/src/main/resources/textures/items/potassium_powder.png similarity index 100% rename from client/data/textures/items/potassium_powder.png rename to client/src/main/resources/textures/items/potassium_powder.png diff --git a/client/data/textures/items/potato.png b/client/src/main/resources/textures/items/potato.png similarity index 100% rename from client/data/textures/items/potato.png rename to client/src/main/resources/textures/items/potato.png diff --git a/client/data/textures/items/potion_bottle_drinkable.png b/client/src/main/resources/textures/items/potion_bottle_drinkable.png similarity index 100% rename from client/data/textures/items/potion_bottle_drinkable.png rename to client/src/main/resources/textures/items/potion_bottle_drinkable.png diff --git a/client/data/textures/items/potion_bottle_empty.png b/client/src/main/resources/textures/items/potion_bottle_empty.png similarity index 100% rename from client/data/textures/items/potion_bottle_empty.png rename to client/src/main/resources/textures/items/potion_bottle_empty.png diff --git a/client/data/textures/items/potion_bottle_splash.png b/client/src/main/resources/textures/items/potion_bottle_splash.png similarity index 100% rename from client/data/textures/items/potion_bottle_splash.png rename to client/src/main/resources/textures/items/potion_bottle_splash.png diff --git a/client/data/textures/items/potion_overlay.png b/client/src/main/resources/textures/items/potion_overlay.png similarity index 100% rename from client/data/textures/items/potion_overlay.png rename to client/src/main/resources/textures/items/potion_overlay.png diff --git a/client/data/textures/items/praseodymium_ingot.png b/client/src/main/resources/textures/items/praseodymium_ingot.png similarity index 100% rename from client/data/textures/items/praseodymium_ingot.png rename to client/src/main/resources/textures/items/praseodymium_ingot.png diff --git a/client/data/textures/items/pufferfish.png b/client/src/main/resources/textures/items/pufferfish.png similarity index 100% rename from client/data/textures/items/pufferfish.png rename to client/src/main/resources/textures/items/pufferfish.png diff --git a/client/data/textures/items/pumpkin_pie.png b/client/src/main/resources/textures/items/pumpkin_pie.png similarity index 100% rename from client/data/textures/items/pumpkin_pie.png rename to client/src/main/resources/textures/items/pumpkin_pie.png diff --git a/client/data/textures/items/pumpkin_stem.png b/client/src/main/resources/textures/items/pumpkin_stem.png similarity index 100% rename from client/data/textures/items/pumpkin_stem.png rename to client/src/main/resources/textures/items/pumpkin_stem.png diff --git a/client/data/textures/items/purple_bed.png b/client/src/main/resources/textures/items/purple_bed.png similarity index 100% rename from client/data/textures/items/purple_bed.png rename to client/src/main/resources/textures/items/purple_bed.png diff --git a/client/data/textures/items/quartz.png b/client/src/main/resources/textures/items/quartz.png similarity index 100% rename from client/data/textures/items/quartz.png rename to client/src/main/resources/textures/items/quartz.png diff --git a/client/data/textures/items/quiver.png b/client/src/main/resources/textures/items/quiver.png similarity index 100% rename from client/data/textures/items/quiver.png rename to client/src/main/resources/textures/items/quiver.png diff --git a/client/data/textures/items/radium_ingot.png b/client/src/main/resources/textures/items/radium_ingot.png similarity index 100% rename from client/data/textures/items/radium_ingot.png rename to client/src/main/resources/textures/items/radium_ingot.png diff --git a/client/data/textures/items/record_old.png b/client/src/main/resources/textures/items/record_old.png similarity index 100% rename from client/data/textures/items/record_old.png rename to client/src/main/resources/textures/items/record_old.png diff --git a/client/data/textures/items/red_bed.png b/client/src/main/resources/textures/items/red_bed.png similarity index 100% rename from client/data/textures/items/red_bed.png rename to client/src/main/resources/textures/items/red_bed.png diff --git a/client/data/textures/items/redstone.png b/client/src/main/resources/textures/items/redstone.png similarity index 100% rename from client/data/textures/items/redstone.png rename to client/src/main/resources/textures/items/redstone.png diff --git a/client/data/textures/items/reeds.png b/client/src/main/resources/textures/items/reeds.png similarity index 100% rename from client/data/textures/items/reeds.png rename to client/src/main/resources/textures/items/reeds.png diff --git a/client/data/textures/items/repeater.png b/client/src/main/resources/textures/items/repeater.png similarity index 100% rename from client/data/textures/items/repeater.png rename to client/src/main/resources/textures/items/repeater.png diff --git a/client/data/textures/items/rotten_flesh.png b/client/src/main/resources/textures/items/rotten_flesh.png similarity index 100% rename from client/data/textures/items/rotten_flesh.png rename to client/src/main/resources/textures/items/rotten_flesh.png diff --git a/client/data/textures/items/ruby.png b/client/src/main/resources/textures/items/ruby.png similarity index 100% rename from client/data/textures/items/ruby.png rename to client/src/main/resources/textures/items/ruby.png diff --git a/client/data/textures/items/saddle.png b/client/src/main/resources/textures/items/saddle.png similarity index 100% rename from client/data/textures/items/saddle.png rename to client/src/main/resources/textures/items/saddle.png diff --git a/client/data/textures/items/salmon.png b/client/src/main/resources/textures/items/salmon.png similarity index 100% rename from client/data/textures/items/salmon.png rename to client/src/main/resources/textures/items/salmon.png diff --git a/client/data/textures/items/selenium_powder.png b/client/src/main/resources/textures/items/selenium_powder.png similarity index 100% rename from client/data/textures/items/selenium_powder.png rename to client/src/main/resources/textures/items/selenium_powder.png diff --git a/client/data/textures/items/sign.png b/client/src/main/resources/textures/items/sign.png similarity index 100% rename from client/data/textures/items/sign.png rename to client/src/main/resources/textures/items/sign.png diff --git a/client/data/textures/items/silicon_ingot.png b/client/src/main/resources/textures/items/silicon_ingot.png similarity index 100% rename from client/data/textures/items/silicon_ingot.png rename to client/src/main/resources/textures/items/silicon_ingot.png diff --git a/client/data/textures/items/silver_ingot.png b/client/src/main/resources/textures/items/silver_ingot.png similarity index 100% rename from client/data/textures/items/silver_ingot.png rename to client/src/main/resources/textures/items/silver_ingot.png diff --git a/client/data/textures/items/slime_ball.png b/client/src/main/resources/textures/items/slime_ball.png similarity index 100% rename from client/data/textures/items/slime_ball.png rename to client/src/main/resources/textures/items/slime_ball.png diff --git a/client/data/textures/items/slime_bucket.png b/client/src/main/resources/textures/items/slime_bucket.png similarity index 100% rename from client/data/textures/items/slime_bucket.png rename to client/src/main/resources/textures/items/slime_bucket.png diff --git a/client/data/textures/items/snowball.png b/client/src/main/resources/textures/items/snowball.png similarity index 100% rename from client/data/textures/items/snowball.png rename to client/src/main/resources/textures/items/snowball.png diff --git a/client/data/textures/items/sodium_powder.png b/client/src/main/resources/textures/items/sodium_powder.png similarity index 100% rename from client/data/textures/items/sodium_powder.png rename to client/src/main/resources/textures/items/sodium_powder.png diff --git a/client/data/textures/items/soul_wart.png b/client/src/main/resources/textures/items/soul_wart.png similarity index 100% rename from client/data/textures/items/soul_wart.png rename to client/src/main/resources/textures/items/soul_wart.png diff --git a/client/data/textures/items/spawn_egg.png b/client/src/main/resources/textures/items/spawn_egg.png similarity index 100% rename from client/data/textures/items/spawn_egg.png rename to client/src/main/resources/textures/items/spawn_egg.png diff --git a/client/data/textures/items/spawn_egg_overlay.png b/client/src/main/resources/textures/items/spawn_egg_overlay.png similarity index 100% rename from client/data/textures/items/spawn_egg_overlay.png rename to client/src/main/resources/textures/items/spawn_egg_overlay.png diff --git a/client/data/textures/items/speckled_melon.png b/client/src/main/resources/textures/items/speckled_melon.png similarity index 100% rename from client/data/textures/items/speckled_melon.png rename to client/src/main/resources/textures/items/speckled_melon.png diff --git a/client/data/textures/items/spider_eye.png b/client/src/main/resources/textures/items/spider_eye.png similarity index 100% rename from client/data/textures/items/spider_eye.png rename to client/src/main/resources/textures/items/spider_eye.png diff --git a/client/data/textures/items/spruce_door.png b/client/src/main/resources/textures/items/spruce_door.png similarity index 100% rename from client/data/textures/items/spruce_door.png rename to client/src/main/resources/textures/items/spruce_door.png diff --git a/client/data/textures/items/stick.png b/client/src/main/resources/textures/items/stick.png similarity index 100% rename from client/data/textures/items/stick.png rename to client/src/main/resources/textures/items/stick.png diff --git a/client/data/textures/items/stone_axe.png b/client/src/main/resources/textures/items/stone_axe.png similarity index 100% rename from client/data/textures/items/stone_axe.png rename to client/src/main/resources/textures/items/stone_axe.png diff --git a/client/data/textures/items/stone_hoe.png b/client/src/main/resources/textures/items/stone_hoe.png similarity index 100% rename from client/data/textures/items/stone_hoe.png rename to client/src/main/resources/textures/items/stone_hoe.png diff --git a/client/data/textures/items/stone_pickaxe.png b/client/src/main/resources/textures/items/stone_pickaxe.png similarity index 100% rename from client/data/textures/items/stone_pickaxe.png rename to client/src/main/resources/textures/items/stone_pickaxe.png diff --git a/client/data/textures/items/stone_shovel.png b/client/src/main/resources/textures/items/stone_shovel.png similarity index 100% rename from client/data/textures/items/stone_shovel.png rename to client/src/main/resources/textures/items/stone_shovel.png diff --git a/client/data/textures/items/stone_sword.png b/client/src/main/resources/textures/items/stone_sword.png similarity index 100% rename from client/data/textures/items/stone_sword.png rename to client/src/main/resources/textures/items/stone_sword.png diff --git a/client/data/textures/items/string.png b/client/src/main/resources/textures/items/string.png similarity index 100% rename from client/data/textures/items/string.png rename to client/src/main/resources/textures/items/string.png diff --git a/client/data/textures/items/sugar.png b/client/src/main/resources/textures/items/sugar.png similarity index 100% rename from client/data/textures/items/sugar.png rename to client/src/main/resources/textures/items/sugar.png diff --git a/client/data/textures/items/sulfur_powder.png b/client/src/main/resources/textures/items/sulfur_powder.png similarity index 100% rename from client/data/textures/items/sulfur_powder.png rename to client/src/main/resources/textures/items/sulfur_powder.png diff --git a/client/data/textures/items/thetium_axe.png b/client/src/main/resources/textures/items/thetium_axe.png similarity index 100% rename from client/data/textures/items/thetium_axe.png rename to client/src/main/resources/textures/items/thetium_axe.png diff --git a/client/data/textures/items/thetium_boots.png b/client/src/main/resources/textures/items/thetium_boots.png similarity index 100% rename from client/data/textures/items/thetium_boots.png rename to client/src/main/resources/textures/items/thetium_boots.png diff --git a/client/data/textures/items/thetium_chestplate.png b/client/src/main/resources/textures/items/thetium_chestplate.png similarity index 100% rename from client/data/textures/items/thetium_chestplate.png rename to client/src/main/resources/textures/items/thetium_chestplate.png diff --git a/client/data/textures/items/thetium_helmet.png b/client/src/main/resources/textures/items/thetium_helmet.png similarity index 100% rename from client/data/textures/items/thetium_helmet.png rename to client/src/main/resources/textures/items/thetium_helmet.png diff --git a/client/data/textures/items/thetium_hoe.png b/client/src/main/resources/textures/items/thetium_hoe.png similarity index 100% rename from client/data/textures/items/thetium_hoe.png rename to client/src/main/resources/textures/items/thetium_hoe.png diff --git a/client/data/textures/items/thetium_leggings.png b/client/src/main/resources/textures/items/thetium_leggings.png similarity index 100% rename from client/data/textures/items/thetium_leggings.png rename to client/src/main/resources/textures/items/thetium_leggings.png diff --git a/client/data/textures/items/thetium_pickaxe.png b/client/src/main/resources/textures/items/thetium_pickaxe.png similarity index 100% rename from client/data/textures/items/thetium_pickaxe.png rename to client/src/main/resources/textures/items/thetium_pickaxe.png diff --git a/client/data/textures/items/thetium_shears.png b/client/src/main/resources/textures/items/thetium_shears.png similarity index 100% rename from client/data/textures/items/thetium_shears.png rename to client/src/main/resources/textures/items/thetium_shears.png diff --git a/client/data/textures/items/thetium_shovel.png b/client/src/main/resources/textures/items/thetium_shovel.png similarity index 100% rename from client/data/textures/items/thetium_shovel.png rename to client/src/main/resources/textures/items/thetium_shovel.png diff --git a/client/data/textures/items/thetium_sword.png b/client/src/main/resources/textures/items/thetium_sword.png similarity index 100% rename from client/data/textures/items/thetium_sword.png rename to client/src/main/resources/textures/items/thetium_sword.png diff --git a/client/data/textures/items/thi_fragment.png b/client/src/main/resources/textures/items/thi_fragment.png similarity index 100% rename from client/data/textures/items/thi_fragment.png rename to client/src/main/resources/textures/items/thi_fragment.png diff --git a/client/data/textures/items/tian_door.png b/client/src/main/resources/textures/items/tian_door.png similarity index 100% rename from client/data/textures/items/tian_door.png rename to client/src/main/resources/textures/items/tian_door.png diff --git a/client/data/textures/items/tin_ingot.png b/client/src/main/resources/textures/items/tin_ingot.png similarity index 100% rename from client/data/textures/items/tin_ingot.png rename to client/src/main/resources/textures/items/tin_ingot.png diff --git a/client/data/textures/items/titanium_ingot.png b/client/src/main/resources/textures/items/titanium_ingot.png similarity index 100% rename from client/data/textures/items/titanium_ingot.png rename to client/src/main/resources/textures/items/titanium_ingot.png diff --git a/client/data/textures/items/tnt_minecart.png b/client/src/main/resources/textures/items/tnt_minecart.png similarity index 100% rename from client/data/textures/items/tnt_minecart.png rename to client/src/main/resources/textures/items/tnt_minecart.png diff --git a/client/data/textures/items/tungsten_ingot.png b/client/src/main/resources/textures/items/tungsten_ingot.png similarity index 100% rename from client/data/textures/items/tungsten_ingot.png rename to client/src/main/resources/textures/items/tungsten_ingot.png diff --git a/client/data/textures/items/uranium_ingot.png b/client/src/main/resources/textures/items/uranium_ingot.png similarity index 100% rename from client/data/textures/items/uranium_ingot.png rename to client/src/main/resources/textures/items/uranium_ingot.png diff --git a/client/data/textures/items/vanadium_ingot.png b/client/src/main/resources/textures/items/vanadium_ingot.png similarity index 100% rename from client/data/textures/items/vanadium_ingot.png rename to client/src/main/resources/textures/items/vanadium_ingot.png diff --git a/client/data/textures/items/wand.png b/client/src/main/resources/textures/items/wand.png similarity index 100% rename from client/data/textures/items/wand.png rename to client/src/main/resources/textures/items/wand.png diff --git a/client/data/textures/items/water_bucket.png b/client/src/main/resources/textures/items/water_bucket.png similarity index 100% rename from client/data/textures/items/water_bucket.png rename to client/src/main/resources/textures/items/water_bucket.png diff --git a/client/data/textures/items/weather_token_chilled.png b/client/src/main/resources/textures/items/weather_token_chilled.png similarity index 100% rename from client/data/textures/items/weather_token_chilled.png rename to client/src/main/resources/textures/items/weather_token_chilled.png diff --git a/client/data/textures/items/weather_token_clear.png b/client/src/main/resources/textures/items/weather_token_clear.png similarity index 100% rename from client/data/textures/items/weather_token_clear.png rename to client/src/main/resources/textures/items/weather_token_clear.png diff --git a/client/data/textures/items/weather_token_cold.png b/client/src/main/resources/textures/items/weather_token_cold.png similarity index 100% rename from client/data/textures/items/weather_token_cold.png rename to client/src/main/resources/textures/items/weather_token_cold.png diff --git a/client/data/textures/items/weather_token_fire.png b/client/src/main/resources/textures/items/weather_token_fire.png similarity index 100% rename from client/data/textures/items/weather_token_fire.png rename to client/src/main/resources/textures/items/weather_token_fire.png diff --git a/client/data/textures/items/weather_token_fog.png b/client/src/main/resources/textures/items/weather_token_fog.png similarity index 100% rename from client/data/textures/items/weather_token_fog.png rename to client/src/main/resources/textures/items/weather_token_fog.png diff --git a/client/data/textures/items/weather_token_frost.png b/client/src/main/resources/textures/items/weather_token_frost.png similarity index 100% rename from client/data/textures/items/weather_token_frost.png rename to client/src/main/resources/textures/items/weather_token_frost.png diff --git a/client/data/textures/items/weather_token_hail.png b/client/src/main/resources/textures/items/weather_token_hail.png similarity index 100% rename from client/data/textures/items/weather_token_hail.png rename to client/src/main/resources/textures/items/weather_token_hail.png diff --git a/client/data/textures/items/weather_token_hailstorm.png b/client/src/main/resources/textures/items/weather_token_hailstorm.png similarity index 100% rename from client/data/textures/items/weather_token_hailstorm.png rename to client/src/main/resources/textures/items/weather_token_hailstorm.png diff --git a/client/data/textures/items/weather_token_hot.png b/client/src/main/resources/textures/items/weather_token_hot.png similarity index 100% rename from client/data/textures/items/weather_token_hot.png rename to client/src/main/resources/textures/items/weather_token_hot.png diff --git a/client/data/textures/items/weather_token_ice.png b/client/src/main/resources/textures/items/weather_token_ice.png similarity index 100% rename from client/data/textures/items/weather_token_ice.png rename to client/src/main/resources/textures/items/weather_token_ice.png diff --git a/client/data/textures/items/weather_token_iceage.png b/client/src/main/resources/textures/items/weather_token_iceage.png similarity index 100% rename from client/data/textures/items/weather_token_iceage.png rename to client/src/main/resources/textures/items/weather_token_iceage.png diff --git a/client/data/textures/items/weather_token_inferno.png b/client/src/main/resources/textures/items/weather_token_inferno.png similarity index 100% rename from client/data/textures/items/weather_token_inferno.png rename to client/src/main/resources/textures/items/weather_token_inferno.png diff --git a/client/data/textures/items/weather_token_rain.png b/client/src/main/resources/textures/items/weather_token_rain.png similarity index 100% rename from client/data/textures/items/weather_token_rain.png rename to client/src/main/resources/textures/items/weather_token_rain.png diff --git a/client/data/textures/items/weather_token_snow.png b/client/src/main/resources/textures/items/weather_token_snow.png similarity index 100% rename from client/data/textures/items/weather_token_snow.png rename to client/src/main/resources/textures/items/weather_token_snow.png diff --git a/client/data/textures/items/weather_token_snowstorm.png b/client/src/main/resources/textures/items/weather_token_snowstorm.png similarity index 100% rename from client/data/textures/items/weather_token_snowstorm.png rename to client/src/main/resources/textures/items/weather_token_snowstorm.png diff --git a/client/data/textures/items/weather_token_storm.png b/client/src/main/resources/textures/items/weather_token_storm.png similarity index 100% rename from client/data/textures/items/weather_token_storm.png rename to client/src/main/resources/textures/items/weather_token_storm.png diff --git a/client/data/textures/items/weather_token_thunder.png b/client/src/main/resources/textures/items/weather_token_thunder.png similarity index 100% rename from client/data/textures/items/weather_token_thunder.png rename to client/src/main/resources/textures/items/weather_token_thunder.png diff --git a/client/data/textures/items/wheat.png b/client/src/main/resources/textures/items/wheat.png similarity index 100% rename from client/data/textures/items/wheat.png rename to client/src/main/resources/textures/items/wheat.png diff --git a/client/data/textures/items/wheats.png b/client/src/main/resources/textures/items/wheats.png similarity index 100% rename from client/data/textures/items/wheats.png rename to client/src/main/resources/textures/items/wheats.png diff --git a/client/data/textures/items/white_bed.png b/client/src/main/resources/textures/items/white_bed.png similarity index 100% rename from client/data/textures/items/white_bed.png rename to client/src/main/resources/textures/items/white_bed.png diff --git a/client/data/textures/items/wood_axe.png b/client/src/main/resources/textures/items/wood_axe.png similarity index 100% rename from client/data/textures/items/wood_axe.png rename to client/src/main/resources/textures/items/wood_axe.png diff --git a/client/data/textures/items/wood_hoe.png b/client/src/main/resources/textures/items/wood_hoe.png similarity index 100% rename from client/data/textures/items/wood_hoe.png rename to client/src/main/resources/textures/items/wood_hoe.png diff --git a/client/data/textures/items/wood_pickaxe.png b/client/src/main/resources/textures/items/wood_pickaxe.png similarity index 100% rename from client/data/textures/items/wood_pickaxe.png rename to client/src/main/resources/textures/items/wood_pickaxe.png diff --git a/client/data/textures/items/wood_shovel.png b/client/src/main/resources/textures/items/wood_shovel.png similarity index 100% rename from client/data/textures/items/wood_shovel.png rename to client/src/main/resources/textures/items/wood_shovel.png diff --git a/client/data/textures/items/wood_sword.png b/client/src/main/resources/textures/items/wood_sword.png similarity index 100% rename from client/data/textures/items/wood_sword.png rename to client/src/main/resources/textures/items/wood_sword.png diff --git a/client/data/textures/items/writable_book.png b/client/src/main/resources/textures/items/writable_book.png similarity index 100% rename from client/data/textures/items/writable_book.png rename to client/src/main/resources/textures/items/writable_book.png diff --git a/client/data/textures/items/written_book.png b/client/src/main/resources/textures/items/written_book.png similarity index 100% rename from client/data/textures/items/written_book.png rename to client/src/main/resources/textures/items/written_book.png diff --git a/client/data/textures/items/zinc_ingot.png b/client/src/main/resources/textures/items/zinc_ingot.png similarity index 100% rename from client/data/textures/items/zinc_ingot.png rename to client/src/main/resources/textures/items/zinc_ingot.png diff --git a/client/data/textures/world/clouds.png b/client/src/main/resources/textures/world/clouds.png similarity index 100% rename from client/data/textures/world/clouds.png rename to client/src/main/resources/textures/world/clouds.png diff --git a/client/data/textures/world/clouds_dense.png b/client/src/main/resources/textures/world/clouds_dense.png similarity index 100% rename from client/data/textures/world/clouds_dense.png rename to client/src/main/resources/textures/world/clouds_dense.png diff --git a/client/data/textures/world/foliage.png b/client/src/main/resources/textures/world/foliage.png similarity index 100% rename from client/data/textures/world/foliage.png rename to client/src/main/resources/textures/world/foliage.png diff --git a/client/data/textures/world/forcefield.png b/client/src/main/resources/textures/world/forcefield.png similarity index 100% rename from client/data/textures/world/forcefield.png rename to client/src/main/resources/textures/world/forcefield.png diff --git a/client/data/textures/world/grass.png b/client/src/main/resources/textures/world/grass.png similarity index 100% rename from client/data/textures/world/grass.png rename to client/src/main/resources/textures/world/grass.png diff --git a/client/data/textures/world/hail.png b/client/src/main/resources/textures/world/hail.png similarity index 100% rename from client/data/textures/world/hail.png rename to client/src/main/resources/textures/world/hail.png diff --git a/client/data/textures/world/molten.png b/client/src/main/resources/textures/world/molten.png similarity index 100% rename from client/data/textures/world/molten.png rename to client/src/main/resources/textures/world/molten.png diff --git a/client/data/textures/world/moon_phases.png b/client/src/main/resources/textures/world/moon_phases.png similarity index 100% rename from client/data/textures/world/moon_phases.png rename to client/src/main/resources/textures/world/moon_phases.png diff --git a/client/data/textures/world/particles.png b/client/src/main/resources/textures/world/particles.png similarity index 100% rename from client/data/textures/world/particles.png rename to client/src/main/resources/textures/world/particles.png diff --git a/client/data/textures/world/rain.png b/client/src/main/resources/textures/world/rain.png similarity index 100% rename from client/data/textures/world/rain.png rename to client/src/main/resources/textures/world/rain.png diff --git a/client/data/textures/world/rain_new.png b/client/src/main/resources/textures/world/rain_new.png similarity index 100% rename from client/data/textures/world/rain_new.png rename to client/src/main/resources/textures/world/rain_new.png diff --git a/client/data/textures/world/snow.png b/client/src/main/resources/textures/world/snow.png similarity index 100% rename from client/data/textures/world/snow.png rename to client/src/main/resources/textures/world/snow.png diff --git a/client/data/textures/world/sun.png b/client/src/main/resources/textures/world/sun.png similarity index 100% rename from client/data/textures/world/sun.png rename to client/src/main/resources/textures/world/sun.png diff --git a/common/build.gradle.kts b/common/build.gradle.kts new file mode 100644 index 0000000..95f1738 --- /dev/null +++ b/common/build.gradle.kts @@ -0,0 +1,11 @@ + +plugins { + `java-library` + eclipse +} + +java { + toolchain { + languageVersion = JavaLanguageVersion.of(8) + } +} diff --git a/common/src/common/Version.java b/common/src/main/java/common/Version.java similarity index 100% rename from common/src/common/Version.java rename to common/src/main/java/common/Version.java diff --git a/common/src/common/ai/AIFireballAttack.java b/common/src/main/java/common/ai/AIFireballAttack.java similarity index 100% rename from common/src/common/ai/AIFireballAttack.java rename to common/src/main/java/common/ai/AIFireballAttack.java diff --git a/common/src/common/ai/AIFlyingBoxAttack.java b/common/src/main/java/common/ai/AIFlyingBoxAttack.java similarity index 100% rename from common/src/common/ai/AIFlyingBoxAttack.java rename to common/src/main/java/common/ai/AIFlyingBoxAttack.java diff --git a/common/src/common/ai/AIRangedAttack.java b/common/src/main/java/common/ai/AIRangedAttack.java similarity index 100% rename from common/src/common/ai/AIRangedAttack.java rename to common/src/main/java/common/ai/AIRangedAttack.java diff --git a/common/src/common/ai/AISmallFireballAttack.java b/common/src/main/java/common/ai/AISmallFireballAttack.java similarity index 100% rename from common/src/common/ai/AISmallFireballAttack.java rename to common/src/main/java/common/ai/AISmallFireballAttack.java diff --git a/common/src/common/ai/EntityAIAttackOnCollide.java b/common/src/main/java/common/ai/EntityAIAttackOnCollide.java similarity index 100% rename from common/src/common/ai/EntityAIAttackOnCollide.java rename to common/src/main/java/common/ai/EntityAIAttackOnCollide.java diff --git a/common/src/common/ai/EntityAIAvoidEntity.java b/common/src/main/java/common/ai/EntityAIAvoidEntity.java similarity index 100% rename from common/src/common/ai/EntityAIAvoidEntity.java rename to common/src/main/java/common/ai/EntityAIAvoidEntity.java diff --git a/common/src/common/ai/EntityAIBase.java b/common/src/main/java/common/ai/EntityAIBase.java similarity index 100% rename from common/src/common/ai/EntityAIBase.java rename to common/src/main/java/common/ai/EntityAIBase.java diff --git a/common/src/common/ai/EntityAIBeg.java b/common/src/main/java/common/ai/EntityAIBeg.java similarity index 100% rename from common/src/common/ai/EntityAIBeg.java rename to common/src/main/java/common/ai/EntityAIBeg.java diff --git a/common/src/common/ai/EntityAIControlledByPlayer.java b/common/src/main/java/common/ai/EntityAIControlledByPlayer.java similarity index 100% rename from common/src/common/ai/EntityAIControlledByPlayer.java rename to common/src/main/java/common/ai/EntityAIControlledByPlayer.java diff --git a/common/src/common/ai/EntityAIDoorInteract.java b/common/src/main/java/common/ai/EntityAIDoorInteract.java similarity index 100% rename from common/src/common/ai/EntityAIDoorInteract.java rename to common/src/main/java/common/ai/EntityAIDoorInteract.java diff --git a/common/src/common/ai/EntityAIEatGrass.java b/common/src/main/java/common/ai/EntityAIEatGrass.java similarity index 100% rename from common/src/common/ai/EntityAIEatGrass.java rename to common/src/main/java/common/ai/EntityAIEatGrass.java diff --git a/common/src/common/ai/EntityAIExplode.java b/common/src/main/java/common/ai/EntityAIExplode.java similarity index 100% rename from common/src/common/ai/EntityAIExplode.java rename to common/src/main/java/common/ai/EntityAIExplode.java diff --git a/common/src/common/ai/EntityAIFindEntityNearest.java b/common/src/main/java/common/ai/EntityAIFindEntityNearest.java similarity index 100% rename from common/src/common/ai/EntityAIFindEntityNearest.java rename to common/src/main/java/common/ai/EntityAIFindEntityNearest.java diff --git a/common/src/common/ai/EntityAIFleeSun.java b/common/src/main/java/common/ai/EntityAIFleeSun.java similarity index 100% rename from common/src/common/ai/EntityAIFleeSun.java rename to common/src/main/java/common/ai/EntityAIFleeSun.java diff --git a/common/src/common/ai/EntityAIFollowOwner.java b/common/src/main/java/common/ai/EntityAIFollowOwner.java similarity index 100% rename from common/src/common/ai/EntityAIFollowOwner.java rename to common/src/main/java/common/ai/EntityAIFollowOwner.java diff --git a/common/src/common/ai/EntityAIFollowParent.java b/common/src/main/java/common/ai/EntityAIFollowParent.java similarity index 100% rename from common/src/common/ai/EntityAIFollowParent.java rename to common/src/main/java/common/ai/EntityAIFollowParent.java diff --git a/common/src/common/ai/EntityAIHarvestFarmland.java b/common/src/main/java/common/ai/EntityAIHarvestFarmland.java similarity index 100% rename from common/src/common/ai/EntityAIHarvestFarmland.java rename to common/src/main/java/common/ai/EntityAIHarvestFarmland.java diff --git a/common/src/common/ai/EntityAIHurtByTarget.java b/common/src/main/java/common/ai/EntityAIHurtByTarget.java similarity index 100% rename from common/src/common/ai/EntityAIHurtByTarget.java rename to common/src/main/java/common/ai/EntityAIHurtByTarget.java diff --git a/common/src/common/ai/EntityAILeapAtTarget.java b/common/src/main/java/common/ai/EntityAILeapAtTarget.java similarity index 100% rename from common/src/common/ai/EntityAILeapAtTarget.java rename to common/src/main/java/common/ai/EntityAILeapAtTarget.java diff --git a/common/src/common/ai/EntityAILookAtTalkingPlayer.java b/common/src/main/java/common/ai/EntityAILookAtTalkingPlayer.java similarity index 100% rename from common/src/common/ai/EntityAILookAtTalkingPlayer.java rename to common/src/main/java/common/ai/EntityAILookAtTalkingPlayer.java diff --git a/common/src/common/ai/EntityAILookIdle.java b/common/src/main/java/common/ai/EntityAILookIdle.java similarity index 100% rename from common/src/common/ai/EntityAILookIdle.java rename to common/src/main/java/common/ai/EntityAILookIdle.java diff --git a/common/src/common/ai/EntityAIMate.java b/common/src/main/java/common/ai/EntityAIMate.java similarity index 100% rename from common/src/common/ai/EntityAIMate.java rename to common/src/main/java/common/ai/EntityAIMate.java diff --git a/common/src/common/ai/EntityAIMoveIndoors.java b/common/src/main/java/common/ai/EntityAIMoveIndoors.java similarity index 100% rename from common/src/common/ai/EntityAIMoveIndoors.java rename to common/src/main/java/common/ai/EntityAIMoveIndoors.java diff --git a/common/src/common/ai/EntityAIMoveThroughVillage.java b/common/src/main/java/common/ai/EntityAIMoveThroughVillage.java similarity index 100% rename from common/src/common/ai/EntityAIMoveThroughVillage.java rename to common/src/main/java/common/ai/EntityAIMoveThroughVillage.java diff --git a/common/src/common/ai/EntityAIMoveToBlock.java b/common/src/main/java/common/ai/EntityAIMoveToBlock.java similarity index 100% rename from common/src/common/ai/EntityAIMoveToBlock.java rename to common/src/main/java/common/ai/EntityAIMoveToBlock.java diff --git a/common/src/common/ai/EntityAIMoveTowardsRestriction.java b/common/src/main/java/common/ai/EntityAIMoveTowardsRestriction.java similarity index 100% rename from common/src/common/ai/EntityAIMoveTowardsRestriction.java rename to common/src/main/java/common/ai/EntityAIMoveTowardsRestriction.java diff --git a/common/src/common/ai/EntityAIMoveTowardsTarget.java b/common/src/main/java/common/ai/EntityAIMoveTowardsTarget.java similarity index 100% rename from common/src/common/ai/EntityAIMoveTowardsTarget.java rename to common/src/main/java/common/ai/EntityAIMoveTowardsTarget.java diff --git a/common/src/common/ai/EntityAINagPlayer.java b/common/src/main/java/common/ai/EntityAINagPlayer.java similarity index 100% rename from common/src/common/ai/EntityAINagPlayer.java rename to common/src/main/java/common/ai/EntityAINagPlayer.java diff --git a/common/src/common/ai/EntityAINearestAttackableTarget.java b/common/src/main/java/common/ai/EntityAINearestAttackableTarget.java similarity index 100% rename from common/src/common/ai/EntityAINearestAttackableTarget.java rename to common/src/main/java/common/ai/EntityAINearestAttackableTarget.java diff --git a/common/src/common/ai/EntityAINpcInteract.java b/common/src/main/java/common/ai/EntityAINpcInteract.java similarity index 100% rename from common/src/common/ai/EntityAINpcInteract.java rename to common/src/main/java/common/ai/EntityAINpcInteract.java diff --git a/common/src/common/ai/EntityAINpcMate.java b/common/src/main/java/common/ai/EntityAINpcMate.java similarity index 100% rename from common/src/common/ai/EntityAINpcMate.java rename to common/src/main/java/common/ai/EntityAINpcMate.java diff --git a/common/src/common/ai/EntityAIOcelotAttack.java b/common/src/main/java/common/ai/EntityAIOcelotAttack.java similarity index 100% rename from common/src/common/ai/EntityAIOcelotAttack.java rename to common/src/main/java/common/ai/EntityAIOcelotAttack.java diff --git a/common/src/common/ai/EntityAIOcelotSit.java b/common/src/main/java/common/ai/EntityAIOcelotSit.java similarity index 100% rename from common/src/common/ai/EntityAIOcelotSit.java rename to common/src/main/java/common/ai/EntityAIOcelotSit.java diff --git a/common/src/common/ai/EntityAIOpenDoor.java b/common/src/main/java/common/ai/EntityAIOpenDoor.java similarity index 100% rename from common/src/common/ai/EntityAIOpenDoor.java rename to common/src/main/java/common/ai/EntityAIOpenDoor.java diff --git a/common/src/common/ai/EntityAIOwnerHurtByTarget.java b/common/src/main/java/common/ai/EntityAIOwnerHurtByTarget.java similarity index 100% rename from common/src/common/ai/EntityAIOwnerHurtByTarget.java rename to common/src/main/java/common/ai/EntityAIOwnerHurtByTarget.java diff --git a/common/src/common/ai/EntityAIOwnerHurtTarget.java b/common/src/main/java/common/ai/EntityAIOwnerHurtTarget.java similarity index 100% rename from common/src/common/ai/EntityAIOwnerHurtTarget.java rename to common/src/main/java/common/ai/EntityAIOwnerHurtTarget.java diff --git a/common/src/common/ai/EntityAIPanic.java b/common/src/main/java/common/ai/EntityAIPanic.java similarity index 100% rename from common/src/common/ai/EntityAIPanic.java rename to common/src/main/java/common/ai/EntityAIPanic.java diff --git a/common/src/common/ai/EntityAIPlay.java b/common/src/main/java/common/ai/EntityAIPlay.java similarity index 100% rename from common/src/common/ai/EntityAIPlay.java rename to common/src/main/java/common/ai/EntityAIPlay.java diff --git a/common/src/common/ai/EntityAIRestrictOpenDoor.java b/common/src/main/java/common/ai/EntityAIRestrictOpenDoor.java similarity index 100% rename from common/src/common/ai/EntityAIRestrictOpenDoor.java rename to common/src/main/java/common/ai/EntityAIRestrictOpenDoor.java diff --git a/common/src/common/ai/EntityAIRestrictSun.java b/common/src/main/java/common/ai/EntityAIRestrictSun.java similarity index 100% rename from common/src/common/ai/EntityAIRestrictSun.java rename to common/src/main/java/common/ai/EntityAIRestrictSun.java diff --git a/common/src/common/ai/EntityAIRunAroundLikeCrazy.java b/common/src/main/java/common/ai/EntityAIRunAroundLikeCrazy.java similarity index 100% rename from common/src/common/ai/EntityAIRunAroundLikeCrazy.java rename to common/src/main/java/common/ai/EntityAIRunAroundLikeCrazy.java diff --git a/common/src/common/ai/EntityAIShareItems.java b/common/src/main/java/common/ai/EntityAIShareItems.java similarity index 100% rename from common/src/common/ai/EntityAIShareItems.java rename to common/src/main/java/common/ai/EntityAIShareItems.java diff --git a/common/src/common/ai/EntityAISit.java b/common/src/main/java/common/ai/EntityAISit.java similarity index 100% rename from common/src/common/ai/EntityAISit.java rename to common/src/main/java/common/ai/EntityAISit.java diff --git a/common/src/common/ai/EntityAISwimming.java b/common/src/main/java/common/ai/EntityAISwimming.java similarity index 100% rename from common/src/common/ai/EntityAISwimming.java rename to common/src/main/java/common/ai/EntityAISwimming.java diff --git a/common/src/common/ai/EntityAITakePlace.java b/common/src/main/java/common/ai/EntityAITakePlace.java similarity index 100% rename from common/src/common/ai/EntityAITakePlace.java rename to common/src/main/java/common/ai/EntityAITakePlace.java diff --git a/common/src/common/ai/EntityAITarget.java b/common/src/main/java/common/ai/EntityAITarget.java similarity index 100% rename from common/src/common/ai/EntityAITarget.java rename to common/src/main/java/common/ai/EntityAITarget.java diff --git a/common/src/common/ai/EntityAITargetNonTamed.java b/common/src/main/java/common/ai/EntityAITargetNonTamed.java similarity index 100% rename from common/src/common/ai/EntityAITargetNonTamed.java rename to common/src/main/java/common/ai/EntityAITargetNonTamed.java diff --git a/common/src/common/ai/EntityAITasks.java b/common/src/main/java/common/ai/EntityAITasks.java similarity index 100% rename from common/src/common/ai/EntityAITasks.java rename to common/src/main/java/common/ai/EntityAITasks.java diff --git a/common/src/common/ai/EntityAITempt.java b/common/src/main/java/common/ai/EntityAITempt.java similarity index 100% rename from common/src/common/ai/EntityAITempt.java rename to common/src/main/java/common/ai/EntityAITempt.java diff --git a/common/src/common/ai/EntityAIWander.java b/common/src/main/java/common/ai/EntityAIWander.java similarity index 100% rename from common/src/common/ai/EntityAIWander.java rename to common/src/main/java/common/ai/EntityAIWander.java diff --git a/common/src/common/ai/EntityAIWatchClosest.java b/common/src/main/java/common/ai/EntityAIWatchClosest.java similarity index 100% rename from common/src/common/ai/EntityAIWatchClosest.java rename to common/src/main/java/common/ai/EntityAIWatchClosest.java diff --git a/common/src/common/ai/EntityAIWatchClosest2.java b/common/src/main/java/common/ai/EntityAIWatchClosest2.java similarity index 100% rename from common/src/common/ai/EntityAIWatchClosest2.java rename to common/src/main/java/common/ai/EntityAIWatchClosest2.java diff --git a/common/src/common/ai/EntityJumpHelper.java b/common/src/main/java/common/ai/EntityJumpHelper.java similarity index 100% rename from common/src/common/ai/EntityJumpHelper.java rename to common/src/main/java/common/ai/EntityJumpHelper.java diff --git a/common/src/common/ai/EntityLookHelper.java b/common/src/main/java/common/ai/EntityLookHelper.java similarity index 100% rename from common/src/common/ai/EntityLookHelper.java rename to common/src/main/java/common/ai/EntityLookHelper.java diff --git a/common/src/common/ai/EntityMoveHelper.java b/common/src/main/java/common/ai/EntityMoveHelper.java similarity index 100% rename from common/src/common/ai/EntityMoveHelper.java rename to common/src/main/java/common/ai/EntityMoveHelper.java diff --git a/common/src/common/ai/EntitySenses.java b/common/src/main/java/common/ai/EntitySenses.java similarity index 100% rename from common/src/common/ai/EntitySenses.java rename to common/src/main/java/common/ai/EntitySenses.java diff --git a/common/src/common/ai/RandomPositionGenerator.java b/common/src/main/java/common/ai/RandomPositionGenerator.java similarity index 100% rename from common/src/common/ai/RandomPositionGenerator.java rename to common/src/main/java/common/ai/RandomPositionGenerator.java diff --git a/common/src/common/attributes/Attribute.java b/common/src/main/java/common/attributes/Attribute.java similarity index 100% rename from common/src/common/attributes/Attribute.java rename to common/src/main/java/common/attributes/Attribute.java diff --git a/common/src/common/attributes/AttributeInstance.java b/common/src/main/java/common/attributes/AttributeInstance.java similarity index 100% rename from common/src/common/attributes/AttributeInstance.java rename to common/src/main/java/common/attributes/AttributeInstance.java diff --git a/common/src/common/attributes/AttributeMap.java b/common/src/main/java/common/attributes/AttributeMap.java similarity index 100% rename from common/src/common/attributes/AttributeMap.java rename to common/src/main/java/common/attributes/AttributeMap.java diff --git a/common/src/common/attributes/AttributeModifier.java b/common/src/main/java/common/attributes/AttributeModifier.java similarity index 100% rename from common/src/common/attributes/AttributeModifier.java rename to common/src/main/java/common/attributes/AttributeModifier.java diff --git a/common/src/common/attributes/Attributes.java b/common/src/main/java/common/attributes/Attributes.java similarity index 100% rename from common/src/common/attributes/Attributes.java rename to common/src/main/java/common/attributes/Attributes.java diff --git a/common/src/common/biome/Biome.java b/common/src/main/java/common/biome/Biome.java similarity index 100% rename from common/src/common/biome/Biome.java rename to common/src/main/java/common/biome/Biome.java diff --git a/common/src/common/biome/IBiome.java b/common/src/main/java/common/biome/IBiome.java similarity index 100% rename from common/src/common/biome/IBiome.java rename to common/src/main/java/common/biome/IBiome.java diff --git a/common/src/common/block/Block.java b/common/src/main/java/common/block/Block.java similarity index 100% rename from common/src/common/block/Block.java rename to common/src/main/java/common/block/Block.java diff --git a/common/src/common/block/BlockAir.java b/common/src/main/java/common/block/BlockAir.java similarity index 100% rename from common/src/common/block/BlockAir.java rename to common/src/main/java/common/block/BlockAir.java diff --git a/common/src/common/block/BlockColored.java b/common/src/main/java/common/block/BlockColored.java similarity index 100% rename from common/src/common/block/BlockColored.java rename to common/src/main/java/common/block/BlockColored.java diff --git a/common/src/common/block/BlockContainer.java b/common/src/main/java/common/block/BlockContainer.java similarity index 100% rename from common/src/common/block/BlockContainer.java rename to common/src/main/java/common/block/BlockContainer.java diff --git a/common/src/common/block/BlockDirectional.java b/common/src/main/java/common/block/BlockDirectional.java similarity index 100% rename from common/src/common/block/BlockDirectional.java rename to common/src/main/java/common/block/BlockDirectional.java diff --git a/common/src/common/block/BlockFalling.java b/common/src/main/java/common/block/BlockFalling.java similarity index 100% rename from common/src/common/block/BlockFalling.java rename to common/src/main/java/common/block/BlockFalling.java diff --git a/common/src/common/block/BlockRotatedPillar.java b/common/src/main/java/common/block/BlockRotatedPillar.java similarity index 100% rename from common/src/common/block/BlockRotatedPillar.java rename to common/src/main/java/common/block/BlockRotatedPillar.java diff --git a/common/src/common/block/BlockTranslucent.java b/common/src/main/java/common/block/BlockTranslucent.java similarity index 100% rename from common/src/common/block/BlockTranslucent.java rename to common/src/main/java/common/block/BlockTranslucent.java diff --git a/common/src/common/block/BlockTreasure.java b/common/src/main/java/common/block/BlockTreasure.java similarity index 100% rename from common/src/common/block/BlockTreasure.java rename to common/src/main/java/common/block/BlockTreasure.java diff --git a/common/src/common/block/ITileEntityProvider.java b/common/src/main/java/common/block/ITileEntityProvider.java similarity index 100% rename from common/src/common/block/ITileEntityProvider.java rename to common/src/main/java/common/block/ITileEntityProvider.java diff --git a/common/src/common/block/Material.java b/common/src/main/java/common/block/Material.java similarity index 100% rename from common/src/common/block/Material.java rename to common/src/main/java/common/block/Material.java diff --git a/common/src/common/block/SoundType.java b/common/src/main/java/common/block/SoundType.java similarity index 100% rename from common/src/common/block/SoundType.java rename to common/src/main/java/common/block/SoundType.java diff --git a/common/src/common/block/artificial/BlockBed.java b/common/src/main/java/common/block/artificial/BlockBed.java similarity index 100% rename from common/src/common/block/artificial/BlockBed.java rename to common/src/main/java/common/block/artificial/BlockBed.java diff --git a/common/src/common/block/artificial/BlockBookshelf.java b/common/src/main/java/common/block/artificial/BlockBookshelf.java similarity index 100% rename from common/src/common/block/artificial/BlockBookshelf.java rename to common/src/main/java/common/block/artificial/BlockBookshelf.java diff --git a/common/src/common/block/artificial/BlockCake.java b/common/src/main/java/common/block/artificial/BlockCake.java similarity index 100% rename from common/src/common/block/artificial/BlockCake.java rename to common/src/main/java/common/block/artificial/BlockCake.java diff --git a/common/src/common/block/artificial/BlockCarpet.java b/common/src/main/java/common/block/artificial/BlockCarpet.java similarity index 100% rename from common/src/common/block/artificial/BlockCarpet.java rename to common/src/main/java/common/block/artificial/BlockCarpet.java diff --git a/common/src/common/block/artificial/BlockCompressedPowered.java b/common/src/main/java/common/block/artificial/BlockCompressedPowered.java similarity index 100% rename from common/src/common/block/artificial/BlockCompressedPowered.java rename to common/src/main/java/common/block/artificial/BlockCompressedPowered.java diff --git a/common/src/common/block/artificial/BlockDoor.java b/common/src/main/java/common/block/artificial/BlockDoor.java similarity index 100% rename from common/src/common/block/artificial/BlockDoor.java rename to common/src/main/java/common/block/artificial/BlockDoor.java diff --git a/common/src/common/block/artificial/BlockDragonEgg.java b/common/src/main/java/common/block/artificial/BlockDragonEgg.java similarity index 100% rename from common/src/common/block/artificial/BlockDragonEgg.java rename to common/src/main/java/common/block/artificial/BlockDragonEgg.java diff --git a/common/src/common/block/artificial/BlockFence.java b/common/src/main/java/common/block/artificial/BlockFence.java similarity index 100% rename from common/src/common/block/artificial/BlockFence.java rename to common/src/main/java/common/block/artificial/BlockFence.java diff --git a/common/src/common/block/artificial/BlockFenceGate.java b/common/src/main/java/common/block/artificial/BlockFenceGate.java similarity index 100% rename from common/src/common/block/artificial/BlockFenceGate.java rename to common/src/main/java/common/block/artificial/BlockFenceGate.java diff --git a/common/src/common/block/artificial/BlockFloorPortal.java b/common/src/main/java/common/block/artificial/BlockFloorPortal.java similarity index 100% rename from common/src/common/block/artificial/BlockFloorPortal.java rename to common/src/main/java/common/block/artificial/BlockFloorPortal.java diff --git a/common/src/common/block/artificial/BlockFlowerPot.java b/common/src/main/java/common/block/artificial/BlockFlowerPot.java similarity index 100% rename from common/src/common/block/artificial/BlockFlowerPot.java rename to common/src/main/java/common/block/artificial/BlockFlowerPot.java diff --git a/common/src/common/block/artificial/BlockGlass.java b/common/src/main/java/common/block/artificial/BlockGlass.java similarity index 100% rename from common/src/common/block/artificial/BlockGlass.java rename to common/src/main/java/common/block/artificial/BlockGlass.java diff --git a/common/src/common/block/artificial/BlockHay.java b/common/src/main/java/common/block/artificial/BlockHay.java similarity index 100% rename from common/src/common/block/artificial/BlockHay.java rename to common/src/main/java/common/block/artificial/BlockHay.java diff --git a/common/src/common/block/artificial/BlockLadder.java b/common/src/main/java/common/block/artificial/BlockLadder.java similarity index 100% rename from common/src/common/block/artificial/BlockLadder.java rename to common/src/main/java/common/block/artificial/BlockLadder.java diff --git a/common/src/common/block/artificial/BlockPane.java b/common/src/main/java/common/block/artificial/BlockPane.java similarity index 100% rename from common/src/common/block/artificial/BlockPane.java rename to common/src/main/java/common/block/artificial/BlockPane.java diff --git a/common/src/common/block/artificial/BlockPortal.java b/common/src/main/java/common/block/artificial/BlockPortal.java similarity index 100% rename from common/src/common/block/artificial/BlockPortal.java rename to common/src/main/java/common/block/artificial/BlockPortal.java diff --git a/common/src/common/block/artificial/BlockPortalFrame.java b/common/src/main/java/common/block/artificial/BlockPortalFrame.java similarity index 100% rename from common/src/common/block/artificial/BlockPortalFrame.java rename to common/src/main/java/common/block/artificial/BlockPortalFrame.java diff --git a/common/src/common/block/artificial/BlockQuartz.java b/common/src/main/java/common/block/artificial/BlockQuartz.java similarity index 100% rename from common/src/common/block/artificial/BlockQuartz.java rename to common/src/main/java/common/block/artificial/BlockQuartz.java diff --git a/common/src/common/block/artificial/BlockSlab.java b/common/src/main/java/common/block/artificial/BlockSlab.java similarity index 100% rename from common/src/common/block/artificial/BlockSlab.java rename to common/src/main/java/common/block/artificial/BlockSlab.java diff --git a/common/src/common/block/artificial/BlockStainedGlass.java b/common/src/main/java/common/block/artificial/BlockStainedGlass.java similarity index 100% rename from common/src/common/block/artificial/BlockStainedGlass.java rename to common/src/main/java/common/block/artificial/BlockStainedGlass.java diff --git a/common/src/common/block/artificial/BlockStainedGlassPane.java b/common/src/main/java/common/block/artificial/BlockStainedGlassPane.java similarity index 100% rename from common/src/common/block/artificial/BlockStainedGlassPane.java rename to common/src/main/java/common/block/artificial/BlockStainedGlassPane.java diff --git a/common/src/common/block/artificial/BlockStairs.java b/common/src/main/java/common/block/artificial/BlockStairs.java similarity index 100% rename from common/src/common/block/artificial/BlockStairs.java rename to common/src/main/java/common/block/artificial/BlockStairs.java diff --git a/common/src/common/block/artificial/BlockStoneBrick.java b/common/src/main/java/common/block/artificial/BlockStoneBrick.java similarity index 100% rename from common/src/common/block/artificial/BlockStoneBrick.java rename to common/src/main/java/common/block/artificial/BlockStoneBrick.java diff --git a/common/src/common/block/artificial/BlockTrapDoor.java b/common/src/main/java/common/block/artificial/BlockTrapDoor.java similarity index 100% rename from common/src/common/block/artificial/BlockTrapDoor.java rename to common/src/main/java/common/block/artificial/BlockTrapDoor.java diff --git a/common/src/common/block/artificial/BlockWall.java b/common/src/main/java/common/block/artificial/BlockWall.java similarity index 100% rename from common/src/common/block/artificial/BlockWall.java rename to common/src/main/java/common/block/artificial/BlockWall.java diff --git a/common/src/common/block/foliage/BlockBaseFlower.java b/common/src/main/java/common/block/foliage/BlockBaseFlower.java similarity index 100% rename from common/src/common/block/foliage/BlockBaseFlower.java rename to common/src/main/java/common/block/foliage/BlockBaseFlower.java diff --git a/common/src/common/block/foliage/BlockBlackenedSoil.java b/common/src/main/java/common/block/foliage/BlockBlackenedSoil.java similarity index 100% rename from common/src/common/block/foliage/BlockBlackenedSoil.java rename to common/src/main/java/common/block/foliage/BlockBlackenedSoil.java diff --git a/common/src/common/block/foliage/BlockBlueShroom.java b/common/src/main/java/common/block/foliage/BlockBlueShroom.java similarity index 100% rename from common/src/common/block/foliage/BlockBlueShroom.java rename to common/src/main/java/common/block/foliage/BlockBlueShroom.java diff --git a/common/src/common/block/foliage/BlockBush.java b/common/src/main/java/common/block/foliage/BlockBush.java similarity index 100% rename from common/src/common/block/foliage/BlockBush.java rename to common/src/main/java/common/block/foliage/BlockBush.java diff --git a/common/src/common/block/foliage/BlockCactus.java b/common/src/main/java/common/block/foliage/BlockCactus.java similarity index 100% rename from common/src/common/block/foliage/BlockCactus.java rename to common/src/main/java/common/block/foliage/BlockCactus.java diff --git a/common/src/common/block/foliage/BlockCarrot.java b/common/src/main/java/common/block/foliage/BlockCarrot.java similarity index 100% rename from common/src/common/block/foliage/BlockCarrot.java rename to common/src/main/java/common/block/foliage/BlockCarrot.java diff --git a/common/src/common/block/foliage/BlockCocoa.java b/common/src/main/java/common/block/foliage/BlockCocoa.java similarity index 100% rename from common/src/common/block/foliage/BlockCocoa.java rename to common/src/main/java/common/block/foliage/BlockCocoa.java diff --git a/common/src/common/block/foliage/BlockCrops.java b/common/src/main/java/common/block/foliage/BlockCrops.java similarity index 100% rename from common/src/common/block/foliage/BlockCrops.java rename to common/src/main/java/common/block/foliage/BlockCrops.java diff --git a/common/src/common/block/foliage/BlockDeadBush.java b/common/src/main/java/common/block/foliage/BlockDeadBush.java similarity index 100% rename from common/src/common/block/foliage/BlockDeadBush.java rename to common/src/main/java/common/block/foliage/BlockDeadBush.java diff --git a/common/src/common/block/foliage/BlockDoublePlant.java b/common/src/main/java/common/block/foliage/BlockDoublePlant.java similarity index 100% rename from common/src/common/block/foliage/BlockDoublePlant.java rename to common/src/main/java/common/block/foliage/BlockDoublePlant.java diff --git a/common/src/common/block/foliage/BlockDryLeaves.java b/common/src/main/java/common/block/foliage/BlockDryLeaves.java similarity index 100% rename from common/src/common/block/foliage/BlockDryLeaves.java rename to common/src/main/java/common/block/foliage/BlockDryLeaves.java diff --git a/common/src/common/block/foliage/BlockFarmland.java b/common/src/main/java/common/block/foliage/BlockFarmland.java similarity index 100% rename from common/src/common/block/foliage/BlockFarmland.java rename to common/src/main/java/common/block/foliage/BlockFarmland.java diff --git a/common/src/common/block/foliage/BlockFlower.java b/common/src/main/java/common/block/foliage/BlockFlower.java similarity index 100% rename from common/src/common/block/foliage/BlockFlower.java rename to common/src/main/java/common/block/foliage/BlockFlower.java diff --git a/common/src/common/block/foliage/BlockGrass.java b/common/src/main/java/common/block/foliage/BlockGrass.java similarity index 100% rename from common/src/common/block/foliage/BlockGrass.java rename to common/src/main/java/common/block/foliage/BlockGrass.java diff --git a/common/src/common/block/foliage/BlockHugeMushroom.java b/common/src/main/java/common/block/foliage/BlockHugeMushroom.java similarity index 100% rename from common/src/common/block/foliage/BlockHugeMushroom.java rename to common/src/main/java/common/block/foliage/BlockHugeMushroom.java diff --git a/common/src/common/block/foliage/BlockLeaves.java b/common/src/main/java/common/block/foliage/BlockLeaves.java similarity index 100% rename from common/src/common/block/foliage/BlockLeaves.java rename to common/src/main/java/common/block/foliage/BlockLeaves.java diff --git a/common/src/common/block/foliage/BlockLeavesBase.java b/common/src/main/java/common/block/foliage/BlockLeavesBase.java similarity index 100% rename from common/src/common/block/foliage/BlockLeavesBase.java rename to common/src/main/java/common/block/foliage/BlockLeavesBase.java diff --git a/common/src/common/block/foliage/BlockLilyPad.java b/common/src/main/java/common/block/foliage/BlockLilyPad.java similarity index 100% rename from common/src/common/block/foliage/BlockLilyPad.java rename to common/src/main/java/common/block/foliage/BlockLilyPad.java diff --git a/common/src/common/block/foliage/BlockLog.java b/common/src/main/java/common/block/foliage/BlockLog.java similarity index 100% rename from common/src/common/block/foliage/BlockLog.java rename to common/src/main/java/common/block/foliage/BlockLog.java diff --git a/common/src/common/block/foliage/BlockMelon.java b/common/src/main/java/common/block/foliage/BlockMelon.java similarity index 100% rename from common/src/common/block/foliage/BlockMelon.java rename to common/src/main/java/common/block/foliage/BlockMelon.java diff --git a/common/src/common/block/foliage/BlockMushroom.java b/common/src/main/java/common/block/foliage/BlockMushroom.java similarity index 100% rename from common/src/common/block/foliage/BlockMushroom.java rename to common/src/main/java/common/block/foliage/BlockMushroom.java diff --git a/common/src/common/block/foliage/BlockMycelium.java b/common/src/main/java/common/block/foliage/BlockMycelium.java similarity index 100% rename from common/src/common/block/foliage/BlockMycelium.java rename to common/src/main/java/common/block/foliage/BlockMycelium.java diff --git a/common/src/common/block/foliage/BlockPotato.java b/common/src/main/java/common/block/foliage/BlockPotato.java similarity index 100% rename from common/src/common/block/foliage/BlockPotato.java rename to common/src/main/java/common/block/foliage/BlockPotato.java diff --git a/common/src/common/block/foliage/BlockPumpkin.java b/common/src/main/java/common/block/foliage/BlockPumpkin.java similarity index 100% rename from common/src/common/block/foliage/BlockPumpkin.java rename to common/src/main/java/common/block/foliage/BlockPumpkin.java diff --git a/common/src/common/block/foliage/BlockReed.java b/common/src/main/java/common/block/foliage/BlockReed.java similarity index 100% rename from common/src/common/block/foliage/BlockReed.java rename to common/src/main/java/common/block/foliage/BlockReed.java diff --git a/common/src/common/block/foliage/BlockSapling.java b/common/src/main/java/common/block/foliage/BlockSapling.java similarity index 100% rename from common/src/common/block/foliage/BlockSapling.java rename to common/src/main/java/common/block/foliage/BlockSapling.java diff --git a/common/src/common/block/foliage/BlockStem.java b/common/src/main/java/common/block/foliage/BlockStem.java similarity index 100% rename from common/src/common/block/foliage/BlockStem.java rename to common/src/main/java/common/block/foliage/BlockStem.java diff --git a/common/src/common/block/foliage/BlockTallGrass.java b/common/src/main/java/common/block/foliage/BlockTallGrass.java similarity index 100% rename from common/src/common/block/foliage/BlockTallGrass.java rename to common/src/main/java/common/block/foliage/BlockTallGrass.java diff --git a/common/src/common/block/foliage/BlockTianSoil.java b/common/src/main/java/common/block/foliage/BlockTianSoil.java similarity index 100% rename from common/src/common/block/foliage/BlockTianSoil.java rename to common/src/main/java/common/block/foliage/BlockTianSoil.java diff --git a/common/src/common/block/foliage/BlockVine.java b/common/src/main/java/common/block/foliage/BlockVine.java similarity index 100% rename from common/src/common/block/foliage/BlockVine.java rename to common/src/main/java/common/block/foliage/BlockVine.java diff --git a/common/src/common/block/foliage/BlockWart.java b/common/src/main/java/common/block/foliage/BlockWart.java similarity index 100% rename from common/src/common/block/foliage/BlockWart.java rename to common/src/main/java/common/block/foliage/BlockWart.java diff --git a/common/src/common/block/foliage/IGrowable.java b/common/src/main/java/common/block/foliage/IGrowable.java similarity index 100% rename from common/src/common/block/foliage/IGrowable.java rename to common/src/main/java/common/block/foliage/IGrowable.java diff --git a/common/src/common/block/foliage/LeavesType.java b/common/src/main/java/common/block/foliage/LeavesType.java similarity index 100% rename from common/src/common/block/foliage/LeavesType.java rename to common/src/main/java/common/block/foliage/LeavesType.java diff --git a/common/src/common/block/liquid/BlockDynamicLiquid.java b/common/src/main/java/common/block/liquid/BlockDynamicLiquid.java similarity index 100% rename from common/src/common/block/liquid/BlockDynamicLiquid.java rename to common/src/main/java/common/block/liquid/BlockDynamicLiquid.java diff --git a/common/src/common/block/liquid/BlockLiquid.java b/common/src/main/java/common/block/liquid/BlockLiquid.java similarity index 100% rename from common/src/common/block/liquid/BlockLiquid.java rename to common/src/main/java/common/block/liquid/BlockLiquid.java diff --git a/common/src/common/block/liquid/BlockStaticLiquid.java b/common/src/main/java/common/block/liquid/BlockStaticLiquid.java similarity index 100% rename from common/src/common/block/liquid/BlockStaticLiquid.java rename to common/src/main/java/common/block/liquid/BlockStaticLiquid.java diff --git a/common/src/common/block/natural/BlockBedrock.java b/common/src/main/java/common/block/natural/BlockBedrock.java similarity index 100% rename from common/src/common/block/natural/BlockBedrock.java rename to common/src/main/java/common/block/natural/BlockBedrock.java diff --git a/common/src/common/block/natural/BlockBlackenedDirt.java b/common/src/main/java/common/block/natural/BlockBlackenedDirt.java similarity index 100% rename from common/src/common/block/natural/BlockBlackenedDirt.java rename to common/src/main/java/common/block/natural/BlockBlackenedDirt.java diff --git a/common/src/common/block/natural/BlockBlackenedStone.java b/common/src/main/java/common/block/natural/BlockBlackenedStone.java similarity index 100% rename from common/src/common/block/natural/BlockBlackenedStone.java rename to common/src/main/java/common/block/natural/BlockBlackenedStone.java diff --git a/common/src/common/block/natural/BlockClay.java b/common/src/main/java/common/block/natural/BlockClay.java similarity index 100% rename from common/src/common/block/natural/BlockClay.java rename to common/src/main/java/common/block/natural/BlockClay.java diff --git a/common/src/common/block/natural/BlockDirt.java b/common/src/main/java/common/block/natural/BlockDirt.java similarity index 100% rename from common/src/common/block/natural/BlockDirt.java rename to common/src/main/java/common/block/natural/BlockDirt.java diff --git a/common/src/common/block/natural/BlockFire.java b/common/src/main/java/common/block/natural/BlockFire.java similarity index 100% rename from common/src/common/block/natural/BlockFire.java rename to common/src/main/java/common/block/natural/BlockFire.java diff --git a/common/src/common/block/natural/BlockGlowstone.java b/common/src/main/java/common/block/natural/BlockGlowstone.java similarity index 100% rename from common/src/common/block/natural/BlockGlowstone.java rename to common/src/main/java/common/block/natural/BlockGlowstone.java diff --git a/common/src/common/block/natural/BlockGravel.java b/common/src/main/java/common/block/natural/BlockGravel.java similarity index 100% rename from common/src/common/block/natural/BlockGravel.java rename to common/src/main/java/common/block/natural/BlockGravel.java diff --git a/common/src/common/block/natural/BlockHardenedClay.java b/common/src/main/java/common/block/natural/BlockHardenedClay.java similarity index 100% rename from common/src/common/block/natural/BlockHardenedClay.java rename to common/src/main/java/common/block/natural/BlockHardenedClay.java diff --git a/common/src/common/block/natural/BlockHellRock.java b/common/src/main/java/common/block/natural/BlockHellRock.java similarity index 100% rename from common/src/common/block/natural/BlockHellRock.java rename to common/src/main/java/common/block/natural/BlockHellRock.java diff --git a/common/src/common/block/natural/BlockIce.java b/common/src/main/java/common/block/natural/BlockIce.java similarity index 100% rename from common/src/common/block/natural/BlockIce.java rename to common/src/main/java/common/block/natural/BlockIce.java diff --git a/common/src/common/block/natural/BlockObsidian.java b/common/src/main/java/common/block/natural/BlockObsidian.java similarity index 100% rename from common/src/common/block/natural/BlockObsidian.java rename to common/src/main/java/common/block/natural/BlockObsidian.java diff --git a/common/src/common/block/natural/BlockOre.java b/common/src/main/java/common/block/natural/BlockOre.java similarity index 100% rename from common/src/common/block/natural/BlockOre.java rename to common/src/main/java/common/block/natural/BlockOre.java diff --git a/common/src/common/block/natural/BlockPackedIce.java b/common/src/main/java/common/block/natural/BlockPackedIce.java similarity index 100% rename from common/src/common/block/natural/BlockPackedIce.java rename to common/src/main/java/common/block/natural/BlockPackedIce.java diff --git a/common/src/common/block/natural/BlockRedstoneOre.java b/common/src/main/java/common/block/natural/BlockRedstoneOre.java similarity index 100% rename from common/src/common/block/natural/BlockRedstoneOre.java rename to common/src/main/java/common/block/natural/BlockRedstoneOre.java diff --git a/common/src/common/block/natural/BlockRock.java b/common/src/main/java/common/block/natural/BlockRock.java similarity index 100% rename from common/src/common/block/natural/BlockRock.java rename to common/src/main/java/common/block/natural/BlockRock.java diff --git a/common/src/common/block/natural/BlockSand.java b/common/src/main/java/common/block/natural/BlockSand.java similarity index 100% rename from common/src/common/block/natural/BlockSand.java rename to common/src/main/java/common/block/natural/BlockSand.java diff --git a/common/src/common/block/natural/BlockSandStone.java b/common/src/main/java/common/block/natural/BlockSandStone.java similarity index 100% rename from common/src/common/block/natural/BlockSandStone.java rename to common/src/main/java/common/block/natural/BlockSandStone.java diff --git a/common/src/common/block/natural/BlockSlime.java b/common/src/main/java/common/block/natural/BlockSlime.java similarity index 100% rename from common/src/common/block/natural/BlockSlime.java rename to common/src/main/java/common/block/natural/BlockSlime.java diff --git a/common/src/common/block/natural/BlockSnow.java b/common/src/main/java/common/block/natural/BlockSnow.java similarity index 100% rename from common/src/common/block/natural/BlockSnow.java rename to common/src/main/java/common/block/natural/BlockSnow.java diff --git a/common/src/common/block/natural/BlockSnowBlock.java b/common/src/main/java/common/block/natural/BlockSnowBlock.java similarity index 100% rename from common/src/common/block/natural/BlockSnowBlock.java rename to common/src/main/java/common/block/natural/BlockSnowBlock.java diff --git a/common/src/common/block/natural/BlockSoulFire.java b/common/src/main/java/common/block/natural/BlockSoulFire.java similarity index 100% rename from common/src/common/block/natural/BlockSoulFire.java rename to common/src/main/java/common/block/natural/BlockSoulFire.java diff --git a/common/src/common/block/natural/BlockSoulSand.java b/common/src/main/java/common/block/natural/BlockSoulSand.java similarity index 100% rename from common/src/common/block/natural/BlockSoulSand.java rename to common/src/main/java/common/block/natural/BlockSoulSand.java diff --git a/common/src/common/block/natural/BlockStone.java b/common/src/main/java/common/block/natural/BlockStone.java similarity index 100% rename from common/src/common/block/natural/BlockStone.java rename to common/src/main/java/common/block/natural/BlockStone.java diff --git a/common/src/common/block/natural/BlockTintedFire.java b/common/src/main/java/common/block/natural/BlockTintedFire.java similarity index 100% rename from common/src/common/block/natural/BlockTintedFire.java rename to common/src/main/java/common/block/natural/BlockTintedFire.java diff --git a/common/src/common/block/natural/BlockWeb.java b/common/src/main/java/common/block/natural/BlockWeb.java similarity index 100% rename from common/src/common/block/natural/BlockWeb.java rename to common/src/main/java/common/block/natural/BlockWeb.java diff --git a/common/src/common/block/tech/BlockAnvil.java b/common/src/main/java/common/block/tech/BlockAnvil.java similarity index 100% rename from common/src/common/block/tech/BlockAnvil.java rename to common/src/main/java/common/block/tech/BlockAnvil.java diff --git a/common/src/common/block/tech/BlockBasePressurePlate.java b/common/src/main/java/common/block/tech/BlockBasePressurePlate.java similarity index 100% rename from common/src/common/block/tech/BlockBasePressurePlate.java rename to common/src/main/java/common/block/tech/BlockBasePressurePlate.java diff --git a/common/src/common/block/tech/BlockBeacon.java b/common/src/main/java/common/block/tech/BlockBeacon.java similarity index 100% rename from common/src/common/block/tech/BlockBeacon.java rename to common/src/main/java/common/block/tech/BlockBeacon.java diff --git a/common/src/common/block/tech/BlockBrewingStand.java b/common/src/main/java/common/block/tech/BlockBrewingStand.java similarity index 100% rename from common/src/common/block/tech/BlockBrewingStand.java rename to common/src/main/java/common/block/tech/BlockBrewingStand.java diff --git a/common/src/common/block/tech/BlockButton.java b/common/src/main/java/common/block/tech/BlockButton.java similarity index 100% rename from common/src/common/block/tech/BlockButton.java rename to common/src/main/java/common/block/tech/BlockButton.java diff --git a/common/src/common/block/tech/BlockCauldron.java b/common/src/main/java/common/block/tech/BlockCauldron.java similarity index 100% rename from common/src/common/block/tech/BlockCauldron.java rename to common/src/main/java/common/block/tech/BlockCauldron.java diff --git a/common/src/common/block/tech/BlockChest.java b/common/src/main/java/common/block/tech/BlockChest.java similarity index 100% rename from common/src/common/block/tech/BlockChest.java rename to common/src/main/java/common/block/tech/BlockChest.java diff --git a/common/src/common/block/tech/BlockCore.java b/common/src/main/java/common/block/tech/BlockCore.java similarity index 100% rename from common/src/common/block/tech/BlockCore.java rename to common/src/main/java/common/block/tech/BlockCore.java diff --git a/common/src/common/block/tech/BlockDaylightDetector.java b/common/src/main/java/common/block/tech/BlockDaylightDetector.java similarity index 100% rename from common/src/common/block/tech/BlockDaylightDetector.java rename to common/src/main/java/common/block/tech/BlockDaylightDetector.java diff --git a/common/src/common/block/tech/BlockDispenser.java b/common/src/main/java/common/block/tech/BlockDispenser.java similarity index 100% rename from common/src/common/block/tech/BlockDispenser.java rename to common/src/main/java/common/block/tech/BlockDispenser.java diff --git a/common/src/common/block/tech/BlockDropper.java b/common/src/main/java/common/block/tech/BlockDropper.java similarity index 100% rename from common/src/common/block/tech/BlockDropper.java rename to common/src/main/java/common/block/tech/BlockDropper.java diff --git a/common/src/common/block/tech/BlockEnchantmentTable.java b/common/src/main/java/common/block/tech/BlockEnchantmentTable.java similarity index 100% rename from common/src/common/block/tech/BlockEnchantmentTable.java rename to common/src/main/java/common/block/tech/BlockEnchantmentTable.java diff --git a/common/src/common/block/tech/BlockFurnace.java b/common/src/main/java/common/block/tech/BlockFurnace.java similarity index 100% rename from common/src/common/block/tech/BlockFurnace.java rename to common/src/main/java/common/block/tech/BlockFurnace.java diff --git a/common/src/common/block/tech/BlockHopper.java b/common/src/main/java/common/block/tech/BlockHopper.java similarity index 100% rename from common/src/common/block/tech/BlockHopper.java rename to common/src/main/java/common/block/tech/BlockHopper.java diff --git a/common/src/common/block/tech/BlockJukebox.java b/common/src/main/java/common/block/tech/BlockJukebox.java similarity index 100% rename from common/src/common/block/tech/BlockJukebox.java rename to common/src/main/java/common/block/tech/BlockJukebox.java diff --git a/common/src/common/block/tech/BlockLever.java b/common/src/main/java/common/block/tech/BlockLever.java similarity index 100% rename from common/src/common/block/tech/BlockLever.java rename to common/src/main/java/common/block/tech/BlockLever.java diff --git a/common/src/common/block/tech/BlockMachine.java b/common/src/main/java/common/block/tech/BlockMachine.java similarity index 100% rename from common/src/common/block/tech/BlockMachine.java rename to common/src/main/java/common/block/tech/BlockMachine.java diff --git a/common/src/common/block/tech/BlockMobSpawner.java b/common/src/main/java/common/block/tech/BlockMobSpawner.java similarity index 100% rename from common/src/common/block/tech/BlockMobSpawner.java rename to common/src/main/java/common/block/tech/BlockMobSpawner.java diff --git a/common/src/common/block/tech/BlockNote.java b/common/src/main/java/common/block/tech/BlockNote.java similarity index 100% rename from common/src/common/block/tech/BlockNote.java rename to common/src/main/java/common/block/tech/BlockNote.java diff --git a/common/src/common/block/tech/BlockNuke.java b/common/src/main/java/common/block/tech/BlockNuke.java similarity index 100% rename from common/src/common/block/tech/BlockNuke.java rename to common/src/main/java/common/block/tech/BlockNuke.java diff --git a/common/src/common/block/tech/BlockPistonBase.java b/common/src/main/java/common/block/tech/BlockPistonBase.java similarity index 100% rename from common/src/common/block/tech/BlockPistonBase.java rename to common/src/main/java/common/block/tech/BlockPistonBase.java diff --git a/common/src/common/block/tech/BlockPistonHead.java b/common/src/main/java/common/block/tech/BlockPistonHead.java similarity index 100% rename from common/src/common/block/tech/BlockPistonHead.java rename to common/src/main/java/common/block/tech/BlockPistonHead.java diff --git a/common/src/common/block/tech/BlockPistonMoving.java b/common/src/main/java/common/block/tech/BlockPistonMoving.java similarity index 100% rename from common/src/common/block/tech/BlockPistonMoving.java rename to common/src/main/java/common/block/tech/BlockPistonMoving.java diff --git a/common/src/common/block/tech/BlockPressurePlate.java b/common/src/main/java/common/block/tech/BlockPressurePlate.java similarity index 100% rename from common/src/common/block/tech/BlockPressurePlate.java rename to common/src/main/java/common/block/tech/BlockPressurePlate.java diff --git a/common/src/common/block/tech/BlockPressurePlateWeighted.java b/common/src/main/java/common/block/tech/BlockPressurePlateWeighted.java similarity index 100% rename from common/src/common/block/tech/BlockPressurePlateWeighted.java rename to common/src/main/java/common/block/tech/BlockPressurePlateWeighted.java diff --git a/common/src/common/block/tech/BlockRail.java b/common/src/main/java/common/block/tech/BlockRail.java similarity index 100% rename from common/src/common/block/tech/BlockRail.java rename to common/src/main/java/common/block/tech/BlockRail.java diff --git a/common/src/common/block/tech/BlockRailBase.java b/common/src/main/java/common/block/tech/BlockRailBase.java similarity index 100% rename from common/src/common/block/tech/BlockRailBase.java rename to common/src/main/java/common/block/tech/BlockRailBase.java diff --git a/common/src/common/block/tech/BlockRailDetector.java b/common/src/main/java/common/block/tech/BlockRailDetector.java similarity index 100% rename from common/src/common/block/tech/BlockRailDetector.java rename to common/src/main/java/common/block/tech/BlockRailDetector.java diff --git a/common/src/common/block/tech/BlockRailPowered.java b/common/src/main/java/common/block/tech/BlockRailPowered.java similarity index 100% rename from common/src/common/block/tech/BlockRailPowered.java rename to common/src/main/java/common/block/tech/BlockRailPowered.java diff --git a/common/src/common/block/tech/BlockRedstoneComparator.java b/common/src/main/java/common/block/tech/BlockRedstoneComparator.java similarity index 100% rename from common/src/common/block/tech/BlockRedstoneComparator.java rename to common/src/main/java/common/block/tech/BlockRedstoneComparator.java diff --git a/common/src/common/block/tech/BlockRedstoneDiode.java b/common/src/main/java/common/block/tech/BlockRedstoneDiode.java similarity index 100% rename from common/src/common/block/tech/BlockRedstoneDiode.java rename to common/src/main/java/common/block/tech/BlockRedstoneDiode.java diff --git a/common/src/common/block/tech/BlockRedstoneLight.java b/common/src/main/java/common/block/tech/BlockRedstoneLight.java similarity index 100% rename from common/src/common/block/tech/BlockRedstoneLight.java rename to common/src/main/java/common/block/tech/BlockRedstoneLight.java diff --git a/common/src/common/block/tech/BlockRedstoneRepeater.java b/common/src/main/java/common/block/tech/BlockRedstoneRepeater.java similarity index 100% rename from common/src/common/block/tech/BlockRedstoneRepeater.java rename to common/src/main/java/common/block/tech/BlockRedstoneRepeater.java diff --git a/common/src/common/block/tech/BlockRedstoneTorch.java b/common/src/main/java/common/block/tech/BlockRedstoneTorch.java similarity index 100% rename from common/src/common/block/tech/BlockRedstoneTorch.java rename to common/src/main/java/common/block/tech/BlockRedstoneTorch.java diff --git a/common/src/common/block/tech/BlockRedstoneWire.java b/common/src/main/java/common/block/tech/BlockRedstoneWire.java similarity index 100% rename from common/src/common/block/tech/BlockRedstoneWire.java rename to common/src/main/java/common/block/tech/BlockRedstoneWire.java diff --git a/common/src/common/block/tech/BlockSourceImpl.java b/common/src/main/java/common/block/tech/BlockSourceImpl.java similarity index 100% rename from common/src/common/block/tech/BlockSourceImpl.java rename to common/src/main/java/common/block/tech/BlockSourceImpl.java diff --git a/common/src/common/block/tech/BlockTNT.java b/common/src/main/java/common/block/tech/BlockTNT.java similarity index 100% rename from common/src/common/block/tech/BlockTNT.java rename to common/src/main/java/common/block/tech/BlockTNT.java diff --git a/common/src/common/block/tech/BlockTianReactor.java b/common/src/main/java/common/block/tech/BlockTianReactor.java similarity index 100% rename from common/src/common/block/tech/BlockTianReactor.java rename to common/src/main/java/common/block/tech/BlockTianReactor.java diff --git a/common/src/common/block/tech/BlockTorch.java b/common/src/main/java/common/block/tech/BlockTorch.java similarity index 100% rename from common/src/common/block/tech/BlockTorch.java rename to common/src/main/java/common/block/tech/BlockTorch.java diff --git a/common/src/common/block/tech/BlockTripWire.java b/common/src/main/java/common/block/tech/BlockTripWire.java similarity index 100% rename from common/src/common/block/tech/BlockTripWire.java rename to common/src/main/java/common/block/tech/BlockTripWire.java diff --git a/common/src/common/block/tech/BlockTripWireHook.java b/common/src/main/java/common/block/tech/BlockTripWireHook.java similarity index 100% rename from common/src/common/block/tech/BlockTripWireHook.java rename to common/src/main/java/common/block/tech/BlockTripWireHook.java diff --git a/common/src/common/block/tech/BlockWarpChest.java b/common/src/main/java/common/block/tech/BlockWarpChest.java similarity index 100% rename from common/src/common/block/tech/BlockWarpChest.java rename to common/src/main/java/common/block/tech/BlockWarpChest.java diff --git a/common/src/common/block/tech/BlockWorkbench.java b/common/src/main/java/common/block/tech/BlockWorkbench.java similarity index 100% rename from common/src/common/block/tech/BlockWorkbench.java rename to common/src/main/java/common/block/tech/BlockWorkbench.java diff --git a/common/src/common/block/tile/BlockBanner.java b/common/src/main/java/common/block/tile/BlockBanner.java similarity index 100% rename from common/src/common/block/tile/BlockBanner.java rename to common/src/main/java/common/block/tile/BlockBanner.java diff --git a/common/src/common/block/tile/BlockSign.java b/common/src/main/java/common/block/tile/BlockSign.java similarity index 100% rename from common/src/common/block/tile/BlockSign.java rename to common/src/main/java/common/block/tile/BlockSign.java diff --git a/common/src/common/block/tile/BlockSkull.java b/common/src/main/java/common/block/tile/BlockSkull.java similarity index 100% rename from common/src/common/block/tile/BlockSkull.java rename to common/src/main/java/common/block/tile/BlockSkull.java diff --git a/common/src/common/block/tile/BlockStandingSign.java b/common/src/main/java/common/block/tile/BlockStandingSign.java similarity index 100% rename from common/src/common/block/tile/BlockStandingSign.java rename to common/src/main/java/common/block/tile/BlockStandingSign.java diff --git a/common/src/common/block/tile/BlockWallSign.java b/common/src/main/java/common/block/tile/BlockWallSign.java similarity index 100% rename from common/src/common/block/tile/BlockWallSign.java rename to common/src/main/java/common/block/tile/BlockWallSign.java diff --git a/common/src/common/collect/AbstractBiMap.java b/common/src/main/java/common/collect/AbstractBiMap.java similarity index 100% rename from common/src/common/collect/AbstractBiMap.java rename to common/src/main/java/common/collect/AbstractBiMap.java diff --git a/common/src/common/collect/AbstractIndexedListIterator.java b/common/src/main/java/common/collect/AbstractIndexedListIterator.java similarity index 100% rename from common/src/common/collect/AbstractIndexedListIterator.java rename to common/src/main/java/common/collect/AbstractIndexedListIterator.java diff --git a/common/src/common/collect/AbstractIterator.java b/common/src/main/java/common/collect/AbstractIterator.java similarity index 100% rename from common/src/common/collect/AbstractIterator.java rename to common/src/main/java/common/collect/AbstractIterator.java diff --git a/common/src/common/collect/AbstractMapEntry.java b/common/src/main/java/common/collect/AbstractMapEntry.java similarity index 100% rename from common/src/common/collect/AbstractMapEntry.java rename to common/src/main/java/common/collect/AbstractMapEntry.java diff --git a/common/src/common/collect/AbstractTable.java b/common/src/main/java/common/collect/AbstractTable.java similarity index 100% rename from common/src/common/collect/AbstractTable.java rename to common/src/main/java/common/collect/AbstractTable.java diff --git a/common/src/common/collect/BiMap.java b/common/src/main/java/common/collect/BiMap.java similarity index 100% rename from common/src/common/collect/BiMap.java rename to common/src/main/java/common/collect/BiMap.java diff --git a/common/src/common/collect/CollectPreconditions.java b/common/src/main/java/common/collect/CollectPreconditions.java similarity index 100% rename from common/src/common/collect/CollectPreconditions.java rename to common/src/main/java/common/collect/CollectPreconditions.java diff --git a/common/src/common/collect/DenseImmutableTable.java b/common/src/main/java/common/collect/DenseImmutableTable.java similarity index 100% rename from common/src/common/collect/DenseImmutableTable.java rename to common/src/main/java/common/collect/DenseImmutableTable.java diff --git a/common/src/common/collect/EmptyImmutableMap.java b/common/src/main/java/common/collect/EmptyImmutableMap.java similarity index 100% rename from common/src/common/collect/EmptyImmutableMap.java rename to common/src/main/java/common/collect/EmptyImmutableMap.java diff --git a/common/src/common/collect/EmptyImmutableSet.java b/common/src/main/java/common/collect/EmptyImmutableSet.java similarity index 100% rename from common/src/common/collect/EmptyImmutableSet.java rename to common/src/main/java/common/collect/EmptyImmutableSet.java diff --git a/common/src/common/collect/Filter.java b/common/src/main/java/common/collect/Filter.java similarity index 100% rename from common/src/common/collect/Filter.java rename to common/src/main/java/common/collect/Filter.java diff --git a/common/src/common/collect/ForwardingCollection.java b/common/src/main/java/common/collect/ForwardingCollection.java similarity index 100% rename from common/src/common/collect/ForwardingCollection.java rename to common/src/main/java/common/collect/ForwardingCollection.java diff --git a/common/src/common/collect/ForwardingMap.java b/common/src/main/java/common/collect/ForwardingMap.java similarity index 100% rename from common/src/common/collect/ForwardingMap.java rename to common/src/main/java/common/collect/ForwardingMap.java diff --git a/common/src/common/collect/ForwardingMapEntry.java b/common/src/main/java/common/collect/ForwardingMapEntry.java similarity index 100% rename from common/src/common/collect/ForwardingMapEntry.java rename to common/src/main/java/common/collect/ForwardingMapEntry.java diff --git a/common/src/common/collect/ForwardingObject.java b/common/src/main/java/common/collect/ForwardingObject.java similarity index 100% rename from common/src/common/collect/ForwardingObject.java rename to common/src/main/java/common/collect/ForwardingObject.java diff --git a/common/src/common/collect/ForwardingSet.java b/common/src/main/java/common/collect/ForwardingSet.java similarity index 100% rename from common/src/common/collect/ForwardingSet.java rename to common/src/main/java/common/collect/ForwardingSet.java diff --git a/common/src/common/collect/HashBiMap.java b/common/src/main/java/common/collect/HashBiMap.java similarity index 100% rename from common/src/common/collect/HashBiMap.java rename to common/src/main/java/common/collect/HashBiMap.java diff --git a/common/src/common/collect/Hashing.java b/common/src/main/java/common/collect/Hashing.java similarity index 100% rename from common/src/common/collect/Hashing.java rename to common/src/main/java/common/collect/Hashing.java diff --git a/common/src/common/collect/ImmutableAsList.java b/common/src/main/java/common/collect/ImmutableAsList.java similarity index 100% rename from common/src/common/collect/ImmutableAsList.java rename to common/src/main/java/common/collect/ImmutableAsList.java diff --git a/common/src/common/collect/ImmutableCollection.java b/common/src/main/java/common/collect/ImmutableCollection.java similarity index 100% rename from common/src/common/collect/ImmutableCollection.java rename to common/src/main/java/common/collect/ImmutableCollection.java diff --git a/common/src/common/collect/ImmutableEntry.java b/common/src/main/java/common/collect/ImmutableEntry.java similarity index 100% rename from common/src/common/collect/ImmutableEntry.java rename to common/src/main/java/common/collect/ImmutableEntry.java diff --git a/common/src/common/collect/ImmutableEnumMap.java b/common/src/main/java/common/collect/ImmutableEnumMap.java similarity index 100% rename from common/src/common/collect/ImmutableEnumMap.java rename to common/src/main/java/common/collect/ImmutableEnumMap.java diff --git a/common/src/common/collect/ImmutableEnumSet.java b/common/src/main/java/common/collect/ImmutableEnumSet.java similarity index 100% rename from common/src/common/collect/ImmutableEnumSet.java rename to common/src/main/java/common/collect/ImmutableEnumSet.java diff --git a/common/src/common/collect/ImmutableList.java b/common/src/main/java/common/collect/ImmutableList.java similarity index 100% rename from common/src/common/collect/ImmutableList.java rename to common/src/main/java/common/collect/ImmutableList.java diff --git a/common/src/common/collect/ImmutableMap.java b/common/src/main/java/common/collect/ImmutableMap.java similarity index 100% rename from common/src/common/collect/ImmutableMap.java rename to common/src/main/java/common/collect/ImmutableMap.java diff --git a/common/src/common/collect/ImmutableMapEntry.java b/common/src/main/java/common/collect/ImmutableMapEntry.java similarity index 100% rename from common/src/common/collect/ImmutableMapEntry.java rename to common/src/main/java/common/collect/ImmutableMapEntry.java diff --git a/common/src/common/collect/ImmutableMapEntrySet.java b/common/src/main/java/common/collect/ImmutableMapEntrySet.java similarity index 100% rename from common/src/common/collect/ImmutableMapEntrySet.java rename to common/src/main/java/common/collect/ImmutableMapEntrySet.java diff --git a/common/src/common/collect/ImmutableMapKeySet.java b/common/src/main/java/common/collect/ImmutableMapKeySet.java similarity index 100% rename from common/src/common/collect/ImmutableMapKeySet.java rename to common/src/main/java/common/collect/ImmutableMapKeySet.java diff --git a/common/src/common/collect/ImmutableMapValues.java b/common/src/main/java/common/collect/ImmutableMapValues.java similarity index 100% rename from common/src/common/collect/ImmutableMapValues.java rename to common/src/main/java/common/collect/ImmutableMapValues.java diff --git a/common/src/common/collect/ImmutableSet.java b/common/src/main/java/common/collect/ImmutableSet.java similarity index 100% rename from common/src/common/collect/ImmutableSet.java rename to common/src/main/java/common/collect/ImmutableSet.java diff --git a/common/src/common/collect/ImmutableTable.java b/common/src/main/java/common/collect/ImmutableTable.java similarity index 100% rename from common/src/common/collect/ImmutableTable.java rename to common/src/main/java/common/collect/ImmutableTable.java diff --git a/common/src/common/collect/Iterables.java b/common/src/main/java/common/collect/Iterables.java similarity index 100% rename from common/src/common/collect/Iterables.java rename to common/src/main/java/common/collect/Iterables.java diff --git a/common/src/common/collect/Iterators.java b/common/src/main/java/common/collect/Iterators.java similarity index 100% rename from common/src/common/collect/Iterators.java rename to common/src/main/java/common/collect/Iterators.java diff --git a/common/src/common/collect/Lists.java b/common/src/main/java/common/collect/Lists.java similarity index 100% rename from common/src/common/collect/Lists.java rename to common/src/main/java/common/collect/Lists.java diff --git a/common/src/common/collect/Maps.java b/common/src/main/java/common/collect/Maps.java similarity index 100% rename from common/src/common/collect/Maps.java rename to common/src/main/java/common/collect/Maps.java diff --git a/common/src/common/collect/ObjectArrays.java b/common/src/main/java/common/collect/ObjectArrays.java similarity index 100% rename from common/src/common/collect/ObjectArrays.java rename to common/src/main/java/common/collect/ObjectArrays.java diff --git a/common/src/common/collect/Preconditions.java b/common/src/main/java/common/collect/Preconditions.java similarity index 100% rename from common/src/common/collect/Preconditions.java rename to common/src/main/java/common/collect/Preconditions.java diff --git a/common/src/common/collect/RegularImmutableAsList.java b/common/src/main/java/common/collect/RegularImmutableAsList.java similarity index 100% rename from common/src/common/collect/RegularImmutableAsList.java rename to common/src/main/java/common/collect/RegularImmutableAsList.java diff --git a/common/src/common/collect/RegularImmutableList.java b/common/src/main/java/common/collect/RegularImmutableList.java similarity index 100% rename from common/src/common/collect/RegularImmutableList.java rename to common/src/main/java/common/collect/RegularImmutableList.java diff --git a/common/src/common/collect/RegularImmutableMap.java b/common/src/main/java/common/collect/RegularImmutableMap.java similarity index 100% rename from common/src/common/collect/RegularImmutableMap.java rename to common/src/main/java/common/collect/RegularImmutableMap.java diff --git a/common/src/common/collect/RegularImmutableSet.java b/common/src/main/java/common/collect/RegularImmutableSet.java similarity index 100% rename from common/src/common/collect/RegularImmutableSet.java rename to common/src/main/java/common/collect/RegularImmutableSet.java diff --git a/common/src/common/collect/RegularImmutableTable.java b/common/src/main/java/common/collect/RegularImmutableTable.java similarity index 100% rename from common/src/common/collect/RegularImmutableTable.java rename to common/src/main/java/common/collect/RegularImmutableTable.java diff --git a/common/src/common/collect/Sets.java b/common/src/main/java/common/collect/Sets.java similarity index 100% rename from common/src/common/collect/Sets.java rename to common/src/main/java/common/collect/Sets.java diff --git a/common/src/common/collect/SparseImmutableTable.java b/common/src/main/java/common/collect/SparseImmutableTable.java similarity index 100% rename from common/src/common/collect/SparseImmutableTable.java rename to common/src/main/java/common/collect/SparseImmutableTable.java diff --git a/common/src/common/collect/StandardTable.java b/common/src/main/java/common/collect/StandardTable.java similarity index 100% rename from common/src/common/collect/StandardTable.java rename to common/src/main/java/common/collect/StandardTable.java diff --git a/common/src/common/collect/Table.java b/common/src/main/java/common/collect/Table.java similarity index 100% rename from common/src/common/collect/Table.java rename to common/src/main/java/common/collect/Table.java diff --git a/common/src/common/collect/TransformedIterator.java b/common/src/main/java/common/collect/TransformedIterator.java similarity index 100% rename from common/src/common/collect/TransformedIterator.java rename to common/src/main/java/common/collect/TransformedIterator.java diff --git a/common/src/common/collect/UnmodifiableIterator.java b/common/src/main/java/common/collect/UnmodifiableIterator.java similarity index 100% rename from common/src/common/collect/UnmodifiableIterator.java rename to common/src/main/java/common/collect/UnmodifiableIterator.java diff --git a/common/src/common/collect/UnmodifiableListIterator.java b/common/src/main/java/common/collect/UnmodifiableListIterator.java similarity index 100% rename from common/src/common/collect/UnmodifiableListIterator.java rename to common/src/main/java/common/collect/UnmodifiableListIterator.java diff --git a/common/src/common/color/Colorizer.java b/common/src/main/java/common/color/Colorizer.java similarity index 100% rename from common/src/common/color/Colorizer.java rename to common/src/main/java/common/color/Colorizer.java diff --git a/common/src/common/color/DyeColor.java b/common/src/main/java/common/color/DyeColor.java similarity index 100% rename from common/src/common/color/DyeColor.java rename to common/src/main/java/common/color/DyeColor.java diff --git a/common/src/common/color/TextColor.java b/common/src/main/java/common/color/TextColor.java similarity index 100% rename from common/src/common/color/TextColor.java rename to common/src/main/java/common/color/TextColor.java diff --git a/common/src/common/dimension/Area.java b/common/src/main/java/common/dimension/Area.java similarity index 100% rename from common/src/common/dimension/Area.java rename to common/src/main/java/common/dimension/Area.java diff --git a/common/src/common/dimension/CloudType.java b/common/src/main/java/common/dimension/CloudType.java similarity index 100% rename from common/src/common/dimension/CloudType.java rename to common/src/main/java/common/dimension/CloudType.java diff --git a/common/src/common/dimension/DimType.java b/common/src/main/java/common/dimension/DimType.java similarity index 100% rename from common/src/common/dimension/DimType.java rename to common/src/main/java/common/dimension/DimType.java diff --git a/common/src/common/dimension/Dimension.java b/common/src/main/java/common/dimension/Dimension.java similarity index 100% rename from common/src/common/dimension/Dimension.java rename to common/src/main/java/common/dimension/Dimension.java diff --git a/common/src/common/dimension/Domain.java b/common/src/main/java/common/dimension/Domain.java similarity index 100% rename from common/src/common/dimension/Domain.java rename to common/src/main/java/common/dimension/Domain.java diff --git a/common/src/common/dimension/Galaxy.java b/common/src/main/java/common/dimension/Galaxy.java similarity index 100% rename from common/src/common/dimension/Galaxy.java rename to common/src/main/java/common/dimension/Galaxy.java diff --git a/common/src/common/dimension/Lake.java b/common/src/main/java/common/dimension/Lake.java similarity index 100% rename from common/src/common/dimension/Lake.java rename to common/src/main/java/common/dimension/Lake.java diff --git a/common/src/common/dimension/Liquid.java b/common/src/main/java/common/dimension/Liquid.java similarity index 100% rename from common/src/common/dimension/Liquid.java rename to common/src/main/java/common/dimension/Liquid.java diff --git a/common/src/common/dimension/Moon.java b/common/src/main/java/common/dimension/Moon.java similarity index 100% rename from common/src/common/dimension/Moon.java rename to common/src/main/java/common/dimension/Moon.java diff --git a/common/src/common/dimension/Nameable.java b/common/src/main/java/common/dimension/Nameable.java similarity index 100% rename from common/src/common/dimension/Nameable.java rename to common/src/main/java/common/dimension/Nameable.java diff --git a/common/src/common/dimension/Ore.java b/common/src/main/java/common/dimension/Ore.java similarity index 100% rename from common/src/common/dimension/Ore.java rename to common/src/main/java/common/dimension/Ore.java diff --git a/common/src/common/dimension/Planet.java b/common/src/main/java/common/dimension/Planet.java similarity index 100% rename from common/src/common/dimension/Planet.java rename to common/src/main/java/common/dimension/Planet.java diff --git a/common/src/common/dimension/Sector.java b/common/src/main/java/common/dimension/Sector.java similarity index 100% rename from common/src/common/dimension/Sector.java rename to common/src/main/java/common/dimension/Sector.java diff --git a/common/src/common/dimension/Semi.java b/common/src/main/java/common/dimension/Semi.java similarity index 100% rename from common/src/common/dimension/Semi.java rename to common/src/main/java/common/dimension/Semi.java diff --git a/common/src/common/dimension/SkyboxType.java b/common/src/main/java/common/dimension/SkyboxType.java similarity index 100% rename from common/src/common/dimension/SkyboxType.java rename to common/src/main/java/common/dimension/SkyboxType.java diff --git a/common/src/common/dimension/Space.java b/common/src/main/java/common/dimension/Space.java similarity index 100% rename from common/src/common/dimension/Space.java rename to common/src/main/java/common/dimension/Space.java diff --git a/common/src/common/dimension/Star.java b/common/src/main/java/common/dimension/Star.java similarity index 100% rename from common/src/common/dimension/Star.java rename to common/src/main/java/common/dimension/Star.java diff --git a/common/src/common/dispenser/BehaviorDefaultDispenseItem.java b/common/src/main/java/common/dispenser/BehaviorDefaultDispenseItem.java similarity index 100% rename from common/src/common/dispenser/BehaviorDefaultDispenseItem.java rename to common/src/main/java/common/dispenser/BehaviorDefaultDispenseItem.java diff --git a/common/src/common/dispenser/BehaviorProjectileDispense.java b/common/src/main/java/common/dispenser/BehaviorProjectileDispense.java similarity index 100% rename from common/src/common/dispenser/BehaviorProjectileDispense.java rename to common/src/main/java/common/dispenser/BehaviorProjectileDispense.java diff --git a/common/src/common/dispenser/IBehaviorDispenseItem.java b/common/src/main/java/common/dispenser/IBehaviorDispenseItem.java similarity index 100% rename from common/src/common/dispenser/IBehaviorDispenseItem.java rename to common/src/main/java/common/dispenser/IBehaviorDispenseItem.java diff --git a/common/src/common/dispenser/IBlockSource.java b/common/src/main/java/common/dispenser/IBlockSource.java similarity index 100% rename from common/src/common/dispenser/IBlockSource.java rename to common/src/main/java/common/dispenser/IBlockSource.java diff --git a/common/src/common/dispenser/ILocatableSource.java b/common/src/main/java/common/dispenser/ILocatableSource.java similarity index 100% rename from common/src/common/dispenser/ILocatableSource.java rename to common/src/main/java/common/dispenser/ILocatableSource.java diff --git a/common/src/common/dispenser/ILocation.java b/common/src/main/java/common/dispenser/ILocation.java similarity index 100% rename from common/src/common/dispenser/ILocation.java rename to common/src/main/java/common/dispenser/ILocation.java diff --git a/common/src/common/dispenser/IPosition.java b/common/src/main/java/common/dispenser/IPosition.java similarity index 100% rename from common/src/common/dispenser/IPosition.java rename to common/src/main/java/common/dispenser/IPosition.java diff --git a/common/src/common/dispenser/PositionImpl.java b/common/src/main/java/common/dispenser/PositionImpl.java similarity index 100% rename from common/src/common/dispenser/PositionImpl.java rename to common/src/main/java/common/dispenser/PositionImpl.java diff --git a/common/src/common/enchantment/Enchantment.java b/common/src/main/java/common/enchantment/Enchantment.java similarity index 100% rename from common/src/common/enchantment/Enchantment.java rename to common/src/main/java/common/enchantment/Enchantment.java diff --git a/common/src/common/enchantment/EnchantmentArrowDamage.java b/common/src/main/java/common/enchantment/EnchantmentArrowDamage.java similarity index 100% rename from common/src/common/enchantment/EnchantmentArrowDamage.java rename to common/src/main/java/common/enchantment/EnchantmentArrowDamage.java diff --git a/common/src/common/enchantment/EnchantmentArrowFire.java b/common/src/main/java/common/enchantment/EnchantmentArrowFire.java similarity index 100% rename from common/src/common/enchantment/EnchantmentArrowFire.java rename to common/src/main/java/common/enchantment/EnchantmentArrowFire.java diff --git a/common/src/common/enchantment/EnchantmentArrowInfinite.java b/common/src/main/java/common/enchantment/EnchantmentArrowInfinite.java similarity index 100% rename from common/src/common/enchantment/EnchantmentArrowInfinite.java rename to common/src/main/java/common/enchantment/EnchantmentArrowInfinite.java diff --git a/common/src/common/enchantment/EnchantmentArrowKnockback.java b/common/src/main/java/common/enchantment/EnchantmentArrowKnockback.java similarity index 100% rename from common/src/common/enchantment/EnchantmentArrowKnockback.java rename to common/src/main/java/common/enchantment/EnchantmentArrowKnockback.java diff --git a/common/src/common/enchantment/EnchantmentDamage.java b/common/src/main/java/common/enchantment/EnchantmentDamage.java similarity index 100% rename from common/src/common/enchantment/EnchantmentDamage.java rename to common/src/main/java/common/enchantment/EnchantmentDamage.java diff --git a/common/src/common/enchantment/EnchantmentDigging.java b/common/src/main/java/common/enchantment/EnchantmentDigging.java similarity index 100% rename from common/src/common/enchantment/EnchantmentDigging.java rename to common/src/main/java/common/enchantment/EnchantmentDigging.java diff --git a/common/src/common/enchantment/EnchantmentDraining.java b/common/src/main/java/common/enchantment/EnchantmentDraining.java similarity index 100% rename from common/src/common/enchantment/EnchantmentDraining.java rename to common/src/main/java/common/enchantment/EnchantmentDraining.java diff --git a/common/src/common/enchantment/EnchantmentDurability.java b/common/src/main/java/common/enchantment/EnchantmentDurability.java similarity index 100% rename from common/src/common/enchantment/EnchantmentDurability.java rename to common/src/main/java/common/enchantment/EnchantmentDurability.java diff --git a/common/src/common/enchantment/EnchantmentFireAspect.java b/common/src/main/java/common/enchantment/EnchantmentFireAspect.java similarity index 100% rename from common/src/common/enchantment/EnchantmentFireAspect.java rename to common/src/main/java/common/enchantment/EnchantmentFireAspect.java diff --git a/common/src/common/enchantment/EnchantmentFishingSpeed.java b/common/src/main/java/common/enchantment/EnchantmentFishingSpeed.java similarity index 100% rename from common/src/common/enchantment/EnchantmentFishingSpeed.java rename to common/src/main/java/common/enchantment/EnchantmentFishingSpeed.java diff --git a/common/src/common/enchantment/EnchantmentHelper.java b/common/src/main/java/common/enchantment/EnchantmentHelper.java similarity index 100% rename from common/src/common/enchantment/EnchantmentHelper.java rename to common/src/main/java/common/enchantment/EnchantmentHelper.java diff --git a/common/src/common/enchantment/EnchantmentKnockback.java b/common/src/main/java/common/enchantment/EnchantmentKnockback.java similarity index 100% rename from common/src/common/enchantment/EnchantmentKnockback.java rename to common/src/main/java/common/enchantment/EnchantmentKnockback.java diff --git a/common/src/common/enchantment/EnchantmentLootBonus.java b/common/src/main/java/common/enchantment/EnchantmentLootBonus.java similarity index 100% rename from common/src/common/enchantment/EnchantmentLootBonus.java rename to common/src/main/java/common/enchantment/EnchantmentLootBonus.java diff --git a/common/src/common/enchantment/EnchantmentProtection.java b/common/src/main/java/common/enchantment/EnchantmentProtection.java similarity index 100% rename from common/src/common/enchantment/EnchantmentProtection.java rename to common/src/main/java/common/enchantment/EnchantmentProtection.java diff --git a/common/src/common/enchantment/EnchantmentThorns.java b/common/src/main/java/common/enchantment/EnchantmentThorns.java similarity index 100% rename from common/src/common/enchantment/EnchantmentThorns.java rename to common/src/main/java/common/enchantment/EnchantmentThorns.java diff --git a/common/src/common/enchantment/EnchantmentUntouching.java b/common/src/main/java/common/enchantment/EnchantmentUntouching.java similarity index 100% rename from common/src/common/enchantment/EnchantmentUntouching.java rename to common/src/main/java/common/enchantment/EnchantmentUntouching.java diff --git a/common/src/common/enchantment/EnumEnchantmentType.java b/common/src/main/java/common/enchantment/EnumEnchantmentType.java similarity index 100% rename from common/src/common/enchantment/EnumEnchantmentType.java rename to common/src/main/java/common/enchantment/EnumEnchantmentType.java diff --git a/common/src/common/enchantment/RngEnchantment.java b/common/src/main/java/common/enchantment/RngEnchantment.java similarity index 100% rename from common/src/common/enchantment/RngEnchantment.java rename to common/src/main/java/common/enchantment/RngEnchantment.java diff --git a/common/src/common/entity/DamageSource.java b/common/src/main/java/common/entity/DamageSource.java similarity index 100% rename from common/src/common/entity/DamageSource.java rename to common/src/main/java/common/entity/DamageSource.java diff --git a/common/src/common/entity/DataWatcher.java b/common/src/main/java/common/entity/DataWatcher.java similarity index 100% rename from common/src/common/entity/DataWatcher.java rename to common/src/main/java/common/entity/DataWatcher.java diff --git a/common/src/common/entity/Entity.java b/common/src/main/java/common/entity/Entity.java similarity index 100% rename from common/src/common/entity/Entity.java rename to common/src/main/java/common/entity/Entity.java diff --git a/common/src/common/entity/EntityDamageSource.java b/common/src/main/java/common/entity/EntityDamageSource.java similarity index 100% rename from common/src/common/entity/EntityDamageSource.java rename to common/src/main/java/common/entity/EntityDamageSource.java diff --git a/common/src/common/entity/EntityDamageSourceIndirect.java b/common/src/main/java/common/entity/EntityDamageSourceIndirect.java similarity index 100% rename from common/src/common/entity/EntityDamageSourceIndirect.java rename to common/src/main/java/common/entity/EntityDamageSourceIndirect.java diff --git a/common/src/common/entity/EntityTrackerEntry.java b/common/src/main/java/common/entity/EntityTrackerEntry.java similarity index 100% rename from common/src/common/entity/EntityTrackerEntry.java rename to common/src/main/java/common/entity/EntityTrackerEntry.java diff --git a/common/src/common/entity/EntityType.java b/common/src/main/java/common/entity/EntityType.java similarity index 100% rename from common/src/common/entity/EntityType.java rename to common/src/main/java/common/entity/EntityType.java diff --git a/common/src/common/entity/animal/EntityBat.java b/common/src/main/java/common/entity/animal/EntityBat.java similarity index 100% rename from common/src/common/entity/animal/EntityBat.java rename to common/src/main/java/common/entity/animal/EntityBat.java diff --git a/common/src/common/entity/animal/EntityChicken.java b/common/src/main/java/common/entity/animal/EntityChicken.java similarity index 100% rename from common/src/common/entity/animal/EntityChicken.java rename to common/src/main/java/common/entity/animal/EntityChicken.java diff --git a/common/src/common/entity/animal/EntityCow.java b/common/src/main/java/common/entity/animal/EntityCow.java similarity index 100% rename from common/src/common/entity/animal/EntityCow.java rename to common/src/main/java/common/entity/animal/EntityCow.java diff --git a/common/src/common/entity/animal/EntityDragon.java b/common/src/main/java/common/entity/animal/EntityDragon.java similarity index 100% rename from common/src/common/entity/animal/EntityDragon.java rename to common/src/main/java/common/entity/animal/EntityDragon.java diff --git a/common/src/common/entity/animal/EntityDragonPart.java b/common/src/main/java/common/entity/animal/EntityDragonPart.java similarity index 100% rename from common/src/common/entity/animal/EntityDragonPart.java rename to common/src/main/java/common/entity/animal/EntityDragonPart.java diff --git a/common/src/common/entity/animal/EntityHorse.java b/common/src/main/java/common/entity/animal/EntityHorse.java similarity index 100% rename from common/src/common/entity/animal/EntityHorse.java rename to common/src/main/java/common/entity/animal/EntityHorse.java diff --git a/common/src/common/entity/animal/EntityMooshroom.java b/common/src/main/java/common/entity/animal/EntityMooshroom.java similarity index 100% rename from common/src/common/entity/animal/EntityMooshroom.java rename to common/src/main/java/common/entity/animal/EntityMooshroom.java diff --git a/common/src/common/entity/animal/EntityMouse.java b/common/src/main/java/common/entity/animal/EntityMouse.java similarity index 100% rename from common/src/common/entity/animal/EntityMouse.java rename to common/src/main/java/common/entity/animal/EntityMouse.java diff --git a/common/src/common/entity/animal/EntityOcelot.java b/common/src/main/java/common/entity/animal/EntityOcelot.java similarity index 100% rename from common/src/common/entity/animal/EntityOcelot.java rename to common/src/main/java/common/entity/animal/EntityOcelot.java diff --git a/common/src/common/entity/animal/EntityPig.java b/common/src/main/java/common/entity/animal/EntityPig.java similarity index 100% rename from common/src/common/entity/animal/EntityPig.java rename to common/src/main/java/common/entity/animal/EntityPig.java diff --git a/common/src/common/entity/animal/EntityRabbit.java b/common/src/main/java/common/entity/animal/EntityRabbit.java similarity index 100% rename from common/src/common/entity/animal/EntityRabbit.java rename to common/src/main/java/common/entity/animal/EntityRabbit.java diff --git a/common/src/common/entity/animal/EntitySheep.java b/common/src/main/java/common/entity/animal/EntitySheep.java similarity index 100% rename from common/src/common/entity/animal/EntitySheep.java rename to common/src/main/java/common/entity/animal/EntitySheep.java diff --git a/common/src/common/entity/animal/EntitySquid.java b/common/src/main/java/common/entity/animal/EntitySquid.java similarity index 100% rename from common/src/common/entity/animal/EntitySquid.java rename to common/src/main/java/common/entity/animal/EntitySquid.java diff --git a/common/src/common/entity/animal/EntityWolf.java b/common/src/main/java/common/entity/animal/EntityWolf.java similarity index 100% rename from common/src/common/entity/animal/EntityWolf.java rename to common/src/main/java/common/entity/animal/EntityWolf.java diff --git a/common/src/common/entity/effect/EntityLightning.java b/common/src/main/java/common/entity/effect/EntityLightning.java similarity index 100% rename from common/src/common/entity/effect/EntityLightning.java rename to common/src/main/java/common/entity/effect/EntityLightning.java diff --git a/common/src/common/entity/item/EntityBoat.java b/common/src/main/java/common/entity/item/EntityBoat.java similarity index 100% rename from common/src/common/entity/item/EntityBoat.java rename to common/src/main/java/common/entity/item/EntityBoat.java diff --git a/common/src/common/entity/item/EntityCart.java b/common/src/main/java/common/entity/item/EntityCart.java similarity index 100% rename from common/src/common/entity/item/EntityCart.java rename to common/src/main/java/common/entity/item/EntityCart.java diff --git a/common/src/common/entity/item/EntityCartContainer.java b/common/src/main/java/common/entity/item/EntityCartContainer.java similarity index 100% rename from common/src/common/entity/item/EntityCartContainer.java rename to common/src/main/java/common/entity/item/EntityCartContainer.java diff --git a/common/src/common/entity/item/EntityChestCart.java b/common/src/main/java/common/entity/item/EntityChestCart.java similarity index 100% rename from common/src/common/entity/item/EntityChestCart.java rename to common/src/main/java/common/entity/item/EntityChestCart.java diff --git a/common/src/common/entity/item/EntityCrystal.java b/common/src/main/java/common/entity/item/EntityCrystal.java similarity index 100% rename from common/src/common/entity/item/EntityCrystal.java rename to common/src/main/java/common/entity/item/EntityCrystal.java diff --git a/common/src/common/entity/item/EntityExplosion.java b/common/src/main/java/common/entity/item/EntityExplosion.java similarity index 100% rename from common/src/common/entity/item/EntityExplosion.java rename to common/src/main/java/common/entity/item/EntityExplosion.java diff --git a/common/src/common/entity/item/EntityFalling.java b/common/src/main/java/common/entity/item/EntityFalling.java similarity index 100% rename from common/src/common/entity/item/EntityFalling.java rename to common/src/main/java/common/entity/item/EntityFalling.java diff --git a/common/src/common/entity/item/EntityFireworks.java b/common/src/main/java/common/entity/item/EntityFireworks.java similarity index 100% rename from common/src/common/entity/item/EntityFireworks.java rename to common/src/main/java/common/entity/item/EntityFireworks.java diff --git a/common/src/common/entity/item/EntityHopperCart.java b/common/src/main/java/common/entity/item/EntityHopperCart.java similarity index 100% rename from common/src/common/entity/item/EntityHopperCart.java rename to common/src/main/java/common/entity/item/EntityHopperCart.java diff --git a/common/src/common/entity/item/EntityItem.java b/common/src/main/java/common/entity/item/EntityItem.java similarity index 100% rename from common/src/common/entity/item/EntityItem.java rename to common/src/main/java/common/entity/item/EntityItem.java diff --git a/common/src/common/entity/item/EntityLeashKnot.java b/common/src/main/java/common/entity/item/EntityLeashKnot.java similarity index 100% rename from common/src/common/entity/item/EntityLeashKnot.java rename to common/src/main/java/common/entity/item/EntityLeashKnot.java diff --git a/common/src/common/entity/item/EntityMinecart.java b/common/src/main/java/common/entity/item/EntityMinecart.java similarity index 100% rename from common/src/common/entity/item/EntityMinecart.java rename to common/src/main/java/common/entity/item/EntityMinecart.java diff --git a/common/src/common/entity/item/EntityNuke.java b/common/src/main/java/common/entity/item/EntityNuke.java similarity index 100% rename from common/src/common/entity/item/EntityNuke.java rename to common/src/main/java/common/entity/item/EntityNuke.java diff --git a/common/src/common/entity/item/EntityOrb.java b/common/src/main/java/common/entity/item/EntityOrb.java similarity index 100% rename from common/src/common/entity/item/EntityOrb.java rename to common/src/main/java/common/entity/item/EntityOrb.java diff --git a/common/src/common/entity/item/EntityTnt.java b/common/src/main/java/common/entity/item/EntityTnt.java similarity index 100% rename from common/src/common/entity/item/EntityTnt.java rename to common/src/main/java/common/entity/item/EntityTnt.java diff --git a/common/src/common/entity/item/EntityTntCart.java b/common/src/main/java/common/entity/item/EntityTntCart.java similarity index 100% rename from common/src/common/entity/item/EntityTntCart.java rename to common/src/main/java/common/entity/item/EntityTntCart.java diff --git a/common/src/common/entity/item/EntityXp.java b/common/src/main/java/common/entity/item/EntityXp.java similarity index 100% rename from common/src/common/entity/item/EntityXp.java rename to common/src/main/java/common/entity/item/EntityXp.java diff --git a/common/src/common/entity/item/EntityXpBottle.java b/common/src/main/java/common/entity/item/EntityXpBottle.java similarity index 100% rename from common/src/common/entity/item/EntityXpBottle.java rename to common/src/main/java/common/entity/item/EntityXpBottle.java diff --git a/common/src/common/entity/npc/Alignment.java b/common/src/main/java/common/entity/npc/Alignment.java similarity index 100% rename from common/src/common/entity/npc/Alignment.java rename to common/src/main/java/common/entity/npc/Alignment.java diff --git a/common/src/common/entity/npc/CharacterInfo.java b/common/src/main/java/common/entity/npc/CharacterInfo.java similarity index 100% rename from common/src/common/entity/npc/CharacterInfo.java rename to common/src/main/java/common/entity/npc/CharacterInfo.java diff --git a/common/src/common/entity/npc/ClassInfo.java b/common/src/main/java/common/entity/npc/ClassInfo.java similarity index 100% rename from common/src/common/entity/npc/ClassInfo.java rename to common/src/main/java/common/entity/npc/ClassInfo.java diff --git a/common/src/common/entity/npc/Energy.java b/common/src/main/java/common/entity/npc/Energy.java similarity index 100% rename from common/src/common/entity/npc/Energy.java rename to common/src/main/java/common/entity/npc/Energy.java diff --git a/common/src/common/entity/npc/EntityArachnoid.java b/common/src/main/java/common/entity/npc/EntityArachnoid.java similarity index 100% rename from common/src/common/entity/npc/EntityArachnoid.java rename to common/src/main/java/common/entity/npc/EntityArachnoid.java diff --git a/common/src/common/entity/npc/EntityBloodElf.java b/common/src/main/java/common/entity/npc/EntityBloodElf.java similarity index 100% rename from common/src/common/entity/npc/EntityBloodElf.java rename to common/src/main/java/common/entity/npc/EntityBloodElf.java diff --git a/common/src/common/entity/npc/EntityChaosMarine.java b/common/src/main/java/common/entity/npc/EntityChaosMarine.java similarity index 100% rename from common/src/common/entity/npc/EntityChaosMarine.java rename to common/src/main/java/common/entity/npc/EntityChaosMarine.java diff --git a/common/src/common/entity/npc/EntityCpu.java b/common/src/main/java/common/entity/npc/EntityCpu.java similarity index 100% rename from common/src/common/entity/npc/EntityCpu.java rename to common/src/main/java/common/entity/npc/EntityCpu.java diff --git a/common/src/common/entity/npc/EntityCultivator.java b/common/src/main/java/common/entity/npc/EntityCultivator.java similarity index 100% rename from common/src/common/entity/npc/EntityCultivator.java rename to common/src/main/java/common/entity/npc/EntityCultivator.java diff --git a/common/src/common/entity/npc/EntityDarkMage.java b/common/src/main/java/common/entity/npc/EntityDarkMage.java similarity index 100% rename from common/src/common/entity/npc/EntityDarkMage.java rename to common/src/main/java/common/entity/npc/EntityDarkMage.java diff --git a/common/src/common/entity/npc/EntityDwarf.java b/common/src/main/java/common/entity/npc/EntityDwarf.java similarity index 100% rename from common/src/common/entity/npc/EntityDwarf.java rename to common/src/main/java/common/entity/npc/EntityDwarf.java diff --git a/common/src/common/entity/npc/EntityElf.java b/common/src/main/java/common/entity/npc/EntityElf.java similarity index 100% rename from common/src/common/entity/npc/EntityElf.java rename to common/src/main/java/common/entity/npc/EntityElf.java diff --git a/common/src/common/entity/npc/EntityFireDemon.java b/common/src/main/java/common/entity/npc/EntityFireDemon.java similarity index 100% rename from common/src/common/entity/npc/EntityFireDemon.java rename to common/src/main/java/common/entity/npc/EntityFireDemon.java diff --git a/common/src/common/entity/npc/EntityFlyingNPC.java b/common/src/main/java/common/entity/npc/EntityFlyingNPC.java similarity index 100% rename from common/src/common/entity/npc/EntityFlyingNPC.java rename to common/src/main/java/common/entity/npc/EntityFlyingNPC.java diff --git a/common/src/common/entity/npc/EntityGargoyle.java b/common/src/main/java/common/entity/npc/EntityGargoyle.java similarity index 100% rename from common/src/common/entity/npc/EntityGargoyle.java rename to common/src/main/java/common/entity/npc/EntityGargoyle.java diff --git a/common/src/common/entity/npc/EntityGoblin.java b/common/src/main/java/common/entity/npc/EntityGoblin.java similarity index 100% rename from common/src/common/entity/npc/EntityGoblin.java rename to common/src/main/java/common/entity/npc/EntityGoblin.java diff --git a/common/src/common/entity/npc/EntityHaunter.java b/common/src/main/java/common/entity/npc/EntityHaunter.java similarity index 100% rename from common/src/common/entity/npc/EntityHaunter.java rename to common/src/main/java/common/entity/npc/EntityHaunter.java diff --git a/common/src/common/entity/npc/EntityHoveringNPC.java b/common/src/main/java/common/entity/npc/EntityHoveringNPC.java similarity index 100% rename from common/src/common/entity/npc/EntityHoveringNPC.java rename to common/src/main/java/common/entity/npc/EntityHoveringNPC.java diff --git a/common/src/common/entity/npc/EntityHuman.java b/common/src/main/java/common/entity/npc/EntityHuman.java similarity index 100% rename from common/src/common/entity/npc/EntityHuman.java rename to common/src/main/java/common/entity/npc/EntityHuman.java diff --git a/common/src/common/entity/npc/EntityMage.java b/common/src/main/java/common/entity/npc/EntityMage.java similarity index 100% rename from common/src/common/entity/npc/EntityMage.java rename to common/src/main/java/common/entity/npc/EntityMage.java diff --git a/common/src/common/entity/npc/EntityMagma.java b/common/src/main/java/common/entity/npc/EntityMagma.java similarity index 100% rename from common/src/common/entity/npc/EntityMagma.java rename to common/src/main/java/common/entity/npc/EntityMagma.java diff --git a/common/src/common/entity/npc/EntityMetalhead.java b/common/src/main/java/common/entity/npc/EntityMetalhead.java similarity index 100% rename from common/src/common/entity/npc/EntityMetalhead.java rename to common/src/main/java/common/entity/npc/EntityMetalhead.java diff --git a/common/src/common/entity/npc/EntityMobNPC.java b/common/src/main/java/common/entity/npc/EntityMobNPC.java similarity index 100% rename from common/src/common/entity/npc/EntityMobNPC.java rename to common/src/main/java/common/entity/npc/EntityMobNPC.java diff --git a/common/src/common/entity/npc/EntityNPC.java b/common/src/main/java/common/entity/npc/EntityNPC.java similarity index 100% rename from common/src/common/entity/npc/EntityNPC.java rename to common/src/main/java/common/entity/npc/EntityNPC.java diff --git a/common/src/common/entity/npc/EntityOrc.java b/common/src/main/java/common/entity/npc/EntityOrc.java similarity index 100% rename from common/src/common/entity/npc/EntityOrc.java rename to common/src/main/java/common/entity/npc/EntityOrc.java diff --git a/common/src/common/entity/npc/EntityPrimarch.java b/common/src/main/java/common/entity/npc/EntityPrimarch.java similarity index 100% rename from common/src/common/entity/npc/EntityPrimarch.java rename to common/src/main/java/common/entity/npc/EntityPrimarch.java diff --git a/common/src/common/entity/npc/EntitySlime.java b/common/src/main/java/common/entity/npc/EntitySlime.java similarity index 100% rename from common/src/common/entity/npc/EntitySlime.java rename to common/src/main/java/common/entity/npc/EntitySlime.java diff --git a/common/src/common/entity/npc/EntitySpaceMarine.java b/common/src/main/java/common/entity/npc/EntitySpaceMarine.java similarity index 100% rename from common/src/common/entity/npc/EntitySpaceMarine.java rename to common/src/main/java/common/entity/npc/EntitySpaceMarine.java diff --git a/common/src/common/entity/npc/EntitySpirit.java b/common/src/main/java/common/entity/npc/EntitySpirit.java similarity index 100% rename from common/src/common/entity/npc/EntitySpirit.java rename to common/src/main/java/common/entity/npc/EntitySpirit.java diff --git a/common/src/common/entity/npc/EntityTiefling.java b/common/src/main/java/common/entity/npc/EntityTiefling.java similarity index 100% rename from common/src/common/entity/npc/EntityTiefling.java rename to common/src/main/java/common/entity/npc/EntityTiefling.java diff --git a/common/src/common/entity/npc/EntityUndead.java b/common/src/main/java/common/entity/npc/EntityUndead.java similarity index 100% rename from common/src/common/entity/npc/EntityUndead.java rename to common/src/main/java/common/entity/npc/EntityUndead.java diff --git a/common/src/common/entity/npc/EntityVampire.java b/common/src/main/java/common/entity/npc/EntityVampire.java similarity index 100% rename from common/src/common/entity/npc/EntityVampire.java rename to common/src/main/java/common/entity/npc/EntityVampire.java diff --git a/common/src/common/entity/npc/EntityWoodElf.java b/common/src/main/java/common/entity/npc/EntityWoodElf.java similarity index 100% rename from common/src/common/entity/npc/EntityWoodElf.java rename to common/src/main/java/common/entity/npc/EntityWoodElf.java diff --git a/common/src/common/entity/npc/EntityZombie.java b/common/src/main/java/common/entity/npc/EntityZombie.java similarity index 100% rename from common/src/common/entity/npc/EntityZombie.java rename to common/src/main/java/common/entity/npc/EntityZombie.java diff --git a/common/src/common/entity/npc/NpcInfo.java b/common/src/main/java/common/entity/npc/NpcInfo.java similarity index 100% rename from common/src/common/entity/npc/NpcInfo.java rename to common/src/main/java/common/entity/npc/NpcInfo.java diff --git a/common/src/common/entity/npc/PlayerCharacter.java b/common/src/main/java/common/entity/npc/PlayerCharacter.java similarity index 100% rename from common/src/common/entity/npc/PlayerCharacter.java rename to common/src/main/java/common/entity/npc/PlayerCharacter.java diff --git a/common/src/common/entity/npc/SpeciesInfo.java b/common/src/main/java/common/entity/npc/SpeciesInfo.java similarity index 100% rename from common/src/common/entity/npc/SpeciesInfo.java rename to common/src/main/java/common/entity/npc/SpeciesInfo.java diff --git a/common/src/common/entity/projectile/EntityArrow.java b/common/src/main/java/common/entity/projectile/EntityArrow.java similarity index 100% rename from common/src/common/entity/projectile/EntityArrow.java rename to common/src/main/java/common/entity/projectile/EntityArrow.java diff --git a/common/src/common/entity/projectile/EntityBox.java b/common/src/main/java/common/entity/projectile/EntityBox.java similarity index 100% rename from common/src/common/entity/projectile/EntityBox.java rename to common/src/main/java/common/entity/projectile/EntityBox.java diff --git a/common/src/common/entity/projectile/EntityBullet.java b/common/src/main/java/common/entity/projectile/EntityBullet.java similarity index 100% rename from common/src/common/entity/projectile/EntityBullet.java rename to common/src/main/java/common/entity/projectile/EntityBullet.java diff --git a/common/src/common/entity/projectile/EntityDie.java b/common/src/main/java/common/entity/projectile/EntityDie.java similarity index 100% rename from common/src/common/entity/projectile/EntityDie.java rename to common/src/main/java/common/entity/projectile/EntityDie.java diff --git a/common/src/common/entity/projectile/EntityDynamite.java b/common/src/main/java/common/entity/projectile/EntityDynamite.java similarity index 100% rename from common/src/common/entity/projectile/EntityDynamite.java rename to common/src/main/java/common/entity/projectile/EntityDynamite.java diff --git a/common/src/common/entity/projectile/EntityEgg.java b/common/src/main/java/common/entity/projectile/EntityEgg.java similarity index 100% rename from common/src/common/entity/projectile/EntityEgg.java rename to common/src/main/java/common/entity/projectile/EntityEgg.java diff --git a/common/src/common/entity/projectile/EntityFireCharge.java b/common/src/main/java/common/entity/projectile/EntityFireCharge.java similarity index 100% rename from common/src/common/entity/projectile/EntityFireCharge.java rename to common/src/main/java/common/entity/projectile/EntityFireCharge.java diff --git a/common/src/common/entity/projectile/EntityFireball.java b/common/src/main/java/common/entity/projectile/EntityFireball.java similarity index 100% rename from common/src/common/entity/projectile/EntityFireball.java rename to common/src/main/java/common/entity/projectile/EntityFireball.java diff --git a/common/src/common/entity/projectile/EntityHook.java b/common/src/main/java/common/entity/projectile/EntityHook.java similarity index 100% rename from common/src/common/entity/projectile/EntityHook.java rename to common/src/main/java/common/entity/projectile/EntityHook.java diff --git a/common/src/common/entity/projectile/EntityPotion.java b/common/src/main/java/common/entity/projectile/EntityPotion.java similarity index 100% rename from common/src/common/entity/projectile/EntityPotion.java rename to common/src/main/java/common/entity/projectile/EntityPotion.java diff --git a/common/src/common/entity/projectile/EntityProjectile.java b/common/src/main/java/common/entity/projectile/EntityProjectile.java similarity index 100% rename from common/src/common/entity/projectile/EntityProjectile.java rename to common/src/main/java/common/entity/projectile/EntityProjectile.java diff --git a/common/src/common/entity/projectile/EntitySnowball.java b/common/src/main/java/common/entity/projectile/EntitySnowball.java similarity index 100% rename from common/src/common/entity/projectile/EntitySnowball.java rename to common/src/main/java/common/entity/projectile/EntitySnowball.java diff --git a/common/src/common/entity/projectile/FishConstants.java b/common/src/main/java/common/entity/projectile/FishConstants.java similarity index 100% rename from common/src/common/entity/projectile/FishConstants.java rename to common/src/main/java/common/entity/projectile/FishConstants.java diff --git a/common/src/common/entity/projectile/RngFishable.java b/common/src/main/java/common/entity/projectile/RngFishable.java similarity index 100% rename from common/src/common/entity/projectile/RngFishable.java rename to common/src/main/java/common/entity/projectile/RngFishable.java diff --git a/common/src/common/entity/types/CombatEntry.java b/common/src/main/java/common/entity/types/CombatEntry.java similarity index 100% rename from common/src/common/entity/types/CombatEntry.java rename to common/src/main/java/common/entity/types/CombatEntry.java diff --git a/common/src/common/entity/types/EntityAnimal.java b/common/src/main/java/common/entity/types/EntityAnimal.java similarity index 100% rename from common/src/common/entity/types/EntityAnimal.java rename to common/src/main/java/common/entity/types/EntityAnimal.java diff --git a/common/src/common/entity/types/EntityBodyHelper.java b/common/src/main/java/common/entity/types/EntityBodyHelper.java similarity index 100% rename from common/src/common/entity/types/EntityBodyHelper.java rename to common/src/main/java/common/entity/types/EntityBodyHelper.java diff --git a/common/src/common/entity/types/EntityLiving.java b/common/src/main/java/common/entity/types/EntityLiving.java similarity index 100% rename from common/src/common/entity/types/EntityLiving.java rename to common/src/main/java/common/entity/types/EntityLiving.java diff --git a/common/src/common/entity/types/EntityTameable.java b/common/src/main/java/common/entity/types/EntityTameable.java similarity index 100% rename from common/src/common/entity/types/EntityTameable.java rename to common/src/main/java/common/entity/types/EntityTameable.java diff --git a/common/src/common/entity/types/EntityThrowable.java b/common/src/main/java/common/entity/types/EntityThrowable.java similarity index 100% rename from common/src/common/entity/types/EntityThrowable.java rename to common/src/main/java/common/entity/types/EntityThrowable.java diff --git a/common/src/common/entity/types/EntityWaterMob.java b/common/src/main/java/common/entity/types/EntityWaterMob.java similarity index 100% rename from common/src/common/entity/types/EntityWaterMob.java rename to common/src/main/java/common/entity/types/EntityWaterMob.java diff --git a/common/src/common/entity/types/EntityWeatherEffect.java b/common/src/main/java/common/entity/types/EntityWeatherEffect.java similarity index 100% rename from common/src/common/entity/types/EntityWeatherEffect.java rename to common/src/main/java/common/entity/types/EntityWeatherEffect.java diff --git a/common/src/common/entity/types/IEntityMultiPart.java b/common/src/main/java/common/entity/types/IEntityMultiPart.java similarity index 100% rename from common/src/common/entity/types/IEntityMultiPart.java rename to common/src/main/java/common/entity/types/IEntityMultiPart.java diff --git a/common/src/common/entity/types/IEntityOwnable.java b/common/src/main/java/common/entity/types/IEntityOwnable.java similarity index 100% rename from common/src/common/entity/types/IEntityOwnable.java rename to common/src/main/java/common/entity/types/IEntityOwnable.java diff --git a/common/src/common/entity/types/IObjectData.java b/common/src/main/java/common/entity/types/IObjectData.java similarity index 100% rename from common/src/common/entity/types/IObjectData.java rename to common/src/main/java/common/entity/types/IObjectData.java diff --git a/common/src/common/entity/types/IProjectile.java b/common/src/main/java/common/entity/types/IProjectile.java similarity index 100% rename from common/src/common/entity/types/IProjectile.java rename to common/src/main/java/common/entity/types/IProjectile.java diff --git a/common/src/common/future/AbstractFuture.java b/common/src/main/java/common/future/AbstractFuture.java similarity index 100% rename from common/src/common/future/AbstractFuture.java rename to common/src/main/java/common/future/AbstractFuture.java diff --git a/common/src/common/future/ExecutionError.java b/common/src/main/java/common/future/ExecutionError.java similarity index 100% rename from common/src/common/future/ExecutionError.java rename to common/src/main/java/common/future/ExecutionError.java diff --git a/common/src/common/future/ExecutionList.java b/common/src/main/java/common/future/ExecutionList.java similarity index 100% rename from common/src/common/future/ExecutionList.java rename to common/src/main/java/common/future/ExecutionList.java diff --git a/common/src/common/future/FutureCallback.java b/common/src/main/java/common/future/FutureCallback.java similarity index 100% rename from common/src/common/future/FutureCallback.java rename to common/src/main/java/common/future/FutureCallback.java diff --git a/common/src/common/future/Futures.java b/common/src/main/java/common/future/Futures.java similarity index 100% rename from common/src/common/future/Futures.java rename to common/src/main/java/common/future/Futures.java diff --git a/common/src/common/future/ListenableFuture.java b/common/src/main/java/common/future/ListenableFuture.java similarity index 100% rename from common/src/common/future/ListenableFuture.java rename to common/src/main/java/common/future/ListenableFuture.java diff --git a/common/src/common/future/ListenableFutureTask.java b/common/src/main/java/common/future/ListenableFutureTask.java similarity index 100% rename from common/src/common/future/ListenableFutureTask.java rename to common/src/main/java/common/future/ListenableFutureTask.java diff --git a/common/src/common/future/MoreExecutors.java b/common/src/main/java/common/future/MoreExecutors.java similarity index 100% rename from common/src/common/future/MoreExecutors.java rename to common/src/main/java/common/future/MoreExecutors.java diff --git a/common/src/common/future/ThreadFactoryBuilder.java b/common/src/main/java/common/future/ThreadFactoryBuilder.java similarity index 100% rename from common/src/common/future/ThreadFactoryBuilder.java rename to common/src/main/java/common/future/ThreadFactoryBuilder.java diff --git a/common/src/common/future/UncheckedExecutionException.java b/common/src/main/java/common/future/UncheckedExecutionException.java similarity index 100% rename from common/src/common/future/UncheckedExecutionException.java rename to common/src/main/java/common/future/UncheckedExecutionException.java diff --git a/common/src/common/init/BlockRegistry.java b/common/src/main/java/common/init/BlockRegistry.java similarity index 100% rename from common/src/common/init/BlockRegistry.java rename to common/src/main/java/common/init/BlockRegistry.java diff --git a/common/src/common/init/Blocks.java b/common/src/main/java/common/init/Blocks.java similarity index 100% rename from common/src/common/init/Blocks.java rename to common/src/main/java/common/init/Blocks.java diff --git a/common/src/common/init/Config.java b/common/src/main/java/common/init/Config.java similarity index 100% rename from common/src/common/init/Config.java rename to common/src/main/java/common/init/Config.java diff --git a/common/src/common/init/CraftingRegistry.java b/common/src/main/java/common/init/CraftingRegistry.java similarity index 100% rename from common/src/common/init/CraftingRegistry.java rename to common/src/main/java/common/init/CraftingRegistry.java diff --git a/common/src/common/init/DecoType.java b/common/src/main/java/common/init/DecoType.java similarity index 100% rename from common/src/common/init/DecoType.java rename to common/src/main/java/common/init/DecoType.java diff --git a/common/src/common/init/DispenserRegistry.java b/common/src/main/java/common/init/DispenserRegistry.java similarity index 100% rename from common/src/common/init/DispenserRegistry.java rename to common/src/main/java/common/init/DispenserRegistry.java diff --git a/common/src/common/init/EntityEggInfo.java b/common/src/main/java/common/init/EntityEggInfo.java similarity index 100% rename from common/src/common/init/EntityEggInfo.java rename to common/src/main/java/common/init/EntityEggInfo.java diff --git a/common/src/common/init/EntityRegistry.java b/common/src/main/java/common/init/EntityRegistry.java similarity index 100% rename from common/src/common/init/EntityRegistry.java rename to common/src/main/java/common/init/EntityRegistry.java diff --git a/common/src/common/init/FlammabilityRegistry.java b/common/src/main/java/common/init/FlammabilityRegistry.java similarity index 100% rename from common/src/common/init/FlammabilityRegistry.java rename to common/src/main/java/common/init/FlammabilityRegistry.java diff --git a/common/src/common/init/FluidRegistry.java b/common/src/main/java/common/init/FluidRegistry.java similarity index 100% rename from common/src/common/init/FluidRegistry.java rename to common/src/main/java/common/init/FluidRegistry.java diff --git a/common/src/common/init/ItemRegistry.java b/common/src/main/java/common/init/ItemRegistry.java similarity index 100% rename from common/src/common/init/ItemRegistry.java rename to common/src/main/java/common/init/ItemRegistry.java diff --git a/common/src/common/init/Items.java b/common/src/main/java/common/init/Items.java similarity index 100% rename from common/src/common/init/Items.java rename to common/src/main/java/common/init/Items.java diff --git a/common/src/common/init/MetalType.java b/common/src/main/java/common/init/MetalType.java similarity index 100% rename from common/src/common/init/MetalType.java rename to common/src/main/java/common/init/MetalType.java diff --git a/common/src/common/init/NameRegistry.java b/common/src/main/java/common/init/NameRegistry.java similarity index 100% rename from common/src/common/init/NameRegistry.java rename to common/src/main/java/common/init/NameRegistry.java diff --git a/common/src/common/init/OreType.java b/common/src/main/java/common/init/OreType.java similarity index 100% rename from common/src/common/init/OreType.java rename to common/src/main/java/common/init/OreType.java diff --git a/common/src/common/init/Registry.java b/common/src/main/java/common/init/Registry.java similarity index 100% rename from common/src/common/init/Registry.java rename to common/src/main/java/common/init/Registry.java diff --git a/common/src/common/init/SmeltingRegistry.java b/common/src/main/java/common/init/SmeltingRegistry.java similarity index 100% rename from common/src/common/init/SmeltingRegistry.java rename to common/src/main/java/common/init/SmeltingRegistry.java diff --git a/common/src/common/init/SoundEvent.java b/common/src/main/java/common/init/SoundEvent.java similarity index 100% rename from common/src/common/init/SoundEvent.java rename to common/src/main/java/common/init/SoundEvent.java diff --git a/common/src/common/init/SpeciesRegistry.java b/common/src/main/java/common/init/SpeciesRegistry.java similarity index 100% rename from common/src/common/init/SpeciesRegistry.java rename to common/src/main/java/common/init/SpeciesRegistry.java diff --git a/common/src/common/init/TileRegistry.java b/common/src/main/java/common/init/TileRegistry.java similarity index 100% rename from common/src/common/init/TileRegistry.java rename to common/src/main/java/common/init/TileRegistry.java diff --git a/common/src/common/init/ToolMaterial.java b/common/src/main/java/common/init/ToolMaterial.java similarity index 100% rename from common/src/common/init/ToolMaterial.java rename to common/src/main/java/common/init/ToolMaterial.java diff --git a/common/src/common/init/ToolType.java b/common/src/main/java/common/init/ToolType.java similarity index 100% rename from common/src/common/init/ToolType.java rename to common/src/main/java/common/init/ToolType.java diff --git a/common/src/common/init/TradeRegistry.java b/common/src/main/java/common/init/TradeRegistry.java similarity index 100% rename from common/src/common/init/TradeRegistry.java rename to common/src/main/java/common/init/TradeRegistry.java diff --git a/common/src/common/init/UniverseRegistry.java b/common/src/main/java/common/init/UniverseRegistry.java similarity index 100% rename from common/src/common/init/UniverseRegistry.java rename to common/src/main/java/common/init/UniverseRegistry.java diff --git a/common/src/common/init/WoodType.java b/common/src/main/java/common/init/WoodType.java similarity index 100% rename from common/src/common/init/WoodType.java rename to common/src/main/java/common/init/WoodType.java diff --git a/common/src/common/inventory/AnimalChest.java b/common/src/main/java/common/inventory/AnimalChest.java similarity index 100% rename from common/src/common/inventory/AnimalChest.java rename to common/src/main/java/common/inventory/AnimalChest.java diff --git a/common/src/common/inventory/Container.java b/common/src/main/java/common/inventory/Container.java similarity index 100% rename from common/src/common/inventory/Container.java rename to common/src/main/java/common/inventory/Container.java diff --git a/common/src/common/inventory/ContainerBrewingStand.java b/common/src/main/java/common/inventory/ContainerBrewingStand.java similarity index 100% rename from common/src/common/inventory/ContainerBrewingStand.java rename to common/src/main/java/common/inventory/ContainerBrewingStand.java diff --git a/common/src/common/inventory/ContainerChest.java b/common/src/main/java/common/inventory/ContainerChest.java similarity index 100% rename from common/src/common/inventory/ContainerChest.java rename to common/src/main/java/common/inventory/ContainerChest.java diff --git a/common/src/common/inventory/ContainerDispenser.java b/common/src/main/java/common/inventory/ContainerDispenser.java similarity index 100% rename from common/src/common/inventory/ContainerDispenser.java rename to common/src/main/java/common/inventory/ContainerDispenser.java diff --git a/common/src/common/inventory/ContainerEnchantment.java b/common/src/main/java/common/inventory/ContainerEnchantment.java similarity index 100% rename from common/src/common/inventory/ContainerEnchantment.java rename to common/src/main/java/common/inventory/ContainerEnchantment.java diff --git a/common/src/common/inventory/ContainerFurnace.java b/common/src/main/java/common/inventory/ContainerFurnace.java similarity index 100% rename from common/src/common/inventory/ContainerFurnace.java rename to common/src/main/java/common/inventory/ContainerFurnace.java diff --git a/common/src/common/inventory/ContainerHopper.java b/common/src/main/java/common/inventory/ContainerHopper.java similarity index 100% rename from common/src/common/inventory/ContainerHopper.java rename to common/src/main/java/common/inventory/ContainerHopper.java diff --git a/common/src/common/inventory/ContainerHorseInventory.java b/common/src/main/java/common/inventory/ContainerHorseInventory.java similarity index 100% rename from common/src/common/inventory/ContainerHorseInventory.java rename to common/src/main/java/common/inventory/ContainerHorseInventory.java diff --git a/common/src/common/inventory/ContainerLocalMenu.java b/common/src/main/java/common/inventory/ContainerLocalMenu.java similarity index 100% rename from common/src/common/inventory/ContainerLocalMenu.java rename to common/src/main/java/common/inventory/ContainerLocalMenu.java diff --git a/common/src/common/inventory/ContainerMachine.java b/common/src/main/java/common/inventory/ContainerMachine.java similarity index 100% rename from common/src/common/inventory/ContainerMachine.java rename to common/src/main/java/common/inventory/ContainerMachine.java diff --git a/common/src/common/inventory/ContainerMerchant.java b/common/src/main/java/common/inventory/ContainerMerchant.java similarity index 100% rename from common/src/common/inventory/ContainerMerchant.java rename to common/src/main/java/common/inventory/ContainerMerchant.java diff --git a/common/src/common/inventory/ContainerPlayer.java b/common/src/main/java/common/inventory/ContainerPlayer.java similarity index 100% rename from common/src/common/inventory/ContainerPlayer.java rename to common/src/main/java/common/inventory/ContainerPlayer.java diff --git a/common/src/common/inventory/ContainerRepair.java b/common/src/main/java/common/inventory/ContainerRepair.java similarity index 100% rename from common/src/common/inventory/ContainerRepair.java rename to common/src/main/java/common/inventory/ContainerRepair.java diff --git a/common/src/common/inventory/ContainerWorkbench.java b/common/src/main/java/common/inventory/ContainerWorkbench.java similarity index 100% rename from common/src/common/inventory/ContainerWorkbench.java rename to common/src/main/java/common/inventory/ContainerWorkbench.java diff --git a/common/src/common/inventory/ICrafting.java b/common/src/main/java/common/inventory/ICrafting.java similarity index 100% rename from common/src/common/inventory/ICrafting.java rename to common/src/main/java/common/inventory/ICrafting.java diff --git a/common/src/common/inventory/IInvBasic.java b/common/src/main/java/common/inventory/IInvBasic.java similarity index 100% rename from common/src/common/inventory/IInvBasic.java rename to common/src/main/java/common/inventory/IInvBasic.java diff --git a/common/src/common/inventory/IInventory.java b/common/src/main/java/common/inventory/IInventory.java similarity index 100% rename from common/src/common/inventory/IInventory.java rename to common/src/main/java/common/inventory/IInventory.java diff --git a/common/src/common/inventory/ISidedInventory.java b/common/src/main/java/common/inventory/ISidedInventory.java similarity index 100% rename from common/src/common/inventory/ISidedInventory.java rename to common/src/main/java/common/inventory/ISidedInventory.java diff --git a/common/src/common/inventory/InventoryBasic.java b/common/src/main/java/common/inventory/InventoryBasic.java similarity index 100% rename from common/src/common/inventory/InventoryBasic.java rename to common/src/main/java/common/inventory/InventoryBasic.java diff --git a/common/src/common/inventory/InventoryCraftResult.java b/common/src/main/java/common/inventory/InventoryCraftResult.java similarity index 100% rename from common/src/common/inventory/InventoryCraftResult.java rename to common/src/main/java/common/inventory/InventoryCraftResult.java diff --git a/common/src/common/inventory/InventoryCrafting.java b/common/src/main/java/common/inventory/InventoryCrafting.java similarity index 100% rename from common/src/common/inventory/InventoryCrafting.java rename to common/src/main/java/common/inventory/InventoryCrafting.java diff --git a/common/src/common/inventory/InventoryHelper.java b/common/src/main/java/common/inventory/InventoryHelper.java similarity index 100% rename from common/src/common/inventory/InventoryHelper.java rename to common/src/main/java/common/inventory/InventoryHelper.java diff --git a/common/src/common/inventory/InventoryLargeChest.java b/common/src/main/java/common/inventory/InventoryLargeChest.java similarity index 100% rename from common/src/common/inventory/InventoryLargeChest.java rename to common/src/main/java/common/inventory/InventoryLargeChest.java diff --git a/common/src/common/inventory/InventoryMerchant.java b/common/src/main/java/common/inventory/InventoryMerchant.java similarity index 100% rename from common/src/common/inventory/InventoryMerchant.java rename to common/src/main/java/common/inventory/InventoryMerchant.java diff --git a/common/src/common/inventory/InventoryPlayer.java b/common/src/main/java/common/inventory/InventoryPlayer.java similarity index 100% rename from common/src/common/inventory/InventoryPlayer.java rename to common/src/main/java/common/inventory/InventoryPlayer.java diff --git a/common/src/common/inventory/InventoryWarpChest.java b/common/src/main/java/common/inventory/InventoryWarpChest.java similarity index 100% rename from common/src/common/inventory/InventoryWarpChest.java rename to common/src/main/java/common/inventory/InventoryWarpChest.java diff --git a/common/src/common/inventory/Slot.java b/common/src/main/java/common/inventory/Slot.java similarity index 100% rename from common/src/common/inventory/Slot.java rename to common/src/main/java/common/inventory/Slot.java diff --git a/common/src/common/inventory/SlotCrafting.java b/common/src/main/java/common/inventory/SlotCrafting.java similarity index 100% rename from common/src/common/inventory/SlotCrafting.java rename to common/src/main/java/common/inventory/SlotCrafting.java diff --git a/common/src/common/inventory/SlotFurnaceFuel.java b/common/src/main/java/common/inventory/SlotFurnaceFuel.java similarity index 100% rename from common/src/common/inventory/SlotFurnaceFuel.java rename to common/src/main/java/common/inventory/SlotFurnaceFuel.java diff --git a/common/src/common/inventory/SlotFurnaceOutput.java b/common/src/main/java/common/inventory/SlotFurnaceOutput.java similarity index 100% rename from common/src/common/inventory/SlotFurnaceOutput.java rename to common/src/main/java/common/inventory/SlotFurnaceOutput.java diff --git a/common/src/common/inventory/SlotMerchantResult.java b/common/src/main/java/common/inventory/SlotMerchantResult.java similarity index 100% rename from common/src/common/inventory/SlotMerchantResult.java rename to common/src/main/java/common/inventory/SlotMerchantResult.java diff --git a/common/src/common/item/CheatTab.java b/common/src/main/java/common/item/CheatTab.java similarity index 100% rename from common/src/common/item/CheatTab.java rename to common/src/main/java/common/item/CheatTab.java diff --git a/common/src/common/item/Item.java b/common/src/main/java/common/item/Item.java similarity index 100% rename from common/src/common/item/Item.java rename to common/src/main/java/common/item/Item.java diff --git a/common/src/common/item/ItemAction.java b/common/src/main/java/common/item/ItemAction.java similarity index 100% rename from common/src/common/item/ItemAction.java rename to common/src/main/java/common/item/ItemAction.java diff --git a/common/src/common/item/ItemAmmo.java b/common/src/main/java/common/item/ItemAmmo.java similarity index 100% rename from common/src/common/item/ItemAmmo.java rename to common/src/main/java/common/item/ItemAmmo.java diff --git a/common/src/common/item/ItemAnvilBlock.java b/common/src/main/java/common/item/ItemAnvilBlock.java similarity index 100% rename from common/src/common/item/ItemAnvilBlock.java rename to common/src/main/java/common/item/ItemAnvilBlock.java diff --git a/common/src/common/item/ItemAppleGold.java b/common/src/main/java/common/item/ItemAppleGold.java similarity index 100% rename from common/src/common/item/ItemAppleGold.java rename to common/src/main/java/common/item/ItemAppleGold.java diff --git a/common/src/common/item/ItemArmor.java b/common/src/main/java/common/item/ItemArmor.java similarity index 100% rename from common/src/common/item/ItemArmor.java rename to common/src/main/java/common/item/ItemArmor.java diff --git a/common/src/common/item/ItemAxe.java b/common/src/main/java/common/item/ItemAxe.java similarity index 100% rename from common/src/common/item/ItemAxe.java rename to common/src/main/java/common/item/ItemAxe.java diff --git a/common/src/common/item/ItemBanHammer.java b/common/src/main/java/common/item/ItemBanHammer.java similarity index 100% rename from common/src/common/item/ItemBanHammer.java rename to common/src/main/java/common/item/ItemBanHammer.java diff --git a/common/src/common/item/ItemBanner.java b/common/src/main/java/common/item/ItemBanner.java similarity index 100% rename from common/src/common/item/ItemBanner.java rename to common/src/main/java/common/item/ItemBanner.java diff --git a/common/src/common/item/ItemBed.java b/common/src/main/java/common/item/ItemBed.java similarity index 100% rename from common/src/common/item/ItemBed.java rename to common/src/main/java/common/item/ItemBed.java diff --git a/common/src/common/item/ItemBlock.java b/common/src/main/java/common/item/ItemBlock.java similarity index 100% rename from common/src/common/item/ItemBlock.java rename to common/src/main/java/common/item/ItemBlock.java diff --git a/common/src/common/item/ItemBoat.java b/common/src/main/java/common/item/ItemBoat.java similarity index 100% rename from common/src/common/item/ItemBoat.java rename to common/src/main/java/common/item/ItemBoat.java diff --git a/common/src/common/item/ItemBoltgun.java b/common/src/main/java/common/item/ItemBoltgun.java similarity index 100% rename from common/src/common/item/ItemBoltgun.java rename to common/src/main/java/common/item/ItemBoltgun.java diff --git a/common/src/common/item/ItemBook.java b/common/src/main/java/common/item/ItemBook.java similarity index 100% rename from common/src/common/item/ItemBook.java rename to common/src/main/java/common/item/ItemBook.java diff --git a/common/src/common/item/ItemBow.java b/common/src/main/java/common/item/ItemBow.java similarity index 100% rename from common/src/common/item/ItemBow.java rename to common/src/main/java/common/item/ItemBow.java diff --git a/common/src/common/item/ItemBucket.java b/common/src/main/java/common/item/ItemBucket.java similarity index 100% rename from common/src/common/item/ItemBucket.java rename to common/src/main/java/common/item/ItemBucket.java diff --git a/common/src/common/item/ItemBucketMilk.java b/common/src/main/java/common/item/ItemBucketMilk.java similarity index 100% rename from common/src/common/item/ItemBucketMilk.java rename to common/src/main/java/common/item/ItemBucketMilk.java diff --git a/common/src/common/item/ItemButton.java b/common/src/main/java/common/item/ItemButton.java similarity index 100% rename from common/src/common/item/ItemButton.java rename to common/src/main/java/common/item/ItemButton.java diff --git a/common/src/common/item/ItemCamera.java b/common/src/main/java/common/item/ItemCamera.java similarity index 100% rename from common/src/common/item/ItemCamera.java rename to common/src/main/java/common/item/ItemCamera.java diff --git a/common/src/common/item/ItemCarrotOnAStick.java b/common/src/main/java/common/item/ItemCarrotOnAStick.java similarity index 100% rename from common/src/common/item/ItemCarrotOnAStick.java rename to common/src/main/java/common/item/ItemCarrotOnAStick.java diff --git a/common/src/common/item/ItemChargedOrb.java b/common/src/main/java/common/item/ItemChargedOrb.java similarity index 100% rename from common/src/common/item/ItemChargedOrb.java rename to common/src/main/java/common/item/ItemChargedOrb.java diff --git a/common/src/common/item/ItemChest.java b/common/src/main/java/common/item/ItemChest.java similarity index 100% rename from common/src/common/item/ItemChest.java rename to common/src/main/java/common/item/ItemChest.java diff --git a/common/src/common/item/ItemCloth.java b/common/src/main/java/common/item/ItemCloth.java similarity index 100% rename from common/src/common/item/ItemCloth.java rename to common/src/main/java/common/item/ItemCloth.java diff --git a/common/src/common/item/ItemCoal.java b/common/src/main/java/common/item/ItemCoal.java similarity index 100% rename from common/src/common/item/ItemCoal.java rename to common/src/main/java/common/item/ItemCoal.java diff --git a/common/src/common/item/ItemColored.java b/common/src/main/java/common/item/ItemColored.java similarity index 100% rename from common/src/common/item/ItemColored.java rename to common/src/main/java/common/item/ItemColored.java diff --git a/common/src/common/item/ItemControl.java b/common/src/main/java/common/item/ItemControl.java similarity index 100% rename from common/src/common/item/ItemControl.java rename to common/src/main/java/common/item/ItemControl.java diff --git a/common/src/common/item/ItemDie.java b/common/src/main/java/common/item/ItemDie.java similarity index 100% rename from common/src/common/item/ItemDie.java rename to common/src/main/java/common/item/ItemDie.java diff --git a/common/src/common/item/ItemDispenser.java b/common/src/main/java/common/item/ItemDispenser.java similarity index 100% rename from common/src/common/item/ItemDispenser.java rename to common/src/main/java/common/item/ItemDispenser.java diff --git a/common/src/common/item/ItemDoor.java b/common/src/main/java/common/item/ItemDoor.java similarity index 100% rename from common/src/common/item/ItemDoor.java rename to common/src/main/java/common/item/ItemDoor.java diff --git a/common/src/common/item/ItemDoublePlant.java b/common/src/main/java/common/item/ItemDoublePlant.java similarity index 100% rename from common/src/common/item/ItemDoublePlant.java rename to common/src/main/java/common/item/ItemDoublePlant.java diff --git a/common/src/common/item/ItemDye.java b/common/src/main/java/common/item/ItemDye.java similarity index 100% rename from common/src/common/item/ItemDye.java rename to common/src/main/java/common/item/ItemDye.java diff --git a/common/src/common/item/ItemDynamite.java b/common/src/main/java/common/item/ItemDynamite.java similarity index 100% rename from common/src/common/item/ItemDynamite.java rename to common/src/main/java/common/item/ItemDynamite.java diff --git a/common/src/common/item/ItemEditWand.java b/common/src/main/java/common/item/ItemEditWand.java similarity index 100% rename from common/src/common/item/ItemEditWand.java rename to common/src/main/java/common/item/ItemEditWand.java diff --git a/common/src/common/item/ItemEffect.java b/common/src/main/java/common/item/ItemEffect.java similarity index 100% rename from common/src/common/item/ItemEffect.java rename to common/src/main/java/common/item/ItemEffect.java diff --git a/common/src/common/item/ItemEgg.java b/common/src/main/java/common/item/ItemEgg.java similarity index 100% rename from common/src/common/item/ItemEgg.java rename to common/src/main/java/common/item/ItemEgg.java diff --git a/common/src/common/item/ItemEnchantedBook.java b/common/src/main/java/common/item/ItemEnchantedBook.java similarity index 100% rename from common/src/common/item/ItemEnchantedBook.java rename to common/src/main/java/common/item/ItemEnchantedBook.java diff --git a/common/src/common/item/ItemExpBottle.java b/common/src/main/java/common/item/ItemExpBottle.java similarity index 100% rename from common/src/common/item/ItemExpBottle.java rename to common/src/main/java/common/item/ItemExpBottle.java diff --git a/common/src/common/item/ItemExterminator.java b/common/src/main/java/common/item/ItemExterminator.java similarity index 100% rename from common/src/common/item/ItemExterminator.java rename to common/src/main/java/common/item/ItemExterminator.java diff --git a/common/src/common/item/ItemFence.java b/common/src/main/java/common/item/ItemFence.java similarity index 100% rename from common/src/common/item/ItemFence.java rename to common/src/main/java/common/item/ItemFence.java diff --git a/common/src/common/item/ItemFireball.java b/common/src/main/java/common/item/ItemFireball.java similarity index 100% rename from common/src/common/item/ItemFireball.java rename to common/src/main/java/common/item/ItemFireball.java diff --git a/common/src/common/item/ItemFirework.java b/common/src/main/java/common/item/ItemFirework.java similarity index 100% rename from common/src/common/item/ItemFirework.java rename to common/src/main/java/common/item/ItemFirework.java diff --git a/common/src/common/item/ItemFireworkCharge.java b/common/src/main/java/common/item/ItemFireworkCharge.java similarity index 100% rename from common/src/common/item/ItemFireworkCharge.java rename to common/src/main/java/common/item/ItemFireworkCharge.java diff --git a/common/src/common/item/ItemFishFood.java b/common/src/main/java/common/item/ItemFishFood.java similarity index 100% rename from common/src/common/item/ItemFishFood.java rename to common/src/main/java/common/item/ItemFishFood.java diff --git a/common/src/common/item/ItemFishingRod.java b/common/src/main/java/common/item/ItemFishingRod.java similarity index 100% rename from common/src/common/item/ItemFishingRod.java rename to common/src/main/java/common/item/ItemFishingRod.java diff --git a/common/src/common/item/ItemFlintAndSteel.java b/common/src/main/java/common/item/ItemFlintAndSteel.java similarity index 100% rename from common/src/common/item/ItemFlintAndSteel.java rename to common/src/main/java/common/item/ItemFlintAndSteel.java diff --git a/common/src/common/item/ItemFood.java b/common/src/main/java/common/item/ItemFood.java similarity index 100% rename from common/src/common/item/ItemFood.java rename to common/src/main/java/common/item/ItemFood.java diff --git a/common/src/common/item/ItemFragile.java b/common/src/main/java/common/item/ItemFragile.java similarity index 100% rename from common/src/common/item/ItemFragile.java rename to common/src/main/java/common/item/ItemFragile.java diff --git a/common/src/common/item/ItemGlassBottle.java b/common/src/main/java/common/item/ItemGlassBottle.java similarity index 100% rename from common/src/common/item/ItemGlassBottle.java rename to common/src/main/java/common/item/ItemGlassBottle.java diff --git a/common/src/common/item/ItemGunBase.java b/common/src/main/java/common/item/ItemGunBase.java similarity index 100% rename from common/src/common/item/ItemGunBase.java rename to common/src/main/java/common/item/ItemGunBase.java diff --git a/common/src/common/item/ItemHoe.java b/common/src/main/java/common/item/ItemHoe.java similarity index 100% rename from common/src/common/item/ItemHoe.java rename to common/src/main/java/common/item/ItemHoe.java diff --git a/common/src/common/item/ItemHorseArmor.java b/common/src/main/java/common/item/ItemHorseArmor.java similarity index 100% rename from common/src/common/item/ItemHorseArmor.java rename to common/src/main/java/common/item/ItemHorseArmor.java diff --git a/common/src/common/item/ItemHugeMushroom.java b/common/src/main/java/common/item/ItemHugeMushroom.java similarity index 100% rename from common/src/common/item/ItemHugeMushroom.java rename to common/src/main/java/common/item/ItemHugeMushroom.java diff --git a/common/src/common/item/ItemInfoWand.java b/common/src/main/java/common/item/ItemInfoWand.java similarity index 100% rename from common/src/common/item/ItemInfoWand.java rename to common/src/main/java/common/item/ItemInfoWand.java diff --git a/common/src/common/item/ItemKey.java b/common/src/main/java/common/item/ItemKey.java similarity index 100% rename from common/src/common/item/ItemKey.java rename to common/src/main/java/common/item/ItemKey.java diff --git a/common/src/common/item/ItemLead.java b/common/src/main/java/common/item/ItemLead.java similarity index 100% rename from common/src/common/item/ItemLead.java rename to common/src/main/java/common/item/ItemLead.java diff --git a/common/src/common/item/ItemLeaves.java b/common/src/main/java/common/item/ItemLeaves.java similarity index 100% rename from common/src/common/item/ItemLeaves.java rename to common/src/main/java/common/item/ItemLeaves.java diff --git a/common/src/common/item/ItemLightning.java b/common/src/main/java/common/item/ItemLightning.java similarity index 100% rename from common/src/common/item/ItemLightning.java rename to common/src/main/java/common/item/ItemLightning.java diff --git a/common/src/common/item/ItemLilyPad.java b/common/src/main/java/common/item/ItemLilyPad.java similarity index 100% rename from common/src/common/item/ItemLilyPad.java rename to common/src/main/java/common/item/ItemLilyPad.java diff --git a/common/src/common/item/ItemMagnet.java b/common/src/main/java/common/item/ItemMagnet.java similarity index 100% rename from common/src/common/item/ItemMagnet.java rename to common/src/main/java/common/item/ItemMagnet.java diff --git a/common/src/common/item/ItemMagnetic.java b/common/src/main/java/common/item/ItemMagnetic.java similarity index 100% rename from common/src/common/item/ItemMagnetic.java rename to common/src/main/java/common/item/ItemMagnetic.java diff --git a/common/src/common/item/ItemMetal.java b/common/src/main/java/common/item/ItemMetal.java similarity index 100% rename from common/src/common/item/ItemMetal.java rename to common/src/main/java/common/item/ItemMetal.java diff --git a/common/src/common/item/ItemMetalBlock.java b/common/src/main/java/common/item/ItemMetalBlock.java similarity index 100% rename from common/src/common/item/ItemMetalBlock.java rename to common/src/main/java/common/item/ItemMetalBlock.java diff --git a/common/src/common/item/ItemMinecart.java b/common/src/main/java/common/item/ItemMinecart.java similarity index 100% rename from common/src/common/item/ItemMinecart.java rename to common/src/main/java/common/item/ItemMinecart.java diff --git a/common/src/common/item/ItemMonsterPlacer.java b/common/src/main/java/common/item/ItemMonsterPlacer.java similarity index 100% rename from common/src/common/item/ItemMonsterPlacer.java rename to common/src/main/java/common/item/ItemMonsterPlacer.java diff --git a/common/src/common/item/ItemMultiTexture.java b/common/src/main/java/common/item/ItemMultiTexture.java similarity index 100% rename from common/src/common/item/ItemMultiTexture.java rename to common/src/main/java/common/item/ItemMultiTexture.java diff --git a/common/src/common/item/ItemNameTag.java b/common/src/main/java/common/item/ItemNameTag.java similarity index 100% rename from common/src/common/item/ItemNameTag.java rename to common/src/main/java/common/item/ItemNameTag.java diff --git a/common/src/common/item/ItemNpcSpawner.java b/common/src/main/java/common/item/ItemNpcSpawner.java similarity index 100% rename from common/src/common/item/ItemNpcSpawner.java rename to common/src/main/java/common/item/ItemNpcSpawner.java diff --git a/common/src/common/item/ItemNugget.java b/common/src/main/java/common/item/ItemNugget.java similarity index 100% rename from common/src/common/item/ItemNugget.java rename to common/src/main/java/common/item/ItemNugget.java diff --git a/common/src/common/item/ItemPickaxe.java b/common/src/main/java/common/item/ItemPickaxe.java similarity index 100% rename from common/src/common/item/ItemPickaxe.java rename to common/src/main/java/common/item/ItemPickaxe.java diff --git a/common/src/common/item/ItemPiston.java b/common/src/main/java/common/item/ItemPiston.java similarity index 100% rename from common/src/common/item/ItemPiston.java rename to common/src/main/java/common/item/ItemPiston.java diff --git a/common/src/common/item/ItemPotion.java b/common/src/main/java/common/item/ItemPotion.java similarity index 100% rename from common/src/common/item/ItemPotion.java rename to common/src/main/java/common/item/ItemPotion.java diff --git a/common/src/common/item/ItemPressurePlate.java b/common/src/main/java/common/item/ItemPressurePlate.java similarity index 100% rename from common/src/common/item/ItemPressurePlate.java rename to common/src/main/java/common/item/ItemPressurePlate.java diff --git a/common/src/common/item/ItemRecord.java b/common/src/main/java/common/item/ItemRecord.java similarity index 100% rename from common/src/common/item/ItemRecord.java rename to common/src/main/java/common/item/ItemRecord.java diff --git a/common/src/common/item/ItemRedstone.java b/common/src/main/java/common/item/ItemRedstone.java similarity index 100% rename from common/src/common/item/ItemRedstone.java rename to common/src/main/java/common/item/ItemRedstone.java diff --git a/common/src/common/item/ItemReed.java b/common/src/main/java/common/item/ItemReed.java similarity index 100% rename from common/src/common/item/ItemReed.java rename to common/src/main/java/common/item/ItemReed.java diff --git a/common/src/common/item/ItemRod.java b/common/src/main/java/common/item/ItemRod.java similarity index 100% rename from common/src/common/item/ItemRod.java rename to common/src/main/java/common/item/ItemRod.java diff --git a/common/src/common/item/ItemSaddle.java b/common/src/main/java/common/item/ItemSaddle.java similarity index 100% rename from common/src/common/item/ItemSaddle.java rename to common/src/main/java/common/item/ItemSaddle.java diff --git a/common/src/common/item/ItemSeedFood.java b/common/src/main/java/common/item/ItemSeedFood.java similarity index 100% rename from common/src/common/item/ItemSeedFood.java rename to common/src/main/java/common/item/ItemSeedFood.java diff --git a/common/src/common/item/ItemSeeds.java b/common/src/main/java/common/item/ItemSeeds.java similarity index 100% rename from common/src/common/item/ItemSeeds.java rename to common/src/main/java/common/item/ItemSeeds.java diff --git a/common/src/common/item/ItemShears.java b/common/src/main/java/common/item/ItemShears.java similarity index 100% rename from common/src/common/item/ItemShears.java rename to common/src/main/java/common/item/ItemShears.java diff --git a/common/src/common/item/ItemShovel.java b/common/src/main/java/common/item/ItemShovel.java similarity index 100% rename from common/src/common/item/ItemShovel.java rename to common/src/main/java/common/item/ItemShovel.java diff --git a/common/src/common/item/ItemSign.java b/common/src/main/java/common/item/ItemSign.java similarity index 100% rename from common/src/common/item/ItemSign.java rename to common/src/main/java/common/item/ItemSign.java diff --git a/common/src/common/item/ItemSkull.java b/common/src/main/java/common/item/ItemSkull.java similarity index 100% rename from common/src/common/item/ItemSkull.java rename to common/src/main/java/common/item/ItemSkull.java diff --git a/common/src/common/item/ItemSlab.java b/common/src/main/java/common/item/ItemSlab.java similarity index 100% rename from common/src/common/item/ItemSlab.java rename to common/src/main/java/common/item/ItemSlab.java diff --git a/common/src/common/item/ItemSmall.java b/common/src/main/java/common/item/ItemSmall.java similarity index 100% rename from common/src/common/item/ItemSmall.java rename to common/src/main/java/common/item/ItemSmall.java diff --git a/common/src/common/item/ItemSnow.java b/common/src/main/java/common/item/ItemSnow.java similarity index 100% rename from common/src/common/item/ItemSnow.java rename to common/src/main/java/common/item/ItemSnow.java diff --git a/common/src/common/item/ItemSnowball.java b/common/src/main/java/common/item/ItemSnowball.java similarity index 100% rename from common/src/common/item/ItemSnowball.java rename to common/src/main/java/common/item/ItemSnowball.java diff --git a/common/src/common/item/ItemSoup.java b/common/src/main/java/common/item/ItemSoup.java similarity index 100% rename from common/src/common/item/ItemSoup.java rename to common/src/main/java/common/item/ItemSoup.java diff --git a/common/src/common/item/ItemSpaceNavigator.java b/common/src/main/java/common/item/ItemSpaceNavigator.java similarity index 100% rename from common/src/common/item/ItemSpaceNavigator.java rename to common/src/main/java/common/item/ItemSpaceNavigator.java diff --git a/common/src/common/item/ItemStack.java b/common/src/main/java/common/item/ItemStack.java similarity index 100% rename from common/src/common/item/ItemStack.java rename to common/src/main/java/common/item/ItemStack.java diff --git a/common/src/common/item/ItemStick.java b/common/src/main/java/common/item/ItemStick.java similarity index 100% rename from common/src/common/item/ItemStick.java rename to common/src/main/java/common/item/ItemStick.java diff --git a/common/src/common/item/ItemSword.java b/common/src/main/java/common/item/ItemSword.java similarity index 100% rename from common/src/common/item/ItemSword.java rename to common/src/main/java/common/item/ItemSword.java diff --git a/common/src/common/item/ItemTNT.java b/common/src/main/java/common/item/ItemTNT.java similarity index 100% rename from common/src/common/item/ItemTNT.java rename to common/src/main/java/common/item/ItemTNT.java diff --git a/common/src/common/item/ItemTiny.java b/common/src/main/java/common/item/ItemTiny.java similarity index 100% rename from common/src/common/item/ItemTiny.java rename to common/src/main/java/common/item/ItemTiny.java diff --git a/common/src/common/item/ItemTool.java b/common/src/main/java/common/item/ItemTool.java similarity index 100% rename from common/src/common/item/ItemTool.java rename to common/src/main/java/common/item/ItemTool.java diff --git a/common/src/common/item/ItemWall.java b/common/src/main/java/common/item/ItemWall.java similarity index 100% rename from common/src/common/item/ItemWall.java rename to common/src/main/java/common/item/ItemWall.java diff --git a/common/src/common/item/ItemWand.java b/common/src/main/java/common/item/ItemWand.java similarity index 100% rename from common/src/common/item/ItemWand.java rename to common/src/main/java/common/item/ItemWand.java diff --git a/common/src/common/item/ItemWeatherToken.java b/common/src/main/java/common/item/ItemWeatherToken.java similarity index 100% rename from common/src/common/item/ItemWeatherToken.java rename to common/src/main/java/common/item/ItemWeatherToken.java diff --git a/common/src/common/item/RngLoot.java b/common/src/main/java/common/item/RngLoot.java similarity index 100% rename from common/src/common/item/RngLoot.java rename to common/src/main/java/common/item/RngLoot.java diff --git a/common/src/common/log/Log.java b/common/src/main/java/common/log/Log.java similarity index 100% rename from common/src/common/log/Log.java rename to common/src/main/java/common/log/Log.java diff --git a/common/src/common/log/LogLevel.java b/common/src/main/java/common/log/LogLevel.java similarity index 100% rename from common/src/common/log/LogLevel.java rename to common/src/main/java/common/log/LogLevel.java diff --git a/common/src/common/model/BlockLayer.java b/common/src/main/java/common/model/BlockLayer.java similarity index 100% rename from common/src/common/model/BlockLayer.java rename to common/src/main/java/common/model/BlockLayer.java diff --git a/common/src/common/model/ItemMeshDefinition.java b/common/src/main/java/common/model/ItemMeshDefinition.java similarity index 100% rename from common/src/common/model/ItemMeshDefinition.java rename to common/src/main/java/common/model/ItemMeshDefinition.java diff --git a/common/src/common/model/Model.java b/common/src/main/java/common/model/Model.java similarity index 100% rename from common/src/common/model/Model.java rename to common/src/main/java/common/model/Model.java diff --git a/common/src/common/model/ModelProvider.java b/common/src/main/java/common/model/ModelProvider.java similarity index 100% rename from common/src/common/model/ModelProvider.java rename to common/src/main/java/common/model/ModelProvider.java diff --git a/common/src/common/model/ModelRotation.java b/common/src/main/java/common/model/ModelRotation.java similarity index 100% rename from common/src/common/model/ModelRotation.java rename to common/src/main/java/common/model/ModelRotation.java diff --git a/common/src/common/model/ParticleType.java b/common/src/main/java/common/model/ParticleType.java similarity index 100% rename from common/src/common/model/ParticleType.java rename to common/src/main/java/common/model/ParticleType.java diff --git a/common/src/common/model/Transform.java b/common/src/main/java/common/model/Transform.java similarity index 100% rename from common/src/common/model/Transform.java rename to common/src/main/java/common/model/Transform.java diff --git a/common/src/common/model/Transforms.java b/common/src/main/java/common/model/Transforms.java similarity index 100% rename from common/src/common/model/Transforms.java rename to common/src/main/java/common/model/Transforms.java diff --git a/common/src/common/nbt/NBTBase.java b/common/src/main/java/common/nbt/NBTBase.java similarity index 100% rename from common/src/common/nbt/NBTBase.java rename to common/src/main/java/common/nbt/NBTBase.java diff --git a/common/src/common/nbt/NBTException.java b/common/src/main/java/common/nbt/NBTException.java similarity index 100% rename from common/src/common/nbt/NBTException.java rename to common/src/main/java/common/nbt/NBTException.java diff --git a/common/src/common/nbt/NBTLoader.java b/common/src/main/java/common/nbt/NBTLoader.java similarity index 100% rename from common/src/common/nbt/NBTLoader.java rename to common/src/main/java/common/nbt/NBTLoader.java diff --git a/common/src/common/nbt/NBTParser.java b/common/src/main/java/common/nbt/NBTParser.java similarity index 100% rename from common/src/common/nbt/NBTParser.java rename to common/src/main/java/common/nbt/NBTParser.java diff --git a/common/src/common/nbt/NBTSizeTracker.java b/common/src/main/java/common/nbt/NBTSizeTracker.java similarity index 100% rename from common/src/common/nbt/NBTSizeTracker.java rename to common/src/main/java/common/nbt/NBTSizeTracker.java diff --git a/common/src/common/nbt/NBTTagByte.java b/common/src/main/java/common/nbt/NBTTagByte.java similarity index 100% rename from common/src/common/nbt/NBTTagByte.java rename to common/src/main/java/common/nbt/NBTTagByte.java diff --git a/common/src/common/nbt/NBTTagByteArray.java b/common/src/main/java/common/nbt/NBTTagByteArray.java similarity index 100% rename from common/src/common/nbt/NBTTagByteArray.java rename to common/src/main/java/common/nbt/NBTTagByteArray.java diff --git a/common/src/common/nbt/NBTTagCompound.java b/common/src/main/java/common/nbt/NBTTagCompound.java similarity index 100% rename from common/src/common/nbt/NBTTagCompound.java rename to common/src/main/java/common/nbt/NBTTagCompound.java diff --git a/common/src/common/nbt/NBTTagDouble.java b/common/src/main/java/common/nbt/NBTTagDouble.java similarity index 100% rename from common/src/common/nbt/NBTTagDouble.java rename to common/src/main/java/common/nbt/NBTTagDouble.java diff --git a/common/src/common/nbt/NBTTagEnd.java b/common/src/main/java/common/nbt/NBTTagEnd.java similarity index 100% rename from common/src/common/nbt/NBTTagEnd.java rename to common/src/main/java/common/nbt/NBTTagEnd.java diff --git a/common/src/common/nbt/NBTTagFloat.java b/common/src/main/java/common/nbt/NBTTagFloat.java similarity index 100% rename from common/src/common/nbt/NBTTagFloat.java rename to common/src/main/java/common/nbt/NBTTagFloat.java diff --git a/common/src/common/nbt/NBTTagInt.java b/common/src/main/java/common/nbt/NBTTagInt.java similarity index 100% rename from common/src/common/nbt/NBTTagInt.java rename to common/src/main/java/common/nbt/NBTTagInt.java diff --git a/common/src/common/nbt/NBTTagIntArray.java b/common/src/main/java/common/nbt/NBTTagIntArray.java similarity index 100% rename from common/src/common/nbt/NBTTagIntArray.java rename to common/src/main/java/common/nbt/NBTTagIntArray.java diff --git a/common/src/common/nbt/NBTTagList.java b/common/src/main/java/common/nbt/NBTTagList.java similarity index 100% rename from common/src/common/nbt/NBTTagList.java rename to common/src/main/java/common/nbt/NBTTagList.java diff --git a/common/src/common/nbt/NBTTagLong.java b/common/src/main/java/common/nbt/NBTTagLong.java similarity index 100% rename from common/src/common/nbt/NBTTagLong.java rename to common/src/main/java/common/nbt/NBTTagLong.java diff --git a/common/src/common/nbt/NBTTagShort.java b/common/src/main/java/common/nbt/NBTTagShort.java similarity index 100% rename from common/src/common/nbt/NBTTagShort.java rename to common/src/main/java/common/nbt/NBTTagShort.java diff --git a/common/src/common/nbt/NBTTagString.java b/common/src/main/java/common/nbt/NBTTagString.java similarity index 100% rename from common/src/common/nbt/NBTTagString.java rename to common/src/main/java/common/nbt/NBTTagString.java diff --git a/common/src/common/nbt/NBTUtil.java b/common/src/main/java/common/nbt/NBTUtil.java similarity index 100% rename from common/src/common/nbt/NBTUtil.java rename to common/src/main/java/common/nbt/NBTUtil.java diff --git a/common/src/common/net/bootstrap/AbstractBootstrap.java b/common/src/main/java/common/net/bootstrap/AbstractBootstrap.java similarity index 100% rename from common/src/common/net/bootstrap/AbstractBootstrap.java rename to common/src/main/java/common/net/bootstrap/AbstractBootstrap.java diff --git a/common/src/common/net/bootstrap/Bootstrap.java b/common/src/main/java/common/net/bootstrap/Bootstrap.java similarity index 100% rename from common/src/common/net/bootstrap/Bootstrap.java rename to common/src/main/java/common/net/bootstrap/Bootstrap.java diff --git a/common/src/common/net/bootstrap/ChannelFactory.java b/common/src/main/java/common/net/bootstrap/ChannelFactory.java similarity index 100% rename from common/src/common/net/bootstrap/ChannelFactory.java rename to common/src/main/java/common/net/bootstrap/ChannelFactory.java diff --git a/common/src/common/net/bootstrap/ServerBootstrap.java b/common/src/main/java/common/net/bootstrap/ServerBootstrap.java similarity index 100% rename from common/src/common/net/bootstrap/ServerBootstrap.java rename to common/src/main/java/common/net/bootstrap/ServerBootstrap.java diff --git a/common/src/common/net/buffer/AbstractByteBuf.java b/common/src/main/java/common/net/buffer/AbstractByteBuf.java similarity index 100% rename from common/src/common/net/buffer/AbstractByteBuf.java rename to common/src/main/java/common/net/buffer/AbstractByteBuf.java diff --git a/common/src/common/net/buffer/AbstractByteBufAllocator.java b/common/src/main/java/common/net/buffer/AbstractByteBufAllocator.java similarity index 100% rename from common/src/common/net/buffer/AbstractByteBufAllocator.java rename to common/src/main/java/common/net/buffer/AbstractByteBufAllocator.java diff --git a/common/src/common/net/buffer/AbstractDerivedByteBuf.java b/common/src/main/java/common/net/buffer/AbstractDerivedByteBuf.java similarity index 100% rename from common/src/common/net/buffer/AbstractDerivedByteBuf.java rename to common/src/main/java/common/net/buffer/AbstractDerivedByteBuf.java diff --git a/common/src/common/net/buffer/AbstractReferenceCountedByteBuf.java b/common/src/main/java/common/net/buffer/AbstractReferenceCountedByteBuf.java similarity index 100% rename from common/src/common/net/buffer/AbstractReferenceCountedByteBuf.java rename to common/src/main/java/common/net/buffer/AbstractReferenceCountedByteBuf.java diff --git a/common/src/common/net/buffer/AdvancedLeakAwareByteBuf.java b/common/src/main/java/common/net/buffer/AdvancedLeakAwareByteBuf.java similarity index 100% rename from common/src/common/net/buffer/AdvancedLeakAwareByteBuf.java rename to common/src/main/java/common/net/buffer/AdvancedLeakAwareByteBuf.java diff --git a/common/src/common/net/buffer/ByteBuf.java b/common/src/main/java/common/net/buffer/ByteBuf.java similarity index 100% rename from common/src/common/net/buffer/ByteBuf.java rename to common/src/main/java/common/net/buffer/ByteBuf.java diff --git a/common/src/common/net/buffer/ByteBufAllocator.java b/common/src/main/java/common/net/buffer/ByteBufAllocator.java similarity index 100% rename from common/src/common/net/buffer/ByteBufAllocator.java rename to common/src/main/java/common/net/buffer/ByteBufAllocator.java diff --git a/common/src/common/net/buffer/ByteBufInputStream.java b/common/src/main/java/common/net/buffer/ByteBufInputStream.java similarity index 100% rename from common/src/common/net/buffer/ByteBufInputStream.java rename to common/src/main/java/common/net/buffer/ByteBufInputStream.java diff --git a/common/src/common/net/buffer/ByteBufOutputStream.java b/common/src/main/java/common/net/buffer/ByteBufOutputStream.java similarity index 100% rename from common/src/common/net/buffer/ByteBufOutputStream.java rename to common/src/main/java/common/net/buffer/ByteBufOutputStream.java diff --git a/common/src/common/net/buffer/ByteBufProcessor.java b/common/src/main/java/common/net/buffer/ByteBufProcessor.java similarity index 100% rename from common/src/common/net/buffer/ByteBufProcessor.java rename to common/src/main/java/common/net/buffer/ByteBufProcessor.java diff --git a/common/src/common/net/buffer/ByteBufUtil.java b/common/src/main/java/common/net/buffer/ByteBufUtil.java similarity index 100% rename from common/src/common/net/buffer/ByteBufUtil.java rename to common/src/main/java/common/net/buffer/ByteBufUtil.java diff --git a/common/src/common/net/buffer/CompositeByteBuf.java b/common/src/main/java/common/net/buffer/CompositeByteBuf.java similarity index 100% rename from common/src/common/net/buffer/CompositeByteBuf.java rename to common/src/main/java/common/net/buffer/CompositeByteBuf.java diff --git a/common/src/common/net/buffer/DuplicatedByteBuf.java b/common/src/main/java/common/net/buffer/DuplicatedByteBuf.java similarity index 100% rename from common/src/common/net/buffer/DuplicatedByteBuf.java rename to common/src/main/java/common/net/buffer/DuplicatedByteBuf.java diff --git a/common/src/common/net/buffer/EmptyByteBuf.java b/common/src/main/java/common/net/buffer/EmptyByteBuf.java similarity index 100% rename from common/src/common/net/buffer/EmptyByteBuf.java rename to common/src/main/java/common/net/buffer/EmptyByteBuf.java diff --git a/common/src/common/net/buffer/PoolArena.java b/common/src/main/java/common/net/buffer/PoolArena.java similarity index 100% rename from common/src/common/net/buffer/PoolArena.java rename to common/src/main/java/common/net/buffer/PoolArena.java diff --git a/common/src/common/net/buffer/PoolChunk.java b/common/src/main/java/common/net/buffer/PoolChunk.java similarity index 100% rename from common/src/common/net/buffer/PoolChunk.java rename to common/src/main/java/common/net/buffer/PoolChunk.java diff --git a/common/src/common/net/buffer/PoolChunkList.java b/common/src/main/java/common/net/buffer/PoolChunkList.java similarity index 100% rename from common/src/common/net/buffer/PoolChunkList.java rename to common/src/main/java/common/net/buffer/PoolChunkList.java diff --git a/common/src/common/net/buffer/PoolSubpage.java b/common/src/main/java/common/net/buffer/PoolSubpage.java similarity index 100% rename from common/src/common/net/buffer/PoolSubpage.java rename to common/src/main/java/common/net/buffer/PoolSubpage.java diff --git a/common/src/common/net/buffer/PoolThreadCache.java b/common/src/main/java/common/net/buffer/PoolThreadCache.java similarity index 100% rename from common/src/common/net/buffer/PoolThreadCache.java rename to common/src/main/java/common/net/buffer/PoolThreadCache.java diff --git a/common/src/common/net/buffer/PooledByteBuf.java b/common/src/main/java/common/net/buffer/PooledByteBuf.java similarity index 100% rename from common/src/common/net/buffer/PooledByteBuf.java rename to common/src/main/java/common/net/buffer/PooledByteBuf.java diff --git a/common/src/common/net/buffer/PooledByteBufAllocator.java b/common/src/main/java/common/net/buffer/PooledByteBufAllocator.java similarity index 100% rename from common/src/common/net/buffer/PooledByteBufAllocator.java rename to common/src/main/java/common/net/buffer/PooledByteBufAllocator.java diff --git a/common/src/common/net/buffer/PooledDirectByteBuf.java b/common/src/main/java/common/net/buffer/PooledDirectByteBuf.java similarity index 100% rename from common/src/common/net/buffer/PooledDirectByteBuf.java rename to common/src/main/java/common/net/buffer/PooledDirectByteBuf.java diff --git a/common/src/common/net/buffer/PooledHeapByteBuf.java b/common/src/main/java/common/net/buffer/PooledHeapByteBuf.java similarity index 100% rename from common/src/common/net/buffer/PooledHeapByteBuf.java rename to common/src/main/java/common/net/buffer/PooledHeapByteBuf.java diff --git a/common/src/common/net/buffer/PooledUnsafeDirectByteBuf.java b/common/src/main/java/common/net/buffer/PooledUnsafeDirectByteBuf.java similarity index 100% rename from common/src/common/net/buffer/PooledUnsafeDirectByteBuf.java rename to common/src/main/java/common/net/buffer/PooledUnsafeDirectByteBuf.java diff --git a/common/src/common/net/buffer/ReadOnlyByteBuf.java b/common/src/main/java/common/net/buffer/ReadOnlyByteBuf.java similarity index 100% rename from common/src/common/net/buffer/ReadOnlyByteBuf.java rename to common/src/main/java/common/net/buffer/ReadOnlyByteBuf.java diff --git a/common/src/common/net/buffer/ReadOnlyByteBufferBuf.java b/common/src/main/java/common/net/buffer/ReadOnlyByteBufferBuf.java similarity index 100% rename from common/src/common/net/buffer/ReadOnlyByteBufferBuf.java rename to common/src/main/java/common/net/buffer/ReadOnlyByteBufferBuf.java diff --git a/common/src/common/net/buffer/ReadOnlyUnsafeDirectByteBuf.java b/common/src/main/java/common/net/buffer/ReadOnlyUnsafeDirectByteBuf.java similarity index 100% rename from common/src/common/net/buffer/ReadOnlyUnsafeDirectByteBuf.java rename to common/src/main/java/common/net/buffer/ReadOnlyUnsafeDirectByteBuf.java diff --git a/common/src/common/net/buffer/SimpleLeakAwareByteBuf.java b/common/src/main/java/common/net/buffer/SimpleLeakAwareByteBuf.java similarity index 100% rename from common/src/common/net/buffer/SimpleLeakAwareByteBuf.java rename to common/src/main/java/common/net/buffer/SimpleLeakAwareByteBuf.java diff --git a/common/src/common/net/buffer/SlicedByteBuf.java b/common/src/main/java/common/net/buffer/SlicedByteBuf.java similarity index 100% rename from common/src/common/net/buffer/SlicedByteBuf.java rename to common/src/main/java/common/net/buffer/SlicedByteBuf.java diff --git a/common/src/common/net/buffer/SwappedByteBuf.java b/common/src/main/java/common/net/buffer/SwappedByteBuf.java similarity index 100% rename from common/src/common/net/buffer/SwappedByteBuf.java rename to common/src/main/java/common/net/buffer/SwappedByteBuf.java diff --git a/common/src/common/net/buffer/Unpooled.java b/common/src/main/java/common/net/buffer/Unpooled.java similarity index 100% rename from common/src/common/net/buffer/Unpooled.java rename to common/src/main/java/common/net/buffer/Unpooled.java diff --git a/common/src/common/net/buffer/UnpooledByteBufAllocator.java b/common/src/main/java/common/net/buffer/UnpooledByteBufAllocator.java similarity index 100% rename from common/src/common/net/buffer/UnpooledByteBufAllocator.java rename to common/src/main/java/common/net/buffer/UnpooledByteBufAllocator.java diff --git a/common/src/common/net/buffer/UnpooledDirectByteBuf.java b/common/src/main/java/common/net/buffer/UnpooledDirectByteBuf.java similarity index 100% rename from common/src/common/net/buffer/UnpooledDirectByteBuf.java rename to common/src/main/java/common/net/buffer/UnpooledDirectByteBuf.java diff --git a/common/src/common/net/buffer/UnpooledHeapByteBuf.java b/common/src/main/java/common/net/buffer/UnpooledHeapByteBuf.java similarity index 100% rename from common/src/common/net/buffer/UnpooledHeapByteBuf.java rename to common/src/main/java/common/net/buffer/UnpooledHeapByteBuf.java diff --git a/common/src/common/net/buffer/UnpooledUnsafeDirectByteBuf.java b/common/src/main/java/common/net/buffer/UnpooledUnsafeDirectByteBuf.java similarity index 100% rename from common/src/common/net/buffer/UnpooledUnsafeDirectByteBuf.java rename to common/src/main/java/common/net/buffer/UnpooledUnsafeDirectByteBuf.java diff --git a/common/src/common/net/buffer/UnreleasableByteBuf.java b/common/src/main/java/common/net/buffer/UnreleasableByteBuf.java similarity index 100% rename from common/src/common/net/buffer/UnreleasableByteBuf.java rename to common/src/main/java/common/net/buffer/UnreleasableByteBuf.java diff --git a/common/src/common/net/buffer/UnsafeDirectSwappedByteBuf.java b/common/src/main/java/common/net/buffer/UnsafeDirectSwappedByteBuf.java similarity index 100% rename from common/src/common/net/buffer/UnsafeDirectSwappedByteBuf.java rename to common/src/main/java/common/net/buffer/UnsafeDirectSwappedByteBuf.java diff --git a/common/src/common/net/buffer/WrappedByteBuf.java b/common/src/main/java/common/net/buffer/WrappedByteBuf.java similarity index 100% rename from common/src/common/net/buffer/WrappedByteBuf.java rename to common/src/main/java/common/net/buffer/WrappedByteBuf.java diff --git a/common/src/common/net/channel/AbstractChannel.java b/common/src/main/java/common/net/channel/AbstractChannel.java similarity index 100% rename from common/src/common/net/channel/AbstractChannel.java rename to common/src/main/java/common/net/channel/AbstractChannel.java diff --git a/common/src/common/net/channel/AbstractChannelHandlerContext.java b/common/src/main/java/common/net/channel/AbstractChannelHandlerContext.java similarity index 100% rename from common/src/common/net/channel/AbstractChannelHandlerContext.java rename to common/src/main/java/common/net/channel/AbstractChannelHandlerContext.java diff --git a/common/src/common/net/channel/AbstractServerChannel.java b/common/src/main/java/common/net/channel/AbstractServerChannel.java similarity index 100% rename from common/src/common/net/channel/AbstractServerChannel.java rename to common/src/main/java/common/net/channel/AbstractServerChannel.java diff --git a/common/src/common/net/channel/AdaptiveRecvByteBufAllocator.java b/common/src/main/java/common/net/channel/AdaptiveRecvByteBufAllocator.java similarity index 100% rename from common/src/common/net/channel/AdaptiveRecvByteBufAllocator.java rename to common/src/main/java/common/net/channel/AdaptiveRecvByteBufAllocator.java diff --git a/common/src/common/net/channel/Channel.java b/common/src/main/java/common/net/channel/Channel.java similarity index 100% rename from common/src/common/net/channel/Channel.java rename to common/src/main/java/common/net/channel/Channel.java diff --git a/common/src/common/net/channel/ChannelConfig.java b/common/src/main/java/common/net/channel/ChannelConfig.java similarity index 100% rename from common/src/common/net/channel/ChannelConfig.java rename to common/src/main/java/common/net/channel/ChannelConfig.java diff --git a/common/src/common/net/channel/ChannelException.java b/common/src/main/java/common/net/channel/ChannelException.java similarity index 100% rename from common/src/common/net/channel/ChannelException.java rename to common/src/main/java/common/net/channel/ChannelException.java diff --git a/common/src/common/net/channel/ChannelFuture.java b/common/src/main/java/common/net/channel/ChannelFuture.java similarity index 100% rename from common/src/common/net/channel/ChannelFuture.java rename to common/src/main/java/common/net/channel/ChannelFuture.java diff --git a/common/src/common/net/channel/ChannelFutureListener.java b/common/src/main/java/common/net/channel/ChannelFutureListener.java similarity index 100% rename from common/src/common/net/channel/ChannelFutureListener.java rename to common/src/main/java/common/net/channel/ChannelFutureListener.java diff --git a/common/src/common/net/channel/ChannelHandler.java b/common/src/main/java/common/net/channel/ChannelHandler.java similarity index 100% rename from common/src/common/net/channel/ChannelHandler.java rename to common/src/main/java/common/net/channel/ChannelHandler.java diff --git a/common/src/common/net/channel/ChannelHandlerAdapter.java b/common/src/main/java/common/net/channel/ChannelHandlerAdapter.java similarity index 100% rename from common/src/common/net/channel/ChannelHandlerAdapter.java rename to common/src/main/java/common/net/channel/ChannelHandlerAdapter.java diff --git a/common/src/common/net/channel/ChannelHandlerContext.java b/common/src/main/java/common/net/channel/ChannelHandlerContext.java similarity index 100% rename from common/src/common/net/channel/ChannelHandlerContext.java rename to common/src/main/java/common/net/channel/ChannelHandlerContext.java diff --git a/common/src/common/net/channel/ChannelInboundHandler.java b/common/src/main/java/common/net/channel/ChannelInboundHandler.java similarity index 100% rename from common/src/common/net/channel/ChannelInboundHandler.java rename to common/src/main/java/common/net/channel/ChannelInboundHandler.java diff --git a/common/src/common/net/channel/ChannelInboundHandlerAdapter.java b/common/src/main/java/common/net/channel/ChannelInboundHandlerAdapter.java similarity index 100% rename from common/src/common/net/channel/ChannelInboundHandlerAdapter.java rename to common/src/main/java/common/net/channel/ChannelInboundHandlerAdapter.java diff --git a/common/src/common/net/channel/ChannelInitializer.java b/common/src/main/java/common/net/channel/ChannelInitializer.java similarity index 100% rename from common/src/common/net/channel/ChannelInitializer.java rename to common/src/main/java/common/net/channel/ChannelInitializer.java diff --git a/common/src/common/net/channel/ChannelMetadata.java b/common/src/main/java/common/net/channel/ChannelMetadata.java similarity index 100% rename from common/src/common/net/channel/ChannelMetadata.java rename to common/src/main/java/common/net/channel/ChannelMetadata.java diff --git a/common/src/common/net/channel/ChannelOption.java b/common/src/main/java/common/net/channel/ChannelOption.java similarity index 100% rename from common/src/common/net/channel/ChannelOption.java rename to common/src/main/java/common/net/channel/ChannelOption.java diff --git a/common/src/common/net/channel/ChannelOutboundBuffer.java b/common/src/main/java/common/net/channel/ChannelOutboundBuffer.java similarity index 100% rename from common/src/common/net/channel/ChannelOutboundBuffer.java rename to common/src/main/java/common/net/channel/ChannelOutboundBuffer.java diff --git a/common/src/common/net/channel/ChannelOutboundHandler.java b/common/src/main/java/common/net/channel/ChannelOutboundHandler.java similarity index 100% rename from common/src/common/net/channel/ChannelOutboundHandler.java rename to common/src/main/java/common/net/channel/ChannelOutboundHandler.java diff --git a/common/src/common/net/channel/ChannelOutboundHandlerAdapter.java b/common/src/main/java/common/net/channel/ChannelOutboundHandlerAdapter.java similarity index 100% rename from common/src/common/net/channel/ChannelOutboundHandlerAdapter.java rename to common/src/main/java/common/net/channel/ChannelOutboundHandlerAdapter.java diff --git a/common/src/common/net/channel/ChannelPipeline.java b/common/src/main/java/common/net/channel/ChannelPipeline.java similarity index 100% rename from common/src/common/net/channel/ChannelPipeline.java rename to common/src/main/java/common/net/channel/ChannelPipeline.java diff --git a/common/src/common/net/channel/ChannelPipelineException.java b/common/src/main/java/common/net/channel/ChannelPipelineException.java similarity index 100% rename from common/src/common/net/channel/ChannelPipelineException.java rename to common/src/main/java/common/net/channel/ChannelPipelineException.java diff --git a/common/src/common/net/channel/ChannelProgressivePromise.java b/common/src/main/java/common/net/channel/ChannelProgressivePromise.java similarity index 100% rename from common/src/common/net/channel/ChannelProgressivePromise.java rename to common/src/main/java/common/net/channel/ChannelProgressivePromise.java diff --git a/common/src/common/net/channel/ChannelPromise.java b/common/src/main/java/common/net/channel/ChannelPromise.java similarity index 100% rename from common/src/common/net/channel/ChannelPromise.java rename to common/src/main/java/common/net/channel/ChannelPromise.java diff --git a/common/src/common/net/channel/CompleteChannelFuture.java b/common/src/main/java/common/net/channel/CompleteChannelFuture.java similarity index 100% rename from common/src/common/net/channel/CompleteChannelFuture.java rename to common/src/main/java/common/net/channel/CompleteChannelFuture.java diff --git a/common/src/common/net/channel/ConnectTimeoutException.java b/common/src/main/java/common/net/channel/ConnectTimeoutException.java similarity index 100% rename from common/src/common/net/channel/ConnectTimeoutException.java rename to common/src/main/java/common/net/channel/ConnectTimeoutException.java diff --git a/common/src/common/net/channel/DefaultChannelConfig.java b/common/src/main/java/common/net/channel/DefaultChannelConfig.java similarity index 100% rename from common/src/common/net/channel/DefaultChannelConfig.java rename to common/src/main/java/common/net/channel/DefaultChannelConfig.java diff --git a/common/src/common/net/channel/DefaultChannelHandlerContext.java b/common/src/main/java/common/net/channel/DefaultChannelHandlerContext.java similarity index 100% rename from common/src/common/net/channel/DefaultChannelHandlerContext.java rename to common/src/main/java/common/net/channel/DefaultChannelHandlerContext.java diff --git a/common/src/common/net/channel/DefaultChannelPipeline.java b/common/src/main/java/common/net/channel/DefaultChannelPipeline.java similarity index 100% rename from common/src/common/net/channel/DefaultChannelPipeline.java rename to common/src/main/java/common/net/channel/DefaultChannelPipeline.java diff --git a/common/src/common/net/channel/DefaultChannelPromise.java b/common/src/main/java/common/net/channel/DefaultChannelPromise.java similarity index 100% rename from common/src/common/net/channel/DefaultChannelPromise.java rename to common/src/main/java/common/net/channel/DefaultChannelPromise.java diff --git a/common/src/common/net/channel/DefaultMessageSizeEstimator.java b/common/src/main/java/common/net/channel/DefaultMessageSizeEstimator.java similarity index 100% rename from common/src/common/net/channel/DefaultMessageSizeEstimator.java rename to common/src/main/java/common/net/channel/DefaultMessageSizeEstimator.java diff --git a/common/src/common/net/channel/EventLoop.java b/common/src/main/java/common/net/channel/EventLoop.java similarity index 100% rename from common/src/common/net/channel/EventLoop.java rename to common/src/main/java/common/net/channel/EventLoop.java diff --git a/common/src/common/net/channel/EventLoopException.java b/common/src/main/java/common/net/channel/EventLoopException.java similarity index 100% rename from common/src/common/net/channel/EventLoopException.java rename to common/src/main/java/common/net/channel/EventLoopException.java diff --git a/common/src/common/net/channel/EventLoopGroup.java b/common/src/main/java/common/net/channel/EventLoopGroup.java similarity index 100% rename from common/src/common/net/channel/EventLoopGroup.java rename to common/src/main/java/common/net/channel/EventLoopGroup.java diff --git a/common/src/common/net/channel/FailedChannelFuture.java b/common/src/main/java/common/net/channel/FailedChannelFuture.java similarity index 100% rename from common/src/common/net/channel/FailedChannelFuture.java rename to common/src/main/java/common/net/channel/FailedChannelFuture.java diff --git a/common/src/common/net/channel/MessageSizeEstimator.java b/common/src/main/java/common/net/channel/MessageSizeEstimator.java similarity index 100% rename from common/src/common/net/channel/MessageSizeEstimator.java rename to common/src/main/java/common/net/channel/MessageSizeEstimator.java diff --git a/common/src/common/net/channel/MultithreadEventLoopGroup.java b/common/src/main/java/common/net/channel/MultithreadEventLoopGroup.java similarity index 100% rename from common/src/common/net/channel/MultithreadEventLoopGroup.java rename to common/src/main/java/common/net/channel/MultithreadEventLoopGroup.java diff --git a/common/src/common/net/channel/RecvByteBufAllocator.java b/common/src/main/java/common/net/channel/RecvByteBufAllocator.java similarity index 100% rename from common/src/common/net/channel/RecvByteBufAllocator.java rename to common/src/main/java/common/net/channel/RecvByteBufAllocator.java diff --git a/common/src/common/net/channel/ServerChannel.java b/common/src/main/java/common/net/channel/ServerChannel.java similarity index 100% rename from common/src/common/net/channel/ServerChannel.java rename to common/src/main/java/common/net/channel/ServerChannel.java diff --git a/common/src/common/net/channel/SimpleChannelInboundHandler.java b/common/src/main/java/common/net/channel/SimpleChannelInboundHandler.java similarity index 100% rename from common/src/common/net/channel/SimpleChannelInboundHandler.java rename to common/src/main/java/common/net/channel/SimpleChannelInboundHandler.java diff --git a/common/src/common/net/channel/SingleThreadEventLoop.java b/common/src/main/java/common/net/channel/SingleThreadEventLoop.java similarity index 100% rename from common/src/common/net/channel/SingleThreadEventLoop.java rename to common/src/main/java/common/net/channel/SingleThreadEventLoop.java diff --git a/common/src/common/net/channel/SucceededChannelFuture.java b/common/src/main/java/common/net/channel/SucceededChannelFuture.java similarity index 100% rename from common/src/common/net/channel/SucceededChannelFuture.java rename to common/src/main/java/common/net/channel/SucceededChannelFuture.java diff --git a/common/src/common/net/channel/VoidChannelPromise.java b/common/src/main/java/common/net/channel/VoidChannelPromise.java similarity index 100% rename from common/src/common/net/channel/VoidChannelPromise.java rename to common/src/main/java/common/net/channel/VoidChannelPromise.java diff --git a/common/src/common/net/channel/local/LocalAddress.java b/common/src/main/java/common/net/channel/local/LocalAddress.java similarity index 100% rename from common/src/common/net/channel/local/LocalAddress.java rename to common/src/main/java/common/net/channel/local/LocalAddress.java diff --git a/common/src/common/net/channel/local/LocalChannel.java b/common/src/main/java/common/net/channel/local/LocalChannel.java similarity index 100% rename from common/src/common/net/channel/local/LocalChannel.java rename to common/src/main/java/common/net/channel/local/LocalChannel.java diff --git a/common/src/common/net/channel/local/LocalChannelRegistry.java b/common/src/main/java/common/net/channel/local/LocalChannelRegistry.java similarity index 100% rename from common/src/common/net/channel/local/LocalChannelRegistry.java rename to common/src/main/java/common/net/channel/local/LocalChannelRegistry.java diff --git a/common/src/common/net/channel/local/LocalEventLoop.java b/common/src/main/java/common/net/channel/local/LocalEventLoop.java similarity index 100% rename from common/src/common/net/channel/local/LocalEventLoop.java rename to common/src/main/java/common/net/channel/local/LocalEventLoop.java diff --git a/common/src/common/net/channel/local/LocalEventLoopGroup.java b/common/src/main/java/common/net/channel/local/LocalEventLoopGroup.java similarity index 100% rename from common/src/common/net/channel/local/LocalEventLoopGroup.java rename to common/src/main/java/common/net/channel/local/LocalEventLoopGroup.java diff --git a/common/src/common/net/channel/local/LocalServerChannel.java b/common/src/main/java/common/net/channel/local/LocalServerChannel.java similarity index 100% rename from common/src/common/net/channel/local/LocalServerChannel.java rename to common/src/main/java/common/net/channel/local/LocalServerChannel.java diff --git a/common/src/common/net/channel/nio/AbstractNioByteChannel.java b/common/src/main/java/common/net/channel/nio/AbstractNioByteChannel.java similarity index 100% rename from common/src/common/net/channel/nio/AbstractNioByteChannel.java rename to common/src/main/java/common/net/channel/nio/AbstractNioByteChannel.java diff --git a/common/src/common/net/channel/nio/AbstractNioChannel.java b/common/src/main/java/common/net/channel/nio/AbstractNioChannel.java similarity index 100% rename from common/src/common/net/channel/nio/AbstractNioChannel.java rename to common/src/main/java/common/net/channel/nio/AbstractNioChannel.java diff --git a/common/src/common/net/channel/nio/AbstractNioMessageChannel.java b/common/src/main/java/common/net/channel/nio/AbstractNioMessageChannel.java similarity index 100% rename from common/src/common/net/channel/nio/AbstractNioMessageChannel.java rename to common/src/main/java/common/net/channel/nio/AbstractNioMessageChannel.java diff --git a/common/src/common/net/channel/nio/NioEventLoop.java b/common/src/main/java/common/net/channel/nio/NioEventLoop.java similarity index 100% rename from common/src/common/net/channel/nio/NioEventLoop.java rename to common/src/main/java/common/net/channel/nio/NioEventLoop.java diff --git a/common/src/common/net/channel/nio/NioEventLoopGroup.java b/common/src/main/java/common/net/channel/nio/NioEventLoopGroup.java similarity index 100% rename from common/src/common/net/channel/nio/NioEventLoopGroup.java rename to common/src/main/java/common/net/channel/nio/NioEventLoopGroup.java diff --git a/common/src/common/net/channel/nio/NioTask.java b/common/src/main/java/common/net/channel/nio/NioTask.java similarity index 100% rename from common/src/common/net/channel/nio/NioTask.java rename to common/src/main/java/common/net/channel/nio/NioTask.java diff --git a/common/src/common/net/channel/nio/SelectedSelectionKeySet.java b/common/src/main/java/common/net/channel/nio/SelectedSelectionKeySet.java similarity index 100% rename from common/src/common/net/channel/nio/SelectedSelectionKeySet.java rename to common/src/main/java/common/net/channel/nio/SelectedSelectionKeySet.java diff --git a/common/src/common/net/channel/socket/ChannelInputShutdownEvent.java b/common/src/main/java/common/net/channel/socket/ChannelInputShutdownEvent.java similarity index 100% rename from common/src/common/net/channel/socket/ChannelInputShutdownEvent.java rename to common/src/main/java/common/net/channel/socket/ChannelInputShutdownEvent.java diff --git a/common/src/common/net/channel/socket/DefaultServerSocketChannelConfig.java b/common/src/main/java/common/net/channel/socket/DefaultServerSocketChannelConfig.java similarity index 100% rename from common/src/common/net/channel/socket/DefaultServerSocketChannelConfig.java rename to common/src/main/java/common/net/channel/socket/DefaultServerSocketChannelConfig.java diff --git a/common/src/common/net/channel/socket/DefaultSocketChannelConfig.java b/common/src/main/java/common/net/channel/socket/DefaultSocketChannelConfig.java similarity index 100% rename from common/src/common/net/channel/socket/DefaultSocketChannelConfig.java rename to common/src/main/java/common/net/channel/socket/DefaultSocketChannelConfig.java diff --git a/common/src/common/net/channel/socket/ServerSocketChannel.java b/common/src/main/java/common/net/channel/socket/ServerSocketChannel.java similarity index 100% rename from common/src/common/net/channel/socket/ServerSocketChannel.java rename to common/src/main/java/common/net/channel/socket/ServerSocketChannel.java diff --git a/common/src/common/net/channel/socket/ServerSocketChannelConfig.java b/common/src/main/java/common/net/channel/socket/ServerSocketChannelConfig.java similarity index 100% rename from common/src/common/net/channel/socket/ServerSocketChannelConfig.java rename to common/src/main/java/common/net/channel/socket/ServerSocketChannelConfig.java diff --git a/common/src/common/net/channel/socket/SocketChannel.java b/common/src/main/java/common/net/channel/socket/SocketChannel.java similarity index 100% rename from common/src/common/net/channel/socket/SocketChannel.java rename to common/src/main/java/common/net/channel/socket/SocketChannel.java diff --git a/common/src/common/net/channel/socket/SocketChannelConfig.java b/common/src/main/java/common/net/channel/socket/SocketChannelConfig.java similarity index 100% rename from common/src/common/net/channel/socket/SocketChannelConfig.java rename to common/src/main/java/common/net/channel/socket/SocketChannelConfig.java diff --git a/common/src/common/net/channel/socket/nio/NioServerSocketChannel.java b/common/src/main/java/common/net/channel/socket/nio/NioServerSocketChannel.java similarity index 100% rename from common/src/common/net/channel/socket/nio/NioServerSocketChannel.java rename to common/src/main/java/common/net/channel/socket/nio/NioServerSocketChannel.java diff --git a/common/src/common/net/channel/socket/nio/NioSocketChannel.java b/common/src/main/java/common/net/channel/socket/nio/NioSocketChannel.java similarity index 100% rename from common/src/common/net/channel/socket/nio/NioSocketChannel.java rename to common/src/main/java/common/net/channel/socket/nio/NioSocketChannel.java diff --git a/common/src/common/net/handler/codec/ByteToMessageDecoder.java b/common/src/main/java/common/net/handler/codec/ByteToMessageDecoder.java similarity index 100% rename from common/src/common/net/handler/codec/ByteToMessageDecoder.java rename to common/src/main/java/common/net/handler/codec/ByteToMessageDecoder.java diff --git a/common/src/common/net/handler/codec/CodecException.java b/common/src/main/java/common/net/handler/codec/CodecException.java similarity index 100% rename from common/src/common/net/handler/codec/CodecException.java rename to common/src/main/java/common/net/handler/codec/CodecException.java diff --git a/common/src/common/net/handler/codec/CorruptedFrameException.java b/common/src/main/java/common/net/handler/codec/CorruptedFrameException.java similarity index 100% rename from common/src/common/net/handler/codec/CorruptedFrameException.java rename to common/src/main/java/common/net/handler/codec/CorruptedFrameException.java diff --git a/common/src/common/net/handler/codec/DecoderException.java b/common/src/main/java/common/net/handler/codec/DecoderException.java similarity index 100% rename from common/src/common/net/handler/codec/DecoderException.java rename to common/src/main/java/common/net/handler/codec/DecoderException.java diff --git a/common/src/common/net/handler/codec/EncoderException.java b/common/src/main/java/common/net/handler/codec/EncoderException.java similarity index 100% rename from common/src/common/net/handler/codec/EncoderException.java rename to common/src/main/java/common/net/handler/codec/EncoderException.java diff --git a/common/src/common/net/handler/codec/MessageToByteEncoder.java b/common/src/main/java/common/net/handler/codec/MessageToByteEncoder.java similarity index 100% rename from common/src/common/net/handler/codec/MessageToByteEncoder.java rename to common/src/main/java/common/net/handler/codec/MessageToByteEncoder.java diff --git a/common/src/common/net/handler/codec/MessageToMessageDecoder.java b/common/src/main/java/common/net/handler/codec/MessageToMessageDecoder.java similarity index 100% rename from common/src/common/net/handler/codec/MessageToMessageDecoder.java rename to common/src/main/java/common/net/handler/codec/MessageToMessageDecoder.java diff --git a/common/src/common/net/handler/timeout/ReadTimeoutException.java b/common/src/main/java/common/net/handler/timeout/ReadTimeoutException.java similarity index 100% rename from common/src/common/net/handler/timeout/ReadTimeoutException.java rename to common/src/main/java/common/net/handler/timeout/ReadTimeoutException.java diff --git a/common/src/common/net/handler/timeout/ReadTimeoutHandler.java b/common/src/main/java/common/net/handler/timeout/ReadTimeoutHandler.java similarity index 100% rename from common/src/common/net/handler/timeout/ReadTimeoutHandler.java rename to common/src/main/java/common/net/handler/timeout/ReadTimeoutHandler.java diff --git a/common/src/common/net/handler/timeout/TimeoutException.java b/common/src/main/java/common/net/handler/timeout/TimeoutException.java similarity index 100% rename from common/src/common/net/handler/timeout/TimeoutException.java rename to common/src/main/java/common/net/handler/timeout/TimeoutException.java diff --git a/common/src/common/net/util/Attribute.java b/common/src/main/java/common/net/util/Attribute.java similarity index 100% rename from common/src/common/net/util/Attribute.java rename to common/src/main/java/common/net/util/Attribute.java diff --git a/common/src/common/net/util/AttributeKey.java b/common/src/main/java/common/net/util/AttributeKey.java similarity index 100% rename from common/src/common/net/util/AttributeKey.java rename to common/src/main/java/common/net/util/AttributeKey.java diff --git a/common/src/common/net/util/AttributeMap.java b/common/src/main/java/common/net/util/AttributeMap.java similarity index 100% rename from common/src/common/net/util/AttributeMap.java rename to common/src/main/java/common/net/util/AttributeMap.java diff --git a/common/src/common/net/util/CharsetUtil.java b/common/src/main/java/common/net/util/CharsetUtil.java similarity index 100% rename from common/src/common/net/util/CharsetUtil.java rename to common/src/main/java/common/net/util/CharsetUtil.java diff --git a/common/src/common/net/util/DefaultAttributeMap.java b/common/src/main/java/common/net/util/DefaultAttributeMap.java similarity index 100% rename from common/src/common/net/util/DefaultAttributeMap.java rename to common/src/main/java/common/net/util/DefaultAttributeMap.java diff --git a/common/src/common/net/util/IllegalReferenceCountException.java b/common/src/main/java/common/net/util/IllegalReferenceCountException.java similarity index 100% rename from common/src/common/net/util/IllegalReferenceCountException.java rename to common/src/main/java/common/net/util/IllegalReferenceCountException.java diff --git a/common/src/common/net/util/NetUtil.java b/common/src/main/java/common/net/util/NetUtil.java similarity index 100% rename from common/src/common/net/util/NetUtil.java rename to common/src/main/java/common/net/util/NetUtil.java diff --git a/common/src/common/net/util/Recycler.java b/common/src/main/java/common/net/util/Recycler.java similarity index 100% rename from common/src/common/net/util/Recycler.java rename to common/src/main/java/common/net/util/Recycler.java diff --git a/common/src/common/net/util/ReferenceCountUtil.java b/common/src/main/java/common/net/util/ReferenceCountUtil.java similarity index 100% rename from common/src/common/net/util/ReferenceCountUtil.java rename to common/src/main/java/common/net/util/ReferenceCountUtil.java diff --git a/common/src/common/net/util/ReferenceCounted.java b/common/src/main/java/common/net/util/ReferenceCounted.java similarity index 100% rename from common/src/common/net/util/ReferenceCounted.java rename to common/src/main/java/common/net/util/ReferenceCounted.java diff --git a/common/src/common/net/util/ResourceLeak.java b/common/src/main/java/common/net/util/ResourceLeak.java similarity index 100% rename from common/src/common/net/util/ResourceLeak.java rename to common/src/main/java/common/net/util/ResourceLeak.java diff --git a/common/src/common/net/util/ResourceLeakDetector.java b/common/src/main/java/common/net/util/ResourceLeakDetector.java similarity index 100% rename from common/src/common/net/util/ResourceLeakDetector.java rename to common/src/main/java/common/net/util/ResourceLeakDetector.java diff --git a/common/src/common/net/util/Signal.java b/common/src/main/java/common/net/util/Signal.java similarity index 100% rename from common/src/common/net/util/Signal.java rename to common/src/main/java/common/net/util/Signal.java diff --git a/common/src/common/net/util/ThreadDeathWatcher.java b/common/src/main/java/common/net/util/ThreadDeathWatcher.java similarity index 100% rename from common/src/common/net/util/ThreadDeathWatcher.java rename to common/src/main/java/common/net/util/ThreadDeathWatcher.java diff --git a/common/src/common/net/util/UniqueName.java b/common/src/main/java/common/net/util/UniqueName.java similarity index 100% rename from common/src/common/net/util/UniqueName.java rename to common/src/main/java/common/net/util/UniqueName.java diff --git a/common/src/common/net/util/concurrent/AbstractEventExecutor.java b/common/src/main/java/common/net/util/concurrent/AbstractEventExecutor.java similarity index 100% rename from common/src/common/net/util/concurrent/AbstractEventExecutor.java rename to common/src/main/java/common/net/util/concurrent/AbstractEventExecutor.java diff --git a/common/src/common/net/util/concurrent/AbstractEventExecutorGroup.java b/common/src/main/java/common/net/util/concurrent/AbstractEventExecutorGroup.java similarity index 100% rename from common/src/common/net/util/concurrent/AbstractEventExecutorGroup.java rename to common/src/main/java/common/net/util/concurrent/AbstractEventExecutorGroup.java diff --git a/common/src/common/net/util/concurrent/AbstractFuture.java b/common/src/main/java/common/net/util/concurrent/AbstractFuture.java similarity index 100% rename from common/src/common/net/util/concurrent/AbstractFuture.java rename to common/src/main/java/common/net/util/concurrent/AbstractFuture.java diff --git a/common/src/common/net/util/concurrent/BlockingOperationException.java b/common/src/main/java/common/net/util/concurrent/BlockingOperationException.java similarity index 100% rename from common/src/common/net/util/concurrent/BlockingOperationException.java rename to common/src/main/java/common/net/util/concurrent/BlockingOperationException.java diff --git a/common/src/common/net/util/concurrent/CompleteFuture.java b/common/src/main/java/common/net/util/concurrent/CompleteFuture.java similarity index 100% rename from common/src/common/net/util/concurrent/CompleteFuture.java rename to common/src/main/java/common/net/util/concurrent/CompleteFuture.java diff --git a/common/src/common/net/util/concurrent/DefaultEventExecutor.java b/common/src/main/java/common/net/util/concurrent/DefaultEventExecutor.java similarity index 100% rename from common/src/common/net/util/concurrent/DefaultEventExecutor.java rename to common/src/main/java/common/net/util/concurrent/DefaultEventExecutor.java diff --git a/common/src/common/net/util/concurrent/DefaultEventExecutorGroup.java b/common/src/main/java/common/net/util/concurrent/DefaultEventExecutorGroup.java similarity index 100% rename from common/src/common/net/util/concurrent/DefaultEventExecutorGroup.java rename to common/src/main/java/common/net/util/concurrent/DefaultEventExecutorGroup.java diff --git a/common/src/common/net/util/concurrent/DefaultFutureListeners.java b/common/src/main/java/common/net/util/concurrent/DefaultFutureListeners.java similarity index 100% rename from common/src/common/net/util/concurrent/DefaultFutureListeners.java rename to common/src/main/java/common/net/util/concurrent/DefaultFutureListeners.java diff --git a/common/src/common/net/util/concurrent/DefaultProgressivePromise.java b/common/src/main/java/common/net/util/concurrent/DefaultProgressivePromise.java similarity index 100% rename from common/src/common/net/util/concurrent/DefaultProgressivePromise.java rename to common/src/main/java/common/net/util/concurrent/DefaultProgressivePromise.java diff --git a/common/src/common/net/util/concurrent/DefaultPromise.java b/common/src/main/java/common/net/util/concurrent/DefaultPromise.java similarity index 100% rename from common/src/common/net/util/concurrent/DefaultPromise.java rename to common/src/main/java/common/net/util/concurrent/DefaultPromise.java diff --git a/common/src/common/net/util/concurrent/DefaultThreadFactory.java b/common/src/main/java/common/net/util/concurrent/DefaultThreadFactory.java similarity index 100% rename from common/src/common/net/util/concurrent/DefaultThreadFactory.java rename to common/src/main/java/common/net/util/concurrent/DefaultThreadFactory.java diff --git a/common/src/common/net/util/concurrent/EventExecutor.java b/common/src/main/java/common/net/util/concurrent/EventExecutor.java similarity index 100% rename from common/src/common/net/util/concurrent/EventExecutor.java rename to common/src/main/java/common/net/util/concurrent/EventExecutor.java diff --git a/common/src/common/net/util/concurrent/EventExecutorGroup.java b/common/src/main/java/common/net/util/concurrent/EventExecutorGroup.java similarity index 100% rename from common/src/common/net/util/concurrent/EventExecutorGroup.java rename to common/src/main/java/common/net/util/concurrent/EventExecutorGroup.java diff --git a/common/src/common/net/util/concurrent/FailedFuture.java b/common/src/main/java/common/net/util/concurrent/FailedFuture.java similarity index 100% rename from common/src/common/net/util/concurrent/FailedFuture.java rename to common/src/main/java/common/net/util/concurrent/FailedFuture.java diff --git a/common/src/common/net/util/concurrent/FastThreadLocal.java b/common/src/main/java/common/net/util/concurrent/FastThreadLocal.java similarity index 100% rename from common/src/common/net/util/concurrent/FastThreadLocal.java rename to common/src/main/java/common/net/util/concurrent/FastThreadLocal.java diff --git a/common/src/common/net/util/concurrent/FastThreadLocalThread.java b/common/src/main/java/common/net/util/concurrent/FastThreadLocalThread.java similarity index 100% rename from common/src/common/net/util/concurrent/FastThreadLocalThread.java rename to common/src/main/java/common/net/util/concurrent/FastThreadLocalThread.java diff --git a/common/src/common/net/util/concurrent/Future.java b/common/src/main/java/common/net/util/concurrent/Future.java similarity index 100% rename from common/src/common/net/util/concurrent/Future.java rename to common/src/main/java/common/net/util/concurrent/Future.java diff --git a/common/src/common/net/util/concurrent/FutureListener.java b/common/src/main/java/common/net/util/concurrent/FutureListener.java similarity index 100% rename from common/src/common/net/util/concurrent/FutureListener.java rename to common/src/main/java/common/net/util/concurrent/FutureListener.java diff --git a/common/src/common/net/util/concurrent/GenericFutureListener.java b/common/src/main/java/common/net/util/concurrent/GenericFutureListener.java similarity index 100% rename from common/src/common/net/util/concurrent/GenericFutureListener.java rename to common/src/main/java/common/net/util/concurrent/GenericFutureListener.java diff --git a/common/src/common/net/util/concurrent/GenericProgressiveFutureListener.java b/common/src/main/java/common/net/util/concurrent/GenericProgressiveFutureListener.java similarity index 100% rename from common/src/common/net/util/concurrent/GenericProgressiveFutureListener.java rename to common/src/main/java/common/net/util/concurrent/GenericProgressiveFutureListener.java diff --git a/common/src/common/net/util/concurrent/GlobalEventExecutor.java b/common/src/main/java/common/net/util/concurrent/GlobalEventExecutor.java similarity index 100% rename from common/src/common/net/util/concurrent/GlobalEventExecutor.java rename to common/src/main/java/common/net/util/concurrent/GlobalEventExecutor.java diff --git a/common/src/common/net/util/concurrent/ImmediateEventExecutor.java b/common/src/main/java/common/net/util/concurrent/ImmediateEventExecutor.java similarity index 100% rename from common/src/common/net/util/concurrent/ImmediateEventExecutor.java rename to common/src/main/java/common/net/util/concurrent/ImmediateEventExecutor.java diff --git a/common/src/common/net/util/concurrent/ImmediateExecutor.java b/common/src/main/java/common/net/util/concurrent/ImmediateExecutor.java similarity index 100% rename from common/src/common/net/util/concurrent/ImmediateExecutor.java rename to common/src/main/java/common/net/util/concurrent/ImmediateExecutor.java diff --git a/common/src/common/net/util/concurrent/MultithreadEventExecutorGroup.java b/common/src/main/java/common/net/util/concurrent/MultithreadEventExecutorGroup.java similarity index 100% rename from common/src/common/net/util/concurrent/MultithreadEventExecutorGroup.java rename to common/src/main/java/common/net/util/concurrent/MultithreadEventExecutorGroup.java diff --git a/common/src/common/net/util/concurrent/ProgressiveFuture.java b/common/src/main/java/common/net/util/concurrent/ProgressiveFuture.java similarity index 100% rename from common/src/common/net/util/concurrent/ProgressiveFuture.java rename to common/src/main/java/common/net/util/concurrent/ProgressiveFuture.java diff --git a/common/src/common/net/util/concurrent/ProgressivePromise.java b/common/src/main/java/common/net/util/concurrent/ProgressivePromise.java similarity index 100% rename from common/src/common/net/util/concurrent/ProgressivePromise.java rename to common/src/main/java/common/net/util/concurrent/ProgressivePromise.java diff --git a/common/src/common/net/util/concurrent/Promise.java b/common/src/main/java/common/net/util/concurrent/Promise.java similarity index 100% rename from common/src/common/net/util/concurrent/Promise.java rename to common/src/main/java/common/net/util/concurrent/Promise.java diff --git a/common/src/common/net/util/concurrent/PromiseTask.java b/common/src/main/java/common/net/util/concurrent/PromiseTask.java similarity index 100% rename from common/src/common/net/util/concurrent/PromiseTask.java rename to common/src/main/java/common/net/util/concurrent/PromiseTask.java diff --git a/common/src/common/net/util/concurrent/ScheduledFuture.java b/common/src/main/java/common/net/util/concurrent/ScheduledFuture.java similarity index 100% rename from common/src/common/net/util/concurrent/ScheduledFuture.java rename to common/src/main/java/common/net/util/concurrent/ScheduledFuture.java diff --git a/common/src/common/net/util/concurrent/ScheduledFutureTask.java b/common/src/main/java/common/net/util/concurrent/ScheduledFutureTask.java similarity index 100% rename from common/src/common/net/util/concurrent/ScheduledFutureTask.java rename to common/src/main/java/common/net/util/concurrent/ScheduledFutureTask.java diff --git a/common/src/common/net/util/concurrent/SingleThreadEventExecutor.java b/common/src/main/java/common/net/util/concurrent/SingleThreadEventExecutor.java similarity index 100% rename from common/src/common/net/util/concurrent/SingleThreadEventExecutor.java rename to common/src/main/java/common/net/util/concurrent/SingleThreadEventExecutor.java diff --git a/common/src/common/net/util/concurrent/SucceededFuture.java b/common/src/main/java/common/net/util/concurrent/SucceededFuture.java similarity index 100% rename from common/src/common/net/util/concurrent/SucceededFuture.java rename to common/src/main/java/common/net/util/concurrent/SucceededFuture.java diff --git a/common/src/common/net/util/internal/Cleaner0.java b/common/src/main/java/common/net/util/internal/Cleaner0.java similarity index 100% rename from common/src/common/net/util/internal/Cleaner0.java rename to common/src/main/java/common/net/util/internal/Cleaner0.java diff --git a/common/src/common/net/util/internal/EmptyArrays.java b/common/src/main/java/common/net/util/internal/EmptyArrays.java similarity index 100% rename from common/src/common/net/util/internal/EmptyArrays.java rename to common/src/main/java/common/net/util/internal/EmptyArrays.java diff --git a/common/src/common/net/util/internal/IntegerHolder.java b/common/src/main/java/common/net/util/internal/IntegerHolder.java similarity index 100% rename from common/src/common/net/util/internal/IntegerHolder.java rename to common/src/main/java/common/net/util/internal/IntegerHolder.java diff --git a/common/src/common/net/util/internal/InternalThreadLocalMap.java b/common/src/main/java/common/net/util/internal/InternalThreadLocalMap.java similarity index 100% rename from common/src/common/net/util/internal/InternalThreadLocalMap.java rename to common/src/main/java/common/net/util/internal/InternalThreadLocalMap.java diff --git a/common/src/common/net/util/internal/MpscLinkedQueue.java b/common/src/main/java/common/net/util/internal/MpscLinkedQueue.java similarity index 100% rename from common/src/common/net/util/internal/MpscLinkedQueue.java rename to common/src/main/java/common/net/util/internal/MpscLinkedQueue.java diff --git a/common/src/common/net/util/internal/MpscLinkedQueueHeadRef.java b/common/src/main/java/common/net/util/internal/MpscLinkedQueueHeadRef.java similarity index 100% rename from common/src/common/net/util/internal/MpscLinkedQueueHeadRef.java rename to common/src/main/java/common/net/util/internal/MpscLinkedQueueHeadRef.java diff --git a/common/src/common/net/util/internal/MpscLinkedQueueNode.java b/common/src/main/java/common/net/util/internal/MpscLinkedQueueNode.java similarity index 100% rename from common/src/common/net/util/internal/MpscLinkedQueueNode.java rename to common/src/main/java/common/net/util/internal/MpscLinkedQueueNode.java diff --git a/common/src/common/net/util/internal/MpscLinkedQueuePad0.java b/common/src/main/java/common/net/util/internal/MpscLinkedQueuePad0.java similarity index 100% rename from common/src/common/net/util/internal/MpscLinkedQueuePad0.java rename to common/src/main/java/common/net/util/internal/MpscLinkedQueuePad0.java diff --git a/common/src/common/net/util/internal/MpscLinkedQueuePad1.java b/common/src/main/java/common/net/util/internal/MpscLinkedQueuePad1.java similarity index 100% rename from common/src/common/net/util/internal/MpscLinkedQueuePad1.java rename to common/src/main/java/common/net/util/internal/MpscLinkedQueuePad1.java diff --git a/common/src/common/net/util/internal/MpscLinkedQueueTailRef.java b/common/src/main/java/common/net/util/internal/MpscLinkedQueueTailRef.java similarity index 100% rename from common/src/common/net/util/internal/MpscLinkedQueueTailRef.java rename to common/src/main/java/common/net/util/internal/MpscLinkedQueueTailRef.java diff --git a/common/src/common/net/util/internal/NoOpTypeParameterMatcher.java b/common/src/main/java/common/net/util/internal/NoOpTypeParameterMatcher.java similarity index 100% rename from common/src/common/net/util/internal/NoOpTypeParameterMatcher.java rename to common/src/main/java/common/net/util/internal/NoOpTypeParameterMatcher.java diff --git a/common/src/common/net/util/internal/OneTimeTask.java b/common/src/main/java/common/net/util/internal/OneTimeTask.java similarity index 100% rename from common/src/common/net/util/internal/OneTimeTask.java rename to common/src/main/java/common/net/util/internal/OneTimeTask.java diff --git a/common/src/common/net/util/internal/PlatformDependent.java b/common/src/main/java/common/net/util/internal/PlatformDependent.java similarity index 100% rename from common/src/common/net/util/internal/PlatformDependent.java rename to common/src/main/java/common/net/util/internal/PlatformDependent.java diff --git a/common/src/common/net/util/internal/PlatformDependent0.java b/common/src/main/java/common/net/util/internal/PlatformDependent0.java similarity index 100% rename from common/src/common/net/util/internal/PlatformDependent0.java rename to common/src/main/java/common/net/util/internal/PlatformDependent0.java diff --git a/common/src/common/net/util/internal/RecyclableArrayList.java b/common/src/main/java/common/net/util/internal/RecyclableArrayList.java similarity index 100% rename from common/src/common/net/util/internal/RecyclableArrayList.java rename to common/src/main/java/common/net/util/internal/RecyclableArrayList.java diff --git a/common/src/common/net/util/internal/RecyclableMpscLinkedQueueNode.java b/common/src/main/java/common/net/util/internal/RecyclableMpscLinkedQueueNode.java similarity index 100% rename from common/src/common/net/util/internal/RecyclableMpscLinkedQueueNode.java rename to common/src/main/java/common/net/util/internal/RecyclableMpscLinkedQueueNode.java diff --git a/common/src/common/net/util/internal/StringUtil.java b/common/src/main/java/common/net/util/internal/StringUtil.java similarity index 100% rename from common/src/common/net/util/internal/StringUtil.java rename to common/src/main/java/common/net/util/internal/StringUtil.java diff --git a/common/src/common/net/util/internal/SystemPropertyUtil.java b/common/src/main/java/common/net/util/internal/SystemPropertyUtil.java similarity index 100% rename from common/src/common/net/util/internal/SystemPropertyUtil.java rename to common/src/main/java/common/net/util/internal/SystemPropertyUtil.java diff --git a/common/src/common/net/util/internal/ThreadLocalRandom.java b/common/src/main/java/common/net/util/internal/ThreadLocalRandom.java similarity index 100% rename from common/src/common/net/util/internal/ThreadLocalRandom.java rename to common/src/main/java/common/net/util/internal/ThreadLocalRandom.java diff --git a/common/src/common/net/util/internal/TypeParameterMatcher.java b/common/src/main/java/common/net/util/internal/TypeParameterMatcher.java similarity index 100% rename from common/src/common/net/util/internal/TypeParameterMatcher.java rename to common/src/main/java/common/net/util/internal/TypeParameterMatcher.java diff --git a/common/src/common/net/util/internal/UnpaddedInternalThreadLocalMap.java b/common/src/main/java/common/net/util/internal/UnpaddedInternalThreadLocalMap.java similarity index 100% rename from common/src/common/net/util/internal/UnpaddedInternalThreadLocalMap.java rename to common/src/main/java/common/net/util/internal/UnpaddedInternalThreadLocalMap.java diff --git a/common/src/common/net/util/internal/UnsafeAtomicIntegerFieldUpdater.java b/common/src/main/java/common/net/util/internal/UnsafeAtomicIntegerFieldUpdater.java similarity index 100% rename from common/src/common/net/util/internal/UnsafeAtomicIntegerFieldUpdater.java rename to common/src/main/java/common/net/util/internal/UnsafeAtomicIntegerFieldUpdater.java diff --git a/common/src/common/net/util/internal/UnsafeAtomicLongFieldUpdater.java b/common/src/main/java/common/net/util/internal/UnsafeAtomicLongFieldUpdater.java similarity index 100% rename from common/src/common/net/util/internal/UnsafeAtomicLongFieldUpdater.java rename to common/src/main/java/common/net/util/internal/UnsafeAtomicLongFieldUpdater.java diff --git a/common/src/common/net/util/internal/UnsafeAtomicReferenceFieldUpdater.java b/common/src/main/java/common/net/util/internal/UnsafeAtomicReferenceFieldUpdater.java similarity index 100% rename from common/src/common/net/util/internal/UnsafeAtomicReferenceFieldUpdater.java rename to common/src/main/java/common/net/util/internal/UnsafeAtomicReferenceFieldUpdater.java diff --git a/common/src/common/net/util/internal/logging/AbstractInternalLogger.java b/common/src/main/java/common/net/util/internal/logging/AbstractInternalLogger.java similarity index 100% rename from common/src/common/net/util/internal/logging/AbstractInternalLogger.java rename to common/src/main/java/common/net/util/internal/logging/AbstractInternalLogger.java diff --git a/common/src/common/net/util/internal/logging/FormattingTuple.java b/common/src/main/java/common/net/util/internal/logging/FormattingTuple.java similarity index 100% rename from common/src/common/net/util/internal/logging/FormattingTuple.java rename to common/src/main/java/common/net/util/internal/logging/FormattingTuple.java diff --git a/common/src/common/net/util/internal/logging/InternalLogLevel.java b/common/src/main/java/common/net/util/internal/logging/InternalLogLevel.java similarity index 100% rename from common/src/common/net/util/internal/logging/InternalLogLevel.java rename to common/src/main/java/common/net/util/internal/logging/InternalLogLevel.java diff --git a/common/src/common/net/util/internal/logging/InternalLogger.java b/common/src/main/java/common/net/util/internal/logging/InternalLogger.java similarity index 100% rename from common/src/common/net/util/internal/logging/InternalLogger.java rename to common/src/main/java/common/net/util/internal/logging/InternalLogger.java diff --git a/common/src/common/net/util/internal/logging/InternalLoggerFactory.java b/common/src/main/java/common/net/util/internal/logging/InternalLoggerFactory.java similarity index 100% rename from common/src/common/net/util/internal/logging/InternalLoggerFactory.java rename to common/src/main/java/common/net/util/internal/logging/InternalLoggerFactory.java diff --git a/common/src/common/net/util/internal/logging/JdkLogger.java b/common/src/main/java/common/net/util/internal/logging/JdkLogger.java similarity index 100% rename from common/src/common/net/util/internal/logging/JdkLogger.java rename to common/src/main/java/common/net/util/internal/logging/JdkLogger.java diff --git a/common/src/common/net/util/internal/logging/JdkLoggerFactory.java b/common/src/main/java/common/net/util/internal/logging/JdkLoggerFactory.java similarity index 100% rename from common/src/common/net/util/internal/logging/JdkLoggerFactory.java rename to common/src/main/java/common/net/util/internal/logging/JdkLoggerFactory.java diff --git a/common/src/common/net/util/internal/logging/MessageFormatter.java b/common/src/main/java/common/net/util/internal/logging/MessageFormatter.java similarity index 100% rename from common/src/common/net/util/internal/logging/MessageFormatter.java rename to common/src/main/java/common/net/util/internal/logging/MessageFormatter.java diff --git a/common/src/common/network/CompressionDecoder.java b/common/src/main/java/common/network/CompressionDecoder.java similarity index 100% rename from common/src/common/network/CompressionDecoder.java rename to common/src/main/java/common/network/CompressionDecoder.java diff --git a/common/src/common/network/CompressionEncoder.java b/common/src/main/java/common/network/CompressionEncoder.java similarity index 100% rename from common/src/common/network/CompressionEncoder.java rename to common/src/main/java/common/network/CompressionEncoder.java diff --git a/common/src/common/network/EncryptionCodec.java b/common/src/main/java/common/network/EncryptionCodec.java similarity index 100% rename from common/src/common/network/EncryptionCodec.java rename to common/src/main/java/common/network/EncryptionCodec.java diff --git a/common/src/common/network/EncryptionDecoder.java b/common/src/main/java/common/network/EncryptionDecoder.java similarity index 100% rename from common/src/common/network/EncryptionDecoder.java rename to common/src/main/java/common/network/EncryptionDecoder.java diff --git a/common/src/common/network/EncryptionEncoder.java b/common/src/main/java/common/network/EncryptionEncoder.java similarity index 100% rename from common/src/common/network/EncryptionEncoder.java rename to common/src/main/java/common/network/EncryptionEncoder.java diff --git a/common/src/common/network/IClientLoginHandler.java b/common/src/main/java/common/network/IClientLoginHandler.java similarity index 100% rename from common/src/common/network/IClientLoginHandler.java rename to common/src/main/java/common/network/IClientLoginHandler.java diff --git a/common/src/common/network/IClientPlayer.java b/common/src/main/java/common/network/IClientPlayer.java similarity index 100% rename from common/src/common/network/IClientPlayer.java rename to common/src/main/java/common/network/IClientPlayer.java diff --git a/common/src/common/network/IHandshakeHandler.java b/common/src/main/java/common/network/IHandshakeHandler.java similarity index 100% rename from common/src/common/network/IHandshakeHandler.java rename to common/src/main/java/common/network/IHandshakeHandler.java diff --git a/common/src/common/network/ILoginHandler.java b/common/src/main/java/common/network/ILoginHandler.java similarity index 100% rename from common/src/common/network/ILoginHandler.java rename to common/src/main/java/common/network/ILoginHandler.java diff --git a/common/src/common/network/IPlayer.java b/common/src/main/java/common/network/IPlayer.java similarity index 100% rename from common/src/common/network/IPlayer.java rename to common/src/main/java/common/network/IPlayer.java diff --git a/common/src/common/network/IThreadListener.java b/common/src/main/java/common/network/IThreadListener.java similarity index 100% rename from common/src/common/network/IThreadListener.java rename to common/src/main/java/common/network/IThreadListener.java diff --git a/common/src/common/network/NetConnection.java b/common/src/main/java/common/network/NetConnection.java similarity index 100% rename from common/src/common/network/NetConnection.java rename to common/src/main/java/common/network/NetConnection.java diff --git a/common/src/common/network/NetHandler.java b/common/src/main/java/common/network/NetHandler.java similarity index 100% rename from common/src/common/network/NetHandler.java rename to common/src/main/java/common/network/NetHandler.java diff --git a/common/src/common/network/Packet.java b/common/src/main/java/common/network/Packet.java similarity index 100% rename from common/src/common/network/Packet.java rename to common/src/main/java/common/network/Packet.java diff --git a/common/src/common/network/PacketBuffer.java b/common/src/main/java/common/network/PacketBuffer.java similarity index 100% rename from common/src/common/network/PacketBuffer.java rename to common/src/main/java/common/network/PacketBuffer.java diff --git a/common/src/common/network/PacketDecoder.java b/common/src/main/java/common/network/PacketDecoder.java similarity index 100% rename from common/src/common/network/PacketDecoder.java rename to common/src/main/java/common/network/PacketDecoder.java diff --git a/common/src/common/network/PacketEncoder.java b/common/src/main/java/common/network/PacketEncoder.java similarity index 100% rename from common/src/common/network/PacketEncoder.java rename to common/src/main/java/common/network/PacketEncoder.java diff --git a/common/src/common/network/PacketPrepender.java b/common/src/main/java/common/network/PacketPrepender.java similarity index 100% rename from common/src/common/network/PacketPrepender.java rename to common/src/main/java/common/network/PacketPrepender.java diff --git a/common/src/common/network/PacketRegistry.java b/common/src/main/java/common/network/PacketRegistry.java similarity index 100% rename from common/src/common/network/PacketRegistry.java rename to common/src/main/java/common/network/PacketRegistry.java diff --git a/common/src/common/network/PacketSplitter.java b/common/src/main/java/common/network/PacketSplitter.java similarity index 100% rename from common/src/common/network/PacketSplitter.java rename to common/src/main/java/common/network/PacketSplitter.java diff --git a/common/src/common/packet/APacketVarInt.java b/common/src/main/java/common/packet/APacketVarInt.java similarity index 100% rename from common/src/common/packet/APacketVarInt.java rename to common/src/main/java/common/packet/APacketVarInt.java diff --git a/common/src/common/packet/CPacketAction.java b/common/src/main/java/common/packet/CPacketAction.java similarity index 100% rename from common/src/common/packet/CPacketAction.java rename to common/src/main/java/common/packet/CPacketAction.java diff --git a/common/src/common/packet/CPacketBreak.java b/common/src/main/java/common/packet/CPacketBreak.java similarity index 100% rename from common/src/common/packet/CPacketBreak.java rename to common/src/main/java/common/packet/CPacketBreak.java diff --git a/common/src/common/packet/CPacketCheat.java b/common/src/main/java/common/packet/CPacketCheat.java similarity index 100% rename from common/src/common/packet/CPacketCheat.java rename to common/src/main/java/common/packet/CPacketCheat.java diff --git a/common/src/common/packet/CPacketClick.java b/common/src/main/java/common/packet/CPacketClick.java similarity index 100% rename from common/src/common/packet/CPacketClick.java rename to common/src/main/java/common/packet/CPacketClick.java diff --git a/common/src/common/packet/CPacketComplete.java b/common/src/main/java/common/packet/CPacketComplete.java similarity index 100% rename from common/src/common/packet/CPacketComplete.java rename to common/src/main/java/common/packet/CPacketComplete.java diff --git a/common/src/common/packet/CPacketForm.java b/common/src/main/java/common/packet/CPacketForm.java similarity index 100% rename from common/src/common/packet/CPacketForm.java rename to common/src/main/java/common/packet/CPacketForm.java diff --git a/common/src/common/packet/CPacketInput.java b/common/src/main/java/common/packet/CPacketInput.java similarity index 100% rename from common/src/common/packet/CPacketInput.java rename to common/src/main/java/common/packet/CPacketInput.java diff --git a/common/src/common/packet/CPacketKeepAlive.java b/common/src/main/java/common/packet/CPacketKeepAlive.java similarity index 100% rename from common/src/common/packet/CPacketKeepAlive.java rename to common/src/main/java/common/packet/CPacketKeepAlive.java diff --git a/common/src/common/packet/CPacketMessage.java b/common/src/main/java/common/packet/CPacketMessage.java similarity index 100% rename from common/src/common/packet/CPacketMessage.java rename to common/src/main/java/common/packet/CPacketMessage.java diff --git a/common/src/common/packet/CPacketPlace.java b/common/src/main/java/common/packet/CPacketPlace.java similarity index 100% rename from common/src/common/packet/CPacketPlace.java rename to common/src/main/java/common/packet/CPacketPlace.java diff --git a/common/src/common/packet/CPacketPlayer.java b/common/src/main/java/common/packet/CPacketPlayer.java similarity index 100% rename from common/src/common/packet/CPacketPlayer.java rename to common/src/main/java/common/packet/CPacketPlayer.java diff --git a/common/src/common/packet/CPacketPlayerLook.java b/common/src/main/java/common/packet/CPacketPlayerLook.java similarity index 100% rename from common/src/common/packet/CPacketPlayerLook.java rename to common/src/main/java/common/packet/CPacketPlayerLook.java diff --git a/common/src/common/packet/CPacketPlayerPosLook.java b/common/src/main/java/common/packet/CPacketPlayerPosLook.java similarity index 100% rename from common/src/common/packet/CPacketPlayerPosLook.java rename to common/src/main/java/common/packet/CPacketPlayerPosLook.java diff --git a/common/src/common/packet/CPacketPlayerPosition.java b/common/src/main/java/common/packet/CPacketPlayerPosition.java similarity index 100% rename from common/src/common/packet/CPacketPlayerPosition.java rename to common/src/main/java/common/packet/CPacketPlayerPosition.java diff --git a/common/src/common/packet/CPacketSign.java b/common/src/main/java/common/packet/CPacketSign.java similarity index 100% rename from common/src/common/packet/CPacketSign.java rename to common/src/main/java/common/packet/CPacketSign.java diff --git a/common/src/common/packet/CPacketSkin.java b/common/src/main/java/common/packet/CPacketSkin.java similarity index 100% rename from common/src/common/packet/CPacketSkin.java rename to common/src/main/java/common/packet/CPacketSkin.java diff --git a/common/src/common/packet/HPacketHandshake.java b/common/src/main/java/common/packet/HPacketHandshake.java similarity index 100% rename from common/src/common/packet/HPacketHandshake.java rename to common/src/main/java/common/packet/HPacketHandshake.java diff --git a/common/src/common/packet/LPacketPasswordResponse.java b/common/src/main/java/common/packet/LPacketPasswordResponse.java similarity index 100% rename from common/src/common/packet/LPacketPasswordResponse.java rename to common/src/main/java/common/packet/LPacketPasswordResponse.java diff --git a/common/src/common/packet/LPacketStartEncrypt.java b/common/src/main/java/common/packet/LPacketStartEncrypt.java similarity index 100% rename from common/src/common/packet/LPacketStartEncrypt.java rename to common/src/main/java/common/packet/LPacketStartEncrypt.java diff --git a/common/src/common/packet/RPacketDisconnect.java b/common/src/main/java/common/packet/RPacketDisconnect.java similarity index 100% rename from common/src/common/packet/RPacketDisconnect.java rename to common/src/main/java/common/packet/RPacketDisconnect.java diff --git a/common/src/common/packet/RPacketEnableCompression.java b/common/src/main/java/common/packet/RPacketEnableCompression.java similarity index 100% rename from common/src/common/packet/RPacketEnableCompression.java rename to common/src/main/java/common/packet/RPacketEnableCompression.java diff --git a/common/src/common/packet/RPacketLoginSuccess.java b/common/src/main/java/common/packet/RPacketLoginSuccess.java similarity index 100% rename from common/src/common/packet/RPacketLoginSuccess.java rename to common/src/main/java/common/packet/RPacketLoginSuccess.java diff --git a/common/src/common/packet/RPacketRequestEncrypt.java b/common/src/main/java/common/packet/RPacketRequestEncrypt.java similarity index 100% rename from common/src/common/packet/RPacketRequestEncrypt.java rename to common/src/main/java/common/packet/RPacketRequestEncrypt.java diff --git a/common/src/common/packet/SPacketAnimation.java b/common/src/main/java/common/packet/SPacketAnimation.java similarity index 100% rename from common/src/common/packet/SPacketAnimation.java rename to common/src/main/java/common/packet/SPacketAnimation.java diff --git a/common/src/common/packet/SPacketBiome.java b/common/src/main/java/common/packet/SPacketBiome.java similarity index 100% rename from common/src/common/packet/SPacketBiome.java rename to common/src/main/java/common/packet/SPacketBiome.java diff --git a/common/src/common/packet/SPacketBlockAction.java b/common/src/main/java/common/packet/SPacketBlockAction.java similarity index 100% rename from common/src/common/packet/SPacketBlockAction.java rename to common/src/main/java/common/packet/SPacketBlockAction.java diff --git a/common/src/common/packet/SPacketBlockBreakAnim.java b/common/src/main/java/common/packet/SPacketBlockBreakAnim.java similarity index 100% rename from common/src/common/packet/SPacketBlockBreakAnim.java rename to common/src/main/java/common/packet/SPacketBlockBreakAnim.java diff --git a/common/src/common/packet/SPacketBlockChange.java b/common/src/main/java/common/packet/SPacketBlockChange.java similarity index 100% rename from common/src/common/packet/SPacketBlockChange.java rename to common/src/main/java/common/packet/SPacketBlockChange.java diff --git a/common/src/common/packet/SPacketCamera.java b/common/src/main/java/common/packet/SPacketCamera.java similarity index 100% rename from common/src/common/packet/SPacketCamera.java rename to common/src/main/java/common/packet/SPacketCamera.java diff --git a/common/src/common/packet/SPacketChangeGameState.java b/common/src/main/java/common/packet/SPacketChangeGameState.java similarity index 100% rename from common/src/common/packet/SPacketChangeGameState.java rename to common/src/main/java/common/packet/SPacketChangeGameState.java diff --git a/common/src/common/packet/SPacketCharacterList.java b/common/src/main/java/common/packet/SPacketCharacterList.java similarity index 100% rename from common/src/common/packet/SPacketCharacterList.java rename to common/src/main/java/common/packet/SPacketCharacterList.java diff --git a/common/src/common/packet/SPacketChunkData.java b/common/src/main/java/common/packet/SPacketChunkData.java similarity index 100% rename from common/src/common/packet/SPacketChunkData.java rename to common/src/main/java/common/packet/SPacketChunkData.java diff --git a/common/src/common/packet/SPacketCloseWindow.java b/common/src/main/java/common/packet/SPacketCloseWindow.java similarity index 100% rename from common/src/common/packet/SPacketCloseWindow.java rename to common/src/main/java/common/packet/SPacketCloseWindow.java diff --git a/common/src/common/packet/SPacketCollectItem.java b/common/src/main/java/common/packet/SPacketCollectItem.java similarity index 100% rename from common/src/common/packet/SPacketCollectItem.java rename to common/src/main/java/common/packet/SPacketCollectItem.java diff --git a/common/src/common/packet/SPacketConfirmTransaction.java b/common/src/main/java/common/packet/SPacketConfirmTransaction.java similarity index 100% rename from common/src/common/packet/SPacketConfirmTransaction.java rename to common/src/main/java/common/packet/SPacketConfirmTransaction.java diff --git a/common/src/common/packet/SPacketDestroyEntities.java b/common/src/main/java/common/packet/SPacketDestroyEntities.java similarity index 100% rename from common/src/common/packet/SPacketDestroyEntities.java rename to common/src/main/java/common/packet/SPacketDestroyEntities.java diff --git a/common/src/common/packet/SPacketDimensionName.java b/common/src/main/java/common/packet/SPacketDimensionName.java similarity index 100% rename from common/src/common/packet/SPacketDimensionName.java rename to common/src/main/java/common/packet/SPacketDimensionName.java diff --git a/common/src/common/packet/SPacketDisconnect.java b/common/src/main/java/common/packet/SPacketDisconnect.java similarity index 100% rename from common/src/common/packet/SPacketDisconnect.java rename to common/src/main/java/common/packet/SPacketDisconnect.java diff --git a/common/src/common/packet/SPacketDisplayForm.java b/common/src/main/java/common/packet/SPacketDisplayForm.java similarity index 100% rename from common/src/common/packet/SPacketDisplayForm.java rename to common/src/main/java/common/packet/SPacketDisplayForm.java diff --git a/common/src/common/packet/SPacketEffect.java b/common/src/main/java/common/packet/SPacketEffect.java similarity index 100% rename from common/src/common/packet/SPacketEffect.java rename to common/src/main/java/common/packet/SPacketEffect.java diff --git a/common/src/common/packet/SPacketEntity.java b/common/src/main/java/common/packet/SPacketEntity.java similarity index 100% rename from common/src/common/packet/SPacketEntity.java rename to common/src/main/java/common/packet/SPacketEntity.java diff --git a/common/src/common/packet/SPacketEntityAttach.java b/common/src/main/java/common/packet/SPacketEntityAttach.java similarity index 100% rename from common/src/common/packet/SPacketEntityAttach.java rename to common/src/main/java/common/packet/SPacketEntityAttach.java diff --git a/common/src/common/packet/SPacketEntityEffect.java b/common/src/main/java/common/packet/SPacketEntityEffect.java similarity index 100% rename from common/src/common/packet/SPacketEntityEffect.java rename to common/src/main/java/common/packet/SPacketEntityEffect.java diff --git a/common/src/common/packet/SPacketEntityEquipment.java b/common/src/main/java/common/packet/SPacketEntityEquipment.java similarity index 100% rename from common/src/common/packet/SPacketEntityEquipment.java rename to common/src/main/java/common/packet/SPacketEntityEquipment.java diff --git a/common/src/common/packet/SPacketEntityHeadLook.java b/common/src/main/java/common/packet/SPacketEntityHeadLook.java similarity index 100% rename from common/src/common/packet/SPacketEntityHeadLook.java rename to common/src/main/java/common/packet/SPacketEntityHeadLook.java diff --git a/common/src/common/packet/SPacketEntityLook.java b/common/src/main/java/common/packet/SPacketEntityLook.java similarity index 100% rename from common/src/common/packet/SPacketEntityLook.java rename to common/src/main/java/common/packet/SPacketEntityLook.java diff --git a/common/src/common/packet/SPacketEntityLookMove.java b/common/src/main/java/common/packet/SPacketEntityLookMove.java similarity index 100% rename from common/src/common/packet/SPacketEntityLookMove.java rename to common/src/main/java/common/packet/SPacketEntityLookMove.java diff --git a/common/src/common/packet/SPacketEntityMetadata.java b/common/src/main/java/common/packet/SPacketEntityMetadata.java similarity index 100% rename from common/src/common/packet/SPacketEntityMetadata.java rename to common/src/main/java/common/packet/SPacketEntityMetadata.java diff --git a/common/src/common/packet/SPacketEntityProperties.java b/common/src/main/java/common/packet/SPacketEntityProperties.java similarity index 100% rename from common/src/common/packet/SPacketEntityProperties.java rename to common/src/main/java/common/packet/SPacketEntityProperties.java diff --git a/common/src/common/packet/SPacketEntityRelMove.java b/common/src/main/java/common/packet/SPacketEntityRelMove.java similarity index 100% rename from common/src/common/packet/SPacketEntityRelMove.java rename to common/src/main/java/common/packet/SPacketEntityRelMove.java diff --git a/common/src/common/packet/SPacketEntityStatus.java b/common/src/main/java/common/packet/SPacketEntityStatus.java similarity index 100% rename from common/src/common/packet/SPacketEntityStatus.java rename to common/src/main/java/common/packet/SPacketEntityStatus.java diff --git a/common/src/common/packet/SPacketEntityTeleport.java b/common/src/main/java/common/packet/SPacketEntityTeleport.java similarity index 100% rename from common/src/common/packet/SPacketEntityTeleport.java rename to common/src/main/java/common/packet/SPacketEntityTeleport.java diff --git a/common/src/common/packet/SPacketEntityVelocity.java b/common/src/main/java/common/packet/SPacketEntityVelocity.java similarity index 100% rename from common/src/common/packet/SPacketEntityVelocity.java rename to common/src/main/java/common/packet/SPacketEntityVelocity.java diff --git a/common/src/common/packet/SPacketExplosion.java b/common/src/main/java/common/packet/SPacketExplosion.java similarity index 100% rename from common/src/common/packet/SPacketExplosion.java rename to common/src/main/java/common/packet/SPacketExplosion.java diff --git a/common/src/common/packet/SPacketHeldItemChange.java b/common/src/main/java/common/packet/SPacketHeldItemChange.java similarity index 100% rename from common/src/common/packet/SPacketHeldItemChange.java rename to common/src/main/java/common/packet/SPacketHeldItemChange.java diff --git a/common/src/common/packet/SPacketJoinGame.java b/common/src/main/java/common/packet/SPacketJoinGame.java similarity index 100% rename from common/src/common/packet/SPacketJoinGame.java rename to common/src/main/java/common/packet/SPacketJoinGame.java diff --git a/common/src/common/packet/SPacketKeepAlive.java b/common/src/main/java/common/packet/SPacketKeepAlive.java similarity index 100% rename from common/src/common/packet/SPacketKeepAlive.java rename to common/src/main/java/common/packet/SPacketKeepAlive.java diff --git a/common/src/common/packet/SPacketLoading.java b/common/src/main/java/common/packet/SPacketLoading.java similarity index 100% rename from common/src/common/packet/SPacketLoading.java rename to common/src/main/java/common/packet/SPacketLoading.java diff --git a/common/src/common/packet/SPacketMapChunkBulk.java b/common/src/main/java/common/packet/SPacketMapChunkBulk.java similarity index 100% rename from common/src/common/packet/SPacketMapChunkBulk.java rename to common/src/main/java/common/packet/SPacketMapChunkBulk.java diff --git a/common/src/common/packet/SPacketMessage.java b/common/src/main/java/common/packet/SPacketMessage.java similarity index 100% rename from common/src/common/packet/SPacketMessage.java rename to common/src/main/java/common/packet/SPacketMessage.java diff --git a/common/src/common/packet/SPacketMultiBlockChange.java b/common/src/main/java/common/packet/SPacketMultiBlockChange.java similarity index 100% rename from common/src/common/packet/SPacketMultiBlockChange.java rename to common/src/main/java/common/packet/SPacketMultiBlockChange.java diff --git a/common/src/common/packet/SPacketOpenWindow.java b/common/src/main/java/common/packet/SPacketOpenWindow.java similarity index 100% rename from common/src/common/packet/SPacketOpenWindow.java rename to common/src/main/java/common/packet/SPacketOpenWindow.java diff --git a/common/src/common/packet/SPacketParticles.java b/common/src/main/java/common/packet/SPacketParticles.java similarity index 100% rename from common/src/common/packet/SPacketParticles.java rename to common/src/main/java/common/packet/SPacketParticles.java diff --git a/common/src/common/packet/SPacketPlayerAbilities.java b/common/src/main/java/common/packet/SPacketPlayerAbilities.java similarity index 100% rename from common/src/common/packet/SPacketPlayerAbilities.java rename to common/src/main/java/common/packet/SPacketPlayerAbilities.java diff --git a/common/src/common/packet/SPacketPlayerListItem.java b/common/src/main/java/common/packet/SPacketPlayerListItem.java similarity index 100% rename from common/src/common/packet/SPacketPlayerListItem.java rename to common/src/main/java/common/packet/SPacketPlayerListItem.java diff --git a/common/src/common/packet/SPacketPlayerPosLook.java b/common/src/main/java/common/packet/SPacketPlayerPosLook.java similarity index 100% rename from common/src/common/packet/SPacketPlayerPosLook.java rename to common/src/main/java/common/packet/SPacketPlayerPosLook.java diff --git a/common/src/common/packet/SPacketRemoveEntityEffect.java b/common/src/main/java/common/packet/SPacketRemoveEntityEffect.java similarity index 100% rename from common/src/common/packet/SPacketRemoveEntityEffect.java rename to common/src/main/java/common/packet/SPacketRemoveEntityEffect.java diff --git a/common/src/common/packet/SPacketRespawn.java b/common/src/main/java/common/packet/SPacketRespawn.java similarity index 100% rename from common/src/common/packet/SPacketRespawn.java rename to common/src/main/java/common/packet/SPacketRespawn.java diff --git a/common/src/common/packet/SPacketServerTick.java b/common/src/main/java/common/packet/SPacketServerTick.java similarity index 100% rename from common/src/common/packet/SPacketServerTick.java rename to common/src/main/java/common/packet/SPacketServerTick.java diff --git a/common/src/common/packet/SPacketSetExperience.java b/common/src/main/java/common/packet/SPacketSetExperience.java similarity index 100% rename from common/src/common/packet/SPacketSetExperience.java rename to common/src/main/java/common/packet/SPacketSetExperience.java diff --git a/common/src/common/packet/SPacketSetSlot.java b/common/src/main/java/common/packet/SPacketSetSlot.java similarity index 100% rename from common/src/common/packet/SPacketSetSlot.java rename to common/src/main/java/common/packet/SPacketSetSlot.java diff --git a/common/src/common/packet/SPacketSignEditorOpen.java b/common/src/main/java/common/packet/SPacketSignEditorOpen.java similarity index 100% rename from common/src/common/packet/SPacketSignEditorOpen.java rename to common/src/main/java/common/packet/SPacketSignEditorOpen.java diff --git a/common/src/common/packet/SPacketSkin.java b/common/src/main/java/common/packet/SPacketSkin.java similarity index 100% rename from common/src/common/packet/SPacketSkin.java rename to common/src/main/java/common/packet/SPacketSkin.java diff --git a/common/src/common/packet/SPacketSoundEffect.java b/common/src/main/java/common/packet/SPacketSoundEffect.java similarity index 100% rename from common/src/common/packet/SPacketSoundEffect.java rename to common/src/main/java/common/packet/SPacketSoundEffect.java diff --git a/common/src/common/packet/SPacketSpawnGlobalEntity.java b/common/src/main/java/common/packet/SPacketSpawnGlobalEntity.java similarity index 100% rename from common/src/common/packet/SPacketSpawnGlobalEntity.java rename to common/src/main/java/common/packet/SPacketSpawnGlobalEntity.java diff --git a/common/src/common/packet/SPacketSpawnMob.java b/common/src/main/java/common/packet/SPacketSpawnMob.java similarity index 100% rename from common/src/common/packet/SPacketSpawnMob.java rename to common/src/main/java/common/packet/SPacketSpawnMob.java diff --git a/common/src/common/packet/SPacketSpawnObject.java b/common/src/main/java/common/packet/SPacketSpawnObject.java similarity index 100% rename from common/src/common/packet/SPacketSpawnObject.java rename to common/src/main/java/common/packet/SPacketSpawnObject.java diff --git a/common/src/common/packet/SPacketSpawnPlayer.java b/common/src/main/java/common/packet/SPacketSpawnPlayer.java similarity index 100% rename from common/src/common/packet/SPacketSpawnPlayer.java rename to common/src/main/java/common/packet/SPacketSpawnPlayer.java diff --git a/common/src/common/packet/SPacketTabComplete.java b/common/src/main/java/common/packet/SPacketTabComplete.java similarity index 100% rename from common/src/common/packet/SPacketTabComplete.java rename to common/src/main/java/common/packet/SPacketTabComplete.java diff --git a/common/src/common/packet/SPacketTimeUpdate.java b/common/src/main/java/common/packet/SPacketTimeUpdate.java similarity index 100% rename from common/src/common/packet/SPacketTimeUpdate.java rename to common/src/main/java/common/packet/SPacketTimeUpdate.java diff --git a/common/src/common/packet/SPacketTrades.java b/common/src/main/java/common/packet/SPacketTrades.java similarity index 100% rename from common/src/common/packet/SPacketTrades.java rename to common/src/main/java/common/packet/SPacketTrades.java diff --git a/common/src/common/packet/SPacketUpdateEntityNBT.java b/common/src/main/java/common/packet/SPacketUpdateEntityNBT.java similarity index 100% rename from common/src/common/packet/SPacketUpdateEntityNBT.java rename to common/src/main/java/common/packet/SPacketUpdateEntityNBT.java diff --git a/common/src/common/packet/SPacketUpdateHealth.java b/common/src/main/java/common/packet/SPacketUpdateHealth.java similarity index 100% rename from common/src/common/packet/SPacketUpdateHealth.java rename to common/src/main/java/common/packet/SPacketUpdateHealth.java diff --git a/common/src/common/packet/SPacketUpdateSign.java b/common/src/main/java/common/packet/SPacketUpdateSign.java similarity index 100% rename from common/src/common/packet/SPacketUpdateSign.java rename to common/src/main/java/common/packet/SPacketUpdateSign.java diff --git a/common/src/common/packet/SPacketUpdateTileEntity.java b/common/src/main/java/common/packet/SPacketUpdateTileEntity.java similarity index 100% rename from common/src/common/packet/SPacketUpdateTileEntity.java rename to common/src/main/java/common/packet/SPacketUpdateTileEntity.java diff --git a/common/src/common/packet/SPacketWindowItems.java b/common/src/main/java/common/packet/SPacketWindowItems.java similarity index 100% rename from common/src/common/packet/SPacketWindowItems.java rename to common/src/main/java/common/packet/SPacketWindowItems.java diff --git a/common/src/common/packet/SPacketWindowProperty.java b/common/src/main/java/common/packet/SPacketWindowProperty.java similarity index 100% rename from common/src/common/packet/SPacketWindowProperty.java rename to common/src/main/java/common/packet/SPacketWindowProperty.java diff --git a/common/src/common/packet/SPacketWorld.java b/common/src/main/java/common/packet/SPacketWorld.java similarity index 100% rename from common/src/common/packet/SPacketWorld.java rename to common/src/main/java/common/packet/SPacketWorld.java diff --git a/common/src/common/pathfinding/NodeProcessor.java b/common/src/main/java/common/pathfinding/NodeProcessor.java similarity index 100% rename from common/src/common/pathfinding/NodeProcessor.java rename to common/src/main/java/common/pathfinding/NodeProcessor.java diff --git a/common/src/common/pathfinding/Path.java b/common/src/main/java/common/pathfinding/Path.java similarity index 100% rename from common/src/common/pathfinding/Path.java rename to common/src/main/java/common/pathfinding/Path.java diff --git a/common/src/common/pathfinding/PathCache.java b/common/src/main/java/common/pathfinding/PathCache.java similarity index 100% rename from common/src/common/pathfinding/PathCache.java rename to common/src/main/java/common/pathfinding/PathCache.java diff --git a/common/src/common/pathfinding/PathEntity.java b/common/src/main/java/common/pathfinding/PathEntity.java similarity index 100% rename from common/src/common/pathfinding/PathEntity.java rename to common/src/main/java/common/pathfinding/PathEntity.java diff --git a/common/src/common/pathfinding/PathFinder.java b/common/src/main/java/common/pathfinding/PathFinder.java similarity index 100% rename from common/src/common/pathfinding/PathFinder.java rename to common/src/main/java/common/pathfinding/PathFinder.java diff --git a/common/src/common/pathfinding/PathNavigate.java b/common/src/main/java/common/pathfinding/PathNavigate.java similarity index 100% rename from common/src/common/pathfinding/PathNavigate.java rename to common/src/main/java/common/pathfinding/PathNavigate.java diff --git a/common/src/common/pathfinding/PathNavigateClimber.java b/common/src/main/java/common/pathfinding/PathNavigateClimber.java similarity index 100% rename from common/src/common/pathfinding/PathNavigateClimber.java rename to common/src/main/java/common/pathfinding/PathNavigateClimber.java diff --git a/common/src/common/pathfinding/PathNavigateGround.java b/common/src/main/java/common/pathfinding/PathNavigateGround.java similarity index 100% rename from common/src/common/pathfinding/PathNavigateGround.java rename to common/src/main/java/common/pathfinding/PathNavigateGround.java diff --git a/common/src/common/pathfinding/PathPoint.java b/common/src/main/java/common/pathfinding/PathPoint.java similarity index 100% rename from common/src/common/pathfinding/PathPoint.java rename to common/src/main/java/common/pathfinding/PathPoint.java diff --git a/common/src/common/pathfinding/SwimNodeProcessor.java b/common/src/main/java/common/pathfinding/SwimNodeProcessor.java similarity index 100% rename from common/src/common/pathfinding/SwimNodeProcessor.java rename to common/src/main/java/common/pathfinding/SwimNodeProcessor.java diff --git a/common/src/common/pathfinding/WalkNodeProcessor.java b/common/src/main/java/common/pathfinding/WalkNodeProcessor.java similarity index 100% rename from common/src/common/pathfinding/WalkNodeProcessor.java rename to common/src/main/java/common/pathfinding/WalkNodeProcessor.java diff --git a/common/src/common/potion/Potion.java b/common/src/main/java/common/potion/Potion.java similarity index 100% rename from common/src/common/potion/Potion.java rename to common/src/main/java/common/potion/Potion.java diff --git a/common/src/common/potion/PotionEffect.java b/common/src/main/java/common/potion/PotionEffect.java similarity index 100% rename from common/src/common/potion/PotionEffect.java rename to common/src/main/java/common/potion/PotionEffect.java diff --git a/common/src/common/potion/PotionHelper.java b/common/src/main/java/common/potion/PotionHelper.java similarity index 100% rename from common/src/common/potion/PotionHelper.java rename to common/src/main/java/common/potion/PotionHelper.java diff --git a/common/src/common/properties/IProperty.java b/common/src/main/java/common/properties/IProperty.java similarity index 100% rename from common/src/common/properties/IProperty.java rename to common/src/main/java/common/properties/IProperty.java diff --git a/common/src/common/properties/PropertyBool.java b/common/src/main/java/common/properties/PropertyBool.java similarity index 100% rename from common/src/common/properties/PropertyBool.java rename to common/src/main/java/common/properties/PropertyBool.java diff --git a/common/src/common/properties/PropertyDirection.java b/common/src/main/java/common/properties/PropertyDirection.java similarity index 100% rename from common/src/common/properties/PropertyDirection.java rename to common/src/main/java/common/properties/PropertyDirection.java diff --git a/common/src/common/properties/PropertyEnum.java b/common/src/main/java/common/properties/PropertyEnum.java similarity index 100% rename from common/src/common/properties/PropertyEnum.java rename to common/src/main/java/common/properties/PropertyEnum.java diff --git a/common/src/common/properties/PropertyHelper.java b/common/src/main/java/common/properties/PropertyHelper.java similarity index 100% rename from common/src/common/properties/PropertyHelper.java rename to common/src/main/java/common/properties/PropertyHelper.java diff --git a/common/src/common/properties/PropertyInteger.java b/common/src/main/java/common/properties/PropertyInteger.java similarity index 100% rename from common/src/common/properties/PropertyInteger.java rename to common/src/main/java/common/properties/PropertyInteger.java diff --git a/common/src/common/rng/ImprovedGen.java b/common/src/main/java/common/rng/ImprovedGen.java similarity index 100% rename from common/src/common/rng/ImprovedGen.java rename to common/src/main/java/common/rng/ImprovedGen.java diff --git a/common/src/common/rng/ImprovedGenOld.java b/common/src/main/java/common/rng/ImprovedGenOld.java similarity index 100% rename from common/src/common/rng/ImprovedGenOld.java rename to common/src/main/java/common/rng/ImprovedGenOld.java diff --git a/common/src/common/rng/NoiseGen.java b/common/src/main/java/common/rng/NoiseGen.java similarity index 100% rename from common/src/common/rng/NoiseGen.java rename to common/src/main/java/common/rng/NoiseGen.java diff --git a/common/src/common/rng/OctaveGen.java b/common/src/main/java/common/rng/OctaveGen.java similarity index 100% rename from common/src/common/rng/OctaveGen.java rename to common/src/main/java/common/rng/OctaveGen.java diff --git a/common/src/common/rng/OctaveGenOld.java b/common/src/main/java/common/rng/OctaveGenOld.java similarity index 100% rename from common/src/common/rng/OctaveGenOld.java rename to common/src/main/java/common/rng/OctaveGenOld.java diff --git a/common/src/common/rng/PerlinGen.java b/common/src/main/java/common/rng/PerlinGen.java similarity index 100% rename from common/src/common/rng/PerlinGen.java rename to common/src/main/java/common/rng/PerlinGen.java diff --git a/common/src/common/rng/PerlinGenOld.java b/common/src/main/java/common/rng/PerlinGenOld.java similarity index 100% rename from common/src/common/rng/PerlinGenOld.java rename to common/src/main/java/common/rng/PerlinGenOld.java diff --git a/common/src/common/rng/Random.java b/common/src/main/java/common/rng/Random.java similarity index 100% rename from common/src/common/rng/Random.java rename to common/src/main/java/common/rng/Random.java diff --git a/common/src/common/rng/RngItem.java b/common/src/main/java/common/rng/RngItem.java similarity index 100% rename from common/src/common/rng/RngItem.java rename to common/src/main/java/common/rng/RngItem.java diff --git a/common/src/common/rng/SimplexGen.java b/common/src/main/java/common/rng/SimplexGen.java similarity index 100% rename from common/src/common/rng/SimplexGen.java rename to common/src/main/java/common/rng/SimplexGen.java diff --git a/common/src/common/rng/SimplexGenOld.java b/common/src/main/java/common/rng/SimplexGenOld.java similarity index 100% rename from common/src/common/rng/SimplexGenOld.java rename to common/src/main/java/common/rng/SimplexGenOld.java diff --git a/common/src/common/rng/WeightedList.java b/common/src/main/java/common/rng/WeightedList.java similarity index 100% rename from common/src/common/rng/WeightedList.java rename to common/src/main/java/common/rng/WeightedList.java diff --git a/common/src/common/sound/EventType.java b/common/src/main/java/common/sound/EventType.java similarity index 100% rename from common/src/common/sound/EventType.java rename to common/src/main/java/common/sound/EventType.java diff --git a/common/src/common/sound/MovingSound.java b/common/src/main/java/common/sound/MovingSound.java similarity index 100% rename from common/src/common/sound/MovingSound.java rename to common/src/main/java/common/sound/MovingSound.java diff --git a/common/src/common/sound/MovingSoundMinecart.java b/common/src/main/java/common/sound/MovingSoundMinecart.java similarity index 100% rename from common/src/common/sound/MovingSoundMinecart.java rename to common/src/main/java/common/sound/MovingSoundMinecart.java diff --git a/common/src/common/sound/MovingSoundMinecartRiding.java b/common/src/main/java/common/sound/MovingSoundMinecartRiding.java similarity index 100% rename from common/src/common/sound/MovingSoundMinecartRiding.java rename to common/src/main/java/common/sound/MovingSoundMinecartRiding.java diff --git a/common/src/common/sound/PositionedSound.java b/common/src/main/java/common/sound/PositionedSound.java similarity index 100% rename from common/src/common/sound/PositionedSound.java rename to common/src/main/java/common/sound/PositionedSound.java diff --git a/common/src/common/sound/Sound.java b/common/src/main/java/common/sound/Sound.java similarity index 100% rename from common/src/common/sound/Sound.java rename to common/src/main/java/common/sound/Sound.java diff --git a/common/src/common/tileentity/IHopper.java b/common/src/main/java/common/tileentity/IHopper.java similarity index 100% rename from common/src/common/tileentity/IHopper.java rename to common/src/main/java/common/tileentity/IHopper.java diff --git a/common/src/common/tileentity/IInteractionObject.java b/common/src/main/java/common/tileentity/IInteractionObject.java similarity index 100% rename from common/src/common/tileentity/IInteractionObject.java rename to common/src/main/java/common/tileentity/IInteractionObject.java diff --git a/common/src/common/tileentity/ILockableContainer.java b/common/src/main/java/common/tileentity/ILockableContainer.java similarity index 100% rename from common/src/common/tileentity/ILockableContainer.java rename to common/src/main/java/common/tileentity/ILockableContainer.java diff --git a/common/src/common/tileentity/ITickable.java b/common/src/main/java/common/tileentity/ITickable.java similarity index 100% rename from common/src/common/tileentity/ITickable.java rename to common/src/main/java/common/tileentity/ITickable.java diff --git a/common/src/common/tileentity/IWorldNameable.java b/common/src/main/java/common/tileentity/IWorldNameable.java similarity index 100% rename from common/src/common/tileentity/IWorldNameable.java rename to common/src/main/java/common/tileentity/IWorldNameable.java diff --git a/common/src/common/tileentity/LocalBlockIntercommunication.java b/common/src/main/java/common/tileentity/LocalBlockIntercommunication.java similarity index 100% rename from common/src/common/tileentity/LocalBlockIntercommunication.java rename to common/src/main/java/common/tileentity/LocalBlockIntercommunication.java diff --git a/common/src/common/tileentity/LockCode.java b/common/src/main/java/common/tileentity/LockCode.java similarity index 100% rename from common/src/common/tileentity/LockCode.java rename to common/src/main/java/common/tileentity/LockCode.java diff --git a/common/src/common/tileentity/MachineResource.java b/common/src/main/java/common/tileentity/MachineResource.java similarity index 100% rename from common/src/common/tileentity/MachineResource.java rename to common/src/main/java/common/tileentity/MachineResource.java diff --git a/common/src/common/tileentity/TileEntity.java b/common/src/main/java/common/tileentity/TileEntity.java similarity index 100% rename from common/src/common/tileentity/TileEntity.java rename to common/src/main/java/common/tileentity/TileEntity.java diff --git a/common/src/common/tileentity/TileEntityBanner.java b/common/src/main/java/common/tileentity/TileEntityBanner.java similarity index 100% rename from common/src/common/tileentity/TileEntityBanner.java rename to common/src/main/java/common/tileentity/TileEntityBanner.java diff --git a/common/src/common/tileentity/TileEntityBeacon.java b/common/src/main/java/common/tileentity/TileEntityBeacon.java similarity index 100% rename from common/src/common/tileentity/TileEntityBeacon.java rename to common/src/main/java/common/tileentity/TileEntityBeacon.java diff --git a/common/src/common/tileentity/TileEntityBrewingStand.java b/common/src/main/java/common/tileentity/TileEntityBrewingStand.java similarity index 100% rename from common/src/common/tileentity/TileEntityBrewingStand.java rename to common/src/main/java/common/tileentity/TileEntityBrewingStand.java diff --git a/common/src/common/tileentity/TileEntityChest.java b/common/src/main/java/common/tileentity/TileEntityChest.java similarity index 100% rename from common/src/common/tileentity/TileEntityChest.java rename to common/src/main/java/common/tileentity/TileEntityChest.java diff --git a/common/src/common/tileentity/TileEntityComparator.java b/common/src/main/java/common/tileentity/TileEntityComparator.java similarity index 100% rename from common/src/common/tileentity/TileEntityComparator.java rename to common/src/main/java/common/tileentity/TileEntityComparator.java diff --git a/common/src/common/tileentity/TileEntityDaylightDetector.java b/common/src/main/java/common/tileentity/TileEntityDaylightDetector.java similarity index 100% rename from common/src/common/tileentity/TileEntityDaylightDetector.java rename to common/src/main/java/common/tileentity/TileEntityDaylightDetector.java diff --git a/common/src/common/tileentity/TileEntityDispenser.java b/common/src/main/java/common/tileentity/TileEntityDispenser.java similarity index 100% rename from common/src/common/tileentity/TileEntityDispenser.java rename to common/src/main/java/common/tileentity/TileEntityDispenser.java diff --git a/common/src/common/tileentity/TileEntityDropper.java b/common/src/main/java/common/tileentity/TileEntityDropper.java similarity index 100% rename from common/src/common/tileentity/TileEntityDropper.java rename to common/src/main/java/common/tileentity/TileEntityDropper.java diff --git a/common/src/common/tileentity/TileEntityEnchantmentTable.java b/common/src/main/java/common/tileentity/TileEntityEnchantmentTable.java similarity index 100% rename from common/src/common/tileentity/TileEntityEnchantmentTable.java rename to common/src/main/java/common/tileentity/TileEntityEnchantmentTable.java diff --git a/common/src/common/tileentity/TileEntityFurnace.java b/common/src/main/java/common/tileentity/TileEntityFurnace.java similarity index 100% rename from common/src/common/tileentity/TileEntityFurnace.java rename to common/src/main/java/common/tileentity/TileEntityFurnace.java diff --git a/common/src/common/tileentity/TileEntityHopper.java b/common/src/main/java/common/tileentity/TileEntityHopper.java similarity index 100% rename from common/src/common/tileentity/TileEntityHopper.java rename to common/src/main/java/common/tileentity/TileEntityHopper.java diff --git a/common/src/common/tileentity/TileEntityLockable.java b/common/src/main/java/common/tileentity/TileEntityLockable.java similarity index 100% rename from common/src/common/tileentity/TileEntityLockable.java rename to common/src/main/java/common/tileentity/TileEntityLockable.java diff --git a/common/src/common/tileentity/TileEntityMachine.java b/common/src/main/java/common/tileentity/TileEntityMachine.java similarity index 100% rename from common/src/common/tileentity/TileEntityMachine.java rename to common/src/main/java/common/tileentity/TileEntityMachine.java diff --git a/common/src/common/tileentity/TileEntityMobSpawner.java b/common/src/main/java/common/tileentity/TileEntityMobSpawner.java similarity index 100% rename from common/src/common/tileentity/TileEntityMobSpawner.java rename to common/src/main/java/common/tileentity/TileEntityMobSpawner.java diff --git a/common/src/common/tileentity/TileEntityNote.java b/common/src/main/java/common/tileentity/TileEntityNote.java similarity index 100% rename from common/src/common/tileentity/TileEntityNote.java rename to common/src/main/java/common/tileentity/TileEntityNote.java diff --git a/common/src/common/tileentity/TileEntityPiston.java b/common/src/main/java/common/tileentity/TileEntityPiston.java similarity index 100% rename from common/src/common/tileentity/TileEntityPiston.java rename to common/src/main/java/common/tileentity/TileEntityPiston.java diff --git a/common/src/common/tileentity/TileEntitySign.java b/common/src/main/java/common/tileentity/TileEntitySign.java similarity index 100% rename from common/src/common/tileentity/TileEntitySign.java rename to common/src/main/java/common/tileentity/TileEntitySign.java diff --git a/common/src/common/tileentity/TileEntitySkull.java b/common/src/main/java/common/tileentity/TileEntitySkull.java similarity index 100% rename from common/src/common/tileentity/TileEntitySkull.java rename to common/src/main/java/common/tileentity/TileEntitySkull.java diff --git a/common/src/common/tileentity/TileEntityTianReactor.java b/common/src/main/java/common/tileentity/TileEntityTianReactor.java similarity index 100% rename from common/src/common/tileentity/TileEntityTianReactor.java rename to common/src/main/java/common/tileentity/TileEntityTianReactor.java diff --git a/common/src/common/util/BlockPos.java b/common/src/main/java/common/util/BlockPos.java similarity index 100% rename from common/src/common/util/BlockPos.java rename to common/src/main/java/common/util/BlockPos.java diff --git a/common/src/common/util/BoundingBox.java b/common/src/main/java/common/util/BoundingBox.java similarity index 100% rename from common/src/common/util/BoundingBox.java rename to common/src/main/java/common/util/BoundingBox.java diff --git a/common/src/common/util/CharValidator.java b/common/src/main/java/common/util/CharValidator.java similarity index 100% rename from common/src/common/util/CharValidator.java rename to common/src/main/java/common/util/CharValidator.java diff --git a/common/src/common/util/ChunkPos.java b/common/src/main/java/common/util/ChunkPos.java similarity index 100% rename from common/src/common/util/ChunkPos.java rename to common/src/main/java/common/util/ChunkPos.java diff --git a/common/src/common/util/ClassInheritanceMultiMap.java b/common/src/main/java/common/util/ClassInheritanceMultiMap.java similarity index 100% rename from common/src/common/util/ClassInheritanceMultiMap.java rename to common/src/main/java/common/util/ClassInheritanceMultiMap.java diff --git a/common/src/common/util/DC32.java b/common/src/main/java/common/util/DC32.java similarity index 100% rename from common/src/common/util/DC32.java rename to common/src/main/java/common/util/DC32.java diff --git a/common/src/common/util/Displayable.java b/common/src/main/java/common/util/Displayable.java similarity index 100% rename from common/src/common/util/Displayable.java rename to common/src/main/java/common/util/Displayable.java diff --git a/common/src/common/util/EncryptUtil.java b/common/src/main/java/common/util/EncryptUtil.java similarity index 100% rename from common/src/common/util/EncryptUtil.java rename to common/src/main/java/common/util/EncryptUtil.java diff --git a/common/src/common/util/ExtMath.java b/common/src/main/java/common/util/ExtMath.java similarity index 100% rename from common/src/common/util/ExtMath.java rename to common/src/main/java/common/util/ExtMath.java diff --git a/common/src/common/util/Facing.java b/common/src/main/java/common/util/Facing.java similarity index 100% rename from common/src/common/util/Facing.java rename to common/src/main/java/common/util/Facing.java diff --git a/common/src/common/util/HitPosition.java b/common/src/main/java/common/util/HitPosition.java similarity index 100% rename from common/src/common/util/HitPosition.java rename to common/src/main/java/common/util/HitPosition.java diff --git a/common/src/common/util/IObjectIntIterable.java b/common/src/main/java/common/util/IObjectIntIterable.java similarity index 100% rename from common/src/common/util/IObjectIntIterable.java rename to common/src/main/java/common/util/IObjectIntIterable.java diff --git a/common/src/common/util/IRegistry.java b/common/src/main/java/common/util/IRegistry.java similarity index 100% rename from common/src/common/util/IRegistry.java rename to common/src/main/java/common/util/IRegistry.java diff --git a/common/src/common/util/Identifyable.java b/common/src/main/java/common/util/Identifyable.java similarity index 100% rename from common/src/common/util/Identifyable.java rename to common/src/main/java/common/util/Identifyable.java diff --git a/common/src/common/util/IntHashMap.java b/common/src/main/java/common/util/IntHashMap.java similarity index 100% rename from common/src/common/util/IntHashMap.java rename to common/src/main/java/common/util/IntHashMap.java diff --git a/common/src/common/util/LazyLoadBase.java b/common/src/main/java/common/util/LazyLoadBase.java similarity index 100% rename from common/src/common/util/LazyLoadBase.java rename to common/src/main/java/common/util/LazyLoadBase.java diff --git a/common/src/common/util/LongHashMap.java b/common/src/main/java/common/util/LongHashMap.java similarity index 100% rename from common/src/common/util/LongHashMap.java rename to common/src/main/java/common/util/LongHashMap.java diff --git a/common/src/common/util/LowerStringMap.java b/common/src/main/java/common/util/LowerStringMap.java similarity index 100% rename from common/src/common/util/LowerStringMap.java rename to common/src/main/java/common/util/LowerStringMap.java diff --git a/common/src/common/util/Matrix4f.java b/common/src/main/java/common/util/Matrix4f.java similarity index 100% rename from common/src/common/util/Matrix4f.java rename to common/src/main/java/common/util/Matrix4f.java diff --git a/common/src/common/util/NextTickListEntry.java b/common/src/main/java/common/util/NextTickListEntry.java similarity index 100% rename from common/src/common/util/NextTickListEntry.java rename to common/src/main/java/common/util/NextTickListEntry.java diff --git a/common/src/common/util/NibbleArray.java b/common/src/main/java/common/util/NibbleArray.java similarity index 100% rename from common/src/common/util/NibbleArray.java rename to common/src/main/java/common/util/NibbleArray.java diff --git a/common/src/common/util/ObjectIntIdentityMap.java b/common/src/main/java/common/util/ObjectIntIdentityMap.java similarity index 100% rename from common/src/common/util/ObjectIntIdentityMap.java rename to common/src/main/java/common/util/ObjectIntIdentityMap.java diff --git a/common/src/common/util/PortalType.java b/common/src/main/java/common/util/PortalType.java similarity index 100% rename from common/src/common/util/PortalType.java rename to common/src/main/java/common/util/PortalType.java diff --git a/common/src/common/util/Position.java b/common/src/main/java/common/util/Position.java similarity index 100% rename from common/src/common/util/Position.java rename to common/src/main/java/common/util/Position.java diff --git a/common/src/common/util/Predicates.java b/common/src/main/java/common/util/Predicates.java similarity index 100% rename from common/src/common/util/Predicates.java rename to common/src/main/java/common/util/Predicates.java diff --git a/common/src/common/util/RegistryDefaulted.java b/common/src/main/java/common/util/RegistryDefaulted.java similarity index 100% rename from common/src/common/util/RegistryDefaulted.java rename to common/src/main/java/common/util/RegistryDefaulted.java diff --git a/common/src/common/util/RegistryNamespaced.java b/common/src/main/java/common/util/RegistryNamespaced.java similarity index 100% rename from common/src/common/util/RegistryNamespaced.java rename to common/src/main/java/common/util/RegistryNamespaced.java diff --git a/common/src/common/util/RegistryNamespacedDefaultedByKey.java b/common/src/main/java/common/util/RegistryNamespacedDefaultedByKey.java similarity index 100% rename from common/src/common/util/RegistryNamespacedDefaultedByKey.java rename to common/src/main/java/common/util/RegistryNamespacedDefaultedByKey.java diff --git a/common/src/common/util/RegistrySimple.java b/common/src/main/java/common/util/RegistrySimple.java similarity index 100% rename from common/src/common/util/RegistrySimple.java rename to common/src/main/java/common/util/RegistrySimple.java diff --git a/common/src/common/util/ReleaseType.java b/common/src/main/java/common/util/ReleaseType.java similarity index 100% rename from common/src/common/util/ReleaseType.java rename to common/src/main/java/common/util/ReleaseType.java diff --git a/common/src/common/util/Triplet.java b/common/src/main/java/common/util/Triplet.java similarity index 100% rename from common/src/common/util/Triplet.java rename to common/src/main/java/common/util/Triplet.java diff --git a/common/src/common/util/Tuple.java b/common/src/main/java/common/util/Tuple.java similarity index 100% rename from common/src/common/util/Tuple.java rename to common/src/main/java/common/util/Tuple.java diff --git a/common/src/common/util/Util.java b/common/src/main/java/common/util/Util.java similarity index 100% rename from common/src/common/util/Util.java rename to common/src/main/java/common/util/Util.java diff --git a/common/src/common/util/Vec3.java b/common/src/main/java/common/util/Vec3.java similarity index 100% rename from common/src/common/util/Vec3.java rename to common/src/main/java/common/util/Vec3.java diff --git a/common/src/common/util/Vec3i.java b/common/src/main/java/common/util/Vec3i.java similarity index 100% rename from common/src/common/util/Vec3i.java rename to common/src/main/java/common/util/Vec3i.java diff --git a/common/src/common/util/Vector.java b/common/src/main/java/common/util/Vector.java similarity index 100% rename from common/src/common/util/Vector.java rename to common/src/main/java/common/util/Vector.java diff --git a/common/src/common/util/Vector3f.java b/common/src/main/java/common/util/Vector3f.java similarity index 100% rename from common/src/common/util/Vector3f.java rename to common/src/main/java/common/util/Vector3f.java diff --git a/common/src/common/util/Vector4f.java b/common/src/main/java/common/util/Vector4f.java similarity index 100% rename from common/src/common/util/Vector4f.java rename to common/src/main/java/common/util/Vector4f.java diff --git a/common/src/common/util/WorldPos.java b/common/src/main/java/common/util/WorldPos.java similarity index 100% rename from common/src/common/util/WorldPos.java rename to common/src/main/java/common/util/WorldPos.java diff --git a/common/src/common/village/MerchantRecipe.java b/common/src/main/java/common/village/MerchantRecipe.java similarity index 100% rename from common/src/common/village/MerchantRecipe.java rename to common/src/main/java/common/village/MerchantRecipe.java diff --git a/common/src/common/village/MerchantRecipeList.java b/common/src/main/java/common/village/MerchantRecipeList.java similarity index 100% rename from common/src/common/village/MerchantRecipeList.java rename to common/src/main/java/common/village/MerchantRecipeList.java diff --git a/common/src/common/village/Village.java b/common/src/main/java/common/village/Village.java similarity index 100% rename from common/src/common/village/Village.java rename to common/src/main/java/common/village/Village.java diff --git a/common/src/common/village/VillageDoorInfo.java b/common/src/main/java/common/village/VillageDoorInfo.java similarity index 100% rename from common/src/common/village/VillageDoorInfo.java rename to common/src/main/java/common/village/VillageDoorInfo.java diff --git a/common/src/common/world/AWorldClient.java b/common/src/main/java/common/world/AWorldClient.java similarity index 100% rename from common/src/common/world/AWorldClient.java rename to common/src/main/java/common/world/AWorldClient.java diff --git a/common/src/common/world/AWorldServer.java b/common/src/main/java/common/world/AWorldServer.java similarity index 100% rename from common/src/common/world/AWorldServer.java rename to common/src/main/java/common/world/AWorldServer.java diff --git a/common/src/common/world/BlockArray.java b/common/src/main/java/common/world/BlockArray.java similarity index 100% rename from common/src/common/world/BlockArray.java rename to common/src/main/java/common/world/BlockArray.java diff --git a/common/src/common/world/Chunk.java b/common/src/main/java/common/world/Chunk.java similarity index 100% rename from common/src/common/world/Chunk.java rename to common/src/main/java/common/world/Chunk.java diff --git a/common/src/common/world/DebugStates.java b/common/src/main/java/common/world/DebugStates.java similarity index 100% rename from common/src/common/world/DebugStates.java rename to common/src/main/java/common/world/DebugStates.java diff --git a/common/src/common/world/Explosion.java b/common/src/main/java/common/world/Explosion.java similarity index 100% rename from common/src/common/world/Explosion.java rename to common/src/main/java/common/world/Explosion.java diff --git a/common/src/common/world/IBlockAccess.java b/common/src/main/java/common/world/IBlockAccess.java similarity index 100% rename from common/src/common/world/IBlockAccess.java rename to common/src/main/java/common/world/IBlockAccess.java diff --git a/common/src/common/world/IWorldAccess.java b/common/src/main/java/common/world/IWorldAccess.java similarity index 100% rename from common/src/common/world/IWorldAccess.java rename to common/src/main/java/common/world/IWorldAccess.java diff --git a/common/src/common/world/LightType.java b/common/src/main/java/common/world/LightType.java similarity index 100% rename from common/src/common/world/LightType.java rename to common/src/main/java/common/world/LightType.java diff --git a/common/src/common/world/State.java b/common/src/main/java/common/world/State.java similarity index 100% rename from common/src/common/world/State.java rename to common/src/main/java/common/world/State.java diff --git a/common/src/common/world/Weather.java b/common/src/main/java/common/world/Weather.java similarity index 100% rename from common/src/common/world/Weather.java rename to common/src/main/java/common/world/Weather.java diff --git a/common/src/common/world/World.java b/common/src/main/java/common/world/World.java similarity index 100% rename from common/src/common/world/World.java rename to common/src/main/java/common/world/World.java diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..91ec0d3 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,4 @@ + +org.gradle.configuration-cache=false +org.gradle.parallel=true +org.gradle.caching=true diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml new file mode 100644 index 0000000..7908d7b --- /dev/null +++ b/gradle/libs.versions.toml @@ -0,0 +1,8 @@ +# This file was generated by the Gradle 'init' task. +# https://docs.gradle.org/current/userguide/platforms.html#sub::toml-dependencies-format + +[versions] +guava = "33.4.5-jre" + +[libraries] +guava = { module = "com.google.guava:guava", version.ref = "guava" } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..1b33c55 Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..002b867 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.1-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100755 index 0000000..23d15a9 --- /dev/null +++ b/gradlew @@ -0,0 +1,251 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# SPDX-License-Identifier: Apache-2.0 +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH="\\\"\\\"" + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..db3a6ac --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,94 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH= + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/server/build.gradle.kts b/server/build.gradle.kts new file mode 100644 index 0000000..73aa623 --- /dev/null +++ b/server/build.gradle.kts @@ -0,0 +1,28 @@ + +plugins { + application + id("com.gradleup.shadow") version "8.3.6" + eclipse +} + +dependencies { + implementation(project(":common")) +} + +java { + toolchain { + languageVersion = JavaLanguageVersion.of(8) + } +} + +application { + mainClass = "server.Server" + tasks.run.get().workingDir = rootProject.file("dev/server") + tasks.run.get().workingDir.mkdirs() + tasks.run.get().systemProperties.put("crash.nodump", "") +} + +tasks.shadowJar { + destinationDirectory = rootProject.file("dev") + archiveFileName = "tcr_server.jar" +} diff --git a/server/src/server/Server.java b/server/src/main/java/server/Server.java similarity index 100% rename from server/src/server/Server.java rename to server/src/main/java/server/Server.java diff --git a/server/src/server/biome/BiomeBeach.java b/server/src/main/java/server/biome/BiomeBeach.java similarity index 100% rename from server/src/server/biome/BiomeBeach.java rename to server/src/main/java/server/biome/BiomeBeach.java diff --git a/server/src/server/biome/BiomeBlackened.java b/server/src/main/java/server/biome/BiomeBlackened.java similarity index 100% rename from server/src/server/biome/BiomeBlackened.java rename to server/src/main/java/server/biome/BiomeBlackened.java diff --git a/server/src/server/biome/BiomeChaos.java b/server/src/main/java/server/biome/BiomeChaos.java similarity index 100% rename from server/src/server/biome/BiomeChaos.java rename to server/src/main/java/server/biome/BiomeChaos.java diff --git a/server/src/server/biome/BiomeDesert.java b/server/src/main/java/server/biome/BiomeDesert.java similarity index 100% rename from server/src/server/biome/BiomeDesert.java rename to server/src/main/java/server/biome/BiomeDesert.java diff --git a/server/src/server/biome/BiomeExterminated.java b/server/src/main/java/server/biome/BiomeExterminated.java similarity index 100% rename from server/src/server/biome/BiomeExterminated.java rename to server/src/main/java/server/biome/BiomeExterminated.java diff --git a/server/src/server/biome/BiomeForest.java b/server/src/main/java/server/biome/BiomeForest.java similarity index 100% rename from server/src/server/biome/BiomeForest.java rename to server/src/main/java/server/biome/BiomeForest.java diff --git a/server/src/server/biome/BiomeHell.java b/server/src/main/java/server/biome/BiomeHell.java similarity index 100% rename from server/src/server/biome/BiomeHell.java rename to server/src/main/java/server/biome/BiomeHell.java diff --git a/server/src/server/biome/BiomeHills.java b/server/src/main/java/server/biome/BiomeHills.java similarity index 100% rename from server/src/server/biome/BiomeHills.java rename to server/src/main/java/server/biome/BiomeHills.java diff --git a/server/src/server/biome/BiomeJungle.java b/server/src/main/java/server/biome/BiomeJungle.java similarity index 100% rename from server/src/server/biome/BiomeJungle.java rename to server/src/main/java/server/biome/BiomeJungle.java diff --git a/server/src/server/biome/BiomeMesa.java b/server/src/main/java/server/biome/BiomeMesa.java similarity index 100% rename from server/src/server/biome/BiomeMesa.java rename to server/src/main/java/server/biome/BiomeMesa.java diff --git a/server/src/server/biome/BiomeMoon.java b/server/src/main/java/server/biome/BiomeMoon.java similarity index 100% rename from server/src/server/biome/BiomeMoon.java rename to server/src/main/java/server/biome/BiomeMoon.java diff --git a/server/src/server/biome/BiomeMushroom.java b/server/src/main/java/server/biome/BiomeMushroom.java similarity index 100% rename from server/src/server/biome/BiomeMushroom.java rename to server/src/main/java/server/biome/BiomeMushroom.java diff --git a/server/src/server/biome/BiomeMutated.java b/server/src/main/java/server/biome/BiomeMutated.java similarity index 100% rename from server/src/server/biome/BiomeMutated.java rename to server/src/main/java/server/biome/BiomeMutated.java diff --git a/server/src/server/biome/BiomeNone.java b/server/src/main/java/server/biome/BiomeNone.java similarity index 100% rename from server/src/server/biome/BiomeNone.java rename to server/src/main/java/server/biome/BiomeNone.java diff --git a/server/src/server/biome/BiomePlains.java b/server/src/main/java/server/biome/BiomePlains.java similarity index 100% rename from server/src/server/biome/BiomePlains.java rename to server/src/main/java/server/biome/BiomePlains.java diff --git a/server/src/server/biome/BiomeSavanna.java b/server/src/main/java/server/biome/BiomeSavanna.java similarity index 100% rename from server/src/server/biome/BiomeSavanna.java rename to server/src/main/java/server/biome/BiomeSavanna.java diff --git a/server/src/server/biome/BiomeSnow.java b/server/src/main/java/server/biome/BiomeSnow.java similarity index 100% rename from server/src/server/biome/BiomeSnow.java rename to server/src/main/java/server/biome/BiomeSnow.java diff --git a/server/src/server/biome/BiomeSnowLand.java b/server/src/main/java/server/biome/BiomeSnowLand.java similarity index 100% rename from server/src/server/biome/BiomeSnowLand.java rename to server/src/main/java/server/biome/BiomeSnowLand.java diff --git a/server/src/server/biome/BiomeSpace.java b/server/src/main/java/server/biome/BiomeSpace.java similarity index 100% rename from server/src/server/biome/BiomeSpace.java rename to server/src/main/java/server/biome/BiomeSpace.java diff --git a/server/src/server/biome/BiomeStoneBeach.java b/server/src/main/java/server/biome/BiomeStoneBeach.java similarity index 100% rename from server/src/server/biome/BiomeStoneBeach.java rename to server/src/main/java/server/biome/BiomeStoneBeach.java diff --git a/server/src/server/biome/BiomeSwamp.java b/server/src/main/java/server/biome/BiomeSwamp.java similarity index 100% rename from server/src/server/biome/BiomeSwamp.java rename to server/src/main/java/server/biome/BiomeSwamp.java diff --git a/server/src/server/biome/BiomeTaiga.java b/server/src/main/java/server/biome/BiomeTaiga.java similarity index 100% rename from server/src/server/biome/BiomeTaiga.java rename to server/src/main/java/server/biome/BiomeTaiga.java diff --git a/server/src/server/biome/BiomeTian.java b/server/src/main/java/server/biome/BiomeTian.java similarity index 100% rename from server/src/server/biome/BiomeTian.java rename to server/src/main/java/server/biome/BiomeTian.java diff --git a/server/src/server/biome/BiomeWater.java b/server/src/main/java/server/biome/BiomeWater.java similarity index 100% rename from server/src/server/biome/BiomeWater.java rename to server/src/main/java/server/biome/BiomeWater.java diff --git a/server/src/server/biome/GenBiome.java b/server/src/main/java/server/biome/GenBiome.java similarity index 100% rename from server/src/server/biome/GenBiome.java rename to server/src/main/java/server/biome/GenBiome.java diff --git a/server/src/server/biome/RngSpawn.java b/server/src/main/java/server/biome/RngSpawn.java similarity index 100% rename from server/src/server/biome/RngSpawn.java rename to server/src/main/java/server/biome/RngSpawn.java diff --git a/server/src/server/biome/Scaling.java b/server/src/main/java/server/biome/Scaling.java similarity index 100% rename from server/src/server/biome/Scaling.java rename to server/src/main/java/server/biome/Scaling.java diff --git a/server/src/server/biome/Temperature.java b/server/src/main/java/server/biome/Temperature.java similarity index 100% rename from server/src/server/biome/Temperature.java rename to server/src/main/java/server/biome/Temperature.java diff --git a/server/src/server/clipboard/BlockTransform.java b/server/src/main/java/server/clipboard/BlockTransform.java similarity index 100% rename from server/src/server/clipboard/BlockTransform.java rename to server/src/main/java/server/clipboard/BlockTransform.java diff --git a/server/src/server/clipboard/ClipboardBlock.java b/server/src/main/java/server/clipboard/ClipboardBlock.java similarity index 100% rename from server/src/server/clipboard/ClipboardBlock.java rename to server/src/main/java/server/clipboard/ClipboardBlock.java diff --git a/server/src/server/clipboard/ClipboardPlacer.java b/server/src/main/java/server/clipboard/ClipboardPlacer.java similarity index 100% rename from server/src/server/clipboard/ClipboardPlacer.java rename to server/src/main/java/server/clipboard/ClipboardPlacer.java diff --git a/server/src/server/clipboard/ReorderRegistry.java b/server/src/main/java/server/clipboard/ReorderRegistry.java similarity index 100% rename from server/src/server/clipboard/ReorderRegistry.java rename to server/src/main/java/server/clipboard/ReorderRegistry.java diff --git a/server/src/server/clipboard/Rotation.java b/server/src/main/java/server/clipboard/Rotation.java similarity index 100% rename from server/src/server/clipboard/Rotation.java rename to server/src/main/java/server/clipboard/Rotation.java diff --git a/server/src/server/clipboard/RotationRegistry.java b/server/src/main/java/server/clipboard/RotationRegistry.java similarity index 100% rename from server/src/server/clipboard/RotationRegistry.java rename to server/src/main/java/server/clipboard/RotationRegistry.java diff --git a/server/src/server/clipboard/RotationValue.java b/server/src/main/java/server/clipboard/RotationValue.java similarity index 100% rename from server/src/server/clipboard/RotationValue.java rename to server/src/main/java/server/clipboard/RotationValue.java diff --git a/server/src/server/clipboard/Vector.java b/server/src/main/java/server/clipboard/Vector.java similarity index 100% rename from server/src/server/clipboard/Vector.java rename to server/src/main/java/server/clipboard/Vector.java diff --git a/server/src/server/command/ArgCombiner.java b/server/src/main/java/server/command/ArgCombiner.java similarity index 100% rename from server/src/server/command/ArgCombiner.java rename to server/src/main/java/server/command/ArgCombiner.java diff --git a/server/src/server/command/Argument.java b/server/src/main/java/server/command/Argument.java similarity index 100% rename from server/src/server/command/Argument.java rename to server/src/main/java/server/command/Argument.java diff --git a/server/src/server/command/ArgumentParser.java b/server/src/main/java/server/command/ArgumentParser.java similarity index 100% rename from server/src/server/command/ArgumentParser.java rename to server/src/main/java/server/command/ArgumentParser.java diff --git a/server/src/server/command/ArgumentSplitter.java b/server/src/main/java/server/command/ArgumentSplitter.java similarity index 100% rename from server/src/server/command/ArgumentSplitter.java rename to server/src/main/java/server/command/ArgumentSplitter.java diff --git a/server/src/server/command/BooleanParser.java b/server/src/main/java/server/command/BooleanParser.java similarity index 100% rename from server/src/server/command/BooleanParser.java rename to server/src/main/java/server/command/BooleanParser.java diff --git a/server/src/server/command/CachedExecutable.java b/server/src/main/java/server/command/CachedExecutable.java similarity index 100% rename from server/src/server/command/CachedExecutable.java rename to server/src/main/java/server/command/CachedExecutable.java diff --git a/server/src/server/command/ColorParser.java b/server/src/main/java/server/command/ColorParser.java similarity index 100% rename from server/src/server/command/ColorParser.java rename to server/src/main/java/server/command/ColorParser.java diff --git a/server/src/server/command/Command.java b/server/src/main/java/server/command/Command.java similarity index 100% rename from server/src/server/command/Command.java rename to server/src/main/java/server/command/Command.java diff --git a/server/src/server/command/CommandEnvironment.java b/server/src/main/java/server/command/CommandEnvironment.java similarity index 100% rename from server/src/server/command/CommandEnvironment.java rename to server/src/main/java/server/command/CommandEnvironment.java diff --git a/server/src/server/command/Completer.java b/server/src/main/java/server/command/Completer.java similarity index 100% rename from server/src/server/command/Completer.java rename to server/src/main/java/server/command/Completer.java diff --git a/server/src/server/command/CompletingParser.java b/server/src/main/java/server/command/CompletingParser.java similarity index 100% rename from server/src/server/command/CompletingParser.java rename to server/src/main/java/server/command/CompletingParser.java diff --git a/server/src/server/command/DefaultingParser.java b/server/src/main/java/server/command/DefaultingParser.java similarity index 100% rename from server/src/server/command/DefaultingParser.java rename to server/src/main/java/server/command/DefaultingParser.java diff --git a/server/src/server/command/DimensionParser.java b/server/src/main/java/server/command/DimensionParser.java similarity index 100% rename from server/src/server/command/DimensionParser.java rename to server/src/main/java/server/command/DimensionParser.java diff --git a/server/src/server/command/DoubleParser.java b/server/src/main/java/server/command/DoubleParser.java similarity index 100% rename from server/src/server/command/DoubleParser.java rename to server/src/main/java/server/command/DoubleParser.java diff --git a/server/src/server/command/EntityListParser.java b/server/src/main/java/server/command/EntityListParser.java similarity index 100% rename from server/src/server/command/EntityListParser.java rename to server/src/main/java/server/command/EntityListParser.java diff --git a/server/src/server/command/EntityParser.java b/server/src/main/java/server/command/EntityParser.java similarity index 100% rename from server/src/server/command/EntityParser.java rename to server/src/main/java/server/command/EntityParser.java diff --git a/server/src/server/command/EnumParser.java b/server/src/main/java/server/command/EnumParser.java similarity index 100% rename from server/src/server/command/EnumParser.java rename to server/src/main/java/server/command/EnumParser.java diff --git a/server/src/server/command/Executable.java b/server/src/main/java/server/command/Executable.java similarity index 100% rename from server/src/server/command/Executable.java rename to server/src/main/java/server/command/Executable.java diff --git a/server/src/server/command/Executor.java b/server/src/main/java/server/command/Executor.java similarity index 100% rename from server/src/server/command/Executor.java rename to server/src/main/java/server/command/Executor.java diff --git a/server/src/server/command/FixedExecutor.java b/server/src/main/java/server/command/FixedExecutor.java similarity index 100% rename from server/src/server/command/FixedExecutor.java rename to server/src/main/java/server/command/FixedExecutor.java diff --git a/server/src/server/command/IntParser.java b/server/src/main/java/server/command/IntParser.java similarity index 100% rename from server/src/server/command/IntParser.java rename to server/src/main/java/server/command/IntParser.java diff --git a/server/src/server/command/LongParser.java b/server/src/main/java/server/command/LongParser.java similarity index 100% rename from server/src/server/command/LongParser.java rename to server/src/main/java/server/command/LongParser.java diff --git a/server/src/server/command/NonDefaultingParser.java b/server/src/main/java/server/command/NonDefaultingParser.java similarity index 100% rename from server/src/server/command/NonDefaultingParser.java rename to server/src/main/java/server/command/NonDefaultingParser.java diff --git a/server/src/server/command/Parameter.java b/server/src/main/java/server/command/Parameter.java similarity index 100% rename from server/src/server/command/Parameter.java rename to server/src/main/java/server/command/Parameter.java diff --git a/server/src/server/command/PatternReplacer.java b/server/src/main/java/server/command/PatternReplacer.java similarity index 100% rename from server/src/server/command/PatternReplacer.java rename to server/src/main/java/server/command/PatternReplacer.java diff --git a/server/src/server/command/PlayerEntityListParser.java b/server/src/main/java/server/command/PlayerEntityListParser.java similarity index 100% rename from server/src/server/command/PlayerEntityListParser.java rename to server/src/main/java/server/command/PlayerEntityListParser.java diff --git a/server/src/server/command/PlayerEntityParser.java b/server/src/main/java/server/command/PlayerEntityParser.java similarity index 100% rename from server/src/server/command/PlayerEntityParser.java rename to server/src/main/java/server/command/PlayerEntityParser.java diff --git a/server/src/server/command/PlayerListParser.java b/server/src/main/java/server/command/PlayerListParser.java similarity index 100% rename from server/src/server/command/PlayerListParser.java rename to server/src/main/java/server/command/PlayerListParser.java diff --git a/server/src/server/command/PlayerParser.java b/server/src/main/java/server/command/PlayerParser.java similarity index 100% rename from server/src/server/command/PlayerParser.java rename to server/src/main/java/server/command/PlayerParser.java diff --git a/server/src/server/command/RunException.java b/server/src/main/java/server/command/RunException.java similarity index 100% rename from server/src/server/command/RunException.java rename to server/src/main/java/server/command/RunException.java diff --git a/server/src/server/command/StringCompleter.java b/server/src/main/java/server/command/StringCompleter.java similarity index 100% rename from server/src/server/command/StringCompleter.java rename to server/src/main/java/server/command/StringCompleter.java diff --git a/server/src/server/command/StringParser.java b/server/src/main/java/server/command/StringParser.java similarity index 100% rename from server/src/server/command/StringParser.java rename to server/src/main/java/server/command/StringParser.java diff --git a/server/src/server/command/TagParser.java b/server/src/main/java/server/command/TagParser.java similarity index 100% rename from server/src/server/command/TagParser.java rename to server/src/main/java/server/command/TagParser.java diff --git a/server/src/server/command/Variable.java b/server/src/main/java/server/command/Variable.java similarity index 100% rename from server/src/server/command/Variable.java rename to server/src/main/java/server/command/Variable.java diff --git a/server/src/server/command/WorldParser.java b/server/src/main/java/server/command/WorldParser.java similarity index 100% rename from server/src/server/command/WorldParser.java rename to server/src/main/java/server/command/WorldParser.java diff --git a/server/src/server/command/commands/CommandAdmin.java b/server/src/main/java/server/command/commands/CommandAdmin.java similarity index 100% rename from server/src/server/command/commands/CommandAdmin.java rename to server/src/main/java/server/command/commands/CommandAdmin.java diff --git a/server/src/server/command/commands/CommandHelp.java b/server/src/main/java/server/command/commands/CommandHelp.java similarity index 100% rename from server/src/server/command/commands/CommandHelp.java rename to server/src/main/java/server/command/commands/CommandHelp.java diff --git a/server/src/server/command/commands/CommandKick.java b/server/src/main/java/server/command/commands/CommandKick.java similarity index 100% rename from server/src/server/command/commands/CommandKick.java rename to server/src/main/java/server/command/commands/CommandKick.java diff --git a/server/src/server/command/commands/CommandMessage.java b/server/src/main/java/server/command/commands/CommandMessage.java similarity index 100% rename from server/src/server/command/commands/CommandMessage.java rename to server/src/main/java/server/command/commands/CommandMessage.java diff --git a/server/src/server/command/commands/CommandMilk.java b/server/src/main/java/server/command/commands/CommandMilk.java similarity index 100% rename from server/src/server/command/commands/CommandMilk.java rename to server/src/main/java/server/command/commands/CommandMilk.java diff --git a/server/src/server/command/commands/CommandOfflinetp.java b/server/src/main/java/server/command/commands/CommandOfflinetp.java similarity index 100% rename from server/src/server/command/commands/CommandOfflinetp.java rename to server/src/main/java/server/command/commands/CommandOfflinetp.java diff --git a/server/src/server/command/commands/CommandPasswd.java b/server/src/main/java/server/command/commands/CommandPasswd.java similarity index 100% rename from server/src/server/command/commands/CommandPasswd.java rename to server/src/main/java/server/command/commands/CommandPasswd.java diff --git a/server/src/server/command/commands/CommandPlayers.java b/server/src/main/java/server/command/commands/CommandPlayers.java similarity index 100% rename from server/src/server/command/commands/CommandPlayers.java rename to server/src/main/java/server/command/commands/CommandPlayers.java diff --git a/server/src/server/command/commands/CommandPotion.java b/server/src/main/java/server/command/commands/CommandPotion.java similarity index 100% rename from server/src/server/command/commands/CommandPotion.java rename to server/src/main/java/server/command/commands/CommandPotion.java diff --git a/server/src/server/command/commands/CommandRegister.java b/server/src/main/java/server/command/commands/CommandRegister.java similarity index 100% rename from server/src/server/command/commands/CommandRegister.java rename to server/src/main/java/server/command/commands/CommandRegister.java diff --git a/server/src/server/command/commands/CommandRemove.java b/server/src/main/java/server/command/commands/CommandRemove.java similarity index 100% rename from server/src/server/command/commands/CommandRemove.java rename to server/src/main/java/server/command/commands/CommandRemove.java diff --git a/server/src/server/command/commands/CommandRevoke.java b/server/src/main/java/server/command/commands/CommandRevoke.java similarity index 100% rename from server/src/server/command/commands/CommandRevoke.java rename to server/src/main/java/server/command/commands/CommandRevoke.java diff --git a/server/src/server/command/commands/CommandSave.java b/server/src/main/java/server/command/commands/CommandSave.java similarity index 100% rename from server/src/server/command/commands/CommandSave.java rename to server/src/main/java/server/command/commands/CommandSave.java diff --git a/server/src/server/command/commands/CommandShutdown.java b/server/src/main/java/server/command/commands/CommandShutdown.java similarity index 100% rename from server/src/server/command/commands/CommandShutdown.java rename to server/src/main/java/server/command/commands/CommandShutdown.java diff --git a/server/src/server/command/commands/CommandSpawn.java b/server/src/main/java/server/command/commands/CommandSpawn.java similarity index 100% rename from server/src/server/command/commands/CommandSpawn.java rename to server/src/main/java/server/command/commands/CommandSpawn.java diff --git a/server/src/server/command/commands/CommandTele.java b/server/src/main/java/server/command/commands/CommandTele.java similarity index 100% rename from server/src/server/command/commands/CommandTele.java rename to server/src/main/java/server/command/commands/CommandTele.java diff --git a/server/src/server/command/commands/CommandTime.java b/server/src/main/java/server/command/commands/CommandTime.java similarity index 100% rename from server/src/server/command/commands/CommandTime.java rename to server/src/main/java/server/command/commands/CommandTime.java diff --git a/server/src/server/command/commands/CommandTp.java b/server/src/main/java/server/command/commands/CommandTp.java similarity index 100% rename from server/src/server/command/commands/CommandTp.java rename to server/src/main/java/server/command/commands/CommandTp.java diff --git a/server/src/server/command/commands/CommandWarp.java b/server/src/main/java/server/command/commands/CommandWarp.java similarity index 100% rename from server/src/server/command/commands/CommandWarp.java rename to server/src/main/java/server/command/commands/CommandWarp.java diff --git a/server/src/server/command/commands/CommandWeather.java b/server/src/main/java/server/command/commands/CommandWeather.java similarity index 100% rename from server/src/server/command/commands/CommandWeather.java rename to server/src/main/java/server/command/commands/CommandWeather.java diff --git a/server/src/server/command/commands/CommandWorld.java b/server/src/main/java/server/command/commands/CommandWorld.java similarity index 100% rename from server/src/server/command/commands/CommandWorld.java rename to server/src/main/java/server/command/commands/CommandWorld.java diff --git a/server/src/server/network/HandshakeHandler.java b/server/src/main/java/server/network/HandshakeHandler.java similarity index 100% rename from server/src/server/network/HandshakeHandler.java rename to server/src/main/java/server/network/HandshakeHandler.java diff --git a/server/src/server/network/LoginHandler.java b/server/src/main/java/server/network/LoginHandler.java similarity index 100% rename from server/src/server/network/LoginHandler.java rename to server/src/main/java/server/network/LoginHandler.java diff --git a/server/src/server/network/Player.java b/server/src/main/java/server/network/Player.java similarity index 100% rename from server/src/server/network/Player.java rename to server/src/main/java/server/network/Player.java diff --git a/server/src/server/util/Form.java b/server/src/main/java/server/util/Form.java similarity index 100% rename from server/src/server/util/Form.java rename to server/src/main/java/server/util/Form.java diff --git a/server/src/server/village/VillageCollection.java b/server/src/main/java/server/village/VillageCollection.java similarity index 100% rename from server/src/server/village/VillageCollection.java rename to server/src/main/java/server/village/VillageCollection.java diff --git a/server/src/server/world/BlockEventData.java b/server/src/main/java/server/world/BlockEventData.java similarity index 100% rename from server/src/server/world/BlockEventData.java rename to server/src/main/java/server/world/BlockEventData.java diff --git a/server/src/server/world/ChunkServer.java b/server/src/main/java/server/world/ChunkServer.java similarity index 100% rename from server/src/server/world/ChunkServer.java rename to server/src/main/java/server/world/ChunkServer.java diff --git a/server/src/server/world/Converter.java b/server/src/main/java/server/world/Converter.java similarity index 100% rename from server/src/server/world/Converter.java rename to server/src/main/java/server/world/Converter.java diff --git a/server/src/server/world/Region.java b/server/src/main/java/server/world/Region.java similarity index 100% rename from server/src/server/world/Region.java rename to server/src/main/java/server/world/Region.java diff --git a/server/src/server/world/Spawner.java b/server/src/main/java/server/world/Spawner.java similarity index 100% rename from server/src/server/world/Spawner.java rename to server/src/main/java/server/world/Spawner.java diff --git a/server/src/server/world/WorldServer.java b/server/src/main/java/server/world/WorldServer.java similarity index 100% rename from server/src/server/world/WorldServer.java rename to server/src/main/java/server/world/WorldServer.java diff --git a/server/src/server/worldgen/BiomeGenLayered.java b/server/src/main/java/server/worldgen/BiomeGenLayered.java similarity index 100% rename from server/src/server/worldgen/BiomeGenLayered.java rename to server/src/main/java/server/worldgen/BiomeGenLayered.java diff --git a/server/src/server/worldgen/BiomeGenPerlin.java b/server/src/main/java/server/worldgen/BiomeGenPerlin.java similarity index 100% rename from server/src/server/worldgen/BiomeGenPerlin.java rename to server/src/main/java/server/worldgen/BiomeGenPerlin.java diff --git a/server/src/server/worldgen/BiomeGenSingle.java b/server/src/main/java/server/worldgen/BiomeGenSingle.java similarity index 100% rename from server/src/server/worldgen/BiomeGenSingle.java rename to server/src/main/java/server/worldgen/BiomeGenSingle.java diff --git a/server/src/server/worldgen/BiomeGenerator.java b/server/src/main/java/server/worldgen/BiomeGenerator.java similarity index 100% rename from server/src/server/worldgen/BiomeGenerator.java rename to server/src/main/java/server/worldgen/BiomeGenerator.java diff --git a/server/src/server/worldgen/BlockReplacer.java b/server/src/main/java/server/worldgen/BlockReplacer.java similarity index 100% rename from server/src/server/worldgen/BlockReplacer.java rename to server/src/main/java/server/worldgen/BlockReplacer.java diff --git a/server/src/server/worldgen/ChunkGenerator.java b/server/src/main/java/server/worldgen/ChunkGenerator.java similarity index 100% rename from server/src/server/worldgen/ChunkGenerator.java rename to server/src/main/java/server/worldgen/ChunkGenerator.java diff --git a/server/src/server/worldgen/ChunkPrimer.java b/server/src/main/java/server/worldgen/ChunkPrimer.java similarity index 100% rename from server/src/server/worldgen/ChunkPrimer.java rename to server/src/main/java/server/worldgen/ChunkPrimer.java diff --git a/server/src/server/worldgen/FeatureDungeons.java b/server/src/main/java/server/worldgen/FeatureDungeons.java similarity index 100% rename from server/src/server/worldgen/FeatureDungeons.java rename to server/src/main/java/server/worldgen/FeatureDungeons.java diff --git a/server/src/server/worldgen/FeatureGenerator.java b/server/src/main/java/server/worldgen/FeatureGenerator.java similarity index 100% rename from server/src/server/worldgen/FeatureGenerator.java rename to server/src/main/java/server/worldgen/FeatureGenerator.java diff --git a/server/src/server/worldgen/FeatureLakes.java b/server/src/main/java/server/worldgen/FeatureLakes.java similarity index 100% rename from server/src/server/worldgen/FeatureLakes.java rename to server/src/main/java/server/worldgen/FeatureLakes.java diff --git a/server/src/server/worldgen/FeatureLiquids.java b/server/src/main/java/server/worldgen/FeatureLiquids.java similarity index 100% rename from server/src/server/worldgen/FeatureLiquids.java rename to server/src/main/java/server/worldgen/FeatureLiquids.java diff --git a/server/src/server/worldgen/FeatureOres.java b/server/src/main/java/server/worldgen/FeatureOres.java similarity index 100% rename from server/src/server/worldgen/FeatureOres.java rename to server/src/main/java/server/worldgen/FeatureOres.java diff --git a/server/src/server/worldgen/GeneratorCavern.java b/server/src/main/java/server/worldgen/GeneratorCavern.java similarity index 100% rename from server/src/server/worldgen/GeneratorCavern.java rename to server/src/main/java/server/worldgen/GeneratorCavern.java diff --git a/server/src/server/worldgen/GeneratorDebug.java b/server/src/main/java/server/worldgen/GeneratorDebug.java similarity index 100% rename from server/src/server/worldgen/GeneratorDebug.java rename to server/src/main/java/server/worldgen/GeneratorDebug.java diff --git a/server/src/server/worldgen/GeneratorDestroyed.java b/server/src/main/java/server/worldgen/GeneratorDestroyed.java similarity index 100% rename from server/src/server/worldgen/GeneratorDestroyed.java rename to server/src/main/java/server/worldgen/GeneratorDestroyed.java diff --git a/server/src/server/worldgen/GeneratorFlat.java b/server/src/main/java/server/worldgen/GeneratorFlat.java similarity index 100% rename from server/src/server/worldgen/GeneratorFlat.java rename to server/src/main/java/server/worldgen/GeneratorFlat.java diff --git a/server/src/server/worldgen/GeneratorIsland.java b/server/src/main/java/server/worldgen/GeneratorIsland.java similarity index 100% rename from server/src/server/worldgen/GeneratorIsland.java rename to server/src/main/java/server/worldgen/GeneratorIsland.java diff --git a/server/src/server/worldgen/GeneratorPerlin.java b/server/src/main/java/server/worldgen/GeneratorPerlin.java similarity index 100% rename from server/src/server/worldgen/GeneratorPerlin.java rename to server/src/main/java/server/worldgen/GeneratorPerlin.java diff --git a/server/src/server/worldgen/GeneratorSimple.java b/server/src/main/java/server/worldgen/GeneratorSimple.java similarity index 100% rename from server/src/server/worldgen/GeneratorSimple.java rename to server/src/main/java/server/worldgen/GeneratorSimple.java diff --git a/server/src/server/worldgen/LootConstants.java b/server/src/main/java/server/worldgen/LootConstants.java similarity index 100% rename from server/src/server/worldgen/LootConstants.java rename to server/src/main/java/server/worldgen/LootConstants.java diff --git a/server/src/server/worldgen/MobConstants.java b/server/src/main/java/server/worldgen/MobConstants.java similarity index 100% rename from server/src/server/worldgen/MobConstants.java rename to server/src/main/java/server/worldgen/MobConstants.java diff --git a/server/src/server/worldgen/ReplacerAltBiome.java b/server/src/main/java/server/worldgen/ReplacerAltBiome.java similarity index 100% rename from server/src/server/worldgen/ReplacerAltBiome.java rename to server/src/main/java/server/worldgen/ReplacerAltBiome.java diff --git a/server/src/server/worldgen/ReplacerAltSurface.java b/server/src/main/java/server/worldgen/ReplacerAltSurface.java similarity index 100% rename from server/src/server/worldgen/ReplacerAltSurface.java rename to server/src/main/java/server/worldgen/ReplacerAltSurface.java diff --git a/server/src/server/worldgen/ReplacerBiome.java b/server/src/main/java/server/worldgen/ReplacerBiome.java similarity index 100% rename from server/src/server/worldgen/ReplacerBiome.java rename to server/src/main/java/server/worldgen/ReplacerBiome.java diff --git a/server/src/server/worldgen/ReplacerTopLayer.java b/server/src/main/java/server/worldgen/ReplacerTopLayer.java similarity index 100% rename from server/src/server/worldgen/ReplacerTopLayer.java rename to server/src/main/java/server/worldgen/ReplacerTopLayer.java diff --git a/server/src/server/worldgen/caves/MapGenBase.java b/server/src/main/java/server/worldgen/caves/MapGenBase.java similarity index 100% rename from server/src/server/worldgen/caves/MapGenBase.java rename to server/src/main/java/server/worldgen/caves/MapGenBase.java diff --git a/server/src/server/worldgen/caves/MapGenBigCaves.java b/server/src/main/java/server/worldgen/caves/MapGenBigCaves.java similarity index 100% rename from server/src/server/worldgen/caves/MapGenBigCaves.java rename to server/src/main/java/server/worldgen/caves/MapGenBigCaves.java diff --git a/server/src/server/worldgen/caves/MapGenCaves.java b/server/src/main/java/server/worldgen/caves/MapGenCaves.java similarity index 100% rename from server/src/server/worldgen/caves/MapGenCaves.java rename to server/src/main/java/server/worldgen/caves/MapGenCaves.java diff --git a/server/src/server/worldgen/caves/MapGenRavine.java b/server/src/main/java/server/worldgen/caves/MapGenRavine.java similarity index 100% rename from server/src/server/worldgen/caves/MapGenRavine.java rename to server/src/main/java/server/worldgen/caves/MapGenRavine.java diff --git a/server/src/server/worldgen/feature/WorldGenAbandonedChest.java b/server/src/main/java/server/worldgen/feature/WorldGenAbandonedChest.java similarity index 100% rename from server/src/server/worldgen/feature/WorldGenAbandonedChest.java rename to server/src/main/java/server/worldgen/feature/WorldGenAbandonedChest.java diff --git a/server/src/server/worldgen/feature/WorldGenAsteroid.java b/server/src/main/java/server/worldgen/feature/WorldGenAsteroid.java similarity index 100% rename from server/src/server/worldgen/feature/WorldGenAsteroid.java rename to server/src/main/java/server/worldgen/feature/WorldGenAsteroid.java diff --git a/server/src/server/worldgen/feature/WorldGenBlockBlob.java b/server/src/main/java/server/worldgen/feature/WorldGenBlockBlob.java similarity index 100% rename from server/src/server/worldgen/feature/WorldGenBlockBlob.java rename to server/src/main/java/server/worldgen/feature/WorldGenBlockBlob.java diff --git a/server/src/server/worldgen/feature/WorldGenClay.java b/server/src/main/java/server/worldgen/feature/WorldGenClay.java similarity index 100% rename from server/src/server/worldgen/feature/WorldGenClay.java rename to server/src/main/java/server/worldgen/feature/WorldGenClay.java diff --git a/server/src/server/worldgen/feature/WorldGenClayExt.java b/server/src/main/java/server/worldgen/feature/WorldGenClayExt.java similarity index 100% rename from server/src/server/worldgen/feature/WorldGenClayExt.java rename to server/src/main/java/server/worldgen/feature/WorldGenClayExt.java diff --git a/server/src/server/worldgen/feature/WorldGenDesertWells.java b/server/src/main/java/server/worldgen/feature/WorldGenDesertWells.java similarity index 100% rename from server/src/server/worldgen/feature/WorldGenDesertWells.java rename to server/src/main/java/server/worldgen/feature/WorldGenDesertWells.java diff --git a/server/src/server/worldgen/feature/WorldGenFire.java b/server/src/main/java/server/worldgen/feature/WorldGenFire.java similarity index 100% rename from server/src/server/worldgen/feature/WorldGenFire.java rename to server/src/main/java/server/worldgen/feature/WorldGenFire.java diff --git a/server/src/server/worldgen/feature/WorldGenGlowStone.java b/server/src/main/java/server/worldgen/feature/WorldGenGlowStone.java similarity index 100% rename from server/src/server/worldgen/feature/WorldGenGlowStone.java rename to server/src/main/java/server/worldgen/feature/WorldGenGlowStone.java diff --git a/server/src/server/worldgen/feature/WorldGenHellLava.java b/server/src/main/java/server/worldgen/feature/WorldGenHellLava.java similarity index 100% rename from server/src/server/worldgen/feature/WorldGenHellLava.java rename to server/src/main/java/server/worldgen/feature/WorldGenHellLava.java diff --git a/server/src/server/worldgen/feature/WorldGenIcePath.java b/server/src/main/java/server/worldgen/feature/WorldGenIcePath.java similarity index 100% rename from server/src/server/worldgen/feature/WorldGenIcePath.java rename to server/src/main/java/server/worldgen/feature/WorldGenIcePath.java diff --git a/server/src/server/worldgen/feature/WorldGenIceSpike.java b/server/src/main/java/server/worldgen/feature/WorldGenIceSpike.java similarity index 100% rename from server/src/server/worldgen/feature/WorldGenIceSpike.java rename to server/src/main/java/server/worldgen/feature/WorldGenIceSpike.java diff --git a/server/src/server/worldgen/feature/WorldGenSand.java b/server/src/main/java/server/worldgen/feature/WorldGenSand.java similarity index 100% rename from server/src/server/worldgen/feature/WorldGenSand.java rename to server/src/main/java/server/worldgen/feature/WorldGenSand.java diff --git a/server/src/server/worldgen/feature/WorldGenSpikes.java b/server/src/main/java/server/worldgen/feature/WorldGenSpikes.java similarity index 100% rename from server/src/server/worldgen/feature/WorldGenSpikes.java rename to server/src/main/java/server/worldgen/feature/WorldGenSpikes.java diff --git a/server/src/server/worldgen/foliage/FeatureDoublePlant.java b/server/src/main/java/server/worldgen/foliage/FeatureDoublePlant.java similarity index 100% rename from server/src/server/worldgen/foliage/FeatureDoublePlant.java rename to server/src/main/java/server/worldgen/foliage/FeatureDoublePlant.java diff --git a/server/src/server/worldgen/foliage/WorldGenBigMushroom.java b/server/src/main/java/server/worldgen/foliage/WorldGenBigMushroom.java similarity index 100% rename from server/src/server/worldgen/foliage/WorldGenBigMushroom.java rename to server/src/main/java/server/worldgen/foliage/WorldGenBigMushroom.java diff --git a/server/src/server/worldgen/foliage/WorldGenCactus.java b/server/src/main/java/server/worldgen/foliage/WorldGenCactus.java similarity index 100% rename from server/src/server/worldgen/foliage/WorldGenCactus.java rename to server/src/main/java/server/worldgen/foliage/WorldGenCactus.java diff --git a/server/src/server/worldgen/foliage/WorldGenDeadBush.java b/server/src/main/java/server/worldgen/foliage/WorldGenDeadBush.java similarity index 100% rename from server/src/server/worldgen/foliage/WorldGenDeadBush.java rename to server/src/main/java/server/worldgen/foliage/WorldGenDeadBush.java diff --git a/server/src/server/worldgen/foliage/WorldGenFlowers.java b/server/src/main/java/server/worldgen/foliage/WorldGenFlowers.java similarity index 100% rename from server/src/server/worldgen/foliage/WorldGenFlowers.java rename to server/src/main/java/server/worldgen/foliage/WorldGenFlowers.java diff --git a/server/src/server/worldgen/foliage/WorldGenMelon.java b/server/src/main/java/server/worldgen/foliage/WorldGenMelon.java similarity index 100% rename from server/src/server/worldgen/foliage/WorldGenMelon.java rename to server/src/main/java/server/worldgen/foliage/WorldGenMelon.java diff --git a/server/src/server/worldgen/foliage/WorldGenMushroom.java b/server/src/main/java/server/worldgen/foliage/WorldGenMushroom.java similarity index 100% rename from server/src/server/worldgen/foliage/WorldGenMushroom.java rename to server/src/main/java/server/worldgen/foliage/WorldGenMushroom.java diff --git a/server/src/server/worldgen/foliage/WorldGenPumpkin.java b/server/src/main/java/server/worldgen/foliage/WorldGenPumpkin.java similarity index 100% rename from server/src/server/worldgen/foliage/WorldGenPumpkin.java rename to server/src/main/java/server/worldgen/foliage/WorldGenPumpkin.java diff --git a/server/src/server/worldgen/foliage/WorldGenReed.java b/server/src/main/java/server/worldgen/foliage/WorldGenReed.java similarity index 100% rename from server/src/server/worldgen/foliage/WorldGenReed.java rename to server/src/main/java/server/worldgen/foliage/WorldGenReed.java diff --git a/server/src/server/worldgen/foliage/WorldGenShrub.java b/server/src/main/java/server/worldgen/foliage/WorldGenShrub.java similarity index 100% rename from server/src/server/worldgen/foliage/WorldGenShrub.java rename to server/src/main/java/server/worldgen/foliage/WorldGenShrub.java diff --git a/server/src/server/worldgen/foliage/WorldGenTallGrass.java b/server/src/main/java/server/worldgen/foliage/WorldGenTallGrass.java similarity index 100% rename from server/src/server/worldgen/foliage/WorldGenTallGrass.java rename to server/src/main/java/server/worldgen/foliage/WorldGenTallGrass.java diff --git a/server/src/server/worldgen/foliage/WorldGenVines.java b/server/src/main/java/server/worldgen/foliage/WorldGenVines.java similarity index 100% rename from server/src/server/worldgen/foliage/WorldGenVines.java rename to server/src/main/java/server/worldgen/foliage/WorldGenVines.java diff --git a/server/src/server/worldgen/foliage/WorldGenWaterlily.java b/server/src/main/java/server/worldgen/foliage/WorldGenWaterlily.java similarity index 100% rename from server/src/server/worldgen/foliage/WorldGenWaterlily.java rename to server/src/main/java/server/worldgen/foliage/WorldGenWaterlily.java diff --git a/server/src/server/worldgen/layer/GenLayer.java b/server/src/main/java/server/worldgen/layer/GenLayer.java similarity index 100% rename from server/src/server/worldgen/layer/GenLayer.java rename to server/src/main/java/server/worldgen/layer/GenLayer.java diff --git a/server/src/server/worldgen/layer/GenLayerAddAreas.java b/server/src/main/java/server/worldgen/layer/GenLayerAddAreas.java similarity index 100% rename from server/src/server/worldgen/layer/GenLayerAddAreas.java rename to server/src/main/java/server/worldgen/layer/GenLayerAddAreas.java diff --git a/server/src/server/worldgen/layer/GenLayerAddExtra.java b/server/src/main/java/server/worldgen/layer/GenLayerAddExtra.java similarity index 100% rename from server/src/server/worldgen/layer/GenLayerAddExtra.java rename to server/src/main/java/server/worldgen/layer/GenLayerAddExtra.java diff --git a/server/src/server/worldgen/layer/GenLayerAddSea.java b/server/src/main/java/server/worldgen/layer/GenLayerAddSea.java similarity index 100% rename from server/src/server/worldgen/layer/GenLayerAddSea.java rename to server/src/main/java/server/worldgen/layer/GenLayerAddSea.java diff --git a/server/src/server/worldgen/layer/GenLayerAddSnow.java b/server/src/main/java/server/worldgen/layer/GenLayerAddSnow.java similarity index 100% rename from server/src/server/worldgen/layer/GenLayerAddSnow.java rename to server/src/main/java/server/worldgen/layer/GenLayerAddSnow.java diff --git a/server/src/server/worldgen/layer/GenLayerBase.java b/server/src/main/java/server/worldgen/layer/GenLayerBase.java similarity index 100% rename from server/src/server/worldgen/layer/GenLayerBase.java rename to server/src/main/java/server/worldgen/layer/GenLayerBase.java diff --git a/server/src/server/worldgen/layer/GenLayerBiome.java b/server/src/main/java/server/worldgen/layer/GenLayerBiome.java similarity index 100% rename from server/src/server/worldgen/layer/GenLayerBiome.java rename to server/src/main/java/server/worldgen/layer/GenLayerBiome.java diff --git a/server/src/server/worldgen/layer/GenLayerBiomeEdge.java b/server/src/main/java/server/worldgen/layer/GenLayerBiomeEdge.java similarity index 100% rename from server/src/server/worldgen/layer/GenLayerBiomeEdge.java rename to server/src/main/java/server/worldgen/layer/GenLayerBiomeEdge.java diff --git a/server/src/server/worldgen/layer/GenLayerEdge.java b/server/src/main/java/server/worldgen/layer/GenLayerEdge.java similarity index 100% rename from server/src/server/worldgen/layer/GenLayerEdge.java rename to server/src/main/java/server/worldgen/layer/GenLayerEdge.java diff --git a/server/src/server/worldgen/layer/GenLayerFuzzyZoom.java b/server/src/main/java/server/worldgen/layer/GenLayerFuzzyZoom.java similarity index 100% rename from server/src/server/worldgen/layer/GenLayerFuzzyZoom.java rename to server/src/main/java/server/worldgen/layer/GenLayerFuzzyZoom.java diff --git a/server/src/server/worldgen/layer/GenLayerHills.java b/server/src/main/java/server/worldgen/layer/GenLayerHills.java similarity index 100% rename from server/src/server/worldgen/layer/GenLayerHills.java rename to server/src/main/java/server/worldgen/layer/GenLayerHills.java diff --git a/server/src/server/worldgen/layer/GenLayerRemoveEmpty.java b/server/src/main/java/server/worldgen/layer/GenLayerRemoveEmpty.java similarity index 100% rename from server/src/server/worldgen/layer/GenLayerRemoveEmpty.java rename to server/src/main/java/server/worldgen/layer/GenLayerRemoveEmpty.java diff --git a/server/src/server/worldgen/layer/GenLayerRiver.java b/server/src/main/java/server/worldgen/layer/GenLayerRiver.java similarity index 100% rename from server/src/server/worldgen/layer/GenLayerRiver.java rename to server/src/main/java/server/worldgen/layer/GenLayerRiver.java diff --git a/server/src/server/worldgen/layer/GenLayerRiverInit.java b/server/src/main/java/server/worldgen/layer/GenLayerRiverInit.java similarity index 100% rename from server/src/server/worldgen/layer/GenLayerRiverInit.java rename to server/src/main/java/server/worldgen/layer/GenLayerRiverInit.java diff --git a/server/src/server/worldgen/layer/GenLayerRiverMix.java b/server/src/main/java/server/worldgen/layer/GenLayerRiverMix.java similarity index 100% rename from server/src/server/worldgen/layer/GenLayerRiverMix.java rename to server/src/main/java/server/worldgen/layer/GenLayerRiverMix.java diff --git a/server/src/server/worldgen/layer/GenLayerShore.java b/server/src/main/java/server/worldgen/layer/GenLayerShore.java similarity index 100% rename from server/src/server/worldgen/layer/GenLayerShore.java rename to server/src/main/java/server/worldgen/layer/GenLayerShore.java diff --git a/server/src/server/worldgen/layer/GenLayerSmooth.java b/server/src/main/java/server/worldgen/layer/GenLayerSmooth.java similarity index 100% rename from server/src/server/worldgen/layer/GenLayerSmooth.java rename to server/src/main/java/server/worldgen/layer/GenLayerSmooth.java diff --git a/server/src/server/worldgen/layer/GenLayerVoronoiZoom.java b/server/src/main/java/server/worldgen/layer/GenLayerVoronoiZoom.java similarity index 100% rename from server/src/server/worldgen/layer/GenLayerVoronoiZoom.java rename to server/src/main/java/server/worldgen/layer/GenLayerVoronoiZoom.java diff --git a/server/src/server/worldgen/layer/GenLayerZoom.java b/server/src/main/java/server/worldgen/layer/GenLayerZoom.java similarity index 100% rename from server/src/server/worldgen/layer/GenLayerZoom.java rename to server/src/main/java/server/worldgen/layer/GenLayerZoom.java diff --git a/server/src/server/worldgen/layer/IntCache.java b/server/src/main/java/server/worldgen/layer/IntCache.java similarity index 100% rename from server/src/server/worldgen/layer/IntCache.java rename to server/src/main/java/server/worldgen/layer/IntCache.java diff --git a/server/src/server/worldgen/structure/MapGenBridge.java b/server/src/main/java/server/worldgen/structure/MapGenBridge.java similarity index 100% rename from server/src/server/worldgen/structure/MapGenBridge.java rename to server/src/main/java/server/worldgen/structure/MapGenBridge.java diff --git a/server/src/server/worldgen/structure/MapGenMineshaft.java b/server/src/main/java/server/worldgen/structure/MapGenMineshaft.java similarity index 100% rename from server/src/server/worldgen/structure/MapGenMineshaft.java rename to server/src/main/java/server/worldgen/structure/MapGenMineshaft.java diff --git a/server/src/server/worldgen/structure/MapGenScatteredFeature.java b/server/src/main/java/server/worldgen/structure/MapGenScatteredFeature.java similarity index 100% rename from server/src/server/worldgen/structure/MapGenScatteredFeature.java rename to server/src/main/java/server/worldgen/structure/MapGenScatteredFeature.java diff --git a/server/src/server/worldgen/structure/MapGenStronghold.java b/server/src/main/java/server/worldgen/structure/MapGenStronghold.java similarity index 100% rename from server/src/server/worldgen/structure/MapGenStronghold.java rename to server/src/main/java/server/worldgen/structure/MapGenStronghold.java diff --git a/server/src/server/worldgen/structure/MapGenStructure.java b/server/src/main/java/server/worldgen/structure/MapGenStructure.java similarity index 100% rename from server/src/server/worldgen/structure/MapGenStructure.java rename to server/src/main/java/server/worldgen/structure/MapGenStructure.java diff --git a/server/src/server/worldgen/structure/MapGenStructureIO.java b/server/src/main/java/server/worldgen/structure/MapGenStructureIO.java similarity index 100% rename from server/src/server/worldgen/structure/MapGenStructureIO.java rename to server/src/main/java/server/worldgen/structure/MapGenStructureIO.java diff --git a/server/src/server/worldgen/structure/MapGenVillage.java b/server/src/main/java/server/worldgen/structure/MapGenVillage.java similarity index 100% rename from server/src/server/worldgen/structure/MapGenVillage.java rename to server/src/main/java/server/worldgen/structure/MapGenVillage.java diff --git a/server/src/server/worldgen/structure/StructureBoundingBox.java b/server/src/main/java/server/worldgen/structure/StructureBoundingBox.java similarity index 100% rename from server/src/server/worldgen/structure/StructureBoundingBox.java rename to server/src/main/java/server/worldgen/structure/StructureBoundingBox.java diff --git a/server/src/server/worldgen/structure/StructureBridge.java b/server/src/main/java/server/worldgen/structure/StructureBridge.java similarity index 100% rename from server/src/server/worldgen/structure/StructureBridge.java rename to server/src/main/java/server/worldgen/structure/StructureBridge.java diff --git a/server/src/server/worldgen/structure/StructureComponent.java b/server/src/main/java/server/worldgen/structure/StructureComponent.java similarity index 100% rename from server/src/server/worldgen/structure/StructureComponent.java rename to server/src/main/java/server/worldgen/structure/StructureComponent.java diff --git a/server/src/server/worldgen/structure/StructureMineshaft.java b/server/src/main/java/server/worldgen/structure/StructureMineshaft.java similarity index 100% rename from server/src/server/worldgen/structure/StructureMineshaft.java rename to server/src/main/java/server/worldgen/structure/StructureMineshaft.java diff --git a/server/src/server/worldgen/structure/StructureMineshaftStart.java b/server/src/main/java/server/worldgen/structure/StructureMineshaftStart.java similarity index 100% rename from server/src/server/worldgen/structure/StructureMineshaftStart.java rename to server/src/main/java/server/worldgen/structure/StructureMineshaftStart.java diff --git a/server/src/server/worldgen/structure/StructureScattered.java b/server/src/main/java/server/worldgen/structure/StructureScattered.java similarity index 100% rename from server/src/server/worldgen/structure/StructureScattered.java rename to server/src/main/java/server/worldgen/structure/StructureScattered.java diff --git a/server/src/server/worldgen/structure/StructureStart.java b/server/src/main/java/server/worldgen/structure/StructureStart.java similarity index 100% rename from server/src/server/worldgen/structure/StructureStart.java rename to server/src/main/java/server/worldgen/structure/StructureStart.java diff --git a/server/src/server/worldgen/structure/StructureStronghold.java b/server/src/main/java/server/worldgen/structure/StructureStronghold.java similarity index 100% rename from server/src/server/worldgen/structure/StructureStronghold.java rename to server/src/main/java/server/worldgen/structure/StructureStronghold.java diff --git a/server/src/server/worldgen/structure/StructureVillage.java b/server/src/main/java/server/worldgen/structure/StructureVillage.java similarity index 100% rename from server/src/server/worldgen/structure/StructureVillage.java rename to server/src/main/java/server/worldgen/structure/StructureVillage.java diff --git a/server/src/server/worldgen/tree/WorldGenBaseTree.java b/server/src/main/java/server/worldgen/tree/WorldGenBaseTree.java similarity index 100% rename from server/src/server/worldgen/tree/WorldGenBaseTree.java rename to server/src/main/java/server/worldgen/tree/WorldGenBaseTree.java diff --git a/server/src/server/worldgen/tree/WorldGenBigTree.java b/server/src/main/java/server/worldgen/tree/WorldGenBigTree.java similarity index 100% rename from server/src/server/worldgen/tree/WorldGenBigTree.java rename to server/src/main/java/server/worldgen/tree/WorldGenBigTree.java diff --git a/server/src/server/worldgen/tree/WorldGenBirch.java b/server/src/main/java/server/worldgen/tree/WorldGenBirch.java similarity index 100% rename from server/src/server/worldgen/tree/WorldGenBirch.java rename to server/src/main/java/server/worldgen/tree/WorldGenBirch.java diff --git a/server/src/server/worldgen/tree/WorldGenDarkOak.java b/server/src/main/java/server/worldgen/tree/WorldGenDarkOak.java similarity index 100% rename from server/src/server/worldgen/tree/WorldGenDarkOak.java rename to server/src/main/java/server/worldgen/tree/WorldGenDarkOak.java diff --git a/server/src/server/worldgen/tree/WorldGenHugeTree.java b/server/src/main/java/server/worldgen/tree/WorldGenHugeTree.java similarity index 100% rename from server/src/server/worldgen/tree/WorldGenHugeTree.java rename to server/src/main/java/server/worldgen/tree/WorldGenHugeTree.java diff --git a/server/src/server/worldgen/tree/WorldGenJungle.java b/server/src/main/java/server/worldgen/tree/WorldGenJungle.java similarity index 100% rename from server/src/server/worldgen/tree/WorldGenJungle.java rename to server/src/main/java/server/worldgen/tree/WorldGenJungle.java diff --git a/server/src/server/worldgen/tree/WorldGenPine.java b/server/src/main/java/server/worldgen/tree/WorldGenPine.java similarity index 100% rename from server/src/server/worldgen/tree/WorldGenPine.java rename to server/src/main/java/server/worldgen/tree/WorldGenPine.java diff --git a/server/src/server/worldgen/tree/WorldGenSavanna.java b/server/src/main/java/server/worldgen/tree/WorldGenSavanna.java similarity index 100% rename from server/src/server/worldgen/tree/WorldGenSavanna.java rename to server/src/main/java/server/worldgen/tree/WorldGenSavanna.java diff --git a/server/src/server/worldgen/tree/WorldGenSwamp.java b/server/src/main/java/server/worldgen/tree/WorldGenSwamp.java similarity index 100% rename from server/src/server/worldgen/tree/WorldGenSwamp.java rename to server/src/main/java/server/worldgen/tree/WorldGenSwamp.java diff --git a/server/src/server/worldgen/tree/WorldGenTaiga1.java b/server/src/main/java/server/worldgen/tree/WorldGenTaiga1.java similarity index 100% rename from server/src/server/worldgen/tree/WorldGenTaiga1.java rename to server/src/main/java/server/worldgen/tree/WorldGenTaiga1.java diff --git a/server/src/server/worldgen/tree/WorldGenTaiga2.java b/server/src/main/java/server/worldgen/tree/WorldGenTaiga2.java similarity index 100% rename from server/src/server/worldgen/tree/WorldGenTaiga2.java rename to server/src/main/java/server/worldgen/tree/WorldGenTaiga2.java diff --git a/server/src/server/worldgen/tree/WorldGenTree.java b/server/src/main/java/server/worldgen/tree/WorldGenTree.java similarity index 100% rename from server/src/server/worldgen/tree/WorldGenTree.java rename to server/src/main/java/server/worldgen/tree/WorldGenTree.java diff --git a/settings.gradle.kts b/settings.gradle.kts new file mode 100644 index 0000000..60f7529 --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1,5 @@ + +rootProject.name = "TCR" +include("common") +include("client") +include("server")