From 812ef0bf2d9f8bae71d9fd3284b6e6d218dc919c Mon Sep 17 00:00:00 2001 From: Alexander Date: Sat, 5 Sep 2015 22:01:35 -0400 Subject: [PATCH] Cleaned up and updated forge version. --- build.gradle | 42 ++++++------------ build.properties | 4 +- src/{ => main/java}/mantle/Mantle.java | 0 .../java}/mantle/blocks/BlockUtils.java | 0 .../java}/mantle/blocks/MantleBlock.java | 0 .../abstracts/AdaptiveInventoryLogic.java | 0 .../abstracts/ExpandableInventoryLogic.java | 0 .../blocks/abstracts/InventoryBlock.java | 0 .../blocks/abstracts/InventoryLogic.java | 0 .../blocks/abstracts/InventorySlab.java | 0 .../blocks/abstracts/MultiItemBlock.java | 0 .../blocks/abstracts/MultiServantLogic.java | 0 .../mantle/blocks/iface/IActiveLogic.java | 0 .../java}/mantle/blocks/iface/ICrop.java | 0 .../mantle/blocks/iface/IFacingLogic.java | 0 .../mantle/blocks/iface/IMasterLogic.java | 0 .../mantle/blocks/iface/IMasterNode.java | 0 .../mantle/blocks/iface/IServantLogic.java | 0 .../blocks/util/IBlockWithVariants.java | 0 .../mantle/blocks/util/ItemBlockVariants.java | 0 .../blocks/util/blockstates/BlockVariant.java | 0 .../util/blockstates/PropertyVariant.java | 0 .../java}/mantle/books/BookData.java | 0 .../java}/mantle/books/BookDataStore.java | 0 .../java}/mantle/books/ManualReader.java | 0 .../java}/mantle/books/client/BookImage.java | 0 .../java}/mantle/books/external/BookIS.java | 0 .../java}/mantle/books/external/BookLoad.java | 0 .../mantle/books/external/ZipLoader.java | 0 .../java}/mantle/client/MProxyClient.java | 0 .../java}/mantle/client/ModelHelper.java | 0 .../java}/mantle/client/ModelVariant.java | 0 .../java}/mantle/client/gui/GuiManual.java | 0 .../mantle/client/gui/TurnPageButton.java | 0 .../java}/mantle/client/pages/BlankPage.java | 0 .../java}/mantle/client/pages/BookPage.java | 0 .../client/pages/ContentsTablePage.java | 0 .../mantle/client/pages/CraftingPage.java | 0 .../mantle/client/pages/FurnacePage.java | 0 .../mantle/client/pages/PicturePage.java | 0 .../mantle/client/pages/SectionPage.java | 0 .../mantle/client/pages/SidebarPage.java | 0 .../java}/mantle/client/pages/TextPage.java | 0 .../java}/mantle/client/pages/TitlePage.java | 0 .../java}/mantle/common/ComparisonHelper.java | 0 .../java}/mantle/common/IDDumps.java | 0 .../java}/mantle/common/MProxyCommon.java | 0 .../mantle/common/network/AbstractPacket.java | 0 .../mantle/common/network/PacketUpdateTE.java | 0 .../mantle/crash/CallableSuppConfig.java | 0 .../mantle/crash/CallableUnsuppConfig.java | 0 .../java}/mantle/debug/DebugData.java | 0 .../java}/mantle/debug/DebugHelper.java | 0 .../java}/mantle/debug/IDebuggable.java | 0 .../java}/mantle/event/ManualOpenEvent.java | 0 .../java}/mantle/event/Migration.java | 0 .../java}/mantle/items/ItemUtils.java | 0 src/{ => main/java}/mantle/items/Manual.java | 0 .../mantle/items/abstracts/CraftingItem.java | 0 .../java}/mantle/items/iface/IDebugItem.java | 0 .../java}/mantle/lib/CoreConfig.java | 0 src/{ => main/java}/mantle/lib/CoreRepo.java | 0 src/{ => main/java}/mantle/lib/TabTools.java | 0 .../lib/client/MantleClientRegistry.java | 0 .../lib/environment/EnvironmentChecks.java | 0 src/{ => main/java}/mantle/math/Dozenal.java | 0 .../java}/mantle/player/PlayerUtils.java | 0 .../java}/mantle/pulsar/config/ForgeCFG.java | 0 .../mantle/pulsar/config/IConfiguration.java | 0 .../mantle/pulsar/control/PulseManager.java | 0 .../java}/mantle/pulsar/debug/EventSpy.java | 0 .../mantle/pulsar/internal/Configuration.java | 0 .../mantle/pulsar/internal/CrashHandler.java | 0 .../pulsar/internal/logging/ILogger.java | 0 .../pulsar/internal/logging/JULLogger.java | 0 .../pulsar/internal/logging/Log4jLogger.java | 0 .../pulsar/internal/logging/LogManager.java | 0 .../java}/mantle/pulsar/package-info.java | 0 .../java}/mantle/pulsar/pulse/Pulse.java | 0 .../java}/mantle/pulsar/pulse/PulseMeta.java | 0 .../java}/mantle/utils/ItemMetaWrapper.java | 0 .../mantle/utils/ItemStackNBTWrapper.java | 0 .../java}/mantle/utils/ItemStackWrapper.java | 0 .../java}/mantle/utils/RecipeRemover.java | 0 .../java}/mantle/world/ChunkCoord.java | 0 .../java}/mantle/world/CoordTuplePair.java | 0 .../mantle/world/DimensionCoordPair.java | 0 .../mantle/world/DimensionCoordTuple.java | 0 .../java}/mantle/world/DirectionUtils.java | 0 {resources => src/main/resources}/Mantle.png | Bin .../resources}/assets/mantle/manuals/test.xml | 0 .../assets/mantle/models/item/mantleBook.json | 0 .../assets/mantle/textures/gui/book.png | Bin .../mantle/textures/gui/bookcrafting.png | Bin .../mantle/textures/gui/bookfurnace.png | Bin .../assets/mantle/textures/gui/bookleft.png | Bin .../assets/mantle/textures/gui/bookright.png | Bin .../assets/mantle/textures/gui/missingno.png | Bin .../mantle/textures/gui/tinkerbook_blue.png | Bin .../mantle/textures/gui/tinkerbook_green.png | Bin .../mantle/textures/items/mantlebook_blue.png | Bin .../mantle/textures/items/tinkerbook_blue.png | Bin .../textures/items/tinkerbook_diary.png | Bin .../textures/items/tinkerbook_green.png | Bin .../textures/items/tinkerbook_smeltery.png | Bin .../textures/items/tinkerbook_toolstation.png | Bin {resources => src/main/resources}/mcmod.info | 0 107 files changed, 15 insertions(+), 31 deletions(-) rename src/{ => main/java}/mantle/Mantle.java (100%) rename src/{ => main/java}/mantle/blocks/BlockUtils.java (100%) rename src/{ => main/java}/mantle/blocks/MantleBlock.java (100%) rename src/{ => main/java}/mantle/blocks/abstracts/AdaptiveInventoryLogic.java (100%) rename src/{ => main/java}/mantle/blocks/abstracts/ExpandableInventoryLogic.java (100%) rename src/{ => main/java}/mantle/blocks/abstracts/InventoryBlock.java (100%) rename src/{ => main/java}/mantle/blocks/abstracts/InventoryLogic.java (100%) rename src/{ => main/java}/mantle/blocks/abstracts/InventorySlab.java (100%) rename src/{ => main/java}/mantle/blocks/abstracts/MultiItemBlock.java (100%) rename src/{ => main/java}/mantle/blocks/abstracts/MultiServantLogic.java (100%) rename src/{ => main/java}/mantle/blocks/iface/IActiveLogic.java (100%) rename src/{ => main/java}/mantle/blocks/iface/ICrop.java (100%) rename src/{ => main/java}/mantle/blocks/iface/IFacingLogic.java (100%) rename src/{ => main/java}/mantle/blocks/iface/IMasterLogic.java (100%) rename src/{ => main/java}/mantle/blocks/iface/IMasterNode.java (100%) rename src/{ => main/java}/mantle/blocks/iface/IServantLogic.java (100%) rename src/{ => main/java}/mantle/blocks/util/IBlockWithVariants.java (100%) rename src/{ => main/java}/mantle/blocks/util/ItemBlockVariants.java (100%) rename src/{ => main/java}/mantle/blocks/util/blockstates/BlockVariant.java (100%) rename src/{ => main/java}/mantle/blocks/util/blockstates/PropertyVariant.java (100%) rename src/{ => main/java}/mantle/books/BookData.java (100%) rename src/{ => main/java}/mantle/books/BookDataStore.java (100%) rename src/{ => main/java}/mantle/books/ManualReader.java (100%) rename src/{ => main/java}/mantle/books/client/BookImage.java (100%) rename src/{ => main/java}/mantle/books/external/BookIS.java (100%) rename src/{ => main/java}/mantle/books/external/BookLoad.java (100%) rename src/{ => main/java}/mantle/books/external/ZipLoader.java (100%) rename src/{ => main/java}/mantle/client/MProxyClient.java (100%) rename src/{ => main/java}/mantle/client/ModelHelper.java (100%) rename src/{ => main/java}/mantle/client/ModelVariant.java (100%) rename src/{ => main/java}/mantle/client/gui/GuiManual.java (100%) rename src/{ => main/java}/mantle/client/gui/TurnPageButton.java (100%) rename src/{ => main/java}/mantle/client/pages/BlankPage.java (100%) rename src/{ => main/java}/mantle/client/pages/BookPage.java (100%) rename src/{ => main/java}/mantle/client/pages/ContentsTablePage.java (100%) rename src/{ => main/java}/mantle/client/pages/CraftingPage.java (100%) rename src/{ => main/java}/mantle/client/pages/FurnacePage.java (100%) rename src/{ => main/java}/mantle/client/pages/PicturePage.java (100%) rename src/{ => main/java}/mantle/client/pages/SectionPage.java (100%) rename src/{ => main/java}/mantle/client/pages/SidebarPage.java (100%) rename src/{ => main/java}/mantle/client/pages/TextPage.java (100%) rename src/{ => main/java}/mantle/client/pages/TitlePage.java (100%) rename src/{ => main/java}/mantle/common/ComparisonHelper.java (100%) rename src/{ => main/java}/mantle/common/IDDumps.java (100%) rename src/{ => main/java}/mantle/common/MProxyCommon.java (100%) rename src/{ => main/java}/mantle/common/network/AbstractPacket.java (100%) rename src/{ => main/java}/mantle/common/network/PacketUpdateTE.java (100%) rename src/{ => main/java}/mantle/crash/CallableSuppConfig.java (100%) rename src/{ => main/java}/mantle/crash/CallableUnsuppConfig.java (100%) rename src/{ => main/java}/mantle/debug/DebugData.java (100%) rename src/{ => main/java}/mantle/debug/DebugHelper.java (100%) rename src/{ => main/java}/mantle/debug/IDebuggable.java (100%) rename src/{ => main/java}/mantle/event/ManualOpenEvent.java (100%) rename src/{ => main/java}/mantle/event/Migration.java (100%) rename src/{ => main/java}/mantle/items/ItemUtils.java (100%) rename src/{ => main/java}/mantle/items/Manual.java (100%) rename src/{ => main/java}/mantle/items/abstracts/CraftingItem.java (100%) rename src/{ => main/java}/mantle/items/iface/IDebugItem.java (100%) rename src/{ => main/java}/mantle/lib/CoreConfig.java (100%) rename src/{ => main/java}/mantle/lib/CoreRepo.java (100%) rename src/{ => main/java}/mantle/lib/TabTools.java (100%) rename src/{ => main/java}/mantle/lib/client/MantleClientRegistry.java (100%) rename src/{ => main/java}/mantle/lib/environment/EnvironmentChecks.java (100%) rename src/{ => main/java}/mantle/math/Dozenal.java (100%) rename src/{ => main/java}/mantle/player/PlayerUtils.java (100%) rename src/{ => main/java}/mantle/pulsar/config/ForgeCFG.java (100%) rename src/{ => main/java}/mantle/pulsar/config/IConfiguration.java (100%) mode change 100755 => 100644 rename src/{ => main/java}/mantle/pulsar/control/PulseManager.java (100%) mode change 100755 => 100644 rename src/{ => main/java}/mantle/pulsar/debug/EventSpy.java (100%) mode change 100755 => 100644 rename src/{ => main/java}/mantle/pulsar/internal/Configuration.java (100%) mode change 100755 => 100644 rename src/{ => main/java}/mantle/pulsar/internal/CrashHandler.java (100%) mode change 100755 => 100644 rename src/{ => main/java}/mantle/pulsar/internal/logging/ILogger.java (100%) mode change 100755 => 100644 rename src/{ => main/java}/mantle/pulsar/internal/logging/JULLogger.java (100%) mode change 100755 => 100644 rename src/{ => main/java}/mantle/pulsar/internal/logging/Log4jLogger.java (100%) mode change 100755 => 100644 rename src/{ => main/java}/mantle/pulsar/internal/logging/LogManager.java (100%) mode change 100755 => 100644 rename src/{ => main/java}/mantle/pulsar/package-info.java (100%) rename src/{ => main/java}/mantle/pulsar/pulse/Pulse.java (100%) mode change 100755 => 100644 rename src/{ => main/java}/mantle/pulsar/pulse/PulseMeta.java (100%) mode change 100755 => 100644 rename src/{ => main/java}/mantle/utils/ItemMetaWrapper.java (100%) rename src/{ => main/java}/mantle/utils/ItemStackNBTWrapper.java (100%) rename src/{ => main/java}/mantle/utils/ItemStackWrapper.java (100%) rename src/{ => main/java}/mantle/utils/RecipeRemover.java (100%) rename src/{ => main/java}/mantle/world/ChunkCoord.java (100%) rename src/{ => main/java}/mantle/world/CoordTuplePair.java (100%) rename src/{ => main/java}/mantle/world/DimensionCoordPair.java (100%) rename src/{ => main/java}/mantle/world/DimensionCoordTuple.java (100%) rename src/{ => main/java}/mantle/world/DirectionUtils.java (100%) rename {resources => src/main/resources}/Mantle.png (100%) rename {resources => src/main/resources}/assets/mantle/manuals/test.xml (100%) rename {resources => src/main/resources}/assets/mantle/models/item/mantleBook.json (100%) rename {resources => src/main/resources}/assets/mantle/textures/gui/book.png (100%) rename {resources => src/main/resources}/assets/mantle/textures/gui/bookcrafting.png (100%) rename {resources => src/main/resources}/assets/mantle/textures/gui/bookfurnace.png (100%) rename {resources => src/main/resources}/assets/mantle/textures/gui/bookleft.png (100%) rename {resources => src/main/resources}/assets/mantle/textures/gui/bookright.png (100%) rename {resources => src/main/resources}/assets/mantle/textures/gui/missingno.png (100%) rename {resources => src/main/resources}/assets/mantle/textures/gui/tinkerbook_blue.png (100%) rename {resources => src/main/resources}/assets/mantle/textures/gui/tinkerbook_green.png (100%) rename {resources => src/main/resources}/assets/mantle/textures/items/mantlebook_blue.png (100%) rename {resources => src/main/resources}/assets/mantle/textures/items/tinkerbook_blue.png (100%) rename {resources => src/main/resources}/assets/mantle/textures/items/tinkerbook_diary.png (100%) rename {resources => src/main/resources}/assets/mantle/textures/items/tinkerbook_green.png (100%) rename {resources => src/main/resources}/assets/mantle/textures/items/tinkerbook_smeltery.png (100%) rename {resources => src/main/resources}/assets/mantle/textures/items/tinkerbook_toolstation.png (100%) rename {resources => src/main/resources}/mcmod.info (100%) diff --git a/build.gradle b/build.gradle index 6991104..be35c95 100644 --- a/build.gradle +++ b/build.gradle @@ -4,25 +4,27 @@ * Based on TConstruct's master build file * Authors: Sunstrike, ProgWML6 * Help from AbrarSyed - */ +*/ buildscript { repositories { mavenCentral() - mavenLocal() + mavenLocal() + jcenter() maven { - name = 'ForgeFS' - url = 'http://files.minecraftforge.net/maven' + name = "forge" + url = "http://files.minecraftforge.net/maven" } - maven { + maven { name = "sonatype" url = "https://oss.sonatype.org/content/repositories/snapshots/" } } dependencies { - classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT' + classpath 'net.minecraftforge.gradle:ForgeGradle:2.0-SNAPSHOT' } } +apply plugin: 'net.minecraftforge.gradle.forge' repositories { mavenLocal() @@ -32,8 +34,6 @@ repositories { } } - -apply plugin: 'forge' group = 'mantle' sourceCompatibility = 1.7 targetCompatibility = 1.7 @@ -48,8 +48,7 @@ configFile.withReader { project.ext.config = new ConfigSlurper().parse prop } -// sets version to the slimeKnights default version format -// Finds and sets version data +// sets version to the slimeKnights version format task buildInfo { def cmd = "git rev-parse --short HEAD" def proc = cmd.execute() @@ -83,30 +82,17 @@ minecraft { replace '${version}', project.version } - -sourceSets { - main { - resources { - srcDir 'resources' - } - java { - srcDir 'src' - } - } -} processResources { inputs.property "version", artifact_version inputs.property "MCversion", config.minecraft_version - - // replace stuff in text files, not binary ones. + // replace stuff in text files, not binary ones. from(sourceSets.main.resources.srcDirs) { include '**/*.info' - // replace version and MCVersion + // replace version and MCVersion expand 'version':artifact_version,'MCversion':config.minecraft_version } - - // copy everything else, thats not text + // copy everything else, thats not text from(sourceSets.main.resources.srcDirs) { exclude '**/*.info' } @@ -129,9 +115,7 @@ artifacts { } task("uploadJars", dependsOn:"build") { - description = "uploads JARs" - if (project.hasProperty("local_maven")) { apply plugin: 'maven' uploadArchives { @@ -142,4 +126,4 @@ task("uploadJars", dependsOn:"build") { } } } -} \ No newline at end of file +} diff --git a/build.properties b/build.properties index 0c8a802..74c1dfa 100644 --- a/build.properties +++ b/build.properties @@ -1,5 +1,5 @@ mod_version=0.4 minecraft_version=1.8 -forge_version=11.14.3.1487 -mappings=snapshot_20150708 +forge_version=11.14.3.1512 +mappings=snapshot_20150905 diff --git a/src/mantle/Mantle.java b/src/main/java/mantle/Mantle.java similarity index 100% rename from src/mantle/Mantle.java rename to src/main/java/mantle/Mantle.java diff --git a/src/mantle/blocks/BlockUtils.java b/src/main/java/mantle/blocks/BlockUtils.java similarity index 100% rename from src/mantle/blocks/BlockUtils.java rename to src/main/java/mantle/blocks/BlockUtils.java diff --git a/src/mantle/blocks/MantleBlock.java b/src/main/java/mantle/blocks/MantleBlock.java similarity index 100% rename from src/mantle/blocks/MantleBlock.java rename to src/main/java/mantle/blocks/MantleBlock.java diff --git a/src/mantle/blocks/abstracts/AdaptiveInventoryLogic.java b/src/main/java/mantle/blocks/abstracts/AdaptiveInventoryLogic.java similarity index 100% rename from src/mantle/blocks/abstracts/AdaptiveInventoryLogic.java rename to src/main/java/mantle/blocks/abstracts/AdaptiveInventoryLogic.java diff --git a/src/mantle/blocks/abstracts/ExpandableInventoryLogic.java b/src/main/java/mantle/blocks/abstracts/ExpandableInventoryLogic.java similarity index 100% rename from src/mantle/blocks/abstracts/ExpandableInventoryLogic.java rename to src/main/java/mantle/blocks/abstracts/ExpandableInventoryLogic.java diff --git a/src/mantle/blocks/abstracts/InventoryBlock.java b/src/main/java/mantle/blocks/abstracts/InventoryBlock.java similarity index 100% rename from src/mantle/blocks/abstracts/InventoryBlock.java rename to src/main/java/mantle/blocks/abstracts/InventoryBlock.java diff --git a/src/mantle/blocks/abstracts/InventoryLogic.java b/src/main/java/mantle/blocks/abstracts/InventoryLogic.java similarity index 100% rename from src/mantle/blocks/abstracts/InventoryLogic.java rename to src/main/java/mantle/blocks/abstracts/InventoryLogic.java diff --git a/src/mantle/blocks/abstracts/InventorySlab.java b/src/main/java/mantle/blocks/abstracts/InventorySlab.java similarity index 100% rename from src/mantle/blocks/abstracts/InventorySlab.java rename to src/main/java/mantle/blocks/abstracts/InventorySlab.java diff --git a/src/mantle/blocks/abstracts/MultiItemBlock.java b/src/main/java/mantle/blocks/abstracts/MultiItemBlock.java similarity index 100% rename from src/mantle/blocks/abstracts/MultiItemBlock.java rename to src/main/java/mantle/blocks/abstracts/MultiItemBlock.java diff --git a/src/mantle/blocks/abstracts/MultiServantLogic.java b/src/main/java/mantle/blocks/abstracts/MultiServantLogic.java similarity index 100% rename from src/mantle/blocks/abstracts/MultiServantLogic.java rename to src/main/java/mantle/blocks/abstracts/MultiServantLogic.java diff --git a/src/mantle/blocks/iface/IActiveLogic.java b/src/main/java/mantle/blocks/iface/IActiveLogic.java similarity index 100% rename from src/mantle/blocks/iface/IActiveLogic.java rename to src/main/java/mantle/blocks/iface/IActiveLogic.java diff --git a/src/mantle/blocks/iface/ICrop.java b/src/main/java/mantle/blocks/iface/ICrop.java similarity index 100% rename from src/mantle/blocks/iface/ICrop.java rename to src/main/java/mantle/blocks/iface/ICrop.java diff --git a/src/mantle/blocks/iface/IFacingLogic.java b/src/main/java/mantle/blocks/iface/IFacingLogic.java similarity index 100% rename from src/mantle/blocks/iface/IFacingLogic.java rename to src/main/java/mantle/blocks/iface/IFacingLogic.java diff --git a/src/mantle/blocks/iface/IMasterLogic.java b/src/main/java/mantle/blocks/iface/IMasterLogic.java similarity index 100% rename from src/mantle/blocks/iface/IMasterLogic.java rename to src/main/java/mantle/blocks/iface/IMasterLogic.java diff --git a/src/mantle/blocks/iface/IMasterNode.java b/src/main/java/mantle/blocks/iface/IMasterNode.java similarity index 100% rename from src/mantle/blocks/iface/IMasterNode.java rename to src/main/java/mantle/blocks/iface/IMasterNode.java diff --git a/src/mantle/blocks/iface/IServantLogic.java b/src/main/java/mantle/blocks/iface/IServantLogic.java similarity index 100% rename from src/mantle/blocks/iface/IServantLogic.java rename to src/main/java/mantle/blocks/iface/IServantLogic.java diff --git a/src/mantle/blocks/util/IBlockWithVariants.java b/src/main/java/mantle/blocks/util/IBlockWithVariants.java similarity index 100% rename from src/mantle/blocks/util/IBlockWithVariants.java rename to src/main/java/mantle/blocks/util/IBlockWithVariants.java diff --git a/src/mantle/blocks/util/ItemBlockVariants.java b/src/main/java/mantle/blocks/util/ItemBlockVariants.java similarity index 100% rename from src/mantle/blocks/util/ItemBlockVariants.java rename to src/main/java/mantle/blocks/util/ItemBlockVariants.java diff --git a/src/mantle/blocks/util/blockstates/BlockVariant.java b/src/main/java/mantle/blocks/util/blockstates/BlockVariant.java similarity index 100% rename from src/mantle/blocks/util/blockstates/BlockVariant.java rename to src/main/java/mantle/blocks/util/blockstates/BlockVariant.java diff --git a/src/mantle/blocks/util/blockstates/PropertyVariant.java b/src/main/java/mantle/blocks/util/blockstates/PropertyVariant.java similarity index 100% rename from src/mantle/blocks/util/blockstates/PropertyVariant.java rename to src/main/java/mantle/blocks/util/blockstates/PropertyVariant.java diff --git a/src/mantle/books/BookData.java b/src/main/java/mantle/books/BookData.java similarity index 100% rename from src/mantle/books/BookData.java rename to src/main/java/mantle/books/BookData.java diff --git a/src/mantle/books/BookDataStore.java b/src/main/java/mantle/books/BookDataStore.java similarity index 100% rename from src/mantle/books/BookDataStore.java rename to src/main/java/mantle/books/BookDataStore.java diff --git a/src/mantle/books/ManualReader.java b/src/main/java/mantle/books/ManualReader.java similarity index 100% rename from src/mantle/books/ManualReader.java rename to src/main/java/mantle/books/ManualReader.java diff --git a/src/mantle/books/client/BookImage.java b/src/main/java/mantle/books/client/BookImage.java similarity index 100% rename from src/mantle/books/client/BookImage.java rename to src/main/java/mantle/books/client/BookImage.java diff --git a/src/mantle/books/external/BookIS.java b/src/main/java/mantle/books/external/BookIS.java similarity index 100% rename from src/mantle/books/external/BookIS.java rename to src/main/java/mantle/books/external/BookIS.java diff --git a/src/mantle/books/external/BookLoad.java b/src/main/java/mantle/books/external/BookLoad.java similarity index 100% rename from src/mantle/books/external/BookLoad.java rename to src/main/java/mantle/books/external/BookLoad.java diff --git a/src/mantle/books/external/ZipLoader.java b/src/main/java/mantle/books/external/ZipLoader.java similarity index 100% rename from src/mantle/books/external/ZipLoader.java rename to src/main/java/mantle/books/external/ZipLoader.java diff --git a/src/mantle/client/MProxyClient.java b/src/main/java/mantle/client/MProxyClient.java similarity index 100% rename from src/mantle/client/MProxyClient.java rename to src/main/java/mantle/client/MProxyClient.java diff --git a/src/mantle/client/ModelHelper.java b/src/main/java/mantle/client/ModelHelper.java similarity index 100% rename from src/mantle/client/ModelHelper.java rename to src/main/java/mantle/client/ModelHelper.java diff --git a/src/mantle/client/ModelVariant.java b/src/main/java/mantle/client/ModelVariant.java similarity index 100% rename from src/mantle/client/ModelVariant.java rename to src/main/java/mantle/client/ModelVariant.java diff --git a/src/mantle/client/gui/GuiManual.java b/src/main/java/mantle/client/gui/GuiManual.java similarity index 100% rename from src/mantle/client/gui/GuiManual.java rename to src/main/java/mantle/client/gui/GuiManual.java diff --git a/src/mantle/client/gui/TurnPageButton.java b/src/main/java/mantle/client/gui/TurnPageButton.java similarity index 100% rename from src/mantle/client/gui/TurnPageButton.java rename to src/main/java/mantle/client/gui/TurnPageButton.java diff --git a/src/mantle/client/pages/BlankPage.java b/src/main/java/mantle/client/pages/BlankPage.java similarity index 100% rename from src/mantle/client/pages/BlankPage.java rename to src/main/java/mantle/client/pages/BlankPage.java diff --git a/src/mantle/client/pages/BookPage.java b/src/main/java/mantle/client/pages/BookPage.java similarity index 100% rename from src/mantle/client/pages/BookPage.java rename to src/main/java/mantle/client/pages/BookPage.java diff --git a/src/mantle/client/pages/ContentsTablePage.java b/src/main/java/mantle/client/pages/ContentsTablePage.java similarity index 100% rename from src/mantle/client/pages/ContentsTablePage.java rename to src/main/java/mantle/client/pages/ContentsTablePage.java diff --git a/src/mantle/client/pages/CraftingPage.java b/src/main/java/mantle/client/pages/CraftingPage.java similarity index 100% rename from src/mantle/client/pages/CraftingPage.java rename to src/main/java/mantle/client/pages/CraftingPage.java diff --git a/src/mantle/client/pages/FurnacePage.java b/src/main/java/mantle/client/pages/FurnacePage.java similarity index 100% rename from src/mantle/client/pages/FurnacePage.java rename to src/main/java/mantle/client/pages/FurnacePage.java diff --git a/src/mantle/client/pages/PicturePage.java b/src/main/java/mantle/client/pages/PicturePage.java similarity index 100% rename from src/mantle/client/pages/PicturePage.java rename to src/main/java/mantle/client/pages/PicturePage.java diff --git a/src/mantle/client/pages/SectionPage.java b/src/main/java/mantle/client/pages/SectionPage.java similarity index 100% rename from src/mantle/client/pages/SectionPage.java rename to src/main/java/mantle/client/pages/SectionPage.java diff --git a/src/mantle/client/pages/SidebarPage.java b/src/main/java/mantle/client/pages/SidebarPage.java similarity index 100% rename from src/mantle/client/pages/SidebarPage.java rename to src/main/java/mantle/client/pages/SidebarPage.java diff --git a/src/mantle/client/pages/TextPage.java b/src/main/java/mantle/client/pages/TextPage.java similarity index 100% rename from src/mantle/client/pages/TextPage.java rename to src/main/java/mantle/client/pages/TextPage.java diff --git a/src/mantle/client/pages/TitlePage.java b/src/main/java/mantle/client/pages/TitlePage.java similarity index 100% rename from src/mantle/client/pages/TitlePage.java rename to src/main/java/mantle/client/pages/TitlePage.java diff --git a/src/mantle/common/ComparisonHelper.java b/src/main/java/mantle/common/ComparisonHelper.java similarity index 100% rename from src/mantle/common/ComparisonHelper.java rename to src/main/java/mantle/common/ComparisonHelper.java diff --git a/src/mantle/common/IDDumps.java b/src/main/java/mantle/common/IDDumps.java similarity index 100% rename from src/mantle/common/IDDumps.java rename to src/main/java/mantle/common/IDDumps.java diff --git a/src/mantle/common/MProxyCommon.java b/src/main/java/mantle/common/MProxyCommon.java similarity index 100% rename from src/mantle/common/MProxyCommon.java rename to src/main/java/mantle/common/MProxyCommon.java diff --git a/src/mantle/common/network/AbstractPacket.java b/src/main/java/mantle/common/network/AbstractPacket.java similarity index 100% rename from src/mantle/common/network/AbstractPacket.java rename to src/main/java/mantle/common/network/AbstractPacket.java diff --git a/src/mantle/common/network/PacketUpdateTE.java b/src/main/java/mantle/common/network/PacketUpdateTE.java similarity index 100% rename from src/mantle/common/network/PacketUpdateTE.java rename to src/main/java/mantle/common/network/PacketUpdateTE.java diff --git a/src/mantle/crash/CallableSuppConfig.java b/src/main/java/mantle/crash/CallableSuppConfig.java similarity index 100% rename from src/mantle/crash/CallableSuppConfig.java rename to src/main/java/mantle/crash/CallableSuppConfig.java diff --git a/src/mantle/crash/CallableUnsuppConfig.java b/src/main/java/mantle/crash/CallableUnsuppConfig.java similarity index 100% rename from src/mantle/crash/CallableUnsuppConfig.java rename to src/main/java/mantle/crash/CallableUnsuppConfig.java diff --git a/src/mantle/debug/DebugData.java b/src/main/java/mantle/debug/DebugData.java similarity index 100% rename from src/mantle/debug/DebugData.java rename to src/main/java/mantle/debug/DebugData.java diff --git a/src/mantle/debug/DebugHelper.java b/src/main/java/mantle/debug/DebugHelper.java similarity index 100% rename from src/mantle/debug/DebugHelper.java rename to src/main/java/mantle/debug/DebugHelper.java diff --git a/src/mantle/debug/IDebuggable.java b/src/main/java/mantle/debug/IDebuggable.java similarity index 100% rename from src/mantle/debug/IDebuggable.java rename to src/main/java/mantle/debug/IDebuggable.java diff --git a/src/mantle/event/ManualOpenEvent.java b/src/main/java/mantle/event/ManualOpenEvent.java similarity index 100% rename from src/mantle/event/ManualOpenEvent.java rename to src/main/java/mantle/event/ManualOpenEvent.java diff --git a/src/mantle/event/Migration.java b/src/main/java/mantle/event/Migration.java similarity index 100% rename from src/mantle/event/Migration.java rename to src/main/java/mantle/event/Migration.java diff --git a/src/mantle/items/ItemUtils.java b/src/main/java/mantle/items/ItemUtils.java similarity index 100% rename from src/mantle/items/ItemUtils.java rename to src/main/java/mantle/items/ItemUtils.java diff --git a/src/mantle/items/Manual.java b/src/main/java/mantle/items/Manual.java similarity index 100% rename from src/mantle/items/Manual.java rename to src/main/java/mantle/items/Manual.java diff --git a/src/mantle/items/abstracts/CraftingItem.java b/src/main/java/mantle/items/abstracts/CraftingItem.java similarity index 100% rename from src/mantle/items/abstracts/CraftingItem.java rename to src/main/java/mantle/items/abstracts/CraftingItem.java diff --git a/src/mantle/items/iface/IDebugItem.java b/src/main/java/mantle/items/iface/IDebugItem.java similarity index 100% rename from src/mantle/items/iface/IDebugItem.java rename to src/main/java/mantle/items/iface/IDebugItem.java diff --git a/src/mantle/lib/CoreConfig.java b/src/main/java/mantle/lib/CoreConfig.java similarity index 100% rename from src/mantle/lib/CoreConfig.java rename to src/main/java/mantle/lib/CoreConfig.java diff --git a/src/mantle/lib/CoreRepo.java b/src/main/java/mantle/lib/CoreRepo.java similarity index 100% rename from src/mantle/lib/CoreRepo.java rename to src/main/java/mantle/lib/CoreRepo.java diff --git a/src/mantle/lib/TabTools.java b/src/main/java/mantle/lib/TabTools.java similarity index 100% rename from src/mantle/lib/TabTools.java rename to src/main/java/mantle/lib/TabTools.java diff --git a/src/mantle/lib/client/MantleClientRegistry.java b/src/main/java/mantle/lib/client/MantleClientRegistry.java similarity index 100% rename from src/mantle/lib/client/MantleClientRegistry.java rename to src/main/java/mantle/lib/client/MantleClientRegistry.java diff --git a/src/mantle/lib/environment/EnvironmentChecks.java b/src/main/java/mantle/lib/environment/EnvironmentChecks.java similarity index 100% rename from src/mantle/lib/environment/EnvironmentChecks.java rename to src/main/java/mantle/lib/environment/EnvironmentChecks.java diff --git a/src/mantle/math/Dozenal.java b/src/main/java/mantle/math/Dozenal.java similarity index 100% rename from src/mantle/math/Dozenal.java rename to src/main/java/mantle/math/Dozenal.java diff --git a/src/mantle/player/PlayerUtils.java b/src/main/java/mantle/player/PlayerUtils.java similarity index 100% rename from src/mantle/player/PlayerUtils.java rename to src/main/java/mantle/player/PlayerUtils.java diff --git a/src/mantle/pulsar/config/ForgeCFG.java b/src/main/java/mantle/pulsar/config/ForgeCFG.java similarity index 100% rename from src/mantle/pulsar/config/ForgeCFG.java rename to src/main/java/mantle/pulsar/config/ForgeCFG.java diff --git a/src/mantle/pulsar/config/IConfiguration.java b/src/main/java/mantle/pulsar/config/IConfiguration.java old mode 100755 new mode 100644 similarity index 100% rename from src/mantle/pulsar/config/IConfiguration.java rename to src/main/java/mantle/pulsar/config/IConfiguration.java diff --git a/src/mantle/pulsar/control/PulseManager.java b/src/main/java/mantle/pulsar/control/PulseManager.java old mode 100755 new mode 100644 similarity index 100% rename from src/mantle/pulsar/control/PulseManager.java rename to src/main/java/mantle/pulsar/control/PulseManager.java diff --git a/src/mantle/pulsar/debug/EventSpy.java b/src/main/java/mantle/pulsar/debug/EventSpy.java old mode 100755 new mode 100644 similarity index 100% rename from src/mantle/pulsar/debug/EventSpy.java rename to src/main/java/mantle/pulsar/debug/EventSpy.java diff --git a/src/mantle/pulsar/internal/Configuration.java b/src/main/java/mantle/pulsar/internal/Configuration.java old mode 100755 new mode 100644 similarity index 100% rename from src/mantle/pulsar/internal/Configuration.java rename to src/main/java/mantle/pulsar/internal/Configuration.java diff --git a/src/mantle/pulsar/internal/CrashHandler.java b/src/main/java/mantle/pulsar/internal/CrashHandler.java old mode 100755 new mode 100644 similarity index 100% rename from src/mantle/pulsar/internal/CrashHandler.java rename to src/main/java/mantle/pulsar/internal/CrashHandler.java diff --git a/src/mantle/pulsar/internal/logging/ILogger.java b/src/main/java/mantle/pulsar/internal/logging/ILogger.java old mode 100755 new mode 100644 similarity index 100% rename from src/mantle/pulsar/internal/logging/ILogger.java rename to src/main/java/mantle/pulsar/internal/logging/ILogger.java diff --git a/src/mantle/pulsar/internal/logging/JULLogger.java b/src/main/java/mantle/pulsar/internal/logging/JULLogger.java old mode 100755 new mode 100644 similarity index 100% rename from src/mantle/pulsar/internal/logging/JULLogger.java rename to src/main/java/mantle/pulsar/internal/logging/JULLogger.java diff --git a/src/mantle/pulsar/internal/logging/Log4jLogger.java b/src/main/java/mantle/pulsar/internal/logging/Log4jLogger.java old mode 100755 new mode 100644 similarity index 100% rename from src/mantle/pulsar/internal/logging/Log4jLogger.java rename to src/main/java/mantle/pulsar/internal/logging/Log4jLogger.java diff --git a/src/mantle/pulsar/internal/logging/LogManager.java b/src/main/java/mantle/pulsar/internal/logging/LogManager.java old mode 100755 new mode 100644 similarity index 100% rename from src/mantle/pulsar/internal/logging/LogManager.java rename to src/main/java/mantle/pulsar/internal/logging/LogManager.java diff --git a/src/mantle/pulsar/package-info.java b/src/main/java/mantle/pulsar/package-info.java similarity index 100% rename from src/mantle/pulsar/package-info.java rename to src/main/java/mantle/pulsar/package-info.java diff --git a/src/mantle/pulsar/pulse/Pulse.java b/src/main/java/mantle/pulsar/pulse/Pulse.java old mode 100755 new mode 100644 similarity index 100% rename from src/mantle/pulsar/pulse/Pulse.java rename to src/main/java/mantle/pulsar/pulse/Pulse.java diff --git a/src/mantle/pulsar/pulse/PulseMeta.java b/src/main/java/mantle/pulsar/pulse/PulseMeta.java old mode 100755 new mode 100644 similarity index 100% rename from src/mantle/pulsar/pulse/PulseMeta.java rename to src/main/java/mantle/pulsar/pulse/PulseMeta.java diff --git a/src/mantle/utils/ItemMetaWrapper.java b/src/main/java/mantle/utils/ItemMetaWrapper.java similarity index 100% rename from src/mantle/utils/ItemMetaWrapper.java rename to src/main/java/mantle/utils/ItemMetaWrapper.java diff --git a/src/mantle/utils/ItemStackNBTWrapper.java b/src/main/java/mantle/utils/ItemStackNBTWrapper.java similarity index 100% rename from src/mantle/utils/ItemStackNBTWrapper.java rename to src/main/java/mantle/utils/ItemStackNBTWrapper.java diff --git a/src/mantle/utils/ItemStackWrapper.java b/src/main/java/mantle/utils/ItemStackWrapper.java similarity index 100% rename from src/mantle/utils/ItemStackWrapper.java rename to src/main/java/mantle/utils/ItemStackWrapper.java diff --git a/src/mantle/utils/RecipeRemover.java b/src/main/java/mantle/utils/RecipeRemover.java similarity index 100% rename from src/mantle/utils/RecipeRemover.java rename to src/main/java/mantle/utils/RecipeRemover.java diff --git a/src/mantle/world/ChunkCoord.java b/src/main/java/mantle/world/ChunkCoord.java similarity index 100% rename from src/mantle/world/ChunkCoord.java rename to src/main/java/mantle/world/ChunkCoord.java diff --git a/src/mantle/world/CoordTuplePair.java b/src/main/java/mantle/world/CoordTuplePair.java similarity index 100% rename from src/mantle/world/CoordTuplePair.java rename to src/main/java/mantle/world/CoordTuplePair.java diff --git a/src/mantle/world/DimensionCoordPair.java b/src/main/java/mantle/world/DimensionCoordPair.java similarity index 100% rename from src/mantle/world/DimensionCoordPair.java rename to src/main/java/mantle/world/DimensionCoordPair.java diff --git a/src/mantle/world/DimensionCoordTuple.java b/src/main/java/mantle/world/DimensionCoordTuple.java similarity index 100% rename from src/mantle/world/DimensionCoordTuple.java rename to src/main/java/mantle/world/DimensionCoordTuple.java diff --git a/src/mantle/world/DirectionUtils.java b/src/main/java/mantle/world/DirectionUtils.java similarity index 100% rename from src/mantle/world/DirectionUtils.java rename to src/main/java/mantle/world/DirectionUtils.java diff --git a/resources/Mantle.png b/src/main/resources/Mantle.png similarity index 100% rename from resources/Mantle.png rename to src/main/resources/Mantle.png diff --git a/resources/assets/mantle/manuals/test.xml b/src/main/resources/assets/mantle/manuals/test.xml similarity index 100% rename from resources/assets/mantle/manuals/test.xml rename to src/main/resources/assets/mantle/manuals/test.xml diff --git a/resources/assets/mantle/models/item/mantleBook.json b/src/main/resources/assets/mantle/models/item/mantleBook.json similarity index 100% rename from resources/assets/mantle/models/item/mantleBook.json rename to src/main/resources/assets/mantle/models/item/mantleBook.json diff --git a/resources/assets/mantle/textures/gui/book.png b/src/main/resources/assets/mantle/textures/gui/book.png similarity index 100% rename from resources/assets/mantle/textures/gui/book.png rename to src/main/resources/assets/mantle/textures/gui/book.png diff --git a/resources/assets/mantle/textures/gui/bookcrafting.png b/src/main/resources/assets/mantle/textures/gui/bookcrafting.png similarity index 100% rename from resources/assets/mantle/textures/gui/bookcrafting.png rename to src/main/resources/assets/mantle/textures/gui/bookcrafting.png diff --git a/resources/assets/mantle/textures/gui/bookfurnace.png b/src/main/resources/assets/mantle/textures/gui/bookfurnace.png similarity index 100% rename from resources/assets/mantle/textures/gui/bookfurnace.png rename to src/main/resources/assets/mantle/textures/gui/bookfurnace.png diff --git a/resources/assets/mantle/textures/gui/bookleft.png b/src/main/resources/assets/mantle/textures/gui/bookleft.png similarity index 100% rename from resources/assets/mantle/textures/gui/bookleft.png rename to src/main/resources/assets/mantle/textures/gui/bookleft.png diff --git a/resources/assets/mantle/textures/gui/bookright.png b/src/main/resources/assets/mantle/textures/gui/bookright.png similarity index 100% rename from resources/assets/mantle/textures/gui/bookright.png rename to src/main/resources/assets/mantle/textures/gui/bookright.png diff --git a/resources/assets/mantle/textures/gui/missingno.png b/src/main/resources/assets/mantle/textures/gui/missingno.png similarity index 100% rename from resources/assets/mantle/textures/gui/missingno.png rename to src/main/resources/assets/mantle/textures/gui/missingno.png diff --git a/resources/assets/mantle/textures/gui/tinkerbook_blue.png b/src/main/resources/assets/mantle/textures/gui/tinkerbook_blue.png similarity index 100% rename from resources/assets/mantle/textures/gui/tinkerbook_blue.png rename to src/main/resources/assets/mantle/textures/gui/tinkerbook_blue.png diff --git a/resources/assets/mantle/textures/gui/tinkerbook_green.png b/src/main/resources/assets/mantle/textures/gui/tinkerbook_green.png similarity index 100% rename from resources/assets/mantle/textures/gui/tinkerbook_green.png rename to src/main/resources/assets/mantle/textures/gui/tinkerbook_green.png diff --git a/resources/assets/mantle/textures/items/mantlebook_blue.png b/src/main/resources/assets/mantle/textures/items/mantlebook_blue.png similarity index 100% rename from resources/assets/mantle/textures/items/mantlebook_blue.png rename to src/main/resources/assets/mantle/textures/items/mantlebook_blue.png diff --git a/resources/assets/mantle/textures/items/tinkerbook_blue.png b/src/main/resources/assets/mantle/textures/items/tinkerbook_blue.png similarity index 100% rename from resources/assets/mantle/textures/items/tinkerbook_blue.png rename to src/main/resources/assets/mantle/textures/items/tinkerbook_blue.png diff --git a/resources/assets/mantle/textures/items/tinkerbook_diary.png b/src/main/resources/assets/mantle/textures/items/tinkerbook_diary.png similarity index 100% rename from resources/assets/mantle/textures/items/tinkerbook_diary.png rename to src/main/resources/assets/mantle/textures/items/tinkerbook_diary.png diff --git a/resources/assets/mantle/textures/items/tinkerbook_green.png b/src/main/resources/assets/mantle/textures/items/tinkerbook_green.png similarity index 100% rename from resources/assets/mantle/textures/items/tinkerbook_green.png rename to src/main/resources/assets/mantle/textures/items/tinkerbook_green.png diff --git a/resources/assets/mantle/textures/items/tinkerbook_smeltery.png b/src/main/resources/assets/mantle/textures/items/tinkerbook_smeltery.png similarity index 100% rename from resources/assets/mantle/textures/items/tinkerbook_smeltery.png rename to src/main/resources/assets/mantle/textures/items/tinkerbook_smeltery.png diff --git a/resources/assets/mantle/textures/items/tinkerbook_toolstation.png b/src/main/resources/assets/mantle/textures/items/tinkerbook_toolstation.png similarity index 100% rename from resources/assets/mantle/textures/items/tinkerbook_toolstation.png rename to src/main/resources/assets/mantle/textures/items/tinkerbook_toolstation.png diff --git a/resources/mcmod.info b/src/main/resources/mcmod.info similarity index 100% rename from resources/mcmod.info rename to src/main/resources/mcmod.info