diff --git a/.gitignore b/.gitignore index 878a9a82a..7ef22217a 100644 --- a/.gitignore +++ b/.gitignore @@ -15,8 +15,6 @@ !LICENSE # include sourcecode except generated -!core/ -!api/ !src/ src/generated diff --git a/build.gradle b/build.gradle index 71d291d01..bab6c0453 100644 --- a/build.gradle +++ b/build.gradle @@ -18,7 +18,7 @@ plugins { id 'java' - id 'fabric-loom' + id 'fabric-loom' version "${loom_version}" apply false id 'maven-publish' id "org.jetbrains.kotlin.jvm" apply false } @@ -62,12 +62,12 @@ allprojects { } dependencies { - minecraft "com.mojang:minecraft:1.16.1" - mappings "net.fabricmc:yarn:1.16.1+build.9:v2" - modImplementation "net.fabricmc:fabric-loader:0.8.8+build.202" + minecraft "com.mojang:minecraft:${project.minecraft_version}" + mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2" + modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" //Fabric api - modImplementation "net.fabricmc.fabric-api:fabric-api:0.14.0+build.371-1.16" + modImplementation "net.fabricmc.fabric-api:fabric-api:${fabric_version}" modImplementation "net.fabricmc:fabric-language-kotlin:${project.fabric_kotlin_version}" diff --git a/core/src/main/java/appeng/crafting/CraftingJob.java b/core/src/main/java/appeng/crafting/CraftingJob.java deleted file mode 100644 index eaa1f0b31..000000000 --- a/core/src/main/java/appeng/crafting/CraftingJob.java +++ /dev/null @@ -1,8 +0,0 @@ -package appeng.crafting; - -// FIXME FABRIC DUMMY -public class CraftingJob { - public boolean simulateFor(int simTime) { - return false; - } -} diff --git a/core/src/main/java/appeng/me/cache/P2PCache.java b/core/src/main/java/appeng/me/cache/P2PCache.java deleted file mode 100644 index 14f7b7ab3..000000000 --- a/core/src/main/java/appeng/me/cache/P2PCache.java +++ /dev/null @@ -1,41 +0,0 @@ -package appeng.me.cache; - -import appeng.api.networking.IGridCache; -import appeng.api.networking.IGridHost; -import appeng.api.networking.IGridNode; -import appeng.api.networking.IGridStorage; - -import javax.annotation.Nonnull; - -// FIXME FABRIC DUMMY -public class P2PCache implements IGridCache { - @Override - public void onUpdateTick() { - - } - - @Override - public void removeNode(@Nonnull IGridNode gridNode, @Nonnull IGridHost machine) { - - } - - @Override - public void addNode(@Nonnull IGridNode gridNode, @Nonnull IGridHost machine) { - - } - - @Override - public void onSplit(@Nonnull IGridStorage destinationStorage) { - - } - - @Override - public void onJoin(@Nonnull IGridStorage sourceStorage) { - - } - - @Override - public void populateGridStorage(@Nonnull IGridStorage destinationStorage) { - - } -} diff --git a/core/src/main/java/appeng/tile/networking/ControllerBlockEntity.java b/core/src/main/java/appeng/tile/networking/ControllerBlockEntity.java deleted file mode 100644 index 72ed2cff1..000000000 --- a/core/src/main/java/appeng/tile/networking/ControllerBlockEntity.java +++ /dev/null @@ -1,34 +0,0 @@ -package appeng.tile.networking; - -import appeng.api.networking.IGridHost; -import appeng.api.networking.IGridNode; -import appeng.api.util.AECableType; -import appeng.api.util.AEPartLocation; -import net.minecraft.util.math.BlockPos; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - -// FIXME FABRIC DUMMY -public class ControllerBlockEntity implements IGridHost { - @Nullable - @Override - public IGridNode getGridNode(@Nonnull AEPartLocation dir) { - return null; - } - - @Nonnull - @Override - public AECableType getCableConnectionType(@Nonnull AEPartLocation dir) { - return null; - } - - @Override - public void securityBreak() { - - } - - public BlockPos getPos() { - return null; - } -} diff --git a/gradle.properties b/gradle.properties index 33cdc4fc7..25fe9f796 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,17 +4,17 @@ artifact_group=appeng artifact_basename=appliedenergistics2-fabric kotlin.code.style=official -org.gradle.jvmargs=-Xmx1G +org.gradle.jvmargs=-Xmx2G # Fabric Properties # Check these on https://modmuss50.me/fabric.html minecraft_version=1.16.1 -yarn_mappings=1.16.1+build.9 -loader_version=0.8.8+build.202 +yarn_mappings=1.16.1+build.19 +loader_version=0.8.9+build.203 #Fabric api -fabric_version=0.14.0+build.371-1.16 +fabric_version=0.14.1+build.372-1.16 loom_version=0.4-SNAPSHOT diff --git a/api/src/main/java/appeng/api/AEApi.java b/src/api/java/appeng/api/AEApi.java similarity index 100% rename from api/src/main/java/appeng/api/AEApi.java rename to src/api/java/appeng/api/AEApi.java diff --git a/api/src/main/java/appeng/api/AEInjectable.java b/src/api/java/appeng/api/AEInjectable.java similarity index 100% rename from api/src/main/java/appeng/api/AEInjectable.java rename to src/api/java/appeng/api/AEInjectable.java diff --git a/api/src/main/java/appeng/api/AEPlugin.java b/src/api/java/appeng/api/AEPlugin.java similarity index 100% rename from api/src/main/java/appeng/api/AEPlugin.java rename to src/api/java/appeng/api/AEPlugin.java diff --git a/api/src/main/java/appeng/api/IAppEngApi.java b/src/api/java/appeng/api/IAppEngApi.java similarity index 100% rename from api/src/main/java/appeng/api/IAppEngApi.java rename to src/api/java/appeng/api/IAppEngApi.java diff --git a/api/src/main/java/appeng/api/LICENSE b/src/api/java/appeng/api/LICENSE similarity index 100% rename from api/src/main/java/appeng/api/LICENSE rename to src/api/java/appeng/api/LICENSE diff --git a/api/src/main/java/appeng/api/config/AccessRestriction.java b/src/api/java/appeng/api/config/AccessRestriction.java similarity index 100% rename from api/src/main/java/appeng/api/config/AccessRestriction.java rename to src/api/java/appeng/api/config/AccessRestriction.java diff --git a/api/src/main/java/appeng/api/config/ActionItems.java b/src/api/java/appeng/api/config/ActionItems.java similarity index 100% rename from api/src/main/java/appeng/api/config/ActionItems.java rename to src/api/java/appeng/api/config/ActionItems.java diff --git a/api/src/main/java/appeng/api/config/Actionable.java b/src/api/java/appeng/api/config/Actionable.java similarity index 100% rename from api/src/main/java/appeng/api/config/Actionable.java rename to src/api/java/appeng/api/config/Actionable.java diff --git a/api/src/main/java/appeng/api/config/CondenserOutput.java b/src/api/java/appeng/api/config/CondenserOutput.java similarity index 100% rename from api/src/main/java/appeng/api/config/CondenserOutput.java rename to src/api/java/appeng/api/config/CondenserOutput.java diff --git a/api/src/main/java/appeng/api/config/CopyMode.java b/src/api/java/appeng/api/config/CopyMode.java similarity index 100% rename from api/src/main/java/appeng/api/config/CopyMode.java rename to src/api/java/appeng/api/config/CopyMode.java diff --git a/api/src/main/java/appeng/api/config/FullnessMode.java b/src/api/java/appeng/api/config/FullnessMode.java similarity index 100% rename from api/src/main/java/appeng/api/config/FullnessMode.java rename to src/api/java/appeng/api/config/FullnessMode.java diff --git a/api/src/main/java/appeng/api/config/FuzzyMode.java b/src/api/java/appeng/api/config/FuzzyMode.java similarity index 100% rename from api/src/main/java/appeng/api/config/FuzzyMode.java rename to src/api/java/appeng/api/config/FuzzyMode.java diff --git a/api/src/main/java/appeng/api/config/IncludeExclude.java b/src/api/java/appeng/api/config/IncludeExclude.java similarity index 100% rename from api/src/main/java/appeng/api/config/IncludeExclude.java rename to src/api/java/appeng/api/config/IncludeExclude.java diff --git a/api/src/main/java/appeng/api/config/LevelEmitterMode.java b/src/api/java/appeng/api/config/LevelEmitterMode.java similarity index 100% rename from api/src/main/java/appeng/api/config/LevelEmitterMode.java rename to src/api/java/appeng/api/config/LevelEmitterMode.java diff --git a/api/src/main/java/appeng/api/config/LevelType.java b/src/api/java/appeng/api/config/LevelType.java similarity index 100% rename from api/src/main/java/appeng/api/config/LevelType.java rename to src/api/java/appeng/api/config/LevelType.java diff --git a/api/src/main/java/appeng/api/config/ModSettings.java b/src/api/java/appeng/api/config/ModSettings.java similarity index 100% rename from api/src/main/java/appeng/api/config/ModSettings.java rename to src/api/java/appeng/api/config/ModSettings.java diff --git a/api/src/main/java/appeng/api/config/NetworkEmitterMode.java b/src/api/java/appeng/api/config/NetworkEmitterMode.java similarity index 100% rename from api/src/main/java/appeng/api/config/NetworkEmitterMode.java rename to src/api/java/appeng/api/config/NetworkEmitterMode.java diff --git a/api/src/main/java/appeng/api/config/OperationMode.java b/src/api/java/appeng/api/config/OperationMode.java similarity index 100% rename from api/src/main/java/appeng/api/config/OperationMode.java rename to src/api/java/appeng/api/config/OperationMode.java diff --git a/api/src/main/java/appeng/api/config/OutputMode.java b/src/api/java/appeng/api/config/OutputMode.java similarity index 100% rename from api/src/main/java/appeng/api/config/OutputMode.java rename to src/api/java/appeng/api/config/OutputMode.java diff --git a/api/src/main/java/appeng/api/config/PowerMultiplier.java b/src/api/java/appeng/api/config/PowerMultiplier.java similarity index 100% rename from api/src/main/java/appeng/api/config/PowerMultiplier.java rename to src/api/java/appeng/api/config/PowerMultiplier.java diff --git a/api/src/main/java/appeng/api/config/PowerUnits.java b/src/api/java/appeng/api/config/PowerUnits.java similarity index 100% rename from api/src/main/java/appeng/api/config/PowerUnits.java rename to src/api/java/appeng/api/config/PowerUnits.java diff --git a/api/src/main/java/appeng/api/config/RedstoneMode.java b/src/api/java/appeng/api/config/RedstoneMode.java similarity index 100% rename from api/src/main/java/appeng/api/config/RedstoneMode.java rename to src/api/java/appeng/api/config/RedstoneMode.java diff --git a/api/src/main/java/appeng/api/config/RelativeDirection.java b/src/api/java/appeng/api/config/RelativeDirection.java similarity index 100% rename from api/src/main/java/appeng/api/config/RelativeDirection.java rename to src/api/java/appeng/api/config/RelativeDirection.java diff --git a/api/src/main/java/appeng/api/config/SchedulingMode.java b/src/api/java/appeng/api/config/SchedulingMode.java similarity index 100% rename from api/src/main/java/appeng/api/config/SchedulingMode.java rename to src/api/java/appeng/api/config/SchedulingMode.java diff --git a/api/src/main/java/appeng/api/config/SearchBoxMode.java b/src/api/java/appeng/api/config/SearchBoxMode.java similarity index 100% rename from api/src/main/java/appeng/api/config/SearchBoxMode.java rename to src/api/java/appeng/api/config/SearchBoxMode.java diff --git a/api/src/main/java/appeng/api/config/SecurityPermissions.java b/src/api/java/appeng/api/config/SecurityPermissions.java similarity index 100% rename from api/src/main/java/appeng/api/config/SecurityPermissions.java rename to src/api/java/appeng/api/config/SecurityPermissions.java diff --git a/api/src/main/java/appeng/api/config/Settings.java b/src/api/java/appeng/api/config/Settings.java similarity index 100% rename from api/src/main/java/appeng/api/config/Settings.java rename to src/api/java/appeng/api/config/Settings.java diff --git a/api/src/main/java/appeng/api/config/SortDir.java b/src/api/java/appeng/api/config/SortDir.java similarity index 100% rename from api/src/main/java/appeng/api/config/SortDir.java rename to src/api/java/appeng/api/config/SortDir.java diff --git a/api/src/main/java/appeng/api/config/SortOrder.java b/src/api/java/appeng/api/config/SortOrder.java similarity index 100% rename from api/src/main/java/appeng/api/config/SortOrder.java rename to src/api/java/appeng/api/config/SortOrder.java diff --git a/api/src/main/java/appeng/api/config/StorageFilter.java b/src/api/java/appeng/api/config/StorageFilter.java similarity index 100% rename from api/src/main/java/appeng/api/config/StorageFilter.java rename to src/api/java/appeng/api/config/StorageFilter.java diff --git a/api/src/main/java/appeng/api/config/TerminalStyle.java b/src/api/java/appeng/api/config/TerminalStyle.java similarity index 100% rename from api/src/main/java/appeng/api/config/TerminalStyle.java rename to src/api/java/appeng/api/config/TerminalStyle.java diff --git a/api/src/main/java/appeng/api/config/TunnelType.java b/src/api/java/appeng/api/config/TunnelType.java similarity index 100% rename from api/src/main/java/appeng/api/config/TunnelType.java rename to src/api/java/appeng/api/config/TunnelType.java diff --git a/api/src/main/java/appeng/api/config/Upgrades.java b/src/api/java/appeng/api/config/Upgrades.java similarity index 100% rename from api/src/main/java/appeng/api/config/Upgrades.java rename to src/api/java/appeng/api/config/Upgrades.java diff --git a/api/src/main/java/appeng/api/config/ViewItems.java b/src/api/java/appeng/api/config/ViewItems.java similarity index 100% rename from api/src/main/java/appeng/api/config/ViewItems.java rename to src/api/java/appeng/api/config/ViewItems.java diff --git a/api/src/main/java/appeng/api/config/YesNo.java b/src/api/java/appeng/api/config/YesNo.java similarity index 100% rename from api/src/main/java/appeng/api/config/YesNo.java rename to src/api/java/appeng/api/config/YesNo.java diff --git a/api/src/main/java/appeng/api/definitions/IBlockDefinition.java b/src/api/java/appeng/api/definitions/IBlockDefinition.java similarity index 100% rename from api/src/main/java/appeng/api/definitions/IBlockDefinition.java rename to src/api/java/appeng/api/definitions/IBlockDefinition.java diff --git a/api/src/main/java/appeng/api/definitions/IBlocks.java b/src/api/java/appeng/api/definitions/IBlocks.java similarity index 100% rename from api/src/main/java/appeng/api/definitions/IBlocks.java rename to src/api/java/appeng/api/definitions/IBlocks.java diff --git a/api/src/main/java/appeng/api/definitions/IComparableDefinition.java b/src/api/java/appeng/api/definitions/IComparableDefinition.java similarity index 100% rename from api/src/main/java/appeng/api/definitions/IComparableDefinition.java rename to src/api/java/appeng/api/definitions/IComparableDefinition.java diff --git a/api/src/main/java/appeng/api/definitions/IDefinitions.java b/src/api/java/appeng/api/definitions/IDefinitions.java similarity index 100% rename from api/src/main/java/appeng/api/definitions/IDefinitions.java rename to src/api/java/appeng/api/definitions/IDefinitions.java diff --git a/api/src/main/java/appeng/api/definitions/IItemDefinition.java b/src/api/java/appeng/api/definitions/IItemDefinition.java similarity index 100% rename from api/src/main/java/appeng/api/definitions/IItemDefinition.java rename to src/api/java/appeng/api/definitions/IItemDefinition.java diff --git a/api/src/main/java/appeng/api/definitions/IItems.java b/src/api/java/appeng/api/definitions/IItems.java similarity index 100% rename from api/src/main/java/appeng/api/definitions/IItems.java rename to src/api/java/appeng/api/definitions/IItems.java diff --git a/api/src/main/java/appeng/api/definitions/IMaterials.java b/src/api/java/appeng/api/definitions/IMaterials.java similarity index 100% rename from api/src/main/java/appeng/api/definitions/IMaterials.java rename to src/api/java/appeng/api/definitions/IMaterials.java diff --git a/api/src/main/java/appeng/api/definitions/IParts.java b/src/api/java/appeng/api/definitions/IParts.java similarity index 100% rename from api/src/main/java/appeng/api/definitions/IParts.java rename to src/api/java/appeng/api/definitions/IParts.java diff --git a/api/src/main/java/appeng/api/definitions/ITileDefinition.java b/src/api/java/appeng/api/definitions/ITileDefinition.java similarity index 100% rename from api/src/main/java/appeng/api/definitions/ITileDefinition.java rename to src/api/java/appeng/api/definitions/ITileDefinition.java diff --git a/api/src/main/java/appeng/api/definitions/IdHelper.java b/src/api/java/appeng/api/definitions/IdHelper.java similarity index 100% rename from api/src/main/java/appeng/api/definitions/IdHelper.java rename to src/api/java/appeng/api/definitions/IdHelper.java diff --git a/api/src/main/java/appeng/api/events/LocatableEventAnnounce.java b/src/api/java/appeng/api/events/LocatableEventAnnounce.java similarity index 100% rename from api/src/main/java/appeng/api/events/LocatableEventAnnounce.java rename to src/api/java/appeng/api/events/LocatableEventAnnounce.java diff --git a/api/src/main/java/appeng/api/events/LocatableEventCallback.java b/src/api/java/appeng/api/events/LocatableEventCallback.java similarity index 100% rename from api/src/main/java/appeng/api/events/LocatableEventCallback.java rename to src/api/java/appeng/api/events/LocatableEventCallback.java diff --git a/api/src/main/java/appeng/api/exceptions/AppEngException.java b/src/api/java/appeng/api/exceptions/AppEngException.java similarity index 100% rename from api/src/main/java/appeng/api/exceptions/AppEngException.java rename to src/api/java/appeng/api/exceptions/AppEngException.java diff --git a/api/src/main/java/appeng/api/exceptions/CoreInaccessibleException.java b/src/api/java/appeng/api/exceptions/CoreInaccessibleException.java similarity index 100% rename from api/src/main/java/appeng/api/exceptions/CoreInaccessibleException.java rename to src/api/java/appeng/api/exceptions/CoreInaccessibleException.java diff --git a/api/src/main/java/appeng/api/exceptions/ExistingConnectionException.java b/src/api/java/appeng/api/exceptions/ExistingConnectionException.java similarity index 100% rename from api/src/main/java/appeng/api/exceptions/ExistingConnectionException.java rename to src/api/java/appeng/api/exceptions/ExistingConnectionException.java diff --git a/api/src/main/java/appeng/api/exceptions/FailedConnectionException.java b/src/api/java/appeng/api/exceptions/FailedConnectionException.java similarity index 100% rename from api/src/main/java/appeng/api/exceptions/FailedConnectionException.java rename to src/api/java/appeng/api/exceptions/FailedConnectionException.java diff --git a/api/src/main/java/appeng/api/exceptions/MissingDefinitionException.java b/src/api/java/appeng/api/exceptions/MissingDefinitionException.java similarity index 100% rename from api/src/main/java/appeng/api/exceptions/MissingDefinitionException.java rename to src/api/java/appeng/api/exceptions/MissingDefinitionException.java diff --git a/api/src/main/java/appeng/api/exceptions/MissingIngredientException.java b/src/api/java/appeng/api/exceptions/MissingIngredientException.java similarity index 100% rename from api/src/main/java/appeng/api/exceptions/MissingIngredientException.java rename to src/api/java/appeng/api/exceptions/MissingIngredientException.java diff --git a/api/src/main/java/appeng/api/exceptions/ModNotInstalledException.java b/src/api/java/appeng/api/exceptions/ModNotInstalledException.java similarity index 100% rename from api/src/main/java/appeng/api/exceptions/ModNotInstalledException.java rename to src/api/java/appeng/api/exceptions/ModNotInstalledException.java diff --git a/api/src/main/java/appeng/api/exceptions/NullNodeConnectionException.java b/src/api/java/appeng/api/exceptions/NullNodeConnectionException.java similarity index 100% rename from api/src/main/java/appeng/api/exceptions/NullNodeConnectionException.java rename to src/api/java/appeng/api/exceptions/NullNodeConnectionException.java diff --git a/api/src/main/java/appeng/api/exceptions/RecipeException.java b/src/api/java/appeng/api/exceptions/RecipeException.java similarity index 100% rename from api/src/main/java/appeng/api/exceptions/RecipeException.java rename to src/api/java/appeng/api/exceptions/RecipeException.java diff --git a/api/src/main/java/appeng/api/exceptions/RegistrationException.java b/src/api/java/appeng/api/exceptions/RegistrationException.java similarity index 100% rename from api/src/main/java/appeng/api/exceptions/RegistrationException.java rename to src/api/java/appeng/api/exceptions/RegistrationException.java diff --git a/api/src/main/java/appeng/api/exceptions/SecurityConnectionException.java b/src/api/java/appeng/api/exceptions/SecurityConnectionException.java similarity index 100% rename from api/src/main/java/appeng/api/exceptions/SecurityConnectionException.java rename to src/api/java/appeng/api/exceptions/SecurityConnectionException.java diff --git a/api/src/main/java/appeng/api/features/AEFeature.java b/src/api/java/appeng/api/features/AEFeature.java similarity index 100% rename from api/src/main/java/appeng/api/features/AEFeature.java rename to src/api/java/appeng/api/features/AEFeature.java diff --git a/api/src/main/java/appeng/api/features/IChargerRegistry.java b/src/api/java/appeng/api/features/IChargerRegistry.java similarity index 100% rename from api/src/main/java/appeng/api/features/IChargerRegistry.java rename to src/api/java/appeng/api/features/IChargerRegistry.java diff --git a/api/src/main/java/appeng/api/features/IItemComparison.java b/src/api/java/appeng/api/features/IItemComparison.java similarity index 100% rename from api/src/main/java/appeng/api/features/IItemComparison.java rename to src/api/java/appeng/api/features/IItemComparison.java diff --git a/api/src/main/java/appeng/api/features/IItemComparisonProvider.java b/src/api/java/appeng/api/features/IItemComparisonProvider.java similarity index 100% rename from api/src/main/java/appeng/api/features/IItemComparisonProvider.java rename to src/api/java/appeng/api/features/IItemComparisonProvider.java diff --git a/api/src/main/java/appeng/api/features/ILocatable.java b/src/api/java/appeng/api/features/ILocatable.java similarity index 100% rename from api/src/main/java/appeng/api/features/ILocatable.java rename to src/api/java/appeng/api/features/ILocatable.java diff --git a/api/src/main/java/appeng/api/features/ILocatableRegistry.java b/src/api/java/appeng/api/features/ILocatableRegistry.java similarity index 100% rename from api/src/main/java/appeng/api/features/ILocatableRegistry.java rename to src/api/java/appeng/api/features/ILocatableRegistry.java diff --git a/api/src/main/java/appeng/api/features/IMatterCannonAmmoRegistry.java b/src/api/java/appeng/api/features/IMatterCannonAmmoRegistry.java similarity index 100% rename from api/src/main/java/appeng/api/features/IMatterCannonAmmoRegistry.java rename to src/api/java/appeng/api/features/IMatterCannonAmmoRegistry.java diff --git a/api/src/main/java/appeng/api/features/INetworkEncodable.java b/src/api/java/appeng/api/features/INetworkEncodable.java similarity index 100% rename from api/src/main/java/appeng/api/features/INetworkEncodable.java rename to src/api/java/appeng/api/features/INetworkEncodable.java diff --git a/api/src/main/java/appeng/api/features/IP2PTunnelRegistry.java b/src/api/java/appeng/api/features/IP2PTunnelRegistry.java similarity index 100% rename from api/src/main/java/appeng/api/features/IP2PTunnelRegistry.java rename to src/api/java/appeng/api/features/IP2PTunnelRegistry.java diff --git a/api/src/main/java/appeng/api/features/IPlayerRegistry.java b/src/api/java/appeng/api/features/IPlayerRegistry.java similarity index 100% rename from api/src/main/java/appeng/api/features/IPlayerRegistry.java rename to src/api/java/appeng/api/features/IPlayerRegistry.java diff --git a/api/src/main/java/appeng/api/features/IRegistryContainer.java b/src/api/java/appeng/api/features/IRegistryContainer.java similarity index 100% rename from api/src/main/java/appeng/api/features/IRegistryContainer.java rename to src/api/java/appeng/api/features/IRegistryContainer.java diff --git a/api/src/main/java/appeng/api/features/IWirelessTermHandler.java b/src/api/java/appeng/api/features/IWirelessTermHandler.java similarity index 100% rename from api/src/main/java/appeng/api/features/IWirelessTermHandler.java rename to src/api/java/appeng/api/features/IWirelessTermHandler.java diff --git a/api/src/main/java/appeng/api/features/IWirelessTermRegistry.java b/src/api/java/appeng/api/features/IWirelessTermRegistry.java similarity index 100% rename from api/src/main/java/appeng/api/features/IWirelessTermRegistry.java rename to src/api/java/appeng/api/features/IWirelessTermRegistry.java diff --git a/api/src/main/java/appeng/api/features/IWorldGen.java b/src/api/java/appeng/api/features/IWorldGen.java similarity index 100% rename from api/src/main/java/appeng/api/features/IWorldGen.java rename to src/api/java/appeng/api/features/IWorldGen.java diff --git a/api/src/main/java/appeng/api/features/InscriberProcessType.java b/src/api/java/appeng/api/features/InscriberProcessType.java similarity index 100% rename from api/src/main/java/appeng/api/features/InscriberProcessType.java rename to src/api/java/appeng/api/features/InscriberProcessType.java diff --git a/api/src/main/java/appeng/api/implementations/ICraftingPatternItem.java b/src/api/java/appeng/api/implementations/ICraftingPatternItem.java similarity index 100% rename from api/src/main/java/appeng/api/implementations/ICraftingPatternItem.java rename to src/api/java/appeng/api/implementations/ICraftingPatternItem.java diff --git a/api/src/main/java/appeng/api/implementations/IPowerChannelState.java b/src/api/java/appeng/api/implementations/IPowerChannelState.java similarity index 100% rename from api/src/main/java/appeng/api/implementations/IPowerChannelState.java rename to src/api/java/appeng/api/implementations/IPowerChannelState.java diff --git a/api/src/main/java/appeng/api/implementations/IUpgradeableHost.java b/src/api/java/appeng/api/implementations/IUpgradeableHost.java similarity index 100% rename from api/src/main/java/appeng/api/implementations/IUpgradeableHost.java rename to src/api/java/appeng/api/implementations/IUpgradeableHost.java diff --git a/api/src/main/java/appeng/api/implementations/TransitionResult.java b/src/api/java/appeng/api/implementations/TransitionResult.java similarity index 100% rename from api/src/main/java/appeng/api/implementations/TransitionResult.java rename to src/api/java/appeng/api/implementations/TransitionResult.java diff --git a/api/src/main/java/appeng/api/implementations/guiobjects/IGuiItem.java b/src/api/java/appeng/api/implementations/guiobjects/IGuiItem.java similarity index 100% rename from api/src/main/java/appeng/api/implementations/guiobjects/IGuiItem.java rename to src/api/java/appeng/api/implementations/guiobjects/IGuiItem.java diff --git a/api/src/main/java/appeng/api/implementations/guiobjects/IGuiItemObject.java b/src/api/java/appeng/api/implementations/guiobjects/IGuiItemObject.java similarity index 100% rename from api/src/main/java/appeng/api/implementations/guiobjects/IGuiItemObject.java rename to src/api/java/appeng/api/implementations/guiobjects/IGuiItemObject.java diff --git a/api/src/main/java/appeng/api/implementations/guiobjects/INetworkTool.java b/src/api/java/appeng/api/implementations/guiobjects/INetworkTool.java similarity index 100% rename from api/src/main/java/appeng/api/implementations/guiobjects/INetworkTool.java rename to src/api/java/appeng/api/implementations/guiobjects/INetworkTool.java diff --git a/api/src/main/java/appeng/api/implementations/guiobjects/IPortableCell.java b/src/api/java/appeng/api/implementations/guiobjects/IPortableCell.java similarity index 100% rename from api/src/main/java/appeng/api/implementations/guiobjects/IPortableCell.java rename to src/api/java/appeng/api/implementations/guiobjects/IPortableCell.java diff --git a/api/src/main/java/appeng/api/implementations/items/IAEItemPowerStorage.java b/src/api/java/appeng/api/implementations/items/IAEItemPowerStorage.java similarity index 100% rename from api/src/main/java/appeng/api/implementations/items/IAEItemPowerStorage.java rename to src/api/java/appeng/api/implementations/items/IAEItemPowerStorage.java diff --git a/api/src/main/java/appeng/api/implementations/items/IAEWrench.java b/src/api/java/appeng/api/implementations/items/IAEWrench.java similarity index 100% rename from api/src/main/java/appeng/api/implementations/items/IAEWrench.java rename to src/api/java/appeng/api/implementations/items/IAEWrench.java diff --git a/api/src/main/java/appeng/api/implementations/items/IBiometricCard.java b/src/api/java/appeng/api/implementations/items/IBiometricCard.java similarity index 100% rename from api/src/main/java/appeng/api/implementations/items/IBiometricCard.java rename to src/api/java/appeng/api/implementations/items/IBiometricCard.java diff --git a/api/src/main/java/appeng/api/implementations/items/IGrowableCrystal.java b/src/api/java/appeng/api/implementations/items/IGrowableCrystal.java similarity index 100% rename from api/src/main/java/appeng/api/implementations/items/IGrowableCrystal.java rename to src/api/java/appeng/api/implementations/items/IGrowableCrystal.java diff --git a/api/src/main/java/appeng/api/implementations/items/IMemoryCard.java b/src/api/java/appeng/api/implementations/items/IMemoryCard.java similarity index 100% rename from api/src/main/java/appeng/api/implementations/items/IMemoryCard.java rename to src/api/java/appeng/api/implementations/items/IMemoryCard.java diff --git a/api/src/main/java/appeng/api/implementations/items/ISpatialStorageCell.java b/src/api/java/appeng/api/implementations/items/ISpatialStorageCell.java similarity index 100% rename from api/src/main/java/appeng/api/implementations/items/ISpatialStorageCell.java rename to src/api/java/appeng/api/implementations/items/ISpatialStorageCell.java diff --git a/api/src/main/java/appeng/api/implementations/items/IStorageCell.java b/src/api/java/appeng/api/implementations/items/IStorageCell.java similarity index 100% rename from api/src/main/java/appeng/api/implementations/items/IStorageCell.java rename to src/api/java/appeng/api/implementations/items/IStorageCell.java diff --git a/api/src/main/java/appeng/api/implementations/items/IStorageComponent.java b/src/api/java/appeng/api/implementations/items/IStorageComponent.java similarity index 100% rename from api/src/main/java/appeng/api/implementations/items/IStorageComponent.java rename to src/api/java/appeng/api/implementations/items/IStorageComponent.java diff --git a/api/src/main/java/appeng/api/implementations/items/IUpgradeModule.java b/src/api/java/appeng/api/implementations/items/IUpgradeModule.java similarity index 100% rename from api/src/main/java/appeng/api/implementations/items/IUpgradeModule.java rename to src/api/java/appeng/api/implementations/items/IUpgradeModule.java diff --git a/api/src/main/java/appeng/api/implementations/items/MemoryCardMessages.java b/src/api/java/appeng/api/implementations/items/MemoryCardMessages.java similarity index 100% rename from api/src/main/java/appeng/api/implementations/items/MemoryCardMessages.java rename to src/api/java/appeng/api/implementations/items/MemoryCardMessages.java diff --git a/api/src/main/java/appeng/api/implementations/parts/ICablePart.java b/src/api/java/appeng/api/implementations/parts/ICablePart.java similarity index 100% rename from api/src/main/java/appeng/api/implementations/parts/ICablePart.java rename to src/api/java/appeng/api/implementations/parts/ICablePart.java diff --git a/api/src/main/java/appeng/api/implementations/parts/IMonitorPart.java b/src/api/java/appeng/api/implementations/parts/IMonitorPart.java similarity index 100% rename from api/src/main/java/appeng/api/implementations/parts/IMonitorPart.java rename to src/api/java/appeng/api/implementations/parts/IMonitorPart.java diff --git a/api/src/main/java/appeng/api/implementations/parts/IStorageMonitorPart.java b/src/api/java/appeng/api/implementations/parts/IStorageMonitorPart.java similarity index 100% rename from api/src/main/java/appeng/api/implementations/parts/IStorageMonitorPart.java rename to src/api/java/appeng/api/implementations/parts/IStorageMonitorPart.java diff --git a/api/src/main/java/appeng/api/implementations/tiles/IChestOrDrive.java b/src/api/java/appeng/api/implementations/tiles/IChestOrDrive.java similarity index 100% rename from api/src/main/java/appeng/api/implementations/tiles/IChestOrDrive.java rename to src/api/java/appeng/api/implementations/tiles/IChestOrDrive.java diff --git a/api/src/main/java/appeng/api/implementations/tiles/IColorableTile.java b/src/api/java/appeng/api/implementations/tiles/IColorableTile.java similarity index 100% rename from api/src/main/java/appeng/api/implementations/tiles/IColorableTile.java rename to src/api/java/appeng/api/implementations/tiles/IColorableTile.java diff --git a/api/src/main/java/appeng/api/implementations/tiles/ICraftingMachine.java b/src/api/java/appeng/api/implementations/tiles/ICraftingMachine.java similarity index 100% rename from api/src/main/java/appeng/api/implementations/tiles/ICraftingMachine.java rename to src/api/java/appeng/api/implementations/tiles/ICraftingMachine.java diff --git a/api/src/main/java/appeng/api/implementations/tiles/ICrankable.java b/src/api/java/appeng/api/implementations/tiles/ICrankable.java similarity index 100% rename from api/src/main/java/appeng/api/implementations/tiles/ICrankable.java rename to src/api/java/appeng/api/implementations/tiles/ICrankable.java diff --git a/api/src/main/java/appeng/api/implementations/tiles/ICrystalGrowthAccelerator.java b/src/api/java/appeng/api/implementations/tiles/ICrystalGrowthAccelerator.java similarity index 100% rename from api/src/main/java/appeng/api/implementations/tiles/ICrystalGrowthAccelerator.java rename to src/api/java/appeng/api/implementations/tiles/ICrystalGrowthAccelerator.java diff --git a/api/src/main/java/appeng/api/implementations/tiles/IMEChest.java b/src/api/java/appeng/api/implementations/tiles/IMEChest.java similarity index 100% rename from api/src/main/java/appeng/api/implementations/tiles/IMEChest.java rename to src/api/java/appeng/api/implementations/tiles/IMEChest.java diff --git a/api/src/main/java/appeng/api/implementations/tiles/ISegmentedInventory.java b/src/api/java/appeng/api/implementations/tiles/ISegmentedInventory.java similarity index 100% rename from api/src/main/java/appeng/api/implementations/tiles/ISegmentedInventory.java rename to src/api/java/appeng/api/implementations/tiles/ISegmentedInventory.java diff --git a/api/src/main/java/appeng/api/implementations/tiles/IViewCellStorage.java b/src/api/java/appeng/api/implementations/tiles/IViewCellStorage.java similarity index 100% rename from api/src/main/java/appeng/api/implementations/tiles/IViewCellStorage.java rename to src/api/java/appeng/api/implementations/tiles/IViewCellStorage.java diff --git a/api/src/main/java/appeng/api/implementations/tiles/IWirelessAccessPoint.java b/src/api/java/appeng/api/implementations/tiles/IWirelessAccessPoint.java similarity index 100% rename from api/src/main/java/appeng/api/implementations/tiles/IWirelessAccessPoint.java rename to src/api/java/appeng/api/implementations/tiles/IWirelessAccessPoint.java diff --git a/api/src/main/java/appeng/api/movable/IMovableHandler.java b/src/api/java/appeng/api/movable/IMovableHandler.java similarity index 100% rename from api/src/main/java/appeng/api/movable/IMovableHandler.java rename to src/api/java/appeng/api/movable/IMovableHandler.java diff --git a/api/src/main/java/appeng/api/movable/IMovableRegistry.java b/src/api/java/appeng/api/movable/IMovableRegistry.java similarity index 100% rename from api/src/main/java/appeng/api/movable/IMovableRegistry.java rename to src/api/java/appeng/api/movable/IMovableRegistry.java diff --git a/api/src/main/java/appeng/api/movable/IMovableTile.java b/src/api/java/appeng/api/movable/IMovableTile.java similarity index 100% rename from api/src/main/java/appeng/api/movable/IMovableTile.java rename to src/api/java/appeng/api/movable/IMovableTile.java diff --git a/api/src/main/java/appeng/api/networking/GridFlags.java b/src/api/java/appeng/api/networking/GridFlags.java similarity index 100% rename from api/src/main/java/appeng/api/networking/GridFlags.java rename to src/api/java/appeng/api/networking/GridFlags.java diff --git a/api/src/main/java/appeng/api/networking/GridNotification.java b/src/api/java/appeng/api/networking/GridNotification.java similarity index 100% rename from api/src/main/java/appeng/api/networking/GridNotification.java rename to src/api/java/appeng/api/networking/GridNotification.java diff --git a/api/src/main/java/appeng/api/networking/IGrid.java b/src/api/java/appeng/api/networking/IGrid.java similarity index 100% rename from api/src/main/java/appeng/api/networking/IGrid.java rename to src/api/java/appeng/api/networking/IGrid.java diff --git a/api/src/main/java/appeng/api/networking/IGridBlock.java b/src/api/java/appeng/api/networking/IGridBlock.java similarity index 100% rename from api/src/main/java/appeng/api/networking/IGridBlock.java rename to src/api/java/appeng/api/networking/IGridBlock.java diff --git a/api/src/main/java/appeng/api/networking/IGridCache.java b/src/api/java/appeng/api/networking/IGridCache.java similarity index 100% rename from api/src/main/java/appeng/api/networking/IGridCache.java rename to src/api/java/appeng/api/networking/IGridCache.java diff --git a/api/src/main/java/appeng/api/networking/IGridCacheFactory.java b/src/api/java/appeng/api/networking/IGridCacheFactory.java similarity index 100% rename from api/src/main/java/appeng/api/networking/IGridCacheFactory.java rename to src/api/java/appeng/api/networking/IGridCacheFactory.java diff --git a/api/src/main/java/appeng/api/networking/IGridCacheRegistry.java b/src/api/java/appeng/api/networking/IGridCacheRegistry.java similarity index 100% rename from api/src/main/java/appeng/api/networking/IGridCacheRegistry.java rename to src/api/java/appeng/api/networking/IGridCacheRegistry.java diff --git a/api/src/main/java/appeng/api/networking/IGridConnection.java b/src/api/java/appeng/api/networking/IGridConnection.java similarity index 100% rename from api/src/main/java/appeng/api/networking/IGridConnection.java rename to src/api/java/appeng/api/networking/IGridConnection.java diff --git a/api/src/main/java/appeng/api/networking/IGridConnectionVisitor.java b/src/api/java/appeng/api/networking/IGridConnectionVisitor.java similarity index 100% rename from api/src/main/java/appeng/api/networking/IGridConnectionVisitor.java rename to src/api/java/appeng/api/networking/IGridConnectionVisitor.java diff --git a/api/src/main/java/appeng/api/networking/IGridHelper.java b/src/api/java/appeng/api/networking/IGridHelper.java similarity index 100% rename from api/src/main/java/appeng/api/networking/IGridHelper.java rename to src/api/java/appeng/api/networking/IGridHelper.java diff --git a/api/src/main/java/appeng/api/networking/IGridHost.java b/src/api/java/appeng/api/networking/IGridHost.java similarity index 100% rename from api/src/main/java/appeng/api/networking/IGridHost.java rename to src/api/java/appeng/api/networking/IGridHost.java diff --git a/api/src/main/java/appeng/api/networking/IGridMultiblock.java b/src/api/java/appeng/api/networking/IGridMultiblock.java similarity index 100% rename from api/src/main/java/appeng/api/networking/IGridMultiblock.java rename to src/api/java/appeng/api/networking/IGridMultiblock.java diff --git a/api/src/main/java/appeng/api/networking/IGridNode.java b/src/api/java/appeng/api/networking/IGridNode.java similarity index 100% rename from api/src/main/java/appeng/api/networking/IGridNode.java rename to src/api/java/appeng/api/networking/IGridNode.java diff --git a/api/src/main/java/appeng/api/networking/IGridStorage.java b/src/api/java/appeng/api/networking/IGridStorage.java similarity index 100% rename from api/src/main/java/appeng/api/networking/IGridStorage.java rename to src/api/java/appeng/api/networking/IGridStorage.java diff --git a/api/src/main/java/appeng/api/networking/IGridVisitor.java b/src/api/java/appeng/api/networking/IGridVisitor.java similarity index 100% rename from api/src/main/java/appeng/api/networking/IGridVisitor.java rename to src/api/java/appeng/api/networking/IGridVisitor.java diff --git a/api/src/main/java/appeng/api/networking/IMachineSet.java b/src/api/java/appeng/api/networking/IMachineSet.java similarity index 100% rename from api/src/main/java/appeng/api/networking/IMachineSet.java rename to src/api/java/appeng/api/networking/IMachineSet.java diff --git a/api/src/main/java/appeng/api/networking/crafting/CraftingItemList.java b/src/api/java/appeng/api/networking/crafting/CraftingItemList.java similarity index 100% rename from api/src/main/java/appeng/api/networking/crafting/CraftingItemList.java rename to src/api/java/appeng/api/networking/crafting/CraftingItemList.java diff --git a/api/src/main/java/appeng/api/networking/crafting/ICraftingCPU.java b/src/api/java/appeng/api/networking/crafting/ICraftingCPU.java similarity index 100% rename from api/src/main/java/appeng/api/networking/crafting/ICraftingCPU.java rename to src/api/java/appeng/api/networking/crafting/ICraftingCPU.java diff --git a/api/src/main/java/appeng/api/networking/crafting/ICraftingCallback.java b/src/api/java/appeng/api/networking/crafting/ICraftingCallback.java similarity index 100% rename from api/src/main/java/appeng/api/networking/crafting/ICraftingCallback.java rename to src/api/java/appeng/api/networking/crafting/ICraftingCallback.java diff --git a/api/src/main/java/appeng/api/networking/crafting/ICraftingGrid.java b/src/api/java/appeng/api/networking/crafting/ICraftingGrid.java similarity index 100% rename from api/src/main/java/appeng/api/networking/crafting/ICraftingGrid.java rename to src/api/java/appeng/api/networking/crafting/ICraftingGrid.java diff --git a/api/src/main/java/appeng/api/networking/crafting/ICraftingJob.java b/src/api/java/appeng/api/networking/crafting/ICraftingJob.java similarity index 100% rename from api/src/main/java/appeng/api/networking/crafting/ICraftingJob.java rename to src/api/java/appeng/api/networking/crafting/ICraftingJob.java diff --git a/api/src/main/java/appeng/api/networking/crafting/ICraftingLink.java b/src/api/java/appeng/api/networking/crafting/ICraftingLink.java similarity index 100% rename from api/src/main/java/appeng/api/networking/crafting/ICraftingLink.java rename to src/api/java/appeng/api/networking/crafting/ICraftingLink.java diff --git a/api/src/main/java/appeng/api/networking/crafting/ICraftingMedium.java b/src/api/java/appeng/api/networking/crafting/ICraftingMedium.java similarity index 100% rename from api/src/main/java/appeng/api/networking/crafting/ICraftingMedium.java rename to src/api/java/appeng/api/networking/crafting/ICraftingMedium.java diff --git a/api/src/main/java/appeng/api/networking/crafting/ICraftingPatternDetails.java b/src/api/java/appeng/api/networking/crafting/ICraftingPatternDetails.java similarity index 100% rename from api/src/main/java/appeng/api/networking/crafting/ICraftingPatternDetails.java rename to src/api/java/appeng/api/networking/crafting/ICraftingPatternDetails.java diff --git a/api/src/main/java/appeng/api/networking/crafting/ICraftingProvider.java b/src/api/java/appeng/api/networking/crafting/ICraftingProvider.java similarity index 100% rename from api/src/main/java/appeng/api/networking/crafting/ICraftingProvider.java rename to src/api/java/appeng/api/networking/crafting/ICraftingProvider.java diff --git a/api/src/main/java/appeng/api/networking/crafting/ICraftingProviderHelper.java b/src/api/java/appeng/api/networking/crafting/ICraftingProviderHelper.java similarity index 100% rename from api/src/main/java/appeng/api/networking/crafting/ICraftingProviderHelper.java rename to src/api/java/appeng/api/networking/crafting/ICraftingProviderHelper.java diff --git a/api/src/main/java/appeng/api/networking/crafting/ICraftingRequester.java b/src/api/java/appeng/api/networking/crafting/ICraftingRequester.java similarity index 100% rename from api/src/main/java/appeng/api/networking/crafting/ICraftingRequester.java rename to src/api/java/appeng/api/networking/crafting/ICraftingRequester.java diff --git a/api/src/main/java/appeng/api/networking/crafting/ICraftingWatcher.java b/src/api/java/appeng/api/networking/crafting/ICraftingWatcher.java similarity index 100% rename from api/src/main/java/appeng/api/networking/crafting/ICraftingWatcher.java rename to src/api/java/appeng/api/networking/crafting/ICraftingWatcher.java diff --git a/api/src/main/java/appeng/api/networking/crafting/ICraftingWatcherHost.java b/src/api/java/appeng/api/networking/crafting/ICraftingWatcherHost.java similarity index 100% rename from api/src/main/java/appeng/api/networking/crafting/ICraftingWatcherHost.java rename to src/api/java/appeng/api/networking/crafting/ICraftingWatcherHost.java diff --git a/api/src/main/java/appeng/api/networking/energy/IAEPowerStorage.java b/src/api/java/appeng/api/networking/energy/IAEPowerStorage.java similarity index 100% rename from api/src/main/java/appeng/api/networking/energy/IAEPowerStorage.java rename to src/api/java/appeng/api/networking/energy/IAEPowerStorage.java diff --git a/api/src/main/java/appeng/api/networking/energy/IEnergyGrid.java b/src/api/java/appeng/api/networking/energy/IEnergyGrid.java similarity index 100% rename from api/src/main/java/appeng/api/networking/energy/IEnergyGrid.java rename to src/api/java/appeng/api/networking/energy/IEnergyGrid.java diff --git a/api/src/main/java/appeng/api/networking/energy/IEnergyGridProvider.java b/src/api/java/appeng/api/networking/energy/IEnergyGridProvider.java similarity index 100% rename from api/src/main/java/appeng/api/networking/energy/IEnergyGridProvider.java rename to src/api/java/appeng/api/networking/energy/IEnergyGridProvider.java diff --git a/api/src/main/java/appeng/api/networking/energy/IEnergySource.java b/src/api/java/appeng/api/networking/energy/IEnergySource.java similarity index 100% rename from api/src/main/java/appeng/api/networking/energy/IEnergySource.java rename to src/api/java/appeng/api/networking/energy/IEnergySource.java diff --git a/api/src/main/java/appeng/api/networking/energy/IEnergyWatcher.java b/src/api/java/appeng/api/networking/energy/IEnergyWatcher.java similarity index 100% rename from api/src/main/java/appeng/api/networking/energy/IEnergyWatcher.java rename to src/api/java/appeng/api/networking/energy/IEnergyWatcher.java diff --git a/api/src/main/java/appeng/api/networking/energy/IEnergyWatcherHost.java b/src/api/java/appeng/api/networking/energy/IEnergyWatcherHost.java similarity index 100% rename from api/src/main/java/appeng/api/networking/energy/IEnergyWatcherHost.java rename to src/api/java/appeng/api/networking/energy/IEnergyWatcherHost.java diff --git a/api/src/main/java/appeng/api/networking/events/MENetworkBootingStatusChange.java b/src/api/java/appeng/api/networking/events/MENetworkBootingStatusChange.java similarity index 100% rename from api/src/main/java/appeng/api/networking/events/MENetworkBootingStatusChange.java rename to src/api/java/appeng/api/networking/events/MENetworkBootingStatusChange.java diff --git a/api/src/main/java/appeng/api/networking/events/MENetworkCellArrayUpdate.java b/src/api/java/appeng/api/networking/events/MENetworkCellArrayUpdate.java similarity index 100% rename from api/src/main/java/appeng/api/networking/events/MENetworkCellArrayUpdate.java rename to src/api/java/appeng/api/networking/events/MENetworkCellArrayUpdate.java diff --git a/api/src/main/java/appeng/api/networking/events/MENetworkChannelChanged.java b/src/api/java/appeng/api/networking/events/MENetworkChannelChanged.java similarity index 100% rename from api/src/main/java/appeng/api/networking/events/MENetworkChannelChanged.java rename to src/api/java/appeng/api/networking/events/MENetworkChannelChanged.java diff --git a/api/src/main/java/appeng/api/networking/events/MENetworkChannelsChanged.java b/src/api/java/appeng/api/networking/events/MENetworkChannelsChanged.java similarity index 100% rename from api/src/main/java/appeng/api/networking/events/MENetworkChannelsChanged.java rename to src/api/java/appeng/api/networking/events/MENetworkChannelsChanged.java diff --git a/api/src/main/java/appeng/api/networking/events/MENetworkControllerChange.java b/src/api/java/appeng/api/networking/events/MENetworkControllerChange.java similarity index 100% rename from api/src/main/java/appeng/api/networking/events/MENetworkControllerChange.java rename to src/api/java/appeng/api/networking/events/MENetworkControllerChange.java diff --git a/api/src/main/java/appeng/api/networking/events/MENetworkCraftingCpuChange.java b/src/api/java/appeng/api/networking/events/MENetworkCraftingCpuChange.java similarity index 100% rename from api/src/main/java/appeng/api/networking/events/MENetworkCraftingCpuChange.java rename to src/api/java/appeng/api/networking/events/MENetworkCraftingCpuChange.java diff --git a/api/src/main/java/appeng/api/networking/events/MENetworkCraftingPatternChange.java b/src/api/java/appeng/api/networking/events/MENetworkCraftingPatternChange.java similarity index 100% rename from api/src/main/java/appeng/api/networking/events/MENetworkCraftingPatternChange.java rename to src/api/java/appeng/api/networking/events/MENetworkCraftingPatternChange.java diff --git a/api/src/main/java/appeng/api/networking/events/MENetworkEvent.java b/src/api/java/appeng/api/networking/events/MENetworkEvent.java similarity index 100% rename from api/src/main/java/appeng/api/networking/events/MENetworkEvent.java rename to src/api/java/appeng/api/networking/events/MENetworkEvent.java diff --git a/api/src/main/java/appeng/api/networking/events/MENetworkEventSubscribe.java b/src/api/java/appeng/api/networking/events/MENetworkEventSubscribe.java similarity index 100% rename from api/src/main/java/appeng/api/networking/events/MENetworkEventSubscribe.java rename to src/api/java/appeng/api/networking/events/MENetworkEventSubscribe.java diff --git a/api/src/main/java/appeng/api/networking/events/MENetworkPostCacheConstruction.java b/src/api/java/appeng/api/networking/events/MENetworkPostCacheConstruction.java similarity index 100% rename from api/src/main/java/appeng/api/networking/events/MENetworkPostCacheConstruction.java rename to src/api/java/appeng/api/networking/events/MENetworkPostCacheConstruction.java diff --git a/api/src/main/java/appeng/api/networking/events/MENetworkPowerIdleChange.java b/src/api/java/appeng/api/networking/events/MENetworkPowerIdleChange.java similarity index 100% rename from api/src/main/java/appeng/api/networking/events/MENetworkPowerIdleChange.java rename to src/api/java/appeng/api/networking/events/MENetworkPowerIdleChange.java diff --git a/api/src/main/java/appeng/api/networking/events/MENetworkPowerStatusChange.java b/src/api/java/appeng/api/networking/events/MENetworkPowerStatusChange.java similarity index 100% rename from api/src/main/java/appeng/api/networking/events/MENetworkPowerStatusChange.java rename to src/api/java/appeng/api/networking/events/MENetworkPowerStatusChange.java diff --git a/api/src/main/java/appeng/api/networking/events/MENetworkPowerStorage.java b/src/api/java/appeng/api/networking/events/MENetworkPowerStorage.java similarity index 100% rename from api/src/main/java/appeng/api/networking/events/MENetworkPowerStorage.java rename to src/api/java/appeng/api/networking/events/MENetworkPowerStorage.java diff --git a/api/src/main/java/appeng/api/networking/events/MENetworkSecurityChange.java b/src/api/java/appeng/api/networking/events/MENetworkSecurityChange.java similarity index 100% rename from api/src/main/java/appeng/api/networking/events/MENetworkSecurityChange.java rename to src/api/java/appeng/api/networking/events/MENetworkSecurityChange.java diff --git a/api/src/main/java/appeng/api/networking/events/MENetworkSpatialEvent.java b/src/api/java/appeng/api/networking/events/MENetworkSpatialEvent.java similarity index 100% rename from api/src/main/java/appeng/api/networking/events/MENetworkSpatialEvent.java rename to src/api/java/appeng/api/networking/events/MENetworkSpatialEvent.java diff --git a/api/src/main/java/appeng/api/networking/events/MENetworkStorageEvent.java b/src/api/java/appeng/api/networking/events/MENetworkStorageEvent.java similarity index 100% rename from api/src/main/java/appeng/api/networking/events/MENetworkStorageEvent.java rename to src/api/java/appeng/api/networking/events/MENetworkStorageEvent.java diff --git a/api/src/main/java/appeng/api/networking/pathing/ControllerState.java b/src/api/java/appeng/api/networking/pathing/ControllerState.java similarity index 100% rename from api/src/main/java/appeng/api/networking/pathing/ControllerState.java rename to src/api/java/appeng/api/networking/pathing/ControllerState.java diff --git a/api/src/main/java/appeng/api/networking/pathing/IPathingGrid.java b/src/api/java/appeng/api/networking/pathing/IPathingGrid.java similarity index 100% rename from api/src/main/java/appeng/api/networking/pathing/IPathingGrid.java rename to src/api/java/appeng/api/networking/pathing/IPathingGrid.java diff --git a/api/src/main/java/appeng/api/networking/security/IActionHost.java b/src/api/java/appeng/api/networking/security/IActionHost.java similarity index 100% rename from api/src/main/java/appeng/api/networking/security/IActionHost.java rename to src/api/java/appeng/api/networking/security/IActionHost.java diff --git a/api/src/main/java/appeng/api/networking/security/IActionSource.java b/src/api/java/appeng/api/networking/security/IActionSource.java similarity index 100% rename from api/src/main/java/appeng/api/networking/security/IActionSource.java rename to src/api/java/appeng/api/networking/security/IActionSource.java diff --git a/api/src/main/java/appeng/api/networking/security/ISecurityGrid.java b/src/api/java/appeng/api/networking/security/ISecurityGrid.java similarity index 100% rename from api/src/main/java/appeng/api/networking/security/ISecurityGrid.java rename to src/api/java/appeng/api/networking/security/ISecurityGrid.java diff --git a/api/src/main/java/appeng/api/networking/security/ISecurityProvider.java b/src/api/java/appeng/api/networking/security/ISecurityProvider.java similarity index 100% rename from api/src/main/java/appeng/api/networking/security/ISecurityProvider.java rename to src/api/java/appeng/api/networking/security/ISecurityProvider.java diff --git a/api/src/main/java/appeng/api/networking/security/ISecurityRegistry.java b/src/api/java/appeng/api/networking/security/ISecurityRegistry.java similarity index 100% rename from api/src/main/java/appeng/api/networking/security/ISecurityRegistry.java rename to src/api/java/appeng/api/networking/security/ISecurityRegistry.java diff --git a/api/src/main/java/appeng/api/networking/spatial/ISpatialCache.java b/src/api/java/appeng/api/networking/spatial/ISpatialCache.java similarity index 100% rename from api/src/main/java/appeng/api/networking/spatial/ISpatialCache.java rename to src/api/java/appeng/api/networking/spatial/ISpatialCache.java diff --git a/api/src/main/java/appeng/api/networking/storage/IBaseMonitor.java b/src/api/java/appeng/api/networking/storage/IBaseMonitor.java similarity index 100% rename from api/src/main/java/appeng/api/networking/storage/IBaseMonitor.java rename to src/api/java/appeng/api/networking/storage/IBaseMonitor.java diff --git a/api/src/main/java/appeng/api/networking/storage/IStackWatcher.java b/src/api/java/appeng/api/networking/storage/IStackWatcher.java similarity index 100% rename from api/src/main/java/appeng/api/networking/storage/IStackWatcher.java rename to src/api/java/appeng/api/networking/storage/IStackWatcher.java diff --git a/api/src/main/java/appeng/api/networking/storage/IStackWatcherHost.java b/src/api/java/appeng/api/networking/storage/IStackWatcherHost.java similarity index 100% rename from api/src/main/java/appeng/api/networking/storage/IStackWatcherHost.java rename to src/api/java/appeng/api/networking/storage/IStackWatcherHost.java diff --git a/api/src/main/java/appeng/api/networking/storage/IStorageGrid.java b/src/api/java/appeng/api/networking/storage/IStorageGrid.java similarity index 100% rename from api/src/main/java/appeng/api/networking/storage/IStorageGrid.java rename to src/api/java/appeng/api/networking/storage/IStorageGrid.java diff --git a/api/src/main/java/appeng/api/networking/ticking/IGridTickable.java b/src/api/java/appeng/api/networking/ticking/IGridTickable.java similarity index 100% rename from api/src/main/java/appeng/api/networking/ticking/IGridTickable.java rename to src/api/java/appeng/api/networking/ticking/IGridTickable.java diff --git a/api/src/main/java/appeng/api/networking/ticking/ITickManager.java b/src/api/java/appeng/api/networking/ticking/ITickManager.java similarity index 100% rename from api/src/main/java/appeng/api/networking/ticking/ITickManager.java rename to src/api/java/appeng/api/networking/ticking/ITickManager.java diff --git a/api/src/main/java/appeng/api/networking/ticking/TickRateModulation.java b/src/api/java/appeng/api/networking/ticking/TickRateModulation.java similarity index 100% rename from api/src/main/java/appeng/api/networking/ticking/TickRateModulation.java rename to src/api/java/appeng/api/networking/ticking/TickRateModulation.java diff --git a/api/src/main/java/appeng/api/networking/ticking/TickingRequest.java b/src/api/java/appeng/api/networking/ticking/TickingRequest.java similarity index 100% rename from api/src/main/java/appeng/api/networking/ticking/TickingRequest.java rename to src/api/java/appeng/api/networking/ticking/TickingRequest.java diff --git a/api/src/main/java/appeng/api/package-info.java b/src/api/java/appeng/api/package-info.java similarity index 100% rename from api/src/main/java/appeng/api/package-info.java rename to src/api/java/appeng/api/package-info.java diff --git a/api/src/main/java/appeng/api/parts/BusSupport.java b/src/api/java/appeng/api/parts/BusSupport.java similarity index 100% rename from api/src/main/java/appeng/api/parts/BusSupport.java rename to src/api/java/appeng/api/parts/BusSupport.java diff --git a/api/src/main/java/appeng/api/parts/CableRenderMode.java b/src/api/java/appeng/api/parts/CableRenderMode.java similarity index 100% rename from api/src/main/java/appeng/api/parts/CableRenderMode.java rename to src/api/java/appeng/api/parts/CableRenderMode.java diff --git a/api/src/main/java/appeng/api/parts/IAlphaPassItem.java b/src/api/java/appeng/api/parts/IAlphaPassItem.java similarity index 100% rename from api/src/main/java/appeng/api/parts/IAlphaPassItem.java rename to src/api/java/appeng/api/parts/IAlphaPassItem.java diff --git a/api/src/main/java/appeng/api/parts/ICustomCableConnection.java b/src/api/java/appeng/api/parts/ICustomCableConnection.java similarity index 100% rename from api/src/main/java/appeng/api/parts/ICustomCableConnection.java rename to src/api/java/appeng/api/parts/ICustomCableConnection.java diff --git a/api/src/main/java/appeng/api/parts/IFacadeContainer.java b/src/api/java/appeng/api/parts/IFacadeContainer.java similarity index 100% rename from api/src/main/java/appeng/api/parts/IFacadeContainer.java rename to src/api/java/appeng/api/parts/IFacadeContainer.java diff --git a/api/src/main/java/appeng/api/parts/IFacadePart.java b/src/api/java/appeng/api/parts/IFacadePart.java similarity index 100% rename from api/src/main/java/appeng/api/parts/IFacadePart.java rename to src/api/java/appeng/api/parts/IFacadePart.java diff --git a/api/src/main/java/appeng/api/parts/IPart.java b/src/api/java/appeng/api/parts/IPart.java similarity index 100% rename from api/src/main/java/appeng/api/parts/IPart.java rename to src/api/java/appeng/api/parts/IPart.java diff --git a/api/src/main/java/appeng/api/parts/IPartCollisionHelper.java b/src/api/java/appeng/api/parts/IPartCollisionHelper.java similarity index 100% rename from api/src/main/java/appeng/api/parts/IPartCollisionHelper.java rename to src/api/java/appeng/api/parts/IPartCollisionHelper.java diff --git a/api/src/main/java/appeng/api/parts/IPartHelper.java b/src/api/java/appeng/api/parts/IPartHelper.java similarity index 100% rename from api/src/main/java/appeng/api/parts/IPartHelper.java rename to src/api/java/appeng/api/parts/IPartHelper.java diff --git a/api/src/main/java/appeng/api/parts/IPartHost.java b/src/api/java/appeng/api/parts/IPartHost.java similarity index 100% rename from api/src/main/java/appeng/api/parts/IPartHost.java rename to src/api/java/appeng/api/parts/IPartHost.java diff --git a/api/src/main/java/appeng/api/parts/IPartItem.java b/src/api/java/appeng/api/parts/IPartItem.java similarity index 100% rename from api/src/main/java/appeng/api/parts/IPartItem.java rename to src/api/java/appeng/api/parts/IPartItem.java diff --git a/api/src/main/java/appeng/api/parts/IPartModel.java b/src/api/java/appeng/api/parts/IPartModel.java similarity index 100% rename from api/src/main/java/appeng/api/parts/IPartModel.java rename to src/api/java/appeng/api/parts/IPartModel.java diff --git a/api/src/main/java/appeng/api/parts/IPartModels.java b/src/api/java/appeng/api/parts/IPartModels.java similarity index 100% rename from api/src/main/java/appeng/api/parts/IPartModels.java rename to src/api/java/appeng/api/parts/IPartModels.java diff --git a/api/src/main/java/appeng/api/parts/LayerBase.java b/src/api/java/appeng/api/parts/LayerBase.java similarity index 100% rename from api/src/main/java/appeng/api/parts/LayerBase.java rename to src/api/java/appeng/api/parts/LayerBase.java diff --git a/api/src/main/java/appeng/api/parts/LayerFlags.java b/src/api/java/appeng/api/parts/LayerFlags.java similarity index 100% rename from api/src/main/java/appeng/api/parts/LayerFlags.java rename to src/api/java/appeng/api/parts/LayerFlags.java diff --git a/api/src/main/java/appeng/api/parts/PartItemStack.java b/src/api/java/appeng/api/parts/PartItemStack.java similarity index 100% rename from api/src/main/java/appeng/api/parts/PartItemStack.java rename to src/api/java/appeng/api/parts/PartItemStack.java diff --git a/api/src/main/java/appeng/api/parts/SelectedPart.java b/src/api/java/appeng/api/parts/SelectedPart.java similarity index 100% rename from api/src/main/java/appeng/api/parts/SelectedPart.java rename to src/api/java/appeng/api/parts/SelectedPart.java diff --git a/api/src/main/java/appeng/api/recipes/ICraftHandler.java b/src/api/java/appeng/api/recipes/ICraftHandler.java similarity index 100% rename from api/src/main/java/appeng/api/recipes/ICraftHandler.java rename to src/api/java/appeng/api/recipes/ICraftHandler.java diff --git a/api/src/main/java/appeng/api/recipes/IIngredient.java b/src/api/java/appeng/api/recipes/IIngredient.java similarity index 100% rename from api/src/main/java/appeng/api/recipes/IIngredient.java rename to src/api/java/appeng/api/recipes/IIngredient.java diff --git a/api/src/main/java/appeng/api/recipes/IRecipeHandler.java b/src/api/java/appeng/api/recipes/IRecipeHandler.java similarity index 100% rename from api/src/main/java/appeng/api/recipes/IRecipeHandler.java rename to src/api/java/appeng/api/recipes/IRecipeHandler.java diff --git a/api/src/main/java/appeng/api/recipes/IRecipeLoader.java b/src/api/java/appeng/api/recipes/IRecipeLoader.java similarity index 100% rename from api/src/main/java/appeng/api/recipes/IRecipeLoader.java rename to src/api/java/appeng/api/recipes/IRecipeLoader.java diff --git a/api/src/main/java/appeng/api/recipes/ResolverResult.java b/src/api/java/appeng/api/recipes/ResolverResult.java similarity index 100% rename from api/src/main/java/appeng/api/recipes/ResolverResult.java rename to src/api/java/appeng/api/recipes/ResolverResult.java diff --git a/api/src/main/java/appeng/api/recipes/ResolverResultSet.java b/src/api/java/appeng/api/recipes/ResolverResultSet.java similarity index 100% rename from api/src/main/java/appeng/api/recipes/ResolverResultSet.java rename to src/api/java/appeng/api/recipes/ResolverResultSet.java diff --git a/api/src/main/java/appeng/api/storage/ICellRegistry.java b/src/api/java/appeng/api/storage/ICellRegistry.java similarity index 100% rename from api/src/main/java/appeng/api/storage/ICellRegistry.java rename to src/api/java/appeng/api/storage/ICellRegistry.java diff --git a/api/src/main/java/appeng/api/storage/IMEInventory.java b/src/api/java/appeng/api/storage/IMEInventory.java similarity index 100% rename from api/src/main/java/appeng/api/storage/IMEInventory.java rename to src/api/java/appeng/api/storage/IMEInventory.java diff --git a/api/src/main/java/appeng/api/storage/IMEInventoryHandler.java b/src/api/java/appeng/api/storage/IMEInventoryHandler.java similarity index 100% rename from api/src/main/java/appeng/api/storage/IMEInventoryHandler.java rename to src/api/java/appeng/api/storage/IMEInventoryHandler.java diff --git a/api/src/main/java/appeng/api/storage/IMEMonitor.java b/src/api/java/appeng/api/storage/IMEMonitor.java similarity index 100% rename from api/src/main/java/appeng/api/storage/IMEMonitor.java rename to src/api/java/appeng/api/storage/IMEMonitor.java diff --git a/api/src/main/java/appeng/api/storage/IMEMonitorHandlerReceiver.java b/src/api/java/appeng/api/storage/IMEMonitorHandlerReceiver.java similarity index 100% rename from api/src/main/java/appeng/api/storage/IMEMonitorHandlerReceiver.java rename to src/api/java/appeng/api/storage/IMEMonitorHandlerReceiver.java diff --git a/api/src/main/java/appeng/api/storage/ISpatialDimension.java b/src/api/java/appeng/api/storage/ISpatialDimension.java similarity index 100% rename from api/src/main/java/appeng/api/storage/ISpatialDimension.java rename to src/api/java/appeng/api/storage/ISpatialDimension.java diff --git a/api/src/main/java/appeng/api/storage/IStorageChannel.java b/src/api/java/appeng/api/storage/IStorageChannel.java similarity index 100% rename from api/src/main/java/appeng/api/storage/IStorageChannel.java rename to src/api/java/appeng/api/storage/IStorageChannel.java diff --git a/api/src/main/java/appeng/api/storage/IStorageHelper.java b/src/api/java/appeng/api/storage/IStorageHelper.java similarity index 100% rename from api/src/main/java/appeng/api/storage/IStorageHelper.java rename to src/api/java/appeng/api/storage/IStorageHelper.java diff --git a/api/src/main/java/appeng/api/storage/IStorageMonitorable.java b/src/api/java/appeng/api/storage/IStorageMonitorable.java similarity index 100% rename from api/src/main/java/appeng/api/storage/IStorageMonitorable.java rename to src/api/java/appeng/api/storage/IStorageMonitorable.java diff --git a/api/src/main/java/appeng/api/storage/IStorageMonitorableAccessor.java b/src/api/java/appeng/api/storage/IStorageMonitorableAccessor.java similarity index 100% rename from api/src/main/java/appeng/api/storage/IStorageMonitorableAccessor.java rename to src/api/java/appeng/api/storage/IStorageMonitorableAccessor.java diff --git a/api/src/main/java/appeng/api/storage/ITerminalHost.java b/src/api/java/appeng/api/storage/ITerminalHost.java similarity index 100% rename from api/src/main/java/appeng/api/storage/ITerminalHost.java rename to src/api/java/appeng/api/storage/ITerminalHost.java diff --git a/api/src/main/java/appeng/api/storage/cells/CellState.java b/src/api/java/appeng/api/storage/cells/CellState.java similarity index 100% rename from api/src/main/java/appeng/api/storage/cells/CellState.java rename to src/api/java/appeng/api/storage/cells/CellState.java diff --git a/api/src/main/java/appeng/api/storage/cells/ICellContainer.java b/src/api/java/appeng/api/storage/cells/ICellContainer.java similarity index 100% rename from api/src/main/java/appeng/api/storage/cells/ICellContainer.java rename to src/api/java/appeng/api/storage/cells/ICellContainer.java diff --git a/api/src/main/java/appeng/api/storage/cells/ICellGuiHandler.java b/src/api/java/appeng/api/storage/cells/ICellGuiHandler.java similarity index 100% rename from api/src/main/java/appeng/api/storage/cells/ICellGuiHandler.java rename to src/api/java/appeng/api/storage/cells/ICellGuiHandler.java diff --git a/api/src/main/java/appeng/api/storage/cells/ICellHandler.java b/src/api/java/appeng/api/storage/cells/ICellHandler.java similarity index 100% rename from api/src/main/java/appeng/api/storage/cells/ICellHandler.java rename to src/api/java/appeng/api/storage/cells/ICellHandler.java diff --git a/api/src/main/java/appeng/api/storage/cells/ICellInventory.java b/src/api/java/appeng/api/storage/cells/ICellInventory.java similarity index 100% rename from api/src/main/java/appeng/api/storage/cells/ICellInventory.java rename to src/api/java/appeng/api/storage/cells/ICellInventory.java diff --git a/api/src/main/java/appeng/api/storage/cells/ICellInventoryHandler.java b/src/api/java/appeng/api/storage/cells/ICellInventoryHandler.java similarity index 100% rename from api/src/main/java/appeng/api/storage/cells/ICellInventoryHandler.java rename to src/api/java/appeng/api/storage/cells/ICellInventoryHandler.java diff --git a/api/src/main/java/appeng/api/storage/cells/ICellProvider.java b/src/api/java/appeng/api/storage/cells/ICellProvider.java similarity index 100% rename from api/src/main/java/appeng/api/storage/cells/ICellProvider.java rename to src/api/java/appeng/api/storage/cells/ICellProvider.java diff --git a/api/src/main/java/appeng/api/storage/cells/ICellWorkbenchItem.java b/src/api/java/appeng/api/storage/cells/ICellWorkbenchItem.java similarity index 100% rename from api/src/main/java/appeng/api/storage/cells/ICellWorkbenchItem.java rename to src/api/java/appeng/api/storage/cells/ICellWorkbenchItem.java diff --git a/api/src/main/java/appeng/api/storage/cells/ISaveProvider.java b/src/api/java/appeng/api/storage/cells/ISaveProvider.java similarity index 100% rename from api/src/main/java/appeng/api/storage/cells/ISaveProvider.java rename to src/api/java/appeng/api/storage/cells/ISaveProvider.java diff --git a/api/src/main/java/appeng/api/storage/channels/IFluidStorageChannel.java b/src/api/java/appeng/api/storage/channels/IFluidStorageChannel.java similarity index 100% rename from api/src/main/java/appeng/api/storage/channels/IFluidStorageChannel.java rename to src/api/java/appeng/api/storage/channels/IFluidStorageChannel.java diff --git a/api/src/main/java/appeng/api/storage/channels/IItemStorageChannel.java b/src/api/java/appeng/api/storage/channels/IItemStorageChannel.java similarity index 100% rename from api/src/main/java/appeng/api/storage/channels/IItemStorageChannel.java rename to src/api/java/appeng/api/storage/channels/IItemStorageChannel.java diff --git a/api/src/main/java/appeng/api/storage/data/IAEFluidStack.java b/src/api/java/appeng/api/storage/data/IAEFluidStack.java similarity index 100% rename from api/src/main/java/appeng/api/storage/data/IAEFluidStack.java rename to src/api/java/appeng/api/storage/data/IAEFluidStack.java diff --git a/api/src/main/java/appeng/api/storage/data/IAEItemStack.java b/src/api/java/appeng/api/storage/data/IAEItemStack.java similarity index 100% rename from api/src/main/java/appeng/api/storage/data/IAEItemStack.java rename to src/api/java/appeng/api/storage/data/IAEItemStack.java diff --git a/api/src/main/java/appeng/api/storage/data/IAEStack.java b/src/api/java/appeng/api/storage/data/IAEStack.java similarity index 100% rename from api/src/main/java/appeng/api/storage/data/IAEStack.java rename to src/api/java/appeng/api/storage/data/IAEStack.java diff --git a/api/src/main/java/appeng/api/storage/data/IItemContainer.java b/src/api/java/appeng/api/storage/data/IItemContainer.java similarity index 100% rename from api/src/main/java/appeng/api/storage/data/IItemContainer.java rename to src/api/java/appeng/api/storage/data/IItemContainer.java diff --git a/api/src/main/java/appeng/api/storage/data/IItemList.java b/src/api/java/appeng/api/storage/data/IItemList.java similarity index 100% rename from api/src/main/java/appeng/api/storage/data/IItemList.java rename to src/api/java/appeng/api/storage/data/IItemList.java diff --git a/api/src/main/java/appeng/api/util/AEAxisAlignedBB.java b/src/api/java/appeng/api/util/AEAxisAlignedBB.java similarity index 100% rename from api/src/main/java/appeng/api/util/AEAxisAlignedBB.java rename to src/api/java/appeng/api/util/AEAxisAlignedBB.java diff --git a/api/src/main/java/appeng/api/util/AECableSize.java b/src/api/java/appeng/api/util/AECableSize.java similarity index 100% rename from api/src/main/java/appeng/api/util/AECableSize.java rename to src/api/java/appeng/api/util/AECableSize.java diff --git a/api/src/main/java/appeng/api/util/AECableType.java b/src/api/java/appeng/api/util/AECableType.java similarity index 100% rename from api/src/main/java/appeng/api/util/AECableType.java rename to src/api/java/appeng/api/util/AECableType.java diff --git a/api/src/main/java/appeng/api/util/AECableVariant.java b/src/api/java/appeng/api/util/AECableVariant.java similarity index 100% rename from api/src/main/java/appeng/api/util/AECableVariant.java rename to src/api/java/appeng/api/util/AECableVariant.java diff --git a/api/src/main/java/appeng/api/util/AEColor.java b/src/api/java/appeng/api/util/AEColor.java similarity index 100% rename from api/src/main/java/appeng/api/util/AEColor.java rename to src/api/java/appeng/api/util/AEColor.java diff --git a/api/src/main/java/appeng/api/util/AEColoredItemDefinition.java b/src/api/java/appeng/api/util/AEColoredItemDefinition.java similarity index 100% rename from api/src/main/java/appeng/api/util/AEColoredItemDefinition.java rename to src/api/java/appeng/api/util/AEColoredItemDefinition.java diff --git a/api/src/main/java/appeng/api/util/AEPartLocation.java b/src/api/java/appeng/api/util/AEPartLocation.java similarity index 100% rename from api/src/main/java/appeng/api/util/AEPartLocation.java rename to src/api/java/appeng/api/util/AEPartLocation.java diff --git a/api/src/main/java/appeng/api/util/DimensionalCoord.java b/src/api/java/appeng/api/util/DimensionalCoord.java similarity index 100% rename from api/src/main/java/appeng/api/util/DimensionalCoord.java rename to src/api/java/appeng/api/util/DimensionalCoord.java diff --git a/api/src/main/java/appeng/api/util/IClientHelper.java b/src/api/java/appeng/api/util/IClientHelper.java similarity index 100% rename from api/src/main/java/appeng/api/util/IClientHelper.java rename to src/api/java/appeng/api/util/IClientHelper.java diff --git a/api/src/main/java/appeng/api/util/ICommonTile.java b/src/api/java/appeng/api/util/ICommonTile.java similarity index 100% rename from api/src/main/java/appeng/api/util/ICommonTile.java rename to src/api/java/appeng/api/util/ICommonTile.java diff --git a/api/src/main/java/appeng/api/util/IConfigManager.java b/src/api/java/appeng/api/util/IConfigManager.java similarity index 100% rename from api/src/main/java/appeng/api/util/IConfigManager.java rename to src/api/java/appeng/api/util/IConfigManager.java diff --git a/api/src/main/java/appeng/api/util/IConfigurableObject.java b/src/api/java/appeng/api/util/IConfigurableObject.java similarity index 100% rename from api/src/main/java/appeng/api/util/IConfigurableObject.java rename to src/api/java/appeng/api/util/IConfigurableObject.java diff --git a/api/src/main/java/appeng/api/util/INetworkToolAgent.java b/src/api/java/appeng/api/util/INetworkToolAgent.java similarity index 100% rename from api/src/main/java/appeng/api/util/INetworkToolAgent.java rename to src/api/java/appeng/api/util/INetworkToolAgent.java diff --git a/api/src/main/java/appeng/api/util/IOrientable.java b/src/api/java/appeng/api/util/IOrientable.java similarity index 100% rename from api/src/main/java/appeng/api/util/IOrientable.java rename to src/api/java/appeng/api/util/IOrientable.java diff --git a/api/src/main/java/appeng/api/util/IOrientableBlock.java b/src/api/java/appeng/api/util/IOrientableBlock.java similarity index 100% rename from api/src/main/java/appeng/api/util/IOrientableBlock.java rename to src/api/java/appeng/api/util/IOrientableBlock.java diff --git a/api/src/main/java/appeng/api/util/IReadOnlyCollection.java b/src/api/java/appeng/api/util/IReadOnlyCollection.java similarity index 100% rename from api/src/main/java/appeng/api/util/IReadOnlyCollection.java rename to src/api/java/appeng/api/util/IReadOnlyCollection.java diff --git a/api/src/main/java/appeng/api/util/WorldCoord.java b/src/api/java/appeng/api/util/WorldCoord.java similarity index 100% rename from api/src/main/java/appeng/api/util/WorldCoord.java rename to src/api/java/appeng/api/util/WorldCoord.java diff --git a/core/src/main/java/appeng/block/AEBaseBlock.java b/src/main/java/appeng/block/AEBaseBlock.java similarity index 100% rename from core/src/main/java/appeng/block/AEBaseBlock.java rename to src/main/java/appeng/block/AEBaseBlock.java diff --git a/core/src/main/java/appeng/block/AEBaseBlockItem.java b/src/main/java/appeng/block/AEBaseBlockItem.java similarity index 100% rename from core/src/main/java/appeng/block/AEBaseBlockItem.java rename to src/main/java/appeng/block/AEBaseBlockItem.java diff --git a/core/src/main/java/appeng/block/AEBaseBlockItemChargeable.java b/src/main/java/appeng/block/AEBaseBlockItemChargeable.java similarity index 100% rename from core/src/main/java/appeng/block/AEBaseBlockItemChargeable.java rename to src/main/java/appeng/block/AEBaseBlockItemChargeable.java diff --git a/core/src/main/java/appeng/block/AEBaseTileBlock.java b/src/main/java/appeng/block/AEBaseTileBlock.java similarity index 100% rename from core/src/main/java/appeng/block/AEBaseTileBlock.java rename to src/main/java/appeng/block/AEBaseTileBlock.java diff --git a/core/src/main/java/appeng/block/misc/LightDetectorBlock.java b/src/main/java/appeng/block/misc/LightDetectorBlock.java similarity index 100% rename from core/src/main/java/appeng/block/misc/LightDetectorBlock.java rename to src/main/java/appeng/block/misc/LightDetectorBlock.java diff --git a/core/src/main/java/appeng/block/misc/QuartzFixtureBlock.java b/src/main/java/appeng/block/misc/QuartzFixtureBlock.java similarity index 100% rename from core/src/main/java/appeng/block/misc/QuartzFixtureBlock.java rename to src/main/java/appeng/block/misc/QuartzFixtureBlock.java diff --git a/core/src/main/java/appeng/block/misc/SkyCompassBlock.java b/src/main/java/appeng/block/misc/SkyCompassBlock.java similarity index 100% rename from core/src/main/java/appeng/block/misc/SkyCompassBlock.java rename to src/main/java/appeng/block/misc/SkyCompassBlock.java diff --git a/core/src/main/java/appeng/block/misc/SkyCompassRendering.java b/src/main/java/appeng/block/misc/SkyCompassRendering.java similarity index 100% rename from core/src/main/java/appeng/block/misc/SkyCompassRendering.java rename to src/main/java/appeng/block/misc/SkyCompassRendering.java diff --git a/core/src/main/java/appeng/block/misc/TinyTNTBlock.java b/src/main/java/appeng/block/misc/TinyTNTBlock.java similarity index 100% rename from core/src/main/java/appeng/block/misc/TinyTNTBlock.java rename to src/main/java/appeng/block/misc/TinyTNTBlock.java diff --git a/core/src/main/java/appeng/block/networking/CableBusBlock.java b/src/main/java/appeng/block/networking/CableBusBlock.java similarity index 100% rename from core/src/main/java/appeng/block/networking/CableBusBlock.java rename to src/main/java/appeng/block/networking/CableBusBlock.java diff --git a/core/src/main/java/appeng/block/networking/CableBusColor.java b/src/main/java/appeng/block/networking/CableBusColor.java similarity index 100% rename from core/src/main/java/appeng/block/networking/CableBusColor.java rename to src/main/java/appeng/block/networking/CableBusColor.java diff --git a/core/src/main/java/appeng/block/networking/CableBusRendering.java b/src/main/java/appeng/block/networking/CableBusRendering.java similarity index 100% rename from core/src/main/java/appeng/block/networking/CableBusRendering.java rename to src/main/java/appeng/block/networking/CableBusRendering.java diff --git a/core/src/main/java/appeng/block/storage/SkyChestBlock.java b/src/main/java/appeng/block/storage/SkyChestBlock.java similarity index 100% rename from core/src/main/java/appeng/block/storage/SkyChestBlock.java rename to src/main/java/appeng/block/storage/SkyChestBlock.java diff --git a/core/src/main/java/appeng/bootstrap/BlockDefinitionBuilder.java b/src/main/java/appeng/bootstrap/BlockDefinitionBuilder.java similarity index 100% rename from core/src/main/java/appeng/bootstrap/BlockDefinitionBuilder.java rename to src/main/java/appeng/bootstrap/BlockDefinitionBuilder.java diff --git a/core/src/main/java/appeng/bootstrap/BlockEntityBuilder.java b/src/main/java/appeng/bootstrap/BlockEntityBuilder.java similarity index 100% rename from core/src/main/java/appeng/bootstrap/BlockEntityBuilder.java rename to src/main/java/appeng/bootstrap/BlockEntityBuilder.java diff --git a/core/src/main/java/appeng/bootstrap/BlockRendering.java b/src/main/java/appeng/bootstrap/BlockRendering.java similarity index 100% rename from core/src/main/java/appeng/bootstrap/BlockRendering.java rename to src/main/java/appeng/bootstrap/BlockRendering.java diff --git a/core/src/main/java/appeng/bootstrap/BlockRenderingCustomizer.java b/src/main/java/appeng/bootstrap/BlockRenderingCustomizer.java similarity index 100% rename from core/src/main/java/appeng/bootstrap/BlockRenderingCustomizer.java rename to src/main/java/appeng/bootstrap/BlockRenderingCustomizer.java diff --git a/core/src/main/java/appeng/bootstrap/EntityBuilder.java b/src/main/java/appeng/bootstrap/EntityBuilder.java similarity index 100% rename from core/src/main/java/appeng/bootstrap/EntityBuilder.java rename to src/main/java/appeng/bootstrap/EntityBuilder.java diff --git a/core/src/main/java/appeng/bootstrap/FeatureFactory.java b/src/main/java/appeng/bootstrap/FeatureFactory.java similarity index 100% rename from core/src/main/java/appeng/bootstrap/FeatureFactory.java rename to src/main/java/appeng/bootstrap/FeatureFactory.java diff --git a/core/src/main/java/appeng/bootstrap/IBlockBuilder.java b/src/main/java/appeng/bootstrap/IBlockBuilder.java similarity index 100% rename from core/src/main/java/appeng/bootstrap/IBlockBuilder.java rename to src/main/java/appeng/bootstrap/IBlockBuilder.java diff --git a/core/src/main/java/appeng/bootstrap/IBlockRendering.java b/src/main/java/appeng/bootstrap/IBlockRendering.java similarity index 100% rename from core/src/main/java/appeng/bootstrap/IBlockRendering.java rename to src/main/java/appeng/bootstrap/IBlockRendering.java diff --git a/core/src/main/java/appeng/bootstrap/IBootstrapComponent.java b/src/main/java/appeng/bootstrap/IBootstrapComponent.java similarity index 100% rename from core/src/main/java/appeng/bootstrap/IBootstrapComponent.java rename to src/main/java/appeng/bootstrap/IBootstrapComponent.java diff --git a/core/src/main/java/appeng/bootstrap/ICriterionTriggerRegistry.java b/src/main/java/appeng/bootstrap/ICriterionTriggerRegistry.java similarity index 100% rename from core/src/main/java/appeng/bootstrap/ICriterionTriggerRegistry.java rename to src/main/java/appeng/bootstrap/ICriterionTriggerRegistry.java diff --git a/core/src/main/java/appeng/bootstrap/IItemBuilder.java b/src/main/java/appeng/bootstrap/IItemBuilder.java similarity index 100% rename from core/src/main/java/appeng/bootstrap/IItemBuilder.java rename to src/main/java/appeng/bootstrap/IItemBuilder.java diff --git a/core/src/main/java/appeng/bootstrap/IItemRendering.java b/src/main/java/appeng/bootstrap/IItemRendering.java similarity index 100% rename from core/src/main/java/appeng/bootstrap/IItemRendering.java rename to src/main/java/appeng/bootstrap/IItemRendering.java diff --git a/core/src/main/java/appeng/bootstrap/ItemDefinitionBuilder.java b/src/main/java/appeng/bootstrap/ItemDefinitionBuilder.java similarity index 100% rename from core/src/main/java/appeng/bootstrap/ItemDefinitionBuilder.java rename to src/main/java/appeng/bootstrap/ItemDefinitionBuilder.java diff --git a/core/src/main/java/appeng/bootstrap/ItemRendering.java b/src/main/java/appeng/bootstrap/ItemRendering.java similarity index 100% rename from core/src/main/java/appeng/bootstrap/ItemRendering.java rename to src/main/java/appeng/bootstrap/ItemRendering.java diff --git a/core/src/main/java/appeng/bootstrap/ItemRenderingCustomizer.java b/src/main/java/appeng/bootstrap/ItemRenderingCustomizer.java similarity index 100% rename from core/src/main/java/appeng/bootstrap/ItemRenderingCustomizer.java rename to src/main/java/appeng/bootstrap/ItemRenderingCustomizer.java diff --git a/core/src/main/java/appeng/bootstrap/ModelsReloadCallback.java b/src/main/java/appeng/bootstrap/ModelsReloadCallback.java similarity index 100% rename from core/src/main/java/appeng/bootstrap/ModelsReloadCallback.java rename to src/main/java/appeng/bootstrap/ModelsReloadCallback.java diff --git a/core/src/main/java/appeng/bootstrap/TileEntityRendering.java b/src/main/java/appeng/bootstrap/TileEntityRendering.java similarity index 100% rename from core/src/main/java/appeng/bootstrap/TileEntityRendering.java rename to src/main/java/appeng/bootstrap/TileEntityRendering.java diff --git a/core/src/main/java/appeng/bootstrap/TileEntityRenderingCustomizer.java b/src/main/java/appeng/bootstrap/TileEntityRenderingCustomizer.java similarity index 100% rename from core/src/main/java/appeng/bootstrap/TileEntityRenderingCustomizer.java rename to src/main/java/appeng/bootstrap/TileEntityRenderingCustomizer.java diff --git a/core/src/main/java/appeng/bootstrap/components/BlockColorComponent.java b/src/main/java/appeng/bootstrap/components/BlockColorComponent.java similarity index 100% rename from core/src/main/java/appeng/bootstrap/components/BlockColorComponent.java rename to src/main/java/appeng/bootstrap/components/BlockColorComponent.java diff --git a/core/src/main/java/appeng/bootstrap/components/IClientSetupComponent.java b/src/main/java/appeng/bootstrap/components/IClientSetupComponent.java similarity index 100% rename from core/src/main/java/appeng/bootstrap/components/IClientSetupComponent.java rename to src/main/java/appeng/bootstrap/components/IClientSetupComponent.java diff --git a/core/src/main/java/appeng/bootstrap/components/IInitComponent.java b/src/main/java/appeng/bootstrap/components/IInitComponent.java similarity index 100% rename from core/src/main/java/appeng/bootstrap/components/IInitComponent.java rename to src/main/java/appeng/bootstrap/components/IInitComponent.java diff --git a/core/src/main/java/appeng/bootstrap/components/IItemColorRegistrationComponent.java b/src/main/java/appeng/bootstrap/components/IItemColorRegistrationComponent.java similarity index 100% rename from core/src/main/java/appeng/bootstrap/components/IItemColorRegistrationComponent.java rename to src/main/java/appeng/bootstrap/components/IItemColorRegistrationComponent.java diff --git a/core/src/main/java/appeng/bootstrap/components/IModelBakeComponent.java b/src/main/java/appeng/bootstrap/components/IModelBakeComponent.java similarity index 100% rename from core/src/main/java/appeng/bootstrap/components/IModelBakeComponent.java rename to src/main/java/appeng/bootstrap/components/IModelBakeComponent.java diff --git a/core/src/main/java/appeng/bootstrap/components/IPostInitComponent.java b/src/main/java/appeng/bootstrap/components/IPostInitComponent.java similarity index 100% rename from core/src/main/java/appeng/bootstrap/components/IPostInitComponent.java rename to src/main/java/appeng/bootstrap/components/IPostInitComponent.java diff --git a/core/src/main/java/appeng/bootstrap/components/ITileEntityRegistrationComponent.java b/src/main/java/appeng/bootstrap/components/ITileEntityRegistrationComponent.java similarity index 100% rename from core/src/main/java/appeng/bootstrap/components/ITileEntityRegistrationComponent.java rename to src/main/java/appeng/bootstrap/components/ITileEntityRegistrationComponent.java diff --git a/core/src/main/java/appeng/bootstrap/components/ItemColorComponent.java b/src/main/java/appeng/bootstrap/components/ItemColorComponent.java similarity index 100% rename from core/src/main/java/appeng/bootstrap/components/ItemColorComponent.java rename to src/main/java/appeng/bootstrap/components/ItemColorComponent.java diff --git a/core/src/main/java/appeng/bootstrap/components/ModelOverrideComponent.java b/src/main/java/appeng/bootstrap/components/ModelOverrideComponent.java similarity index 100% rename from core/src/main/java/appeng/bootstrap/components/ModelOverrideComponent.java rename to src/main/java/appeng/bootstrap/components/ModelOverrideComponent.java diff --git a/core/src/main/java/appeng/bootstrap/components/RenderTypeComponent.java b/src/main/java/appeng/bootstrap/components/RenderTypeComponent.java similarity index 100% rename from core/src/main/java/appeng/bootstrap/components/RenderTypeComponent.java rename to src/main/java/appeng/bootstrap/components/RenderTypeComponent.java diff --git a/core/src/main/java/appeng/bootstrap/definitions/TileEntityDefinition.java b/src/main/java/appeng/bootstrap/definitions/TileEntityDefinition.java similarity index 100% rename from core/src/main/java/appeng/bootstrap/definitions/TileEntityDefinition.java rename to src/main/java/appeng/bootstrap/definitions/TileEntityDefinition.java diff --git a/core/src/main/java/appeng/client/ActionKey.java b/src/main/java/appeng/client/ActionKey.java similarity index 100% rename from core/src/main/java/appeng/client/ActionKey.java rename to src/main/java/appeng/client/ActionKey.java diff --git a/core/src/main/java/appeng/client/AppEngClient.java b/src/main/java/appeng/client/AppEngClient.java similarity index 100% rename from core/src/main/java/appeng/client/AppEngClient.java rename to src/main/java/appeng/client/AppEngClient.java diff --git a/core/src/main/java/appeng/client/EffectType.java b/src/main/java/appeng/client/EffectType.java similarity index 100% rename from core/src/main/java/appeng/client/EffectType.java rename to src/main/java/appeng/client/EffectType.java diff --git a/core/src/main/java/appeng/client/render/FacingToRotation.java b/src/main/java/appeng/client/render/FacingToRotation.java similarity index 100% rename from core/src/main/java/appeng/client/render/FacingToRotation.java rename to src/main/java/appeng/client/render/FacingToRotation.java diff --git a/core/src/main/java/appeng/client/render/StaticItemColor.java b/src/main/java/appeng/client/render/StaticItemColor.java similarity index 100% rename from core/src/main/java/appeng/client/render/StaticItemColor.java rename to src/main/java/appeng/client/render/StaticItemColor.java diff --git a/core/src/main/java/appeng/client/render/cablebus/CableBuilder.java b/src/main/java/appeng/client/render/cablebus/CableBuilder.java similarity index 100% rename from core/src/main/java/appeng/client/render/cablebus/CableBuilder.java rename to src/main/java/appeng/client/render/cablebus/CableBuilder.java diff --git a/core/src/main/java/appeng/client/render/cablebus/CableBusBakedModel.java b/src/main/java/appeng/client/render/cablebus/CableBusBakedModel.java similarity index 100% rename from core/src/main/java/appeng/client/render/cablebus/CableBusBakedModel.java rename to src/main/java/appeng/client/render/cablebus/CableBusBakedModel.java diff --git a/core/src/main/java/appeng/client/render/cablebus/CableBusBreakingParticle.java b/src/main/java/appeng/client/render/cablebus/CableBusBreakingParticle.java similarity index 100% rename from core/src/main/java/appeng/client/render/cablebus/CableBusBreakingParticle.java rename to src/main/java/appeng/client/render/cablebus/CableBusBreakingParticle.java diff --git a/core/src/main/java/appeng/client/render/cablebus/CableBusModel.java b/src/main/java/appeng/client/render/cablebus/CableBusModel.java similarity index 100% rename from core/src/main/java/appeng/client/render/cablebus/CableBusModel.java rename to src/main/java/appeng/client/render/cablebus/CableBusModel.java diff --git a/core/src/main/java/appeng/client/render/cablebus/CableBusModelLoader.java b/src/main/java/appeng/client/render/cablebus/CableBusModelLoader.java similarity index 100% rename from core/src/main/java/appeng/client/render/cablebus/CableBusModelLoader.java rename to src/main/java/appeng/client/render/cablebus/CableBusModelLoader.java diff --git a/core/src/main/java/appeng/client/render/cablebus/CableBusRenderState.java b/src/main/java/appeng/client/render/cablebus/CableBusRenderState.java similarity index 100% rename from core/src/main/java/appeng/client/render/cablebus/CableBusRenderState.java rename to src/main/java/appeng/client/render/cablebus/CableBusRenderState.java diff --git a/core/src/main/java/appeng/client/render/cablebus/CableCoreType.java b/src/main/java/appeng/client/render/cablebus/CableCoreType.java similarity index 100% rename from core/src/main/java/appeng/client/render/cablebus/CableCoreType.java rename to src/main/java/appeng/client/render/cablebus/CableCoreType.java diff --git a/core/src/main/java/appeng/client/render/cablebus/CubeBuilder.java b/src/main/java/appeng/client/render/cablebus/CubeBuilder.java similarity index 100% rename from core/src/main/java/appeng/client/render/cablebus/CubeBuilder.java rename to src/main/java/appeng/client/render/cablebus/CubeBuilder.java diff --git a/core/src/main/java/appeng/client/render/cablebus/FacadeBuilder.java b/src/main/java/appeng/client/render/cablebus/FacadeBuilder.java similarity index 100% rename from core/src/main/java/appeng/client/render/cablebus/FacadeBuilder.java rename to src/main/java/appeng/client/render/cablebus/FacadeBuilder.java diff --git a/core/src/main/java/appeng/client/render/cablebus/FacadeRenderState.java b/src/main/java/appeng/client/render/cablebus/FacadeRenderState.java similarity index 100% rename from core/src/main/java/appeng/client/render/cablebus/FacadeRenderState.java rename to src/main/java/appeng/client/render/cablebus/FacadeRenderState.java diff --git a/core/src/main/java/appeng/client/render/cablebus/QuadRotator.java b/src/main/java/appeng/client/render/cablebus/QuadRotator.java similarity index 100% rename from core/src/main/java/appeng/client/render/cablebus/QuadRotator.java rename to src/main/java/appeng/client/render/cablebus/QuadRotator.java diff --git a/core/src/main/java/appeng/client/render/cablebus/SmartCableTextures.java b/src/main/java/appeng/client/render/cablebus/SmartCableTextures.java similarity index 100% rename from core/src/main/java/appeng/client/render/cablebus/SmartCableTextures.java rename to src/main/java/appeng/client/render/cablebus/SmartCableTextures.java diff --git a/core/src/main/java/appeng/client/render/effects/ChargedOreFX.java b/src/main/java/appeng/client/render/effects/ChargedOreFX.java similarity index 100% rename from core/src/main/java/appeng/client/render/effects/ChargedOreFX.java rename to src/main/java/appeng/client/render/effects/ChargedOreFX.java diff --git a/core/src/main/java/appeng/client/render/effects/CraftingFx.java b/src/main/java/appeng/client/render/effects/CraftingFx.java similarity index 100% rename from core/src/main/java/appeng/client/render/effects/CraftingFx.java rename to src/main/java/appeng/client/render/effects/CraftingFx.java diff --git a/core/src/main/java/appeng/client/render/effects/EnergyFx.java b/src/main/java/appeng/client/render/effects/EnergyFx.java similarity index 100% rename from core/src/main/java/appeng/client/render/effects/EnergyFx.java rename to src/main/java/appeng/client/render/effects/EnergyFx.java diff --git a/core/src/main/java/appeng/client/render/effects/EnergyParticleData.java b/src/main/java/appeng/client/render/effects/EnergyParticleData.java similarity index 100% rename from core/src/main/java/appeng/client/render/effects/EnergyParticleData.java rename to src/main/java/appeng/client/render/effects/EnergyParticleData.java diff --git a/core/src/main/java/appeng/client/render/effects/LightningArcFX.java b/src/main/java/appeng/client/render/effects/LightningArcFX.java similarity index 100% rename from core/src/main/java/appeng/client/render/effects/LightningArcFX.java rename to src/main/java/appeng/client/render/effects/LightningArcFX.java diff --git a/core/src/main/java/appeng/client/render/effects/LightningArcParticleData.java b/src/main/java/appeng/client/render/effects/LightningArcParticleData.java similarity index 100% rename from core/src/main/java/appeng/client/render/effects/LightningArcParticleData.java rename to src/main/java/appeng/client/render/effects/LightningArcParticleData.java diff --git a/core/src/main/java/appeng/client/render/effects/LightningFX.java b/src/main/java/appeng/client/render/effects/LightningFX.java similarity index 100% rename from core/src/main/java/appeng/client/render/effects/LightningFX.java rename to src/main/java/appeng/client/render/effects/LightningFX.java diff --git a/core/src/main/java/appeng/client/render/effects/MatterCannonFX.java b/src/main/java/appeng/client/render/effects/MatterCannonFX.java similarity index 100% rename from core/src/main/java/appeng/client/render/effects/MatterCannonFX.java rename to src/main/java/appeng/client/render/effects/MatterCannonFX.java diff --git a/core/src/main/java/appeng/client/render/effects/ParticleTypes.java b/src/main/java/appeng/client/render/effects/ParticleTypes.java similarity index 100% rename from core/src/main/java/appeng/client/render/effects/ParticleTypes.java rename to src/main/java/appeng/client/render/effects/ParticleTypes.java diff --git a/core/src/main/java/appeng/client/render/effects/VibrantFX.java b/src/main/java/appeng/client/render/effects/VibrantFX.java similarity index 100% rename from core/src/main/java/appeng/client/render/effects/VibrantFX.java rename to src/main/java/appeng/client/render/effects/VibrantFX.java diff --git a/core/src/main/java/appeng/client/render/model/AEModelData.java b/src/main/java/appeng/client/render/model/AEModelData.java similarity index 100% rename from core/src/main/java/appeng/client/render/model/AEModelData.java rename to src/main/java/appeng/client/render/model/AEModelData.java diff --git a/core/src/main/java/appeng/client/render/tesr/SkyChestTESR.java b/src/main/java/appeng/client/render/tesr/SkyChestTESR.java similarity index 100% rename from core/src/main/java/appeng/client/render/tesr/SkyChestTESR.java rename to src/main/java/appeng/client/render/tesr/SkyChestTESR.java diff --git a/core/src/main/java/appeng/client/render/tesr/SkyCompassTESR.java b/src/main/java/appeng/client/render/tesr/SkyCompassTESR.java similarity index 100% rename from core/src/main/java/appeng/client/render/tesr/SkyCompassTESR.java rename to src/main/java/appeng/client/render/tesr/SkyCompassTESR.java diff --git a/core/src/main/java/appeng/container/ContainerLocator.java b/src/main/java/appeng/container/ContainerLocator.java similarity index 100% rename from core/src/main/java/appeng/container/ContainerLocator.java rename to src/main/java/appeng/container/ContainerLocator.java diff --git a/core/src/main/java/appeng/container/interfaces/IInventorySlotAware.java b/src/main/java/appeng/container/interfaces/IInventorySlotAware.java similarity index 100% rename from core/src/main/java/appeng/container/interfaces/IInventorySlotAware.java rename to src/main/java/appeng/container/interfaces/IInventorySlotAware.java diff --git a/core/src/main/java/appeng/core/AEConfig.java b/src/main/java/appeng/core/AEConfig.java similarity index 100% rename from core/src/main/java/appeng/core/AEConfig.java rename to src/main/java/appeng/core/AEConfig.java diff --git a/core/src/main/java/appeng/core/AELog.java b/src/main/java/appeng/core/AELog.java similarity index 100% rename from core/src/main/java/appeng/core/AELog.java rename to src/main/java/appeng/core/AELog.java diff --git a/core/src/main/java/appeng/core/AERecipeType.java b/src/main/java/appeng/core/AERecipeType.java similarity index 100% rename from core/src/main/java/appeng/core/AERecipeType.java rename to src/main/java/appeng/core/AERecipeType.java diff --git a/core/src/main/java/appeng/core/Api.java b/src/main/java/appeng/core/Api.java similarity index 100% rename from core/src/main/java/appeng/core/Api.java rename to src/main/java/appeng/core/Api.java diff --git a/core/src/main/java/appeng/core/ApiDefinitions.java b/src/main/java/appeng/core/ApiDefinitions.java similarity index 100% rename from core/src/main/java/appeng/core/ApiDefinitions.java rename to src/main/java/appeng/core/ApiDefinitions.java diff --git a/core/src/main/java/appeng/core/AppEng.java b/src/main/java/appeng/core/AppEng.java similarity index 100% rename from core/src/main/java/appeng/core/AppEng.java rename to src/main/java/appeng/core/AppEng.java diff --git a/core/src/main/java/appeng/core/AppEngBase.java b/src/main/java/appeng/core/AppEngBase.java similarity index 100% rename from core/src/main/java/appeng/core/AppEngBase.java rename to src/main/java/appeng/core/AppEngBase.java diff --git a/core/src/main/java/appeng/core/AppEngClientStartup.java b/src/main/java/appeng/core/AppEngClientStartup.java similarity index 100% rename from core/src/main/java/appeng/core/AppEngClientStartup.java rename to src/main/java/appeng/core/AppEngClientStartup.java diff --git a/core/src/main/java/appeng/core/AppEngHolder.java b/src/main/java/appeng/core/AppEngHolder.java similarity index 100% rename from core/src/main/java/appeng/core/AppEngHolder.java rename to src/main/java/appeng/core/AppEngHolder.java diff --git a/core/src/main/java/appeng/core/CreativeTab.java b/src/main/java/appeng/core/CreativeTab.java similarity index 100% rename from core/src/main/java/appeng/core/CreativeTab.java rename to src/main/java/appeng/core/CreativeTab.java diff --git a/core/src/main/java/appeng/core/api/ApiClientHelper.java b/src/main/java/appeng/core/api/ApiClientHelper.java similarity index 100% rename from core/src/main/java/appeng/core/api/ApiClientHelper.java rename to src/main/java/appeng/core/api/ApiClientHelper.java diff --git a/core/src/main/java/appeng/core/api/ApiGrid.java b/src/main/java/appeng/core/api/ApiGrid.java similarity index 100% rename from core/src/main/java/appeng/core/api/ApiGrid.java rename to src/main/java/appeng/core/api/ApiGrid.java diff --git a/core/src/main/java/appeng/core/api/ApiPart.java b/src/main/java/appeng/core/api/ApiPart.java similarity index 100% rename from core/src/main/java/appeng/core/api/ApiPart.java rename to src/main/java/appeng/core/api/ApiPart.java diff --git a/core/src/main/java/appeng/core/api/ApiStorage.java b/src/main/java/appeng/core/api/ApiStorage.java similarity index 100% rename from core/src/main/java/appeng/core/api/ApiStorage.java rename to src/main/java/appeng/core/api/ApiStorage.java diff --git a/core/src/main/java/appeng/core/api/definitions/ApiBlocks.java b/src/main/java/appeng/core/api/definitions/ApiBlocks.java similarity index 100% rename from core/src/main/java/appeng/core/api/definitions/ApiBlocks.java rename to src/main/java/appeng/core/api/definitions/ApiBlocks.java diff --git a/core/src/main/java/appeng/core/api/definitions/ApiItems.java b/src/main/java/appeng/core/api/definitions/ApiItems.java similarity index 100% rename from core/src/main/java/appeng/core/api/definitions/ApiItems.java rename to src/main/java/appeng/core/api/definitions/ApiItems.java diff --git a/core/src/main/java/appeng/core/api/definitions/ApiMaterials.java b/src/main/java/appeng/core/api/definitions/ApiMaterials.java similarity index 100% rename from core/src/main/java/appeng/core/api/definitions/ApiMaterials.java rename to src/main/java/appeng/core/api/definitions/ApiMaterials.java diff --git a/core/src/main/java/appeng/core/api/definitions/ApiParts.java b/src/main/java/appeng/core/api/definitions/ApiParts.java similarity index 100% rename from core/src/main/java/appeng/core/api/definitions/ApiParts.java rename to src/main/java/appeng/core/api/definitions/ApiParts.java diff --git a/core/src/main/java/appeng/core/config/BaseOption.java b/src/main/java/appeng/core/config/BaseOption.java similarity index 100% rename from core/src/main/java/appeng/core/config/BaseOption.java rename to src/main/java/appeng/core/config/BaseOption.java diff --git a/core/src/main/java/appeng/core/config/BooleanOption.java b/src/main/java/appeng/core/config/BooleanOption.java similarity index 100% rename from core/src/main/java/appeng/core/config/BooleanOption.java rename to src/main/java/appeng/core/config/BooleanOption.java diff --git a/core/src/main/java/appeng/core/config/ConfigSection.java b/src/main/java/appeng/core/config/ConfigSection.java similarity index 100% rename from core/src/main/java/appeng/core/config/ConfigSection.java rename to src/main/java/appeng/core/config/ConfigSection.java diff --git a/core/src/main/java/appeng/core/config/ConfigValidationException.java b/src/main/java/appeng/core/config/ConfigValidationException.java similarity index 100% rename from core/src/main/java/appeng/core/config/ConfigValidationException.java rename to src/main/java/appeng/core/config/ConfigValidationException.java diff --git a/core/src/main/java/appeng/core/config/DoubleOption.java b/src/main/java/appeng/core/config/DoubleOption.java similarity index 100% rename from core/src/main/java/appeng/core/config/DoubleOption.java rename to src/main/java/appeng/core/config/DoubleOption.java diff --git a/core/src/main/java/appeng/core/config/EnumOption.java b/src/main/java/appeng/core/config/EnumOption.java similarity index 100% rename from core/src/main/java/appeng/core/config/EnumOption.java rename to src/main/java/appeng/core/config/EnumOption.java diff --git a/core/src/main/java/appeng/core/config/IntegerOption.java b/src/main/java/appeng/core/config/IntegerOption.java similarity index 100% rename from core/src/main/java/appeng/core/config/IntegerOption.java rename to src/main/java/appeng/core/config/IntegerOption.java diff --git a/core/src/main/java/appeng/core/config/StringListOption.java b/src/main/java/appeng/core/config/StringListOption.java similarity index 100% rename from core/src/main/java/appeng/core/config/StringListOption.java rename to src/main/java/appeng/core/config/StringListOption.java diff --git a/core/src/main/java/appeng/core/features/ActivityState.java b/src/main/java/appeng/core/features/ActivityState.java similarity index 100% rename from core/src/main/java/appeng/core/features/ActivityState.java rename to src/main/java/appeng/core/features/ActivityState.java diff --git a/core/src/main/java/appeng/core/features/BlockDefinition.java b/src/main/java/appeng/core/features/BlockDefinition.java similarity index 100% rename from core/src/main/java/appeng/core/features/BlockDefinition.java rename to src/main/java/appeng/core/features/BlockDefinition.java diff --git a/core/src/main/java/appeng/core/features/BlockStackSrc.java b/src/main/java/appeng/core/features/BlockStackSrc.java similarity index 100% rename from core/src/main/java/appeng/core/features/BlockStackSrc.java rename to src/main/java/appeng/core/features/BlockStackSrc.java diff --git a/core/src/main/java/appeng/core/features/ColoredItemDefinition.java b/src/main/java/appeng/core/features/ColoredItemDefinition.java similarity index 100% rename from core/src/main/java/appeng/core/features/ColoredItemDefinition.java rename to src/main/java/appeng/core/features/ColoredItemDefinition.java diff --git a/core/src/main/java/appeng/core/features/DamagedItemDefinition.java b/src/main/java/appeng/core/features/DamagedItemDefinition.java similarity index 100% rename from core/src/main/java/appeng/core/features/DamagedItemDefinition.java rename to src/main/java/appeng/core/features/DamagedItemDefinition.java diff --git a/core/src/main/java/appeng/core/features/IStackSrc.java b/src/main/java/appeng/core/features/IStackSrc.java similarity index 100% rename from core/src/main/java/appeng/core/features/IStackSrc.java rename to src/main/java/appeng/core/features/IStackSrc.java diff --git a/core/src/main/java/appeng/core/features/ItemDefinition.java b/src/main/java/appeng/core/features/ItemDefinition.java similarity index 100% rename from core/src/main/java/appeng/core/features/ItemDefinition.java rename to src/main/java/appeng/core/features/ItemDefinition.java diff --git a/core/src/main/java/appeng/core/features/ItemStackSrc.java b/src/main/java/appeng/core/features/ItemStackSrc.java similarity index 100% rename from core/src/main/java/appeng/core/features/ItemStackSrc.java rename to src/main/java/appeng/core/features/ItemStackSrc.java diff --git a/core/src/main/java/appeng/core/features/TileDefinition.java b/src/main/java/appeng/core/features/TileDefinition.java similarity index 100% rename from core/src/main/java/appeng/core/features/TileDefinition.java rename to src/main/java/appeng/core/features/TileDefinition.java diff --git a/core/src/main/java/appeng/core/features/registries/GridCacheRegistry.java b/src/main/java/appeng/core/features/registries/GridCacheRegistry.java similarity index 100% rename from core/src/main/java/appeng/core/features/registries/GridCacheRegistry.java rename to src/main/java/appeng/core/features/registries/GridCacheRegistry.java diff --git a/core/src/main/java/appeng/core/features/registries/LocatableRegistry.java b/src/main/java/appeng/core/features/registries/LocatableRegistry.java similarity index 100% rename from core/src/main/java/appeng/core/features/registries/LocatableRegistry.java rename to src/main/java/appeng/core/features/registries/LocatableRegistry.java diff --git a/core/src/main/java/appeng/core/features/registries/MatterCannonAmmoRegistry.java b/src/main/java/appeng/core/features/registries/MatterCannonAmmoRegistry.java similarity index 100% rename from core/src/main/java/appeng/core/features/registries/MatterCannonAmmoRegistry.java rename to src/main/java/appeng/core/features/registries/MatterCannonAmmoRegistry.java diff --git a/core/src/main/java/appeng/core/features/registries/MovableTileRegistry.java b/src/main/java/appeng/core/features/registries/MovableTileRegistry.java similarity index 100% rename from core/src/main/java/appeng/core/features/registries/MovableTileRegistry.java rename to src/main/java/appeng/core/features/registries/MovableTileRegistry.java diff --git a/core/src/main/java/appeng/core/features/registries/P2PTunnelRegistry.java b/src/main/java/appeng/core/features/registries/P2PTunnelRegistry.java similarity index 100% rename from core/src/main/java/appeng/core/features/registries/P2PTunnelRegistry.java rename to src/main/java/appeng/core/features/registries/P2PTunnelRegistry.java diff --git a/core/src/main/java/appeng/core/features/registries/PartModels.java b/src/main/java/appeng/core/features/registries/PartModels.java similarity index 100% rename from core/src/main/java/appeng/core/features/registries/PartModels.java rename to src/main/java/appeng/core/features/registries/PartModels.java diff --git a/core/src/main/java/appeng/core/features/registries/PlayerRegistry.java b/src/main/java/appeng/core/features/registries/PlayerRegistry.java similarity index 100% rename from core/src/main/java/appeng/core/features/registries/PlayerRegistry.java rename to src/main/java/appeng/core/features/registries/PlayerRegistry.java diff --git a/core/src/main/java/appeng/core/features/registries/RegistryContainer.java b/src/main/java/appeng/core/features/registries/RegistryContainer.java similarity index 100% rename from core/src/main/java/appeng/core/features/registries/RegistryContainer.java rename to src/main/java/appeng/core/features/registries/RegistryContainer.java diff --git a/core/src/main/java/appeng/core/features/registries/WirelessRegistry.java b/src/main/java/appeng/core/features/registries/WirelessRegistry.java similarity index 100% rename from core/src/main/java/appeng/core/features/registries/WirelessRegistry.java rename to src/main/java/appeng/core/features/registries/WirelessRegistry.java diff --git a/core/src/main/java/appeng/core/features/registries/WorldGenRegistry.java b/src/main/java/appeng/core/features/registries/WorldGenRegistry.java similarity index 100% rename from core/src/main/java/appeng/core/features/registries/WorldGenRegistry.java rename to src/main/java/appeng/core/features/registries/WorldGenRegistry.java diff --git a/core/src/main/java/appeng/core/features/registries/cell/BasicCellHandler.java b/src/main/java/appeng/core/features/registries/cell/BasicCellHandler.java similarity index 100% rename from core/src/main/java/appeng/core/features/registries/cell/BasicCellHandler.java rename to src/main/java/appeng/core/features/registries/cell/BasicCellHandler.java diff --git a/core/src/main/java/appeng/core/features/registries/cell/BasicItemCellGuiHandler.java b/src/main/java/appeng/core/features/registries/cell/BasicItemCellGuiHandler.java similarity index 100% rename from core/src/main/java/appeng/core/features/registries/cell/BasicItemCellGuiHandler.java rename to src/main/java/appeng/core/features/registries/cell/BasicItemCellGuiHandler.java diff --git a/core/src/main/java/appeng/core/features/registries/cell/CellRegistry.java b/src/main/java/appeng/core/features/registries/cell/CellRegistry.java similarity index 100% rename from core/src/main/java/appeng/core/features/registries/cell/CellRegistry.java rename to src/main/java/appeng/core/features/registries/cell/CellRegistry.java diff --git a/core/src/main/java/appeng/core/features/registries/cell/CreativeCellHandler.java b/src/main/java/appeng/core/features/registries/cell/CreativeCellHandler.java similarity index 100% rename from core/src/main/java/appeng/core/features/registries/cell/CreativeCellHandler.java rename to src/main/java/appeng/core/features/registries/cell/CreativeCellHandler.java diff --git a/core/src/main/java/appeng/core/features/registries/charger/ChargerRegistry.java b/src/main/java/appeng/core/features/registries/charger/ChargerRegistry.java similarity index 100% rename from core/src/main/java/appeng/core/features/registries/charger/ChargerRegistry.java rename to src/main/java/appeng/core/features/registries/charger/ChargerRegistry.java diff --git a/core/src/main/java/appeng/core/localization/ButtonToolTips.java b/src/main/java/appeng/core/localization/ButtonToolTips.java similarity index 100% rename from core/src/main/java/appeng/core/localization/ButtonToolTips.java rename to src/main/java/appeng/core/localization/ButtonToolTips.java diff --git a/core/src/main/java/appeng/core/localization/GuiText.java b/src/main/java/appeng/core/localization/GuiText.java similarity index 100% rename from core/src/main/java/appeng/core/localization/GuiText.java rename to src/main/java/appeng/core/localization/GuiText.java diff --git a/core/src/main/java/appeng/core/localization/PlayerMessages.java b/src/main/java/appeng/core/localization/PlayerMessages.java similarity index 100% rename from core/src/main/java/appeng/core/localization/PlayerMessages.java rename to src/main/java/appeng/core/localization/PlayerMessages.java diff --git a/core/src/main/java/appeng/core/localization/WailaText.java b/src/main/java/appeng/core/localization/WailaText.java similarity index 100% rename from core/src/main/java/appeng/core/localization/WailaText.java rename to src/main/java/appeng/core/localization/WailaText.java diff --git a/core/src/main/java/appeng/core/settings/TickRates.java b/src/main/java/appeng/core/settings/TickRates.java similarity index 100% rename from core/src/main/java/appeng/core/settings/TickRates.java rename to src/main/java/appeng/core/settings/TickRates.java diff --git a/core/src/main/java/appeng/core/stats/AdvancementTriggers.java b/src/main/java/appeng/core/stats/AdvancementTriggers.java similarity index 100% rename from core/src/main/java/appeng/core/stats/AdvancementTriggers.java rename to src/main/java/appeng/core/stats/AdvancementTriggers.java diff --git a/core/src/main/java/appeng/core/stats/AeStats.java b/src/main/java/appeng/core/stats/AeStats.java similarity index 100% rename from core/src/main/java/appeng/core/stats/AeStats.java rename to src/main/java/appeng/core/stats/AeStats.java diff --git a/core/src/main/java/appeng/core/stats/AppEngAdvancementTrigger.java b/src/main/java/appeng/core/stats/AppEngAdvancementTrigger.java similarity index 100% rename from core/src/main/java/appeng/core/stats/AppEngAdvancementTrigger.java rename to src/main/java/appeng/core/stats/AppEngAdvancementTrigger.java diff --git a/core/src/main/java/appeng/core/stats/IAdvancementTrigger.java b/src/main/java/appeng/core/stats/IAdvancementTrigger.java similarity index 100% rename from core/src/main/java/appeng/core/stats/IAdvancementTrigger.java rename to src/main/java/appeng/core/stats/IAdvancementTrigger.java diff --git a/core/src/main/java/appeng/core/sync/BasePacket.java b/src/main/java/appeng/core/sync/BasePacket.java similarity index 100% rename from core/src/main/java/appeng/core/sync/BasePacket.java rename to src/main/java/appeng/core/sync/BasePacket.java diff --git a/core/src/main/java/appeng/core/sync/BasePacketHandler.java b/src/main/java/appeng/core/sync/BasePacketHandler.java similarity index 100% rename from core/src/main/java/appeng/core/sync/BasePacketHandler.java rename to src/main/java/appeng/core/sync/BasePacketHandler.java diff --git a/core/src/main/java/appeng/core/sync/network/ClientNetworkHandler.java b/src/main/java/appeng/core/sync/network/ClientNetworkHandler.java similarity index 100% rename from core/src/main/java/appeng/core/sync/network/ClientNetworkHandler.java rename to src/main/java/appeng/core/sync/network/ClientNetworkHandler.java diff --git a/core/src/main/java/appeng/core/sync/network/INetworkInfo.java b/src/main/java/appeng/core/sync/network/INetworkInfo.java similarity index 100% rename from core/src/main/java/appeng/core/sync/network/INetworkInfo.java rename to src/main/java/appeng/core/sync/network/INetworkInfo.java diff --git a/core/src/main/java/appeng/core/sync/network/NetworkHandler.java b/src/main/java/appeng/core/sync/network/NetworkHandler.java similarity index 100% rename from core/src/main/java/appeng/core/sync/network/NetworkHandler.java rename to src/main/java/appeng/core/sync/network/NetworkHandler.java diff --git a/core/src/main/java/appeng/core/sync/network/NetworkHandlerHolder.java b/src/main/java/appeng/core/sync/network/NetworkHandlerHolder.java similarity index 100% rename from core/src/main/java/appeng/core/sync/network/NetworkHandlerHolder.java rename to src/main/java/appeng/core/sync/network/NetworkHandlerHolder.java diff --git a/core/src/main/java/appeng/core/sync/network/ServerNetworkHandler.java b/src/main/java/appeng/core/sync/network/ServerNetworkHandler.java similarity index 100% rename from core/src/main/java/appeng/core/sync/network/ServerNetworkHandler.java rename to src/main/java/appeng/core/sync/network/ServerNetworkHandler.java diff --git a/core/src/main/java/appeng/core/sync/network/TargetPoint.java b/src/main/java/appeng/core/sync/network/TargetPoint.java similarity index 100% rename from core/src/main/java/appeng/core/sync/network/TargetPoint.java rename to src/main/java/appeng/core/sync/network/TargetPoint.java diff --git a/core/src/main/java/appeng/core/sync/packets/CompassRequestPacket.java b/src/main/java/appeng/core/sync/packets/CompassRequestPacket.java similarity index 100% rename from core/src/main/java/appeng/core/sync/packets/CompassRequestPacket.java rename to src/main/java/appeng/core/sync/packets/CompassRequestPacket.java diff --git a/core/src/main/java/appeng/core/sync/packets/CompassResponsePacket.java b/src/main/java/appeng/core/sync/packets/CompassResponsePacket.java similarity index 100% rename from core/src/main/java/appeng/core/sync/packets/CompassResponsePacket.java rename to src/main/java/appeng/core/sync/packets/CompassResponsePacket.java diff --git a/core/src/main/java/appeng/core/sync/packets/ICustomEntity.java b/src/main/java/appeng/core/sync/packets/ICustomEntity.java similarity index 100% rename from core/src/main/java/appeng/core/sync/packets/ICustomEntity.java rename to src/main/java/appeng/core/sync/packets/ICustomEntity.java diff --git a/core/src/main/java/appeng/core/sync/packets/PaintedEntityPacket.java b/src/main/java/appeng/core/sync/packets/PaintedEntityPacket.java similarity index 100% rename from core/src/main/java/appeng/core/sync/packets/PaintedEntityPacket.java rename to src/main/java/appeng/core/sync/packets/PaintedEntityPacket.java diff --git a/core/src/main/java/appeng/core/sync/packets/PartPlacementPacket.java b/src/main/java/appeng/core/sync/packets/PartPlacementPacket.java similarity index 100% rename from core/src/main/java/appeng/core/sync/packets/PartPlacementPacket.java rename to src/main/java/appeng/core/sync/packets/PartPlacementPacket.java diff --git a/core/src/main/java/appeng/core/sync/packets/SpawnEntityPacket.java b/src/main/java/appeng/core/sync/packets/SpawnEntityPacket.java similarity index 100% rename from core/src/main/java/appeng/core/sync/packets/SpawnEntityPacket.java rename to src/main/java/appeng/core/sync/packets/SpawnEntityPacket.java diff --git a/core/src/main/java/appeng/core/worlddata/CompassData.java b/src/main/java/appeng/core/worlddata/CompassData.java similarity index 100% rename from core/src/main/java/appeng/core/worlddata/CompassData.java rename to src/main/java/appeng/core/worlddata/CompassData.java diff --git a/core/src/main/java/appeng/core/worlddata/IWorldCompassData.java b/src/main/java/appeng/core/worlddata/IWorldCompassData.java similarity index 100% rename from core/src/main/java/appeng/core/worlddata/IWorldCompassData.java rename to src/main/java/appeng/core/worlddata/IWorldCompassData.java diff --git a/core/src/main/java/appeng/core/worlddata/IWorldData.java b/src/main/java/appeng/core/worlddata/IWorldData.java similarity index 100% rename from core/src/main/java/appeng/core/worlddata/IWorldData.java rename to src/main/java/appeng/core/worlddata/IWorldData.java diff --git a/core/src/main/java/appeng/core/worlddata/IWorldGridStorageData.java b/src/main/java/appeng/core/worlddata/IWorldGridStorageData.java similarity index 100% rename from core/src/main/java/appeng/core/worlddata/IWorldGridStorageData.java rename to src/main/java/appeng/core/worlddata/IWorldGridStorageData.java diff --git a/core/src/main/java/appeng/core/worlddata/IWorldPlayerData.java b/src/main/java/appeng/core/worlddata/IWorldPlayerData.java similarity index 100% rename from core/src/main/java/appeng/core/worlddata/IWorldPlayerData.java rename to src/main/java/appeng/core/worlddata/IWorldPlayerData.java diff --git a/core/src/main/java/appeng/core/worlddata/MeteorDataNameEncoder.java b/src/main/java/appeng/core/worlddata/MeteorDataNameEncoder.java similarity index 100% rename from core/src/main/java/appeng/core/worlddata/MeteorDataNameEncoder.java rename to src/main/java/appeng/core/worlddata/MeteorDataNameEncoder.java diff --git a/core/src/main/java/appeng/core/worlddata/PlayerData.java b/src/main/java/appeng/core/worlddata/PlayerData.java similarity index 100% rename from core/src/main/java/appeng/core/worlddata/PlayerData.java rename to src/main/java/appeng/core/worlddata/PlayerData.java diff --git a/core/src/main/java/appeng/core/worlddata/StorageData.java b/src/main/java/appeng/core/worlddata/StorageData.java similarity index 100% rename from core/src/main/java/appeng/core/worlddata/StorageData.java rename to src/main/java/appeng/core/worlddata/StorageData.java diff --git a/core/src/main/java/appeng/core/worlddata/WorldData.java b/src/main/java/appeng/core/worlddata/WorldData.java similarity index 100% rename from core/src/main/java/appeng/core/worlddata/WorldData.java rename to src/main/java/appeng/core/worlddata/WorldData.java diff --git a/src/main/java/appeng/crafting/CraftingJob.java b/src/main/java/appeng/crafting/CraftingJob.java index 45fbf7da9..eaa1f0b31 100644 --- a/src/main/java/appeng/crafting/CraftingJob.java +++ b/src/main/java/appeng/crafting/CraftingJob.java @@ -1,345 +1,8 @@ -/* - * This file is part of Applied Energistics 2. - * Copyright (c) 2013 - 2014, AlgorithmX2, All rights reserved. - * - * Applied Energistics 2 is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Applied Energistics 2 is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Applied Energistics 2. If not, see . - */ - package appeng.crafting; -import java.util.HashMap; -import java.util.concurrent.TimeUnit; - -import com.google.common.base.Stopwatch; - -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.nbt.CompoundTag; -import net.minecraft.world.World; - -import appeng.api.AEApi; -import appeng.api.config.Actionable; -import appeng.api.networking.IGrid; -import appeng.api.networking.IGridHost; -import appeng.api.networking.IGridNode; -import appeng.api.networking.crafting.ICraftingCallback; -import appeng.api.networking.crafting.ICraftingGrid; -import appeng.api.networking.crafting.ICraftingJob; -import appeng.api.networking.crafting.ICraftingPatternDetails; -import appeng.api.networking.security.IActionHost; -import appeng.api.networking.security.IActionSource; -import appeng.api.networking.storage.IStorageGrid; -import appeng.api.storage.channels.IItemStorageChannel; -import appeng.api.storage.data.IAEItemStack; -import appeng.api.storage.data.IItemList; -import appeng.api.util.DimensionalCoord; -import appeng.core.AELog; -import appeng.hooks.TickHandler; - -public class CraftingJob implements Runnable, ICraftingJob { - private static final String LOG_CRAFTING_JOB = "CraftingJob (%s) issued by %s requesting [%s] using %s bytes took %s ms"; - private static final String LOG_MACHINE_SOURCE_DETAILS = "Machine[object=%s, %s]"; - - private final MECraftingInventory original; - private final World world; - private final IItemList crafting = AEApi.instance().storage() - .getStorageChannel(IItemStorageChannel.class).createList(); - private final IItemList missing = AEApi.instance().storage() - .getStorageChannel(IItemStorageChannel.class).createList(); - private final HashMap opsAndMultiplier = new HashMap<>(); - private final Object monitor = new Object(); - private final Stopwatch watch = Stopwatch.createUnstarted(); - private CraftingTreeNode tree; - private final IAEItemStack output; - private boolean simulate = false; - private MECraftingInventory availableCheck; - private long bytes = 0; - private final IActionSource actionSrc; - private final ICraftingCallback callback; - private boolean running = false; - private boolean done = false; - private int time = 5; - private int incTime = Integer.MAX_VALUE; - - private World wrapWorld(final World w) { - return w; - } - - public CraftingJob(final World w, final IGrid grid, final IActionSource actionSrc, final IAEItemStack what, - final ICraftingCallback callback) { - this.world = this.wrapWorld(w); - this.output = what.copy(); - this.actionSrc = actionSrc; - - this.callback = callback; - final ICraftingGrid cc = grid.getCache(ICraftingGrid.class); - final IStorageGrid sg = grid.getCache(IStorageGrid.class); - this.original = new MECraftingInventory( - sg.getInventory(AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class)), actionSrc, - false, false, false); - - this.setTree(this.getCraftingTree(cc, what)); - this.availableCheck = null; - } - - private CraftingTreeNode getCraftingTree(final ICraftingGrid cc, final IAEItemStack what) { - return new CraftingTreeNode(cc, this, what, null, -1, 0); - } - - void refund(final IAEItemStack o) { - this.availableCheck.injectItems(o, Actionable.MODULATE, this.actionSrc); - } - - IAEItemStack checkUse(final IAEItemStack available) { - return this.availableCheck.extractItems(available, Actionable.MODULATE, this.actionSrc); - } - - public void writeToNBT(final CompoundTag out) { - - } - - void addTask(IAEItemStack what, final long crafts, final ICraftingPatternDetails details, final int depth) { - if (crafts > 0) { - what = what.copy(); - what.setStackSize(what.getStackSize() * crafts); - this.crafting.add(what); - } - } - - void addMissing(IAEItemStack what) { - what = what.copy(); - this.missing.add(what); - } - - @Override - public void run() { - try { - try { - TickHandler.INSTANCE.registerCraftingSimulation(this.world, this); - this.handlePausing(); - - final Stopwatch timer = Stopwatch.createStarted(); - - final MECraftingInventory craftingInventory = new MECraftingInventory(this.original, true, false, true); - craftingInventory.ignore(this.output); - - this.availableCheck = new MECraftingInventory(this.original, false, false, false); - this.getTree().request(craftingInventory, this.output.getStackSize(), this.actionSrc); - this.getTree().dive(this); - - for (final String s : this.opsAndMultiplier.keySet()) { - final TwoIntegers ti = this.opsAndMultiplier.get(s); - AELog.crafting(s + " * " + ti.times + " = " + (ti.perOp * ti.times)); - } - - this.logCraftingJob("real", timer); - // if ( mode == Actionable.MODULATE ) - // craftingInventory.moveItemsToStorage( storage ); - } catch (final CraftBranchFailure e) { - this.simulate = true; - - try { - final Stopwatch timer = Stopwatch.createStarted(); - final MECraftingInventory craftingInventory = new MECraftingInventory(this.original, true, false, - true); - craftingInventory.ignore(this.output); - - this.availableCheck = new MECraftingInventory(this.original, false, false, false); - - this.getTree().setSimulate(); - this.getTree().request(craftingInventory, this.output.getStackSize(), this.actionSrc); - this.getTree().dive(this); - - for (final String s : this.opsAndMultiplier.keySet()) { - final TwoIntegers ti = this.opsAndMultiplier.get(s); - AELog.crafting(s + " * " + ti.times + " = " + (ti.perOp * ti.times)); - } - - this.logCraftingJob("simulate", timer); - } catch (final CraftBranchFailure e1) { - AELog.debug(e1); - } catch (final CraftingCalculationFailure f) { - AELog.debug(f); - } catch (final InterruptedException e1) { - AELog.crafting("Crafting calculation canceled."); - this.finish(); - return; - } - } catch (final CraftingCalculationFailure f) { - AELog.debug(f); - } catch (final InterruptedException e1) { - AELog.crafting("Crafting calculation canceled."); - this.finish(); - return; - } - - AELog.craftingDebug("crafting job now done"); - } catch (final Throwable t) { - this.finish(); - throw new IllegalStateException(t); - } - - this.finish(); - } - - void handlePausing() throws InterruptedException { - if (this.incTime > 100) { - this.incTime = 0; - - synchronized (this.monitor) { - if (this.watch.elapsed(TimeUnit.MICROSECONDS) > this.time) { - this.running = false; - this.watch.stop(); - this.monitor.notify(); - } - - if (!this.running) { - AELog.craftingDebug("crafting job will now sleep"); - - while (!this.running) { - this.monitor.wait(); - } - - AELog.craftingDebug("crafting job now active"); - } - } - - if (Thread.interrupted()) { - throw new InterruptedException(); - } - } - this.incTime++; - } - - private void finish() { - if (this.callback != null) { - this.callback.calculationComplete(this); - } - - this.availableCheck = null; - - synchronized (this.monitor) { - this.running = false; - this.done = true; - this.monitor.notify(); - } - } - - @Override - public boolean isSimulation() { - return this.simulate; - } - - @Override - public long getByteTotal() { - return this.bytes; - } - - @Override - public void populatePlan(final IItemList plan) { - if (this.getTree() != null) { - this.getTree().getPlan(plan); - } - } - - @Override - public IAEItemStack getOutput() { - return this.output; - } - - public boolean isDone() { - return this.done; - } - - World getWorld() { - return this.world; - } - - /** - * returns true if this needs more simulation. - * - * @param milli milliseconds of simulation - * - * @return true if this needs more simulation - */ - public boolean simulateFor(final int milli) { - this.time = milli; - - synchronized (this.monitor) { - if (this.done) { - return false; - } - - this.watch.reset(); - this.watch.start(); - this.running = true; - - AELog.craftingDebug("main thread is now going to sleep"); - - this.monitor.notify(); - - while (this.running) { - try { - this.monitor.wait(); - } catch (final InterruptedException ignored) { - } - } - - AELog.craftingDebug("main thread is now active"); - } - - return true; - } - - void addBytes(final long crafts) { - this.bytes += crafts; - } - - public CraftingTreeNode getTree() { - return this.tree; - } - - private void setTree(final CraftingTreeNode tree) { - this.tree = tree; - } - - private void logCraftingJob(String type, Stopwatch timer) { - if (AELog.isCraftingLogEnabled()) { - final String itemToOutput = this.output.toString(); - final long elapsedTime = timer.elapsed(TimeUnit.MILLISECONDS); - final String actionSource; - - if (this.actionSrc.player().isPresent()) { - final PlayerEntity player = this.actionSrc.player().get(); - - actionSource = player.toString(); - } else if (this.actionSrc.machine().isPresent()) { - final IActionHost machineSource = this.actionSrc.machine().get(); - final IGridNode actionableNode = machineSource.getActionableNode(); - final IGridHost machine = actionableNode.getMachine(); - final DimensionalCoord location = actionableNode.getGridBlock().getLocation(); - - actionSource = String.format(LOG_MACHINE_SOURCE_DETAILS, machine, location); - } else { - actionSource = "[unknown source]"; - } - - AELog.crafting(LOG_CRAFTING_JOB, type, actionSource, itemToOutput, this.bytes, elapsedTime); - } - } - - private static class TwoIntegers { - private final long perOp = 0; - private final long times = 0; +// FIXME FABRIC DUMMY +public class CraftingJob { + public boolean simulateFor(int simTime) { + return false; } } diff --git a/core/src/main/java/appeng/decorative/AEDecorativeBlock.java b/src/main/java/appeng/decorative/AEDecorativeBlock.java similarity index 100% rename from core/src/main/java/appeng/decorative/AEDecorativeBlock.java rename to src/main/java/appeng/decorative/AEDecorativeBlock.java diff --git a/core/src/main/java/appeng/decorative/solid/AEStairsBlock.java b/src/main/java/appeng/decorative/solid/AEStairsBlock.java similarity index 100% rename from core/src/main/java/appeng/decorative/solid/AEStairsBlock.java rename to src/main/java/appeng/decorative/solid/AEStairsBlock.java diff --git a/core/src/main/java/appeng/decorative/solid/ChargedQuartzOreBlock.java b/src/main/java/appeng/decorative/solid/ChargedQuartzOreBlock.java similarity index 100% rename from core/src/main/java/appeng/decorative/solid/ChargedQuartzOreBlock.java rename to src/main/java/appeng/decorative/solid/ChargedQuartzOreBlock.java diff --git a/core/src/main/java/appeng/decorative/solid/GlassState.java b/src/main/java/appeng/decorative/solid/GlassState.java similarity index 100% rename from core/src/main/java/appeng/decorative/solid/GlassState.java rename to src/main/java/appeng/decorative/solid/GlassState.java diff --git a/core/src/main/java/appeng/decorative/solid/QuartzGlassBlock.java b/src/main/java/appeng/decorative/solid/QuartzGlassBlock.java similarity index 100% rename from core/src/main/java/appeng/decorative/solid/QuartzGlassBlock.java rename to src/main/java/appeng/decorative/solid/QuartzGlassBlock.java diff --git a/core/src/main/java/appeng/decorative/solid/QuartzLampBlock.java b/src/main/java/appeng/decorative/solid/QuartzLampBlock.java similarity index 100% rename from core/src/main/java/appeng/decorative/solid/QuartzLampBlock.java rename to src/main/java/appeng/decorative/solid/QuartzLampBlock.java diff --git a/core/src/main/java/appeng/decorative/solid/QuartzOreBlock.java b/src/main/java/appeng/decorative/solid/QuartzOreBlock.java similarity index 100% rename from core/src/main/java/appeng/decorative/solid/QuartzOreBlock.java rename to src/main/java/appeng/decorative/solid/QuartzOreBlock.java diff --git a/core/src/main/java/appeng/decorative/solid/QuartzPillarBlock.java b/src/main/java/appeng/decorative/solid/QuartzPillarBlock.java similarity index 100% rename from core/src/main/java/appeng/decorative/solid/QuartzPillarBlock.java rename to src/main/java/appeng/decorative/solid/QuartzPillarBlock.java diff --git a/core/src/main/java/appeng/decorative/solid/SkyStoneBlock.java b/src/main/java/appeng/decorative/solid/SkyStoneBlock.java similarity index 100% rename from core/src/main/java/appeng/decorative/solid/SkyStoneBlock.java rename to src/main/java/appeng/decorative/solid/SkyStoneBlock.java diff --git a/core/src/main/java/appeng/entity/AEBaseItemEntity.java b/src/main/java/appeng/entity/AEBaseItemEntity.java similarity index 100% rename from core/src/main/java/appeng/entity/AEBaseItemEntity.java rename to src/main/java/appeng/entity/AEBaseItemEntity.java diff --git a/core/src/main/java/appeng/entity/ChargedQuartzEntity.java b/src/main/java/appeng/entity/ChargedQuartzEntity.java similarity index 100% rename from core/src/main/java/appeng/entity/ChargedQuartzEntity.java rename to src/main/java/appeng/entity/ChargedQuartzEntity.java diff --git a/core/src/main/java/appeng/entity/GrowingCrystalEntity.java b/src/main/java/appeng/entity/GrowingCrystalEntity.java similarity index 100% rename from core/src/main/java/appeng/entity/GrowingCrystalEntity.java rename to src/main/java/appeng/entity/GrowingCrystalEntity.java diff --git a/core/src/main/java/appeng/entity/ICanDie.java b/src/main/java/appeng/entity/ICanDie.java similarity index 100% rename from core/src/main/java/appeng/entity/ICanDie.java rename to src/main/java/appeng/entity/ICanDie.java diff --git a/core/src/main/java/appeng/entity/SingularityEntity.java b/src/main/java/appeng/entity/SingularityEntity.java similarity index 100% rename from core/src/main/java/appeng/entity/SingularityEntity.java rename to src/main/java/appeng/entity/SingularityEntity.java diff --git a/core/src/main/java/appeng/entity/TinyTNTPrimedEntity.java b/src/main/java/appeng/entity/TinyTNTPrimedEntity.java similarity index 100% rename from core/src/main/java/appeng/entity/TinyTNTPrimedEntity.java rename to src/main/java/appeng/entity/TinyTNTPrimedEntity.java diff --git a/core/src/main/java/appeng/entity/TinyTNTPrimedRenderer.java b/src/main/java/appeng/entity/TinyTNTPrimedRenderer.java similarity index 100% rename from core/src/main/java/appeng/entity/TinyTNTPrimedRenderer.java rename to src/main/java/appeng/entity/TinyTNTPrimedRenderer.java diff --git a/core/src/main/java/appeng/facade/FacadeContainer.java b/src/main/java/appeng/facade/FacadeContainer.java similarity index 100% rename from core/src/main/java/appeng/facade/FacadeContainer.java rename to src/main/java/appeng/facade/FacadeContainer.java diff --git a/core/src/main/java/appeng/facade/FacadePart.java b/src/main/java/appeng/facade/FacadePart.java similarity index 100% rename from core/src/main/java/appeng/facade/FacadePart.java rename to src/main/java/appeng/facade/FacadePart.java diff --git a/core/src/main/java/appeng/facade/IFacadeItem.java b/src/main/java/appeng/facade/IFacadeItem.java similarity index 100% rename from core/src/main/java/appeng/facade/IFacadeItem.java rename to src/main/java/appeng/facade/IFacadeItem.java diff --git a/core/src/main/java/appeng/fluids/items/FluidDummyItem.java b/src/main/java/appeng/fluids/items/FluidDummyItem.java similarity index 100% rename from core/src/main/java/appeng/fluids/items/FluidDummyItem.java rename to src/main/java/appeng/fluids/items/FluidDummyItem.java diff --git a/core/src/main/java/appeng/fluids/util/AEFluidStack.java b/src/main/java/appeng/fluids/util/AEFluidStack.java similarity index 100% rename from core/src/main/java/appeng/fluids/util/AEFluidStack.java rename to src/main/java/appeng/fluids/util/AEFluidStack.java diff --git a/core/src/main/java/appeng/fluids/util/FluidList.java b/src/main/java/appeng/fluids/util/FluidList.java similarity index 100% rename from core/src/main/java/appeng/fluids/util/FluidList.java rename to src/main/java/appeng/fluids/util/FluidList.java diff --git a/core/src/main/java/appeng/fluids/util/MeaningfulFluidIterator.java b/src/main/java/appeng/fluids/util/MeaningfulFluidIterator.java similarity index 100% rename from core/src/main/java/appeng/fluids/util/MeaningfulFluidIterator.java rename to src/main/java/appeng/fluids/util/MeaningfulFluidIterator.java diff --git a/core/src/main/java/appeng/helpers/AEGlassMaterial.java b/src/main/java/appeng/helpers/AEGlassMaterial.java similarity index 100% rename from core/src/main/java/appeng/helpers/AEGlassMaterial.java rename to src/main/java/appeng/helpers/AEGlassMaterial.java diff --git a/core/src/main/java/appeng/helpers/AEMultiTile.java b/src/main/java/appeng/helpers/AEMultiTile.java similarity index 100% rename from core/src/main/java/appeng/helpers/AEMultiTile.java rename to src/main/java/appeng/helpers/AEMultiTile.java diff --git a/core/src/main/java/appeng/helpers/ICustomNameObject.java b/src/main/java/appeng/helpers/ICustomNameObject.java similarity index 100% rename from core/src/main/java/appeng/helpers/ICustomNameObject.java rename to src/main/java/appeng/helpers/ICustomNameObject.java diff --git a/core/src/main/java/appeng/helpers/IPriorityHost.java b/src/main/java/appeng/helpers/IPriorityHost.java similarity index 100% rename from core/src/main/java/appeng/helpers/IPriorityHost.java rename to src/main/java/appeng/helpers/IPriorityHost.java diff --git a/core/src/main/java/appeng/helpers/MetaRotation.java b/src/main/java/appeng/helpers/MetaRotation.java similarity index 100% rename from core/src/main/java/appeng/helpers/MetaRotation.java rename to src/main/java/appeng/helpers/MetaRotation.java diff --git a/core/src/main/java/appeng/hooks/AEToolItem.java b/src/main/java/appeng/hooks/AEToolItem.java similarity index 100% rename from core/src/main/java/appeng/hooks/AEToolItem.java rename to src/main/java/appeng/hooks/AEToolItem.java diff --git a/core/src/main/java/appeng/hooks/ClientTickHandler.java b/src/main/java/appeng/hooks/ClientTickHandler.java similarity index 100% rename from core/src/main/java/appeng/hooks/ClientTickHandler.java rename to src/main/java/appeng/hooks/ClientTickHandler.java diff --git a/core/src/main/java/appeng/hooks/CompassManager.java b/src/main/java/appeng/hooks/CompassManager.java similarity index 100% rename from core/src/main/java/appeng/hooks/CompassManager.java rename to src/main/java/appeng/hooks/CompassManager.java diff --git a/core/src/main/java/appeng/hooks/CompassResult.java b/src/main/java/appeng/hooks/CompassResult.java similarity index 100% rename from core/src/main/java/appeng/hooks/CompassResult.java rename to src/main/java/appeng/hooks/CompassResult.java diff --git a/core/src/main/java/appeng/hooks/TickHandler.java b/src/main/java/appeng/hooks/TickHandler.java similarity index 100% rename from core/src/main/java/appeng/hooks/TickHandler.java rename to src/main/java/appeng/hooks/TickHandler.java diff --git a/core/src/main/java/appeng/hooks/TinyTNTDispenseItemBehavior.java b/src/main/java/appeng/hooks/TinyTNTDispenseItemBehavior.java similarity index 100% rename from core/src/main/java/appeng/hooks/TinyTNTDispenseItemBehavior.java rename to src/main/java/appeng/hooks/TinyTNTDispenseItemBehavior.java diff --git a/core/src/main/java/appeng/hooks/ToolItemHook.java b/src/main/java/appeng/hooks/ToolItemHook.java similarity index 100% rename from core/src/main/java/appeng/hooks/ToolItemHook.java rename to src/main/java/appeng/hooks/ToolItemHook.java diff --git a/core/src/main/java/appeng/integration/abstraction/IAEFacade.java b/src/main/java/appeng/integration/abstraction/IAEFacade.java similarity index 100% rename from core/src/main/java/appeng/integration/abstraction/IAEFacade.java rename to src/main/java/appeng/integration/abstraction/IAEFacade.java diff --git a/core/src/main/java/appeng/items/AEBaseItem.java b/src/main/java/appeng/items/AEBaseItem.java similarity index 100% rename from core/src/main/java/appeng/items/AEBaseItem.java rename to src/main/java/appeng/items/AEBaseItem.java diff --git a/core/src/main/java/appeng/items/contents/CellConfig.java b/src/main/java/appeng/items/contents/CellConfig.java similarity index 100% rename from core/src/main/java/appeng/items/contents/CellConfig.java rename to src/main/java/appeng/items/contents/CellConfig.java diff --git a/core/src/main/java/appeng/items/contents/CellUpgrades.java b/src/main/java/appeng/items/contents/CellUpgrades.java similarity index 100% rename from core/src/main/java/appeng/items/contents/CellUpgrades.java rename to src/main/java/appeng/items/contents/CellUpgrades.java diff --git a/core/src/main/java/appeng/items/contents/NetworkToolViewer.java b/src/main/java/appeng/items/contents/NetworkToolViewer.java similarity index 100% rename from core/src/main/java/appeng/items/contents/NetworkToolViewer.java rename to src/main/java/appeng/items/contents/NetworkToolViewer.java diff --git a/core/src/main/java/appeng/items/contents/PortableCellViewer.java b/src/main/java/appeng/items/contents/PortableCellViewer.java similarity index 100% rename from core/src/main/java/appeng/items/contents/PortableCellViewer.java rename to src/main/java/appeng/items/contents/PortableCellViewer.java diff --git a/core/src/main/java/appeng/items/contents/QuartzKnifeObj.java b/src/main/java/appeng/items/contents/QuartzKnifeObj.java similarity index 100% rename from core/src/main/java/appeng/items/contents/QuartzKnifeObj.java rename to src/main/java/appeng/items/contents/QuartzKnifeObj.java diff --git a/core/src/main/java/appeng/items/materials/MaterialItem.java b/src/main/java/appeng/items/materials/MaterialItem.java similarity index 100% rename from core/src/main/java/appeng/items/materials/MaterialItem.java rename to src/main/java/appeng/items/materials/MaterialItem.java diff --git a/core/src/main/java/appeng/items/materials/MaterialType.java b/src/main/java/appeng/items/materials/MaterialType.java similarity index 100% rename from core/src/main/java/appeng/items/materials/MaterialType.java rename to src/main/java/appeng/items/materials/MaterialType.java diff --git a/core/src/main/java/appeng/items/parts/ColoredPartItem.java b/src/main/java/appeng/items/parts/ColoredPartItem.java similarity index 100% rename from core/src/main/java/appeng/items/parts/ColoredPartItem.java rename to src/main/java/appeng/items/parts/ColoredPartItem.java diff --git a/core/src/main/java/appeng/items/parts/FacadeItem.java b/src/main/java/appeng/items/parts/FacadeItem.java similarity index 100% rename from core/src/main/java/appeng/items/parts/FacadeItem.java rename to src/main/java/appeng/items/parts/FacadeItem.java diff --git a/core/src/main/java/appeng/items/parts/PartItem.java b/src/main/java/appeng/items/parts/PartItem.java similarity index 100% rename from core/src/main/java/appeng/items/parts/PartItem.java rename to src/main/java/appeng/items/parts/PartItem.java diff --git a/core/src/main/java/appeng/items/parts/PartItemRendering.java b/src/main/java/appeng/items/parts/PartItemRendering.java similarity index 100% rename from core/src/main/java/appeng/items/parts/PartItemRendering.java rename to src/main/java/appeng/items/parts/PartItemRendering.java diff --git a/core/src/main/java/appeng/items/parts/PartModels.java b/src/main/java/appeng/items/parts/PartModels.java similarity index 100% rename from core/src/main/java/appeng/items/parts/PartModels.java rename to src/main/java/appeng/items/parts/PartModels.java diff --git a/core/src/main/java/appeng/items/parts/PartModelsHelper.java b/src/main/java/appeng/items/parts/PartModelsHelper.java similarity index 100% rename from core/src/main/java/appeng/items/parts/PartModelsHelper.java rename to src/main/java/appeng/items/parts/PartModelsHelper.java diff --git a/core/src/main/java/appeng/items/storage/CreativeStorageCellItem.java b/src/main/java/appeng/items/storage/CreativeStorageCellItem.java similarity index 100% rename from core/src/main/java/appeng/items/storage/CreativeStorageCellItem.java rename to src/main/java/appeng/items/storage/CreativeStorageCellItem.java diff --git a/core/src/main/java/appeng/items/tools/quartz/QuartzAxeItem.java b/src/main/java/appeng/items/tools/quartz/QuartzAxeItem.java similarity index 100% rename from core/src/main/java/appeng/items/tools/quartz/QuartzAxeItem.java rename to src/main/java/appeng/items/tools/quartz/QuartzAxeItem.java diff --git a/core/src/main/java/appeng/items/tools/quartz/QuartzCuttingKnifeItem.java b/src/main/java/appeng/items/tools/quartz/QuartzCuttingKnifeItem.java similarity index 100% rename from core/src/main/java/appeng/items/tools/quartz/QuartzCuttingKnifeItem.java rename to src/main/java/appeng/items/tools/quartz/QuartzCuttingKnifeItem.java diff --git a/core/src/main/java/appeng/items/tools/quartz/QuartzHoeItem.java b/src/main/java/appeng/items/tools/quartz/QuartzHoeItem.java similarity index 100% rename from core/src/main/java/appeng/items/tools/quartz/QuartzHoeItem.java rename to src/main/java/appeng/items/tools/quartz/QuartzHoeItem.java diff --git a/core/src/main/java/appeng/items/tools/quartz/QuartzPickaxeItem.java b/src/main/java/appeng/items/tools/quartz/QuartzPickaxeItem.java similarity index 100% rename from core/src/main/java/appeng/items/tools/quartz/QuartzPickaxeItem.java rename to src/main/java/appeng/items/tools/quartz/QuartzPickaxeItem.java diff --git a/core/src/main/java/appeng/items/tools/quartz/QuartzSpadeItem.java b/src/main/java/appeng/items/tools/quartz/QuartzSpadeItem.java similarity index 100% rename from core/src/main/java/appeng/items/tools/quartz/QuartzSpadeItem.java rename to src/main/java/appeng/items/tools/quartz/QuartzSpadeItem.java diff --git a/core/src/main/java/appeng/items/tools/quartz/QuartzSwordItem.java b/src/main/java/appeng/items/tools/quartz/QuartzSwordItem.java similarity index 100% rename from core/src/main/java/appeng/items/tools/quartz/QuartzSwordItem.java rename to src/main/java/appeng/items/tools/quartz/QuartzSwordItem.java diff --git a/core/src/main/java/appeng/items/tools/quartz/QuartzWrenchItem.java b/src/main/java/appeng/items/tools/quartz/QuartzWrenchItem.java similarity index 100% rename from core/src/main/java/appeng/items/tools/quartz/QuartzWrenchItem.java rename to src/main/java/appeng/items/tools/quartz/QuartzWrenchItem.java diff --git a/core/src/main/java/appeng/me/Grid.java b/src/main/java/appeng/me/Grid.java similarity index 100% rename from core/src/main/java/appeng/me/Grid.java rename to src/main/java/appeng/me/Grid.java diff --git a/core/src/main/java/appeng/me/GridAccessException.java b/src/main/java/appeng/me/GridAccessException.java similarity index 100% rename from core/src/main/java/appeng/me/GridAccessException.java rename to src/main/java/appeng/me/GridAccessException.java diff --git a/core/src/main/java/appeng/me/GridCacheWrapper.java b/src/main/java/appeng/me/GridCacheWrapper.java similarity index 100% rename from core/src/main/java/appeng/me/GridCacheWrapper.java rename to src/main/java/appeng/me/GridCacheWrapper.java diff --git a/core/src/main/java/appeng/me/GridConnection.java b/src/main/java/appeng/me/GridConnection.java similarity index 100% rename from core/src/main/java/appeng/me/GridConnection.java rename to src/main/java/appeng/me/GridConnection.java diff --git a/core/src/main/java/appeng/me/GridException.java b/src/main/java/appeng/me/GridException.java similarity index 100% rename from core/src/main/java/appeng/me/GridException.java rename to src/main/java/appeng/me/GridException.java diff --git a/core/src/main/java/appeng/me/GridNode.java b/src/main/java/appeng/me/GridNode.java similarity index 100% rename from core/src/main/java/appeng/me/GridNode.java rename to src/main/java/appeng/me/GridNode.java diff --git a/core/src/main/java/appeng/me/GridNodeCollection.java b/src/main/java/appeng/me/GridNodeCollection.java similarity index 100% rename from core/src/main/java/appeng/me/GridNodeCollection.java rename to src/main/java/appeng/me/GridNodeCollection.java diff --git a/core/src/main/java/appeng/me/GridNodeIterator.java b/src/main/java/appeng/me/GridNodeIterator.java similarity index 100% rename from core/src/main/java/appeng/me/GridNodeIterator.java rename to src/main/java/appeng/me/GridNodeIterator.java diff --git a/core/src/main/java/appeng/me/GridPropagator.java b/src/main/java/appeng/me/GridPropagator.java similarity index 100% rename from core/src/main/java/appeng/me/GridPropagator.java rename to src/main/java/appeng/me/GridPropagator.java diff --git a/core/src/main/java/appeng/me/GridSplitDetector.java b/src/main/java/appeng/me/GridSplitDetector.java similarity index 100% rename from core/src/main/java/appeng/me/GridSplitDetector.java rename to src/main/java/appeng/me/GridSplitDetector.java diff --git a/core/src/main/java/appeng/me/GridStorage.java b/src/main/java/appeng/me/GridStorage.java similarity index 100% rename from core/src/main/java/appeng/me/GridStorage.java rename to src/main/java/appeng/me/GridStorage.java diff --git a/core/src/main/java/appeng/me/MachineSet.java b/src/main/java/appeng/me/MachineSet.java similarity index 100% rename from core/src/main/java/appeng/me/MachineSet.java rename to src/main/java/appeng/me/MachineSet.java diff --git a/core/src/main/java/appeng/me/NetworkEventBus.java b/src/main/java/appeng/me/NetworkEventBus.java similarity index 100% rename from core/src/main/java/appeng/me/NetworkEventBus.java rename to src/main/java/appeng/me/NetworkEventBus.java diff --git a/core/src/main/java/appeng/me/cache/EnergyGridCache.java b/src/main/java/appeng/me/cache/EnergyGridCache.java similarity index 100% rename from core/src/main/java/appeng/me/cache/EnergyGridCache.java rename to src/main/java/appeng/me/cache/EnergyGridCache.java diff --git a/core/src/main/java/appeng/me/cache/GridStorageCache.java b/src/main/java/appeng/me/cache/GridStorageCache.java similarity index 100% rename from core/src/main/java/appeng/me/cache/GridStorageCache.java rename to src/main/java/appeng/me/cache/GridStorageCache.java diff --git a/core/src/main/java/appeng/me/cache/NetworkMonitor.java b/src/main/java/appeng/me/cache/NetworkMonitor.java similarity index 100% rename from core/src/main/java/appeng/me/cache/NetworkMonitor.java rename to src/main/java/appeng/me/cache/NetworkMonitor.java diff --git a/src/main/java/appeng/me/cache/P2PCache.java b/src/main/java/appeng/me/cache/P2PCache.java index 100270340..14f7b7ab3 100644 --- a/src/main/java/appeng/me/cache/P2PCache.java +++ b/src/main/java/appeng/me/cache/P2PCache.java @@ -1,214 +1,41 @@ -/* - * This file is part of Applied Energistics 2. - * Copyright (c) 2013 - 2014, AlgorithmX2, All rights reserved. - * - * Applied Energistics 2 is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Applied Energistics 2 is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Applied Energistics 2. If not, see . - */ - package appeng.me.cache; -import java.util.HashMap; -import java.util.Random; - -import com.google.common.collect.LinkedHashMultimap; -import com.google.common.collect.Multimap; - -import appeng.api.networking.GridFlags; -import appeng.api.networking.IGrid; import appeng.api.networking.IGridCache; import appeng.api.networking.IGridHost; import appeng.api.networking.IGridNode; import appeng.api.networking.IGridStorage; -import appeng.api.networking.events.MENetworkBootingStatusChange; -import appeng.api.networking.events.MENetworkEventSubscribe; -import appeng.api.networking.events.MENetworkPowerStatusChange; -import appeng.api.networking.ticking.ITickManager; -import appeng.core.AELog; -import appeng.me.cache.helpers.TunnelCollection; -import appeng.parts.p2p.MEP2PTunnelPart; -import appeng.parts.p2p.P2PTunnelPart; +import javax.annotation.Nonnull; + +// FIXME FABRIC DUMMY public class P2PCache implements IGridCache { - private static final TunnelCollection NULL_COLLECTION = new TunnelCollection(null, - null); - - private final IGrid myGrid; - private final HashMap inputs = new HashMap<>(); - private final Multimap outputs = LinkedHashMultimap.create(); - private final Random frequencyGenerator; - - public P2PCache(final IGrid g) { - this.myGrid = g; - this.frequencyGenerator = new Random(g.hashCode()); - } - - @MENetworkEventSubscribe - public void bootComplete(final MENetworkBootingStatusChange bootStatus) { - final ITickManager tm = this.myGrid.getCache(ITickManager.class); - for (final P2PTunnelPart me : this.inputs.values()) { - if (me instanceof MEP2PTunnelPart) { - tm.wakeDevice(me.getGridNode()); - } - } - } - - @MENetworkEventSubscribe - public void bootComplete(final MENetworkPowerStatusChange power) { - final ITickManager tm = this.myGrid.getCache(ITickManager.class); - for (final P2PTunnelPart me : this.inputs.values()) { - if (me instanceof MEP2PTunnelPart) { - tm.wakeDevice(me.getGridNode()); - } - } - } - @Override public void onUpdateTick() { } @Override - public void removeNode(final IGridNode node, final IGridHost machine) { - if (machine instanceof P2PTunnelPart) { - if (machine instanceof MEP2PTunnelPart) { - if (!node.hasFlag(GridFlags.REQUIRE_CHANNEL)) { - return; - } - } - - final P2PTunnelPart t = (P2PTunnelPart) machine; - // AELog.info( "rmv-" + (t.output ? "output: " : "input: ") + t.freq ); - - if (t.isOutput()) { - this.outputs.remove(t.getFrequency(), t); - } else { - this.inputs.remove(t.getFrequency()); - } - - this.updateTunnel(t.getFrequency(), !t.isOutput(), false); - } - } - - @Override - public void addNode(final IGridNode node, final IGridHost machine) { - if (machine instanceof P2PTunnelPart) { - if (machine instanceof MEP2PTunnelPart) { - if (!node.hasFlag(GridFlags.REQUIRE_CHANNEL)) { - return; - } - } - - final P2PTunnelPart t = (P2PTunnelPart) machine; - // AELog.info( "add-" + (t.output ? "output: " : "input: ") + t.freq ); - - if (t.isOutput()) { - this.outputs.put(t.getFrequency(), t); - } else { - this.inputs.put(t.getFrequency(), t); - } - - this.updateTunnel(t.getFrequency(), !t.isOutput(), false); - } - } - - @Override - public void onSplit(final IGridStorage storageB) { + public void removeNode(@Nonnull IGridNode gridNode, @Nonnull IGridHost machine) { } @Override - public void onJoin(final IGridStorage storageB) { + public void addNode(@Nonnull IGridNode gridNode, @Nonnull IGridHost machine) { } @Override - public void populateGridStorage(final IGridStorage storage) { + public void onSplit(@Nonnull IGridStorage destinationStorage) { } - private void updateTunnel(final short freq, final boolean updateOutputs, final boolean configChange) { - for (final P2PTunnelPart p : this.outputs.get(freq)) { - if (configChange) { - p.onTunnelConfigChange(); - } - p.onTunnelNetworkChange(); - } + @Override + public void onJoin(@Nonnull IGridStorage sourceStorage) { - final P2PTunnelPart in = this.inputs.get(freq); - if (in != null) { - if (configChange) { - in.onTunnelConfigChange(); - } - in.onTunnelNetworkChange(); - } } - public void updateFreq(final P2PTunnelPart t, final short newFrequency) { - if (this.outputs.containsValue(t)) { - this.outputs.remove(t.getFrequency(), t); - } + @Override + public void populateGridStorage(@Nonnull IGridStorage destinationStorage) { - if (this.inputs.containsValue(t)) { - this.inputs.remove(t.getFrequency()); - } - - t.setFrequency(newFrequency); - - if (t.isOutput()) { - this.outputs.put(t.getFrequency(), t); - } else { - this.inputs.put(t.getFrequency(), t); - } - - // AELog.info( "update-" + (t.output ? "output: " : "input: ") + t.freq ); - this.updateTunnel(t.getFrequency(), t.isOutput(), true); - this.updateTunnel(t.getFrequency(), !t.isOutput(), true); - } - - public short newFrequency() { - short newFrequency; - int cycles = 0; - - do { - newFrequency = (short) this.frequencyGenerator.nextInt(1 << 16); - cycles++; - } while (newFrequency == 0 || this.inputs.containsKey(newFrequency)); - - if (cycles > 25) { - AELog.debug("Generating a new P2P frequency '%1$d' took %2$d cycles", newFrequency, cycles); - } - - return newFrequency; - } - - public TunnelCollection getOutputs(final short freq, final Class c) { - final P2PTunnelPart in = this.inputs.get(freq); - - if (in == null) { - return NULL_COLLECTION; - } - - final TunnelCollection out = this.inputs.get(freq).getCollection(this.outputs.get(freq), c); - - if (out == null) { - return NULL_COLLECTION; - } - - return out; - } - - public P2PTunnelPart getInput(final short freq) { - return this.inputs.get(freq); } } diff --git a/core/src/main/java/appeng/me/cache/PathGridCache.java b/src/main/java/appeng/me/cache/PathGridCache.java similarity index 100% rename from core/src/main/java/appeng/me/cache/PathGridCache.java rename to src/main/java/appeng/me/cache/PathGridCache.java diff --git a/core/src/main/java/appeng/me/cache/SecurityCache.java b/src/main/java/appeng/me/cache/SecurityCache.java similarity index 100% rename from core/src/main/java/appeng/me/cache/SecurityCache.java rename to src/main/java/appeng/me/cache/SecurityCache.java diff --git a/core/src/main/java/appeng/me/cache/TickManagerCache.java b/src/main/java/appeng/me/cache/TickManagerCache.java similarity index 100% rename from core/src/main/java/appeng/me/cache/TickManagerCache.java rename to src/main/java/appeng/me/cache/TickManagerCache.java diff --git a/core/src/main/java/appeng/me/cache/helpers/TickTracker.java b/src/main/java/appeng/me/cache/helpers/TickTracker.java similarity index 100% rename from core/src/main/java/appeng/me/cache/helpers/TickTracker.java rename to src/main/java/appeng/me/cache/helpers/TickTracker.java diff --git a/core/src/main/java/appeng/me/cluster/IAECluster.java b/src/main/java/appeng/me/cluster/IAECluster.java similarity index 100% rename from core/src/main/java/appeng/me/cluster/IAECluster.java rename to src/main/java/appeng/me/cluster/IAECluster.java diff --git a/core/src/main/java/appeng/me/cluster/IAEMultiBlock.java b/src/main/java/appeng/me/cluster/IAEMultiBlock.java similarity index 100% rename from core/src/main/java/appeng/me/cluster/IAEMultiBlock.java rename to src/main/java/appeng/me/cluster/IAEMultiBlock.java diff --git a/core/src/main/java/appeng/me/energy/EnergyThreshold.java b/src/main/java/appeng/me/energy/EnergyThreshold.java similarity index 100% rename from core/src/main/java/appeng/me/energy/EnergyThreshold.java rename to src/main/java/appeng/me/energy/EnergyThreshold.java diff --git a/core/src/main/java/appeng/me/energy/EnergyWatcher.java b/src/main/java/appeng/me/energy/EnergyWatcher.java similarity index 100% rename from core/src/main/java/appeng/me/energy/EnergyWatcher.java rename to src/main/java/appeng/me/energy/EnergyWatcher.java diff --git a/core/src/main/java/appeng/me/helpers/AENetworkProxy.java b/src/main/java/appeng/me/helpers/AENetworkProxy.java similarity index 100% rename from core/src/main/java/appeng/me/helpers/AENetworkProxy.java rename to src/main/java/appeng/me/helpers/AENetworkProxy.java diff --git a/core/src/main/java/appeng/me/helpers/BaseActionSource.java b/src/main/java/appeng/me/helpers/BaseActionSource.java similarity index 100% rename from core/src/main/java/appeng/me/helpers/BaseActionSource.java rename to src/main/java/appeng/me/helpers/BaseActionSource.java diff --git a/core/src/main/java/appeng/me/helpers/ChannelPowerSrc.java b/src/main/java/appeng/me/helpers/ChannelPowerSrc.java similarity index 100% rename from core/src/main/java/appeng/me/helpers/ChannelPowerSrc.java rename to src/main/java/appeng/me/helpers/ChannelPowerSrc.java diff --git a/core/src/main/java/appeng/me/helpers/GenericInterestManager.java b/src/main/java/appeng/me/helpers/GenericInterestManager.java similarity index 100% rename from core/src/main/java/appeng/me/helpers/GenericInterestManager.java rename to src/main/java/appeng/me/helpers/GenericInterestManager.java diff --git a/core/src/main/java/appeng/me/helpers/IGridProxyable.java b/src/main/java/appeng/me/helpers/IGridProxyable.java similarity index 100% rename from core/src/main/java/appeng/me/helpers/IGridProxyable.java rename to src/main/java/appeng/me/helpers/IGridProxyable.java diff --git a/core/src/main/java/appeng/me/helpers/MEMonitorHandler.java b/src/main/java/appeng/me/helpers/MEMonitorHandler.java similarity index 100% rename from core/src/main/java/appeng/me/helpers/MEMonitorHandler.java rename to src/main/java/appeng/me/helpers/MEMonitorHandler.java diff --git a/core/src/main/java/appeng/me/helpers/MachineSource.java b/src/main/java/appeng/me/helpers/MachineSource.java similarity index 100% rename from core/src/main/java/appeng/me/helpers/MachineSource.java rename to src/main/java/appeng/me/helpers/MachineSource.java diff --git a/core/src/main/java/appeng/me/helpers/PlayerSource.java b/src/main/java/appeng/me/helpers/PlayerSource.java similarity index 100% rename from core/src/main/java/appeng/me/helpers/PlayerSource.java rename to src/main/java/appeng/me/helpers/PlayerSource.java diff --git a/core/src/main/java/appeng/me/pathfinding/AdHocChannelUpdater.java b/src/main/java/appeng/me/pathfinding/AdHocChannelUpdater.java similarity index 100% rename from core/src/main/java/appeng/me/pathfinding/AdHocChannelUpdater.java rename to src/main/java/appeng/me/pathfinding/AdHocChannelUpdater.java diff --git a/core/src/main/java/appeng/me/pathfinding/ControllerChannelUpdater.java b/src/main/java/appeng/me/pathfinding/ControllerChannelUpdater.java similarity index 100% rename from core/src/main/java/appeng/me/pathfinding/ControllerChannelUpdater.java rename to src/main/java/appeng/me/pathfinding/ControllerChannelUpdater.java diff --git a/core/src/main/java/appeng/me/pathfinding/ControllerValidator.java b/src/main/java/appeng/me/pathfinding/ControllerValidator.java similarity index 100% rename from core/src/main/java/appeng/me/pathfinding/ControllerValidator.java rename to src/main/java/appeng/me/pathfinding/ControllerValidator.java diff --git a/core/src/main/java/appeng/me/pathfinding/IPathItem.java b/src/main/java/appeng/me/pathfinding/IPathItem.java similarity index 100% rename from core/src/main/java/appeng/me/pathfinding/IPathItem.java rename to src/main/java/appeng/me/pathfinding/IPathItem.java diff --git a/core/src/main/java/appeng/me/pathfinding/PathSegment.java b/src/main/java/appeng/me/pathfinding/PathSegment.java similarity index 100% rename from core/src/main/java/appeng/me/pathfinding/PathSegment.java rename to src/main/java/appeng/me/pathfinding/PathSegment.java diff --git a/core/src/main/java/appeng/me/storage/AbstractCellInventory.java b/src/main/java/appeng/me/storage/AbstractCellInventory.java similarity index 100% rename from core/src/main/java/appeng/me/storage/AbstractCellInventory.java rename to src/main/java/appeng/me/storage/AbstractCellInventory.java diff --git a/core/src/main/java/appeng/me/storage/BasicCellInventory.java b/src/main/java/appeng/me/storage/BasicCellInventory.java similarity index 100% rename from core/src/main/java/appeng/me/storage/BasicCellInventory.java rename to src/main/java/appeng/me/storage/BasicCellInventory.java diff --git a/core/src/main/java/appeng/me/storage/BasicCellInventoryHandler.java b/src/main/java/appeng/me/storage/BasicCellInventoryHandler.java similarity index 100% rename from core/src/main/java/appeng/me/storage/BasicCellInventoryHandler.java rename to src/main/java/appeng/me/storage/BasicCellInventoryHandler.java diff --git a/core/src/main/java/appeng/me/storage/CreativeCellInventory.java b/src/main/java/appeng/me/storage/CreativeCellInventory.java similarity index 100% rename from core/src/main/java/appeng/me/storage/CreativeCellInventory.java rename to src/main/java/appeng/me/storage/CreativeCellInventory.java diff --git a/core/src/main/java/appeng/me/storage/DriveWatcher.java b/src/main/java/appeng/me/storage/DriveWatcher.java similarity index 100% rename from core/src/main/java/appeng/me/storage/DriveWatcher.java rename to src/main/java/appeng/me/storage/DriveWatcher.java diff --git a/core/src/main/java/appeng/me/storage/ITickingMonitor.java b/src/main/java/appeng/me/storage/ITickingMonitor.java similarity index 100% rename from core/src/main/java/appeng/me/storage/ITickingMonitor.java rename to src/main/java/appeng/me/storage/ITickingMonitor.java diff --git a/core/src/main/java/appeng/me/storage/ItemWatcher.java b/src/main/java/appeng/me/storage/ItemWatcher.java similarity index 100% rename from core/src/main/java/appeng/me/storage/ItemWatcher.java rename to src/main/java/appeng/me/storage/ItemWatcher.java diff --git a/core/src/main/java/appeng/me/storage/MEInventoryHandler.java b/src/main/java/appeng/me/storage/MEInventoryHandler.java similarity index 100% rename from core/src/main/java/appeng/me/storage/MEInventoryHandler.java rename to src/main/java/appeng/me/storage/MEInventoryHandler.java diff --git a/core/src/main/java/appeng/me/storage/MEMonitorIInventory.java b/src/main/java/appeng/me/storage/MEMonitorIInventory.java similarity index 100% rename from core/src/main/java/appeng/me/storage/MEMonitorIInventory.java rename to src/main/java/appeng/me/storage/MEMonitorIInventory.java diff --git a/core/src/main/java/appeng/me/storage/MEMonitorPassThrough.java b/src/main/java/appeng/me/storage/MEMonitorPassThrough.java similarity index 100% rename from core/src/main/java/appeng/me/storage/MEMonitorPassThrough.java rename to src/main/java/appeng/me/storage/MEMonitorPassThrough.java diff --git a/core/src/main/java/appeng/me/storage/MEPassThrough.java b/src/main/java/appeng/me/storage/MEPassThrough.java similarity index 100% rename from core/src/main/java/appeng/me/storage/MEPassThrough.java rename to src/main/java/appeng/me/storage/MEPassThrough.java diff --git a/core/src/main/java/appeng/me/storage/NetworkInventoryHandler.java b/src/main/java/appeng/me/storage/NetworkInventoryHandler.java similarity index 100% rename from core/src/main/java/appeng/me/storage/NetworkInventoryHandler.java rename to src/main/java/appeng/me/storage/NetworkInventoryHandler.java diff --git a/core/src/main/java/appeng/me/storage/NullInventory.java b/src/main/java/appeng/me/storage/NullInventory.java similarity index 100% rename from core/src/main/java/appeng/me/storage/NullInventory.java rename to src/main/java/appeng/me/storage/NullInventory.java diff --git a/core/src/main/java/appeng/mixins/CriteriaRegisterMixin.java b/src/main/java/appeng/mixins/CriteriaRegisterMixin.java similarity index 100% rename from core/src/main/java/appeng/mixins/CriteriaRegisterMixin.java rename to src/main/java/appeng/mixins/CriteriaRegisterMixin.java diff --git a/core/src/main/java/appeng/mixins/ModelsReloadMixin.java b/src/main/java/appeng/mixins/ModelsReloadMixin.java similarity index 100% rename from core/src/main/java/appeng/mixins/ModelsReloadMixin.java rename to src/main/java/appeng/mixins/ModelsReloadMixin.java diff --git a/core/src/main/java/appeng/mixins/RecipeManagerMixin.java b/src/main/java/appeng/mixins/RecipeManagerMixin.java similarity index 100% rename from core/src/main/java/appeng/mixins/RecipeManagerMixin.java rename to src/main/java/appeng/mixins/RecipeManagerMixin.java diff --git a/core/src/main/java/appeng/mixins/RemainderSetter.java b/src/main/java/appeng/mixins/RemainderSetter.java similarity index 100% rename from core/src/main/java/appeng/mixins/RemainderSetter.java rename to src/main/java/appeng/mixins/RemainderSetter.java diff --git a/core/src/main/java/appeng/mixins/ShapelessRecipeMixin.java b/src/main/java/appeng/mixins/ShapelessRecipeMixin.java similarity index 100% rename from core/src/main/java/appeng/mixins/ShapelessRecipeMixin.java rename to src/main/java/appeng/mixins/ShapelessRecipeMixin.java diff --git a/core/src/main/java/appeng/parts/AEBasePart.java b/src/main/java/appeng/parts/AEBasePart.java similarity index 100% rename from core/src/main/java/appeng/parts/AEBasePart.java rename to src/main/java/appeng/parts/AEBasePart.java diff --git a/core/src/main/java/appeng/parts/BusCollisionHelper.java b/src/main/java/appeng/parts/BusCollisionHelper.java similarity index 100% rename from core/src/main/java/appeng/parts/BusCollisionHelper.java rename to src/main/java/appeng/parts/BusCollisionHelper.java diff --git a/core/src/main/java/appeng/parts/CableBusContainer.java b/src/main/java/appeng/parts/CableBusContainer.java similarity index 100% rename from core/src/main/java/appeng/parts/CableBusContainer.java rename to src/main/java/appeng/parts/CableBusContainer.java diff --git a/core/src/main/java/appeng/parts/CableBusStorage.java b/src/main/java/appeng/parts/CableBusStorage.java similarity index 100% rename from core/src/main/java/appeng/parts/CableBusStorage.java rename to src/main/java/appeng/parts/CableBusStorage.java diff --git a/core/src/main/java/appeng/parts/ICableBusContainer.java b/src/main/java/appeng/parts/ICableBusContainer.java similarity index 100% rename from core/src/main/java/appeng/parts/ICableBusContainer.java rename to src/main/java/appeng/parts/ICableBusContainer.java diff --git a/core/src/main/java/appeng/parts/NullCableBusContainer.java b/src/main/java/appeng/parts/NullCableBusContainer.java similarity index 100% rename from core/src/main/java/appeng/parts/NullCableBusContainer.java rename to src/main/java/appeng/parts/NullCableBusContainer.java diff --git a/core/src/main/java/appeng/parts/PartModel.java b/src/main/java/appeng/parts/PartModel.java similarity index 100% rename from core/src/main/java/appeng/parts/PartModel.java rename to src/main/java/appeng/parts/PartModel.java diff --git a/core/src/main/java/appeng/parts/PartPlacement.java b/src/main/java/appeng/parts/PartPlacement.java similarity index 100% rename from core/src/main/java/appeng/parts/PartPlacement.java rename to src/main/java/appeng/parts/PartPlacement.java diff --git a/core/src/main/java/appeng/parts/automation/BlockUpgradeInventory.java b/src/main/java/appeng/parts/automation/BlockUpgradeInventory.java similarity index 100% rename from core/src/main/java/appeng/parts/automation/BlockUpgradeInventory.java rename to src/main/java/appeng/parts/automation/BlockUpgradeInventory.java diff --git a/core/src/main/java/appeng/parts/automation/StackUpgradeInventory.java b/src/main/java/appeng/parts/automation/StackUpgradeInventory.java similarity index 100% rename from core/src/main/java/appeng/parts/automation/StackUpgradeInventory.java rename to src/main/java/appeng/parts/automation/StackUpgradeInventory.java diff --git a/core/src/main/java/appeng/parts/automation/UpgradeInventory.java b/src/main/java/appeng/parts/automation/UpgradeInventory.java similarity index 100% rename from core/src/main/java/appeng/parts/automation/UpgradeInventory.java rename to src/main/java/appeng/parts/automation/UpgradeInventory.java diff --git a/core/src/main/java/appeng/parts/misc/CableAnchorPart.java b/src/main/java/appeng/parts/misc/CableAnchorPart.java similarity index 100% rename from core/src/main/java/appeng/parts/misc/CableAnchorPart.java rename to src/main/java/appeng/parts/misc/CableAnchorPart.java diff --git a/core/src/main/java/appeng/parts/networking/CablePart.java b/src/main/java/appeng/parts/networking/CablePart.java similarity index 100% rename from core/src/main/java/appeng/parts/networking/CablePart.java rename to src/main/java/appeng/parts/networking/CablePart.java diff --git a/core/src/main/java/appeng/parts/networking/CoveredCablePart.java b/src/main/java/appeng/parts/networking/CoveredCablePart.java similarity index 100% rename from core/src/main/java/appeng/parts/networking/CoveredCablePart.java rename to src/main/java/appeng/parts/networking/CoveredCablePart.java diff --git a/core/src/main/java/appeng/parts/networking/CoveredDenseCablePart.java b/src/main/java/appeng/parts/networking/CoveredDenseCablePart.java similarity index 100% rename from core/src/main/java/appeng/parts/networking/CoveredDenseCablePart.java rename to src/main/java/appeng/parts/networking/CoveredDenseCablePart.java diff --git a/core/src/main/java/appeng/parts/networking/DenseCablePart.java b/src/main/java/appeng/parts/networking/DenseCablePart.java similarity index 100% rename from core/src/main/java/appeng/parts/networking/DenseCablePart.java rename to src/main/java/appeng/parts/networking/DenseCablePart.java diff --git a/core/src/main/java/appeng/parts/networking/GlassCablePart.java b/src/main/java/appeng/parts/networking/GlassCablePart.java similarity index 100% rename from core/src/main/java/appeng/parts/networking/GlassCablePart.java rename to src/main/java/appeng/parts/networking/GlassCablePart.java diff --git a/core/src/main/java/appeng/parts/networking/QuartzFiberPart.java b/src/main/java/appeng/parts/networking/QuartzFiberPart.java similarity index 100% rename from core/src/main/java/appeng/parts/networking/QuartzFiberPart.java rename to src/main/java/appeng/parts/networking/QuartzFiberPart.java diff --git a/core/src/main/java/appeng/parts/networking/SmartCablePart.java b/src/main/java/appeng/parts/networking/SmartCablePart.java similarity index 100% rename from core/src/main/java/appeng/parts/networking/SmartCablePart.java rename to src/main/java/appeng/parts/networking/SmartCablePart.java diff --git a/core/src/main/java/appeng/parts/networking/SmartDenseCablePart.java b/src/main/java/appeng/parts/networking/SmartDenseCablePart.java similarity index 100% rename from core/src/main/java/appeng/parts/networking/SmartDenseCablePart.java rename to src/main/java/appeng/parts/networking/SmartDenseCablePart.java diff --git a/core/src/main/java/appeng/recipes/handlers/GrinderOptionalResult.java b/src/main/java/appeng/recipes/handlers/GrinderOptionalResult.java similarity index 100% rename from core/src/main/java/appeng/recipes/handlers/GrinderOptionalResult.java rename to src/main/java/appeng/recipes/handlers/GrinderOptionalResult.java diff --git a/core/src/main/java/appeng/recipes/handlers/GrinderRecipe.java b/src/main/java/appeng/recipes/handlers/GrinderRecipe.java similarity index 100% rename from core/src/main/java/appeng/recipes/handlers/GrinderRecipe.java rename to src/main/java/appeng/recipes/handlers/GrinderRecipe.java diff --git a/core/src/main/java/appeng/recipes/handlers/GrinderRecipeSerializer.java b/src/main/java/appeng/recipes/handlers/GrinderRecipeSerializer.java similarity index 100% rename from core/src/main/java/appeng/recipes/handlers/GrinderRecipeSerializer.java rename to src/main/java/appeng/recipes/handlers/GrinderRecipeSerializer.java diff --git a/core/src/main/java/appeng/recipes/handlers/GrinderRecipes.java b/src/main/java/appeng/recipes/handlers/GrinderRecipes.java similarity index 100% rename from core/src/main/java/appeng/recipes/handlers/GrinderRecipes.java rename to src/main/java/appeng/recipes/handlers/GrinderRecipes.java diff --git a/core/src/main/java/appeng/recipes/handlers/InscriberRecipe.java b/src/main/java/appeng/recipes/handlers/InscriberRecipe.java similarity index 100% rename from core/src/main/java/appeng/recipes/handlers/InscriberRecipe.java rename to src/main/java/appeng/recipes/handlers/InscriberRecipe.java diff --git a/core/src/main/java/appeng/recipes/handlers/InscriberRecipeSerializer.java b/src/main/java/appeng/recipes/handlers/InscriberRecipeSerializer.java similarity index 100% rename from core/src/main/java/appeng/recipes/handlers/InscriberRecipeSerializer.java rename to src/main/java/appeng/recipes/handlers/InscriberRecipeSerializer.java diff --git a/core/src/main/java/appeng/recipes/handlers/QuartzKnifeRecipe.java b/src/main/java/appeng/recipes/handlers/QuartzKnifeRecipe.java similarity index 100% rename from core/src/main/java/appeng/recipes/handlers/QuartzKnifeRecipe.java rename to src/main/java/appeng/recipes/handlers/QuartzKnifeRecipe.java diff --git a/core/src/main/java/appeng/recipes/handlers/QuartzKnifeRecipeSerializer.java b/src/main/java/appeng/recipes/handlers/QuartzKnifeRecipeSerializer.java similarity index 100% rename from core/src/main/java/appeng/recipes/handlers/QuartzKnifeRecipeSerializer.java rename to src/main/java/appeng/recipes/handlers/QuartzKnifeRecipeSerializer.java diff --git a/core/src/main/java/appeng/server/AppEngServer.java b/src/main/java/appeng/server/AppEngServer.java similarity index 100% rename from core/src/main/java/appeng/server/AppEngServer.java rename to src/main/java/appeng/server/AppEngServer.java diff --git a/core/src/main/java/appeng/services/CompassService.java b/src/main/java/appeng/services/CompassService.java similarity index 100% rename from core/src/main/java/appeng/services/CompassService.java rename to src/main/java/appeng/services/CompassService.java diff --git a/core/src/main/java/appeng/services/compass/CompassException.java b/src/main/java/appeng/services/compass/CompassException.java similarity index 100% rename from core/src/main/java/appeng/services/compass/CompassException.java rename to src/main/java/appeng/services/compass/CompassException.java diff --git a/core/src/main/java/appeng/services/compass/CompassReader.java b/src/main/java/appeng/services/compass/CompassReader.java similarity index 100% rename from core/src/main/java/appeng/services/compass/CompassReader.java rename to src/main/java/appeng/services/compass/CompassReader.java diff --git a/core/src/main/java/appeng/services/compass/CompassRegion.java b/src/main/java/appeng/services/compass/CompassRegion.java similarity index 100% rename from core/src/main/java/appeng/services/compass/CompassRegion.java rename to src/main/java/appeng/services/compass/CompassRegion.java diff --git a/core/src/main/java/appeng/services/compass/CompassThreadFactory.java b/src/main/java/appeng/services/compass/CompassThreadFactory.java similarity index 100% rename from core/src/main/java/appeng/services/compass/CompassThreadFactory.java rename to src/main/java/appeng/services/compass/CompassThreadFactory.java diff --git a/core/src/main/java/appeng/services/compass/ICompassCallback.java b/src/main/java/appeng/services/compass/ICompassCallback.java similarity index 100% rename from core/src/main/java/appeng/services/compass/ICompassCallback.java rename to src/main/java/appeng/services/compass/ICompassCallback.java diff --git a/core/src/main/java/appeng/spatial/DefaultSpatialHandler.java b/src/main/java/appeng/spatial/DefaultSpatialHandler.java similarity index 100% rename from core/src/main/java/appeng/spatial/DefaultSpatialHandler.java rename to src/main/java/appeng/spatial/DefaultSpatialHandler.java diff --git a/core/src/main/java/appeng/tile/AEBaseBlockEntity.java b/src/main/java/appeng/tile/AEBaseBlockEntity.java similarity index 100% rename from core/src/main/java/appeng/tile/AEBaseBlockEntity.java rename to src/main/java/appeng/tile/AEBaseBlockEntity.java diff --git a/core/src/main/java/appeng/tile/AEBaseInvBlockEntity.java b/src/main/java/appeng/tile/AEBaseInvBlockEntity.java similarity index 100% rename from core/src/main/java/appeng/tile/AEBaseInvBlockEntity.java rename to src/main/java/appeng/tile/AEBaseInvBlockEntity.java diff --git a/core/src/main/java/appeng/tile/inventory/AppEngInternalAEInventory.java b/src/main/java/appeng/tile/inventory/AppEngInternalAEInventory.java similarity index 100% rename from core/src/main/java/appeng/tile/inventory/AppEngInternalAEInventory.java rename to src/main/java/appeng/tile/inventory/AppEngInternalAEInventory.java diff --git a/core/src/main/java/appeng/tile/inventory/AppEngInternalInventory.java b/src/main/java/appeng/tile/inventory/AppEngInternalInventory.java similarity index 100% rename from core/src/main/java/appeng/tile/inventory/AppEngInternalInventory.java rename to src/main/java/appeng/tile/inventory/AppEngInternalInventory.java diff --git a/core/src/main/java/appeng/tile/misc/LightDetectorBlockEntity.java b/src/main/java/appeng/tile/misc/LightDetectorBlockEntity.java similarity index 100% rename from core/src/main/java/appeng/tile/misc/LightDetectorBlockEntity.java rename to src/main/java/appeng/tile/misc/LightDetectorBlockEntity.java diff --git a/core/src/main/java/appeng/tile/misc/SkyCompassBlockEntity.java b/src/main/java/appeng/tile/misc/SkyCompassBlockEntity.java similarity index 100% rename from core/src/main/java/appeng/tile/misc/SkyCompassBlockEntity.java rename to src/main/java/appeng/tile/misc/SkyCompassBlockEntity.java diff --git a/core/src/main/java/appeng/tile/networking/CableBusBlockEntity.java b/src/main/java/appeng/tile/networking/CableBusBlockEntity.java similarity index 100% rename from core/src/main/java/appeng/tile/networking/CableBusBlockEntity.java rename to src/main/java/appeng/tile/networking/CableBusBlockEntity.java diff --git a/core/src/main/java/appeng/tile/networking/CableBusTESR.java b/src/main/java/appeng/tile/networking/CableBusTESR.java similarity index 100% rename from core/src/main/java/appeng/tile/networking/CableBusTESR.java rename to src/main/java/appeng/tile/networking/CableBusTESR.java diff --git a/src/main/java/appeng/tile/networking/ControllerBlockEntity.java b/src/main/java/appeng/tile/networking/ControllerBlockEntity.java index 8edb3c29d..72ed2cff1 100644 --- a/src/main/java/appeng/tile/networking/ControllerBlockEntity.java +++ b/src/main/java/appeng/tile/networking/ControllerBlockEntity.java @@ -1,192 +1,34 @@ -/* - * This file is part of Applied Energistics 2. - * Copyright (c) 2013 - 2015, AlgorithmX2, All rights reserved. - * - * Applied Energistics 2 is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Applied Energistics 2 is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Applied Energistics 2. If not, see . - */ - package appeng.tile.networking; -import java.util.EnumSet; - -import net.minecraft.item.ItemStack; -import net.minecraft.block.entity.BlockEntityType; -import net.minecraft.util.math.Direction; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.ChunkPos; -import alexiil.mc.lib.attributes.item.FixedItemInv; -import alexiil.mc.lib.attributes.item.impl.EmptyFixedItemInv; - -import appeng.api.config.Actionable; -import appeng.api.networking.GridFlags; -import appeng.api.networking.energy.IEnergyGrid; -import appeng.api.networking.events.MENetworkControllerChange; -import appeng.api.networking.events.MENetworkEventSubscribe; -import appeng.api.networking.events.MENetworkPowerStatusChange; -import appeng.api.networking.events.MENetworkPowerStorage; -import appeng.api.networking.events.MENetworkPowerStorage.PowerEventType; -import appeng.api.networking.pathing.ControllerState; +import appeng.api.networking.IGridHost; +import appeng.api.networking.IGridNode; import appeng.api.util.AECableType; import appeng.api.util.AEPartLocation; -import appeng.block.networking.ControllerBlock; -import appeng.block.networking.ControllerBlock.ControllerBlockState; -import appeng.me.GridAccessException; -import appeng.tile.grid.AENetworkPowerBlockEntity; -import appeng.util.inv.InvOperation; +import net.minecraft.util.math.BlockPos; -public class ControllerBlockEntity extends AENetworkPowerBlockEntity { - private boolean isValid = false; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; - public ControllerBlockEntity(BlockEntityType tileEntityTypeIn) { - super(tileEntityTypeIn); - this.setInternalMaxPower(8000); - this.setInternalPublicPowerStorage(true); - this.getProxy().setIdlePowerUsage(3); - this.getProxy().setFlags(GridFlags.CANNOT_CARRY, GridFlags.DENSE_CAPACITY); +// FIXME FABRIC DUMMY +public class ControllerBlockEntity implements IGridHost { + @Nullable + @Override + public IGridNode getGridNode(@Nonnull AEPartLocation dir) { + return null; + } + + @Nonnull + @Override + public AECableType getCableConnectionType(@Nonnull AEPartLocation dir) { + return null; } @Override - public AECableType getCableConnectionType(final AEPartLocation dir) { - return AECableType.DENSE_SMART; - } - - @Override - public void onReady() { - this.onNeighborChange(true); - super.onReady(); - } - - public void onNeighborChange(final boolean force) { - final boolean xx = this.checkController(this.pos.offset(Direction.EAST)) - && this.checkController(this.pos.offset(Direction.WEST)); - final boolean yy = this.checkController(this.pos.offset(Direction.UP)) - && this.checkController(this.pos.offset(Direction.DOWN)); - final boolean zz = this.checkController(this.pos.offset(Direction.NORTH)) - && this.checkController(this.pos.offset(Direction.SOUTH)); - - // int meta = world.getBlockMetadata( xCoord, yCoord, zCoord ); - // boolean hasPower = meta > 0; - // boolean isConflict = meta == 2; - - final boolean oldValid = this.isValid; - - this.isValid = (xx && !yy && !zz) || (!xx && yy && !zz) || (!xx && !yy && zz) - || ((xx ? 1 : 0) + (yy ? 1 : 0) + (zz ? 1 : 0) <= 1); - - if (oldValid != this.isValid || force) { - if (this.isValid) { - this.getProxy().setValidSides(EnumSet.allOf(Direction.class)); - } else { - this.getProxy().setValidSides(EnumSet.noneOf(Direction.class)); - } - - this.updateMeta(); - } + public void securityBreak() { } - private void updateMeta() { - if (!this.getProxy().isReady()) { - return; - } - - ControllerBlockState metaState = ControllerBlockState.offline; - - try { - if (this.getProxy().getEnergy().isNetworkPowered()) { - metaState = ControllerBlockState.online; - - if (this.getProxy().getPath().getControllerState() == ControllerState.CONTROLLER_CONFLICT) { - metaState = ControllerBlockState.conflicted; - } - } - } catch (final GridAccessException e) { - metaState = ControllerBlockState.offline; - } - - if (this.checkController(this.pos) - && this.world.getBlockState(this.pos).get(ControllerBlock.CONTROLLER_STATE) != metaState) { - this.world.setBlockState(this.pos, - this.world.getBlockState(this.pos).with(ControllerBlock.CONTROLLER_STATE, metaState)); - } - - } - - @Override - protected double getFunnelPowerDemand(final double maxReceived) { - try { - final IEnergyGrid grid = this.getProxy().getEnergy(); - - return grid.getEnergyDemand(maxReceived); - } catch (final GridAccessException e) { - // no grid? use local... - return super.getFunnelPowerDemand(maxReceived); - } - } - - @Override - protected double funnelPowerIntoStorage(final double power, final Actionable mode) { - try { - final IEnergyGrid grid = this.getProxy().getEnergy(); - final double leftOver = grid.injectPower(power, mode); - - return leftOver; - } catch (final GridAccessException e) { - // no grid? use local... - return super.funnelPowerIntoStorage(power, mode); - } - } - - @Override - protected void PowerEvent(final PowerEventType x) { - try { - this.getProxy().getGrid().postEvent(new MENetworkPowerStorage(this, x)); - } catch (final GridAccessException e) { - // not ready! - } - } - - @MENetworkEventSubscribe - public void onControllerChange(final MENetworkControllerChange status) { - this.updateMeta(); - } - - @MENetworkEventSubscribe - public void onPowerChange(final MENetworkPowerStatusChange status) { - this.updateMeta(); - } - - @Override - public FixedItemInv getInternalInventory() { - return EmptyFixedItemInv.INSTANCE; - } - - @Override - public void onChangeInventory(final FixedItemInv inv, final int slot, final InvOperation mc, - final ItemStack removed, final ItemStack added) { - } - - /** - * Check for a controller at this coordinates as well as is it loaded. - * - * @return true if there is a loaded controller - */ - private boolean checkController(final BlockPos pos) { - if (this.world.getChunkManager().isChunkLoaded(new ChunkPos(pos.getX() >> 4, pos.getZ() >> 4))) { - return this.world.getBlockEntity(pos) instanceof ControllerBlockEntity; - } - - return false; + public BlockPos getPos() { + return null; } } diff --git a/core/src/main/java/appeng/tile/storage/SkyChestBlockEntity.java b/src/main/java/appeng/tile/storage/SkyChestBlockEntity.java similarity index 100% rename from core/src/main/java/appeng/tile/storage/SkyChestBlockEntity.java rename to src/main/java/appeng/tile/storage/SkyChestBlockEntity.java diff --git a/core/src/main/java/appeng/util/BlockUpdate.java b/src/main/java/appeng/util/BlockUpdate.java similarity index 100% rename from core/src/main/java/appeng/util/BlockUpdate.java rename to src/main/java/appeng/util/BlockUpdate.java diff --git a/core/src/main/java/appeng/util/ClassInstantiation.java b/src/main/java/appeng/util/ClassInstantiation.java similarity index 100% rename from core/src/main/java/appeng/util/ClassInstantiation.java rename to src/main/java/appeng/util/ClassInstantiation.java diff --git a/core/src/main/java/appeng/util/ConfigManager.java b/src/main/java/appeng/util/ConfigManager.java similarity index 100% rename from core/src/main/java/appeng/util/ConfigManager.java rename to src/main/java/appeng/util/ConfigManager.java diff --git a/core/src/main/java/appeng/util/EnumCycler.java b/src/main/java/appeng/util/EnumCycler.java similarity index 100% rename from core/src/main/java/appeng/util/EnumCycler.java rename to src/main/java/appeng/util/EnumCycler.java diff --git a/core/src/main/java/appeng/util/FakePlayer.java b/src/main/java/appeng/util/FakePlayer.java similarity index 100% rename from core/src/main/java/appeng/util/FakePlayer.java rename to src/main/java/appeng/util/FakePlayer.java diff --git a/core/src/main/java/appeng/util/IConfigManagerHost.java b/src/main/java/appeng/util/IConfigManagerHost.java similarity index 100% rename from core/src/main/java/appeng/util/IConfigManagerHost.java rename to src/main/java/appeng/util/IConfigManagerHost.java diff --git a/core/src/main/java/appeng/util/ISlimReadableNumberConverter.java b/src/main/java/appeng/util/ISlimReadableNumberConverter.java similarity index 100% rename from core/src/main/java/appeng/util/ISlimReadableNumberConverter.java rename to src/main/java/appeng/util/ISlimReadableNumberConverter.java diff --git a/core/src/main/java/appeng/util/IWideReadableNumberConverter.java b/src/main/java/appeng/util/IWideReadableNumberConverter.java similarity index 100% rename from core/src/main/java/appeng/util/IWideReadableNumberConverter.java rename to src/main/java/appeng/util/IWideReadableNumberConverter.java diff --git a/core/src/main/java/appeng/util/IWorldCallable.java b/src/main/java/appeng/util/IWorldCallable.java similarity index 100% rename from core/src/main/java/appeng/util/IWorldCallable.java rename to src/main/java/appeng/util/IWorldCallable.java diff --git a/core/src/main/java/appeng/util/InWorldToolOperationResult.java b/src/main/java/appeng/util/InWorldToolOperationResult.java similarity index 100% rename from core/src/main/java/appeng/util/InWorldToolOperationResult.java rename to src/main/java/appeng/util/InWorldToolOperationResult.java diff --git a/core/src/main/java/appeng/util/InventoryAdaptor.java b/src/main/java/appeng/util/InventoryAdaptor.java similarity index 100% rename from core/src/main/java/appeng/util/InventoryAdaptor.java rename to src/main/java/appeng/util/InventoryAdaptor.java diff --git a/core/src/main/java/appeng/util/ItemSorters.java b/src/main/java/appeng/util/ItemSorters.java similarity index 100% rename from core/src/main/java/appeng/util/ItemSorters.java rename to src/main/java/appeng/util/ItemSorters.java diff --git a/core/src/main/java/appeng/util/Lazy.java b/src/main/java/appeng/util/Lazy.java similarity index 100% rename from core/src/main/java/appeng/util/Lazy.java rename to src/main/java/appeng/util/Lazy.java diff --git a/core/src/main/java/appeng/util/LookDirection.java b/src/main/java/appeng/util/LookDirection.java similarity index 100% rename from core/src/main/java/appeng/util/LookDirection.java rename to src/main/java/appeng/util/LookDirection.java diff --git a/core/src/main/java/appeng/util/Platform.java b/src/main/java/appeng/util/Platform.java similarity index 100% rename from core/src/main/java/appeng/util/Platform.java rename to src/main/java/appeng/util/Platform.java diff --git a/core/src/main/java/appeng/util/ReadOnlyCollection.java b/src/main/java/appeng/util/ReadOnlyCollection.java similarity index 100% rename from core/src/main/java/appeng/util/ReadOnlyCollection.java rename to src/main/java/appeng/util/ReadOnlyCollection.java diff --git a/core/src/main/java/appeng/util/ReadableNumberConverter.java b/src/main/java/appeng/util/ReadableNumberConverter.java similarity index 100% rename from core/src/main/java/appeng/util/ReadableNumberConverter.java rename to src/main/java/appeng/util/ReadableNumberConverter.java diff --git a/core/src/main/java/appeng/util/SettingsFrom.java b/src/main/java/appeng/util/SettingsFrom.java similarity index 100% rename from core/src/main/java/appeng/util/SettingsFrom.java rename to src/main/java/appeng/util/SettingsFrom.java diff --git a/core/src/main/java/appeng/util/UUIDMatcher.java b/src/main/java/appeng/util/UUIDMatcher.java similarity index 100% rename from core/src/main/java/appeng/util/UUIDMatcher.java rename to src/main/java/appeng/util/UUIDMatcher.java diff --git a/core/src/main/java/appeng/util/helpers/ItemComparisonHelper.java b/src/main/java/appeng/util/helpers/ItemComparisonHelper.java similarity index 100% rename from core/src/main/java/appeng/util/helpers/ItemComparisonHelper.java rename to src/main/java/appeng/util/helpers/ItemComparisonHelper.java diff --git a/core/src/main/java/appeng/util/helpers/ItemHandlerUtil.java b/src/main/java/appeng/util/helpers/ItemHandlerUtil.java similarity index 100% rename from core/src/main/java/appeng/util/helpers/ItemHandlerUtil.java rename to src/main/java/appeng/util/helpers/ItemHandlerUtil.java diff --git a/core/src/main/java/appeng/util/helpers/P2PHelper.java b/src/main/java/appeng/util/helpers/P2PHelper.java similarity index 100% rename from core/src/main/java/appeng/util/helpers/P2PHelper.java rename to src/main/java/appeng/util/helpers/P2PHelper.java diff --git a/core/src/main/java/appeng/util/inv/AdaptorFixedInv.java b/src/main/java/appeng/util/inv/AdaptorFixedInv.java similarity index 100% rename from core/src/main/java/appeng/util/inv/AdaptorFixedInv.java rename to src/main/java/appeng/util/inv/AdaptorFixedInv.java diff --git a/core/src/main/java/appeng/util/inv/AdaptorItemHandlerPlayerInv.java b/src/main/java/appeng/util/inv/AdaptorItemHandlerPlayerInv.java similarity index 100% rename from core/src/main/java/appeng/util/inv/AdaptorItemHandlerPlayerInv.java rename to src/main/java/appeng/util/inv/AdaptorItemHandlerPlayerInv.java diff --git a/core/src/main/java/appeng/util/inv/AdaptorList.java b/src/main/java/appeng/util/inv/AdaptorList.java similarity index 100% rename from core/src/main/java/appeng/util/inv/AdaptorList.java rename to src/main/java/appeng/util/inv/AdaptorList.java diff --git a/core/src/main/java/appeng/util/inv/IAEAppEngInventory.java b/src/main/java/appeng/util/inv/IAEAppEngInventory.java similarity index 100% rename from core/src/main/java/appeng/util/inv/IAEAppEngInventory.java rename to src/main/java/appeng/util/inv/IAEAppEngInventory.java diff --git a/core/src/main/java/appeng/util/inv/IInventoryDestination.java b/src/main/java/appeng/util/inv/IInventoryDestination.java similarity index 100% rename from core/src/main/java/appeng/util/inv/IInventoryDestination.java rename to src/main/java/appeng/util/inv/IInventoryDestination.java diff --git a/core/src/main/java/appeng/util/inv/IMEAdaptor.java b/src/main/java/appeng/util/inv/IMEAdaptor.java similarity index 100% rename from core/src/main/java/appeng/util/inv/IMEAdaptor.java rename to src/main/java/appeng/util/inv/IMEAdaptor.java diff --git a/core/src/main/java/appeng/util/inv/IMEAdaptorIterator.java b/src/main/java/appeng/util/inv/IMEAdaptorIterator.java similarity index 100% rename from core/src/main/java/appeng/util/inv/IMEAdaptorIterator.java rename to src/main/java/appeng/util/inv/IMEAdaptorIterator.java diff --git a/core/src/main/java/appeng/util/inv/IMEInventoryDestination.java b/src/main/java/appeng/util/inv/IMEInventoryDestination.java similarity index 100% rename from core/src/main/java/appeng/util/inv/IMEInventoryDestination.java rename to src/main/java/appeng/util/inv/IMEInventoryDestination.java diff --git a/core/src/main/java/appeng/util/inv/InvOperation.java b/src/main/java/appeng/util/inv/InvOperation.java similarity index 100% rename from core/src/main/java/appeng/util/inv/InvOperation.java rename to src/main/java/appeng/util/inv/InvOperation.java diff --git a/core/src/main/java/appeng/util/inv/ItemHandlerIterator.java b/src/main/java/appeng/util/inv/ItemHandlerIterator.java similarity index 100% rename from core/src/main/java/appeng/util/inv/ItemHandlerIterator.java rename to src/main/java/appeng/util/inv/ItemHandlerIterator.java diff --git a/core/src/main/java/appeng/util/inv/ItemListIgnoreCrafting.java b/src/main/java/appeng/util/inv/ItemListIgnoreCrafting.java similarity index 100% rename from core/src/main/java/appeng/util/inv/ItemListIgnoreCrafting.java rename to src/main/java/appeng/util/inv/ItemListIgnoreCrafting.java diff --git a/core/src/main/java/appeng/util/inv/ItemSlot.java b/src/main/java/appeng/util/inv/ItemSlot.java similarity index 100% rename from core/src/main/java/appeng/util/inv/ItemSlot.java rename to src/main/java/appeng/util/inv/ItemSlot.java diff --git a/core/src/main/java/appeng/util/inv/WrapperChainedItemHandler.java b/src/main/java/appeng/util/inv/WrapperChainedItemHandler.java similarity index 100% rename from core/src/main/java/appeng/util/inv/WrapperChainedItemHandler.java rename to src/main/java/appeng/util/inv/WrapperChainedItemHandler.java diff --git a/core/src/main/java/appeng/util/inv/WrapperCursorItemHandler.java b/src/main/java/appeng/util/inv/WrapperCursorItemHandler.java similarity index 100% rename from core/src/main/java/appeng/util/inv/WrapperCursorItemHandler.java rename to src/main/java/appeng/util/inv/WrapperCursorItemHandler.java diff --git a/core/src/main/java/appeng/util/inv/WrapperFilteredItemHandler.java b/src/main/java/appeng/util/inv/WrapperFilteredItemHandler.java similarity index 100% rename from core/src/main/java/appeng/util/inv/WrapperFilteredItemHandler.java rename to src/main/java/appeng/util/inv/WrapperFilteredItemHandler.java diff --git a/core/src/main/java/appeng/util/inv/WrapperInvItemHandler.java b/src/main/java/appeng/util/inv/WrapperInvItemHandler.java similarity index 100% rename from core/src/main/java/appeng/util/inv/WrapperInvItemHandler.java rename to src/main/java/appeng/util/inv/WrapperInvItemHandler.java diff --git a/core/src/main/java/appeng/util/inv/WrapperSupplierItemHandler.java b/src/main/java/appeng/util/inv/WrapperSupplierItemHandler.java similarity index 100% rename from core/src/main/java/appeng/util/inv/WrapperSupplierItemHandler.java rename to src/main/java/appeng/util/inv/WrapperSupplierItemHandler.java diff --git a/core/src/main/java/appeng/util/inv/filter/AEItemDefinitionFilter.java b/src/main/java/appeng/util/inv/filter/AEItemDefinitionFilter.java similarity index 100% rename from core/src/main/java/appeng/util/inv/filter/AEItemDefinitionFilter.java rename to src/main/java/appeng/util/inv/filter/AEItemDefinitionFilter.java diff --git a/core/src/main/java/appeng/util/inv/filter/AEItemFilters.java b/src/main/java/appeng/util/inv/filter/AEItemFilters.java similarity index 100% rename from core/src/main/java/appeng/util/inv/filter/AEItemFilters.java rename to src/main/java/appeng/util/inv/filter/AEItemFilters.java diff --git a/core/src/main/java/appeng/util/inv/filter/IAEItemFilter.java b/src/main/java/appeng/util/inv/filter/IAEItemFilter.java similarity index 100% rename from core/src/main/java/appeng/util/inv/filter/IAEItemFilter.java rename to src/main/java/appeng/util/inv/filter/IAEItemFilter.java diff --git a/core/src/main/java/appeng/util/item/AEItemStack.java b/src/main/java/appeng/util/item/AEItemStack.java similarity index 100% rename from core/src/main/java/appeng/util/item/AEItemStack.java rename to src/main/java/appeng/util/item/AEItemStack.java diff --git a/core/src/main/java/appeng/util/item/AEItemStackRegistry.java b/src/main/java/appeng/util/item/AEItemStackRegistry.java similarity index 100% rename from core/src/main/java/appeng/util/item/AEItemStackRegistry.java rename to src/main/java/appeng/util/item/AEItemStackRegistry.java diff --git a/core/src/main/java/appeng/util/item/AESharedItemStack.java b/src/main/java/appeng/util/item/AESharedItemStack.java similarity index 100% rename from core/src/main/java/appeng/util/item/AESharedItemStack.java rename to src/main/java/appeng/util/item/AESharedItemStack.java diff --git a/core/src/main/java/appeng/util/item/AEStack.java b/src/main/java/appeng/util/item/AEStack.java similarity index 100% rename from core/src/main/java/appeng/util/item/AEStack.java rename to src/main/java/appeng/util/item/AEStack.java diff --git a/core/src/main/java/appeng/util/item/AbstractItemList.java b/src/main/java/appeng/util/item/AbstractItemList.java similarity index 100% rename from core/src/main/java/appeng/util/item/AbstractItemList.java rename to src/main/java/appeng/util/item/AbstractItemList.java diff --git a/core/src/main/java/appeng/util/item/FuzzyItemList.java b/src/main/java/appeng/util/item/FuzzyItemList.java similarity index 100% rename from core/src/main/java/appeng/util/item/FuzzyItemList.java rename to src/main/java/appeng/util/item/FuzzyItemList.java diff --git a/core/src/main/java/appeng/util/item/ItemList.java b/src/main/java/appeng/util/item/ItemList.java similarity index 100% rename from core/src/main/java/appeng/util/item/ItemList.java rename to src/main/java/appeng/util/item/ItemList.java diff --git a/core/src/main/java/appeng/util/item/ItemModList.java b/src/main/java/appeng/util/item/ItemModList.java similarity index 100% rename from core/src/main/java/appeng/util/item/ItemModList.java rename to src/main/java/appeng/util/item/ItemModList.java diff --git a/core/src/main/java/appeng/util/item/MeaningfulItemIterator.java b/src/main/java/appeng/util/item/MeaningfulItemIterator.java similarity index 100% rename from core/src/main/java/appeng/util/item/MeaningfulItemIterator.java rename to src/main/java/appeng/util/item/MeaningfulItemIterator.java diff --git a/core/src/main/java/appeng/util/item/NullItemList.java b/src/main/java/appeng/util/item/NullItemList.java similarity index 100% rename from core/src/main/java/appeng/util/item/NullItemList.java rename to src/main/java/appeng/util/item/NullItemList.java diff --git a/core/src/main/java/appeng/util/item/StrictItemList.java b/src/main/java/appeng/util/item/StrictItemList.java similarity index 100% rename from core/src/main/java/appeng/util/item/StrictItemList.java rename to src/main/java/appeng/util/item/StrictItemList.java diff --git a/core/src/main/java/appeng/util/iterators/ChainedIterator.java b/src/main/java/appeng/util/iterators/ChainedIterator.java similarity index 100% rename from core/src/main/java/appeng/util/iterators/ChainedIterator.java rename to src/main/java/appeng/util/iterators/ChainedIterator.java diff --git a/core/src/main/java/appeng/util/iterators/InvIterator.java b/src/main/java/appeng/util/iterators/InvIterator.java similarity index 100% rename from core/src/main/java/appeng/util/iterators/InvIterator.java rename to src/main/java/appeng/util/iterators/InvIterator.java diff --git a/core/src/main/java/appeng/util/iterators/NullIterator.java b/src/main/java/appeng/util/iterators/NullIterator.java similarity index 100% rename from core/src/main/java/appeng/util/iterators/NullIterator.java rename to src/main/java/appeng/util/iterators/NullIterator.java diff --git a/core/src/main/java/appeng/util/iterators/ProxyNodeIterator.java b/src/main/java/appeng/util/iterators/ProxyNodeIterator.java similarity index 100% rename from core/src/main/java/appeng/util/iterators/ProxyNodeIterator.java rename to src/main/java/appeng/util/iterators/ProxyNodeIterator.java diff --git a/core/src/main/java/appeng/util/iterators/StackToSlotIterator.java b/src/main/java/appeng/util/iterators/StackToSlotIterator.java similarity index 100% rename from core/src/main/java/appeng/util/iterators/StackToSlotIterator.java rename to src/main/java/appeng/util/iterators/StackToSlotIterator.java diff --git a/core/src/main/java/appeng/util/prioritylist/DefaultPriorityList.java b/src/main/java/appeng/util/prioritylist/DefaultPriorityList.java similarity index 100% rename from core/src/main/java/appeng/util/prioritylist/DefaultPriorityList.java rename to src/main/java/appeng/util/prioritylist/DefaultPriorityList.java diff --git a/core/src/main/java/appeng/util/prioritylist/FuzzyPriorityList.java b/src/main/java/appeng/util/prioritylist/FuzzyPriorityList.java similarity index 100% rename from core/src/main/java/appeng/util/prioritylist/FuzzyPriorityList.java rename to src/main/java/appeng/util/prioritylist/FuzzyPriorityList.java diff --git a/core/src/main/java/appeng/util/prioritylist/IPartitionList.java b/src/main/java/appeng/util/prioritylist/IPartitionList.java similarity index 100% rename from core/src/main/java/appeng/util/prioritylist/IPartitionList.java rename to src/main/java/appeng/util/prioritylist/IPartitionList.java diff --git a/core/src/main/java/appeng/util/prioritylist/MergedPriorityList.java b/src/main/java/appeng/util/prioritylist/MergedPriorityList.java similarity index 100% rename from core/src/main/java/appeng/util/prioritylist/MergedPriorityList.java rename to src/main/java/appeng/util/prioritylist/MergedPriorityList.java diff --git a/core/src/main/java/appeng/util/prioritylist/PrecisePriorityList.java b/src/main/java/appeng/util/prioritylist/PrecisePriorityList.java similarity index 100% rename from core/src/main/java/appeng/util/prioritylist/PrecisePriorityList.java rename to src/main/java/appeng/util/prioritylist/PrecisePriorityList.java diff --git a/core/src/main/java/team/chisel/ctm/api/IFacade.java b/src/main/java/team/chisel/ctm/api/IFacade.java similarity index 100% rename from core/src/main/java/team/chisel/ctm/api/IFacade.java rename to src/main/java/team/chisel/ctm/api/IFacade.java diff --git a/core/src/main/resources/appliedenergistics2.accesswidener b/src/main/resources/appliedenergistics2.accesswidener similarity index 100% rename from core/src/main/resources/appliedenergistics2.accesswidener rename to src/main/resources/appliedenergistics2.accesswidener diff --git a/core/src/main/resources/appliedenergistics2.mixins.json b/src/main/resources/appliedenergistics2.mixins.json similarity index 100% rename from core/src/main/resources/appliedenergistics2.mixins.json rename to src/main/resources/appliedenergistics2.mixins.json diff --git a/core/src/main/resources/assets/appliedenergistics2/blockstates/16k_crafting_storage.json b/src/main/resources/assets/appliedenergistics2/blockstates/16k_crafting_storage.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/blockstates/16k_crafting_storage.json rename to src/main/resources/assets/appliedenergistics2/blockstates/16k_crafting_storage.json diff --git a/core/src/main/resources/assets/appliedenergistics2/blockstates/1k_crafting_storage.json b/src/main/resources/assets/appliedenergistics2/blockstates/1k_crafting_storage.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/blockstates/1k_crafting_storage.json rename to src/main/resources/assets/appliedenergistics2/blockstates/1k_crafting_storage.json diff --git a/core/src/main/resources/assets/appliedenergistics2/blockstates/4k_crafting_storage.json b/src/main/resources/assets/appliedenergistics2/blockstates/4k_crafting_storage.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/blockstates/4k_crafting_storage.json rename to src/main/resources/assets/appliedenergistics2/blockstates/4k_crafting_storage.json diff --git a/core/src/main/resources/assets/appliedenergistics2/blockstates/64k_crafting_storage.json b/src/main/resources/assets/appliedenergistics2/blockstates/64k_crafting_storage.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/blockstates/64k_crafting_storage.json rename to src/main/resources/assets/appliedenergistics2/blockstates/64k_crafting_storage.json diff --git a/core/src/main/resources/assets/appliedenergistics2/blockstates/cable_bus.json b/src/main/resources/assets/appliedenergistics2/blockstates/cable_bus.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/blockstates/cable_bus.json rename to src/main/resources/assets/appliedenergistics2/blockstates/cable_bus.json diff --git a/core/src/main/resources/assets/appliedenergistics2/blockstates/cell_workbench.json b/src/main/resources/assets/appliedenergistics2/blockstates/cell_workbench.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/blockstates/cell_workbench.json rename to src/main/resources/assets/appliedenergistics2/blockstates/cell_workbench.json diff --git a/core/src/main/resources/assets/appliedenergistics2/blockstates/charged_quartz_ore.json b/src/main/resources/assets/appliedenergistics2/blockstates/charged_quartz_ore.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/blockstates/charged_quartz_ore.json rename to src/main/resources/assets/appliedenergistics2/blockstates/charged_quartz_ore.json diff --git a/core/src/main/resources/assets/appliedenergistics2/blockstates/charger.json b/src/main/resources/assets/appliedenergistics2/blockstates/charger.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/blockstates/charger.json rename to src/main/resources/assets/appliedenergistics2/blockstates/charger.json diff --git a/core/src/main/resources/assets/appliedenergistics2/blockstates/chest.json b/src/main/resources/assets/appliedenergistics2/blockstates/chest.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/blockstates/chest.json rename to src/main/resources/assets/appliedenergistics2/blockstates/chest.json diff --git a/core/src/main/resources/assets/appliedenergistics2/blockstates/chiseled_quartz_block.json b/src/main/resources/assets/appliedenergistics2/blockstates/chiseled_quartz_block.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/blockstates/chiseled_quartz_block.json rename to src/main/resources/assets/appliedenergistics2/blockstates/chiseled_quartz_block.json diff --git a/core/src/main/resources/assets/appliedenergistics2/blockstates/chiseled_quartz_slab.json b/src/main/resources/assets/appliedenergistics2/blockstates/chiseled_quartz_slab.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/blockstates/chiseled_quartz_slab.json rename to src/main/resources/assets/appliedenergistics2/blockstates/chiseled_quartz_slab.json diff --git a/core/src/main/resources/assets/appliedenergistics2/blockstates/chiseled_quartz_stairs.json b/src/main/resources/assets/appliedenergistics2/blockstates/chiseled_quartz_stairs.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/blockstates/chiseled_quartz_stairs.json rename to src/main/resources/assets/appliedenergistics2/blockstates/chiseled_quartz_stairs.json diff --git a/core/src/main/resources/assets/appliedenergistics2/blockstates/condenser.json b/src/main/resources/assets/appliedenergistics2/blockstates/condenser.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/blockstates/condenser.json rename to src/main/resources/assets/appliedenergistics2/blockstates/condenser.json diff --git a/core/src/main/resources/assets/appliedenergistics2/blockstates/controller.json b/src/main/resources/assets/appliedenergistics2/blockstates/controller.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/blockstates/controller.json rename to src/main/resources/assets/appliedenergistics2/blockstates/controller.json diff --git a/core/src/main/resources/assets/appliedenergistics2/blockstates/crafting_accelerator.json b/src/main/resources/assets/appliedenergistics2/blockstates/crafting_accelerator.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/blockstates/crafting_accelerator.json rename to src/main/resources/assets/appliedenergistics2/blockstates/crafting_accelerator.json diff --git a/core/src/main/resources/assets/appliedenergistics2/blockstates/crafting_monitor.json b/src/main/resources/assets/appliedenergistics2/blockstates/crafting_monitor.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/blockstates/crafting_monitor.json rename to src/main/resources/assets/appliedenergistics2/blockstates/crafting_monitor.json diff --git a/core/src/main/resources/assets/appliedenergistics2/blockstates/crafting_unit.json b/src/main/resources/assets/appliedenergistics2/blockstates/crafting_unit.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/blockstates/crafting_unit.json rename to src/main/resources/assets/appliedenergistics2/blockstates/crafting_unit.json diff --git a/core/src/main/resources/assets/appliedenergistics2/blockstates/crank.json b/src/main/resources/assets/appliedenergistics2/blockstates/crank.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/blockstates/crank.json rename to src/main/resources/assets/appliedenergistics2/blockstates/crank.json diff --git a/core/src/main/resources/assets/appliedenergistics2/blockstates/creative_energy_cell.json b/src/main/resources/assets/appliedenergistics2/blockstates/creative_energy_cell.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/blockstates/creative_energy_cell.json rename to src/main/resources/assets/appliedenergistics2/blockstates/creative_energy_cell.json diff --git a/core/src/main/resources/assets/appliedenergistics2/blockstates/debug_chunk_loader.json b/src/main/resources/assets/appliedenergistics2/blockstates/debug_chunk_loader.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/blockstates/debug_chunk_loader.json rename to src/main/resources/assets/appliedenergistics2/blockstates/debug_chunk_loader.json diff --git a/core/src/main/resources/assets/appliedenergistics2/blockstates/debug_cube_gen.json b/src/main/resources/assets/appliedenergistics2/blockstates/debug_cube_gen.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/blockstates/debug_cube_gen.json rename to src/main/resources/assets/appliedenergistics2/blockstates/debug_cube_gen.json diff --git a/core/src/main/resources/assets/appliedenergistics2/blockstates/debug_energy_gen.json b/src/main/resources/assets/appliedenergistics2/blockstates/debug_energy_gen.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/blockstates/debug_energy_gen.json rename to src/main/resources/assets/appliedenergistics2/blockstates/debug_energy_gen.json diff --git a/core/src/main/resources/assets/appliedenergistics2/blockstates/debug_item_gen.json b/src/main/resources/assets/appliedenergistics2/blockstates/debug_item_gen.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/blockstates/debug_item_gen.json rename to src/main/resources/assets/appliedenergistics2/blockstates/debug_item_gen.json diff --git a/core/src/main/resources/assets/appliedenergistics2/blockstates/debug_phantom_node.json b/src/main/resources/assets/appliedenergistics2/blockstates/debug_phantom_node.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/blockstates/debug_phantom_node.json rename to src/main/resources/assets/appliedenergistics2/blockstates/debug_phantom_node.json diff --git a/core/src/main/resources/assets/appliedenergistics2/blockstates/dense_energy_cell.json b/src/main/resources/assets/appliedenergistics2/blockstates/dense_energy_cell.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/blockstates/dense_energy_cell.json rename to src/main/resources/assets/appliedenergistics2/blockstates/dense_energy_cell.json diff --git a/core/src/main/resources/assets/appliedenergistics2/blockstates/drive.json b/src/main/resources/assets/appliedenergistics2/blockstates/drive.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/blockstates/drive.json rename to src/main/resources/assets/appliedenergistics2/blockstates/drive.json diff --git a/core/src/main/resources/assets/appliedenergistics2/blockstates/energy_acceptor.json b/src/main/resources/assets/appliedenergistics2/blockstates/energy_acceptor.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/blockstates/energy_acceptor.json rename to src/main/resources/assets/appliedenergistics2/blockstates/energy_acceptor.json diff --git a/core/src/main/resources/assets/appliedenergistics2/blockstates/energy_cell.json b/src/main/resources/assets/appliedenergistics2/blockstates/energy_cell.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/blockstates/energy_cell.json rename to src/main/resources/assets/appliedenergistics2/blockstates/energy_cell.json diff --git a/core/src/main/resources/assets/appliedenergistics2/blockstates/fluid_interface.json b/src/main/resources/assets/appliedenergistics2/blockstates/fluid_interface.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/blockstates/fluid_interface.json rename to src/main/resources/assets/appliedenergistics2/blockstates/fluid_interface.json diff --git a/core/src/main/resources/assets/appliedenergistics2/blockstates/fluix_block.json b/src/main/resources/assets/appliedenergistics2/blockstates/fluix_block.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/blockstates/fluix_block.json rename to src/main/resources/assets/appliedenergistics2/blockstates/fluix_block.json diff --git a/core/src/main/resources/assets/appliedenergistics2/blockstates/fluix_slab.json b/src/main/resources/assets/appliedenergistics2/blockstates/fluix_slab.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/blockstates/fluix_slab.json rename to src/main/resources/assets/appliedenergistics2/blockstates/fluix_slab.json diff --git a/core/src/main/resources/assets/appliedenergistics2/blockstates/fluix_stairs.json b/src/main/resources/assets/appliedenergistics2/blockstates/fluix_stairs.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/blockstates/fluix_stairs.json rename to src/main/resources/assets/appliedenergistics2/blockstates/fluix_stairs.json diff --git a/core/src/main/resources/assets/appliedenergistics2/blockstates/grindstone.json b/src/main/resources/assets/appliedenergistics2/blockstates/grindstone.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/blockstates/grindstone.json rename to src/main/resources/assets/appliedenergistics2/blockstates/grindstone.json diff --git a/core/src/main/resources/assets/appliedenergistics2/blockstates/inscriber.json b/src/main/resources/assets/appliedenergistics2/blockstates/inscriber.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/blockstates/inscriber.json rename to src/main/resources/assets/appliedenergistics2/blockstates/inscriber.json diff --git a/core/src/main/resources/assets/appliedenergistics2/blockstates/interface.json b/src/main/resources/assets/appliedenergistics2/blockstates/interface.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/blockstates/interface.json rename to src/main/resources/assets/appliedenergistics2/blockstates/interface.json diff --git a/core/src/main/resources/assets/appliedenergistics2/blockstates/io_port.json b/src/main/resources/assets/appliedenergistics2/blockstates/io_port.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/blockstates/io_port.json rename to src/main/resources/assets/appliedenergistics2/blockstates/io_port.json diff --git a/core/src/main/resources/assets/appliedenergistics2/blockstates/light_detector.json b/src/main/resources/assets/appliedenergistics2/blockstates/light_detector.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/blockstates/light_detector.json rename to src/main/resources/assets/appliedenergistics2/blockstates/light_detector.json diff --git a/core/src/main/resources/assets/appliedenergistics2/blockstates/matrix_frame.json b/src/main/resources/assets/appliedenergistics2/blockstates/matrix_frame.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/blockstates/matrix_frame.json rename to src/main/resources/assets/appliedenergistics2/blockstates/matrix_frame.json diff --git a/core/src/main/resources/assets/appliedenergistics2/blockstates/molecular_assembler.json b/src/main/resources/assets/appliedenergistics2/blockstates/molecular_assembler.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/blockstates/molecular_assembler.json rename to src/main/resources/assets/appliedenergistics2/blockstates/molecular_assembler.json diff --git a/core/src/main/resources/assets/appliedenergistics2/blockstates/paint.json b/src/main/resources/assets/appliedenergistics2/blockstates/paint.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/blockstates/paint.json rename to src/main/resources/assets/appliedenergistics2/blockstates/paint.json diff --git a/core/src/main/resources/assets/appliedenergistics2/blockstates/quantum_link.json b/src/main/resources/assets/appliedenergistics2/blockstates/quantum_link.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/blockstates/quantum_link.json rename to src/main/resources/assets/appliedenergistics2/blockstates/quantum_link.json diff --git a/core/src/main/resources/assets/appliedenergistics2/blockstates/quantum_ring.json b/src/main/resources/assets/appliedenergistics2/blockstates/quantum_ring.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/blockstates/quantum_ring.json rename to src/main/resources/assets/appliedenergistics2/blockstates/quantum_ring.json diff --git a/core/src/main/resources/assets/appliedenergistics2/blockstates/quartz_block.json b/src/main/resources/assets/appliedenergistics2/blockstates/quartz_block.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/blockstates/quartz_block.json rename to src/main/resources/assets/appliedenergistics2/blockstates/quartz_block.json diff --git a/core/src/main/resources/assets/appliedenergistics2/blockstates/quartz_fixture.json b/src/main/resources/assets/appliedenergistics2/blockstates/quartz_fixture.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/blockstates/quartz_fixture.json rename to src/main/resources/assets/appliedenergistics2/blockstates/quartz_fixture.json diff --git a/core/src/main/resources/assets/appliedenergistics2/blockstates/quartz_glass.json b/src/main/resources/assets/appliedenergistics2/blockstates/quartz_glass.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/blockstates/quartz_glass.json rename to src/main/resources/assets/appliedenergistics2/blockstates/quartz_glass.json diff --git a/core/src/main/resources/assets/appliedenergistics2/blockstates/quartz_growth_accelerator.json b/src/main/resources/assets/appliedenergistics2/blockstates/quartz_growth_accelerator.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/blockstates/quartz_growth_accelerator.json rename to src/main/resources/assets/appliedenergistics2/blockstates/quartz_growth_accelerator.json diff --git a/core/src/main/resources/assets/appliedenergistics2/blockstates/quartz_ore.json b/src/main/resources/assets/appliedenergistics2/blockstates/quartz_ore.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/blockstates/quartz_ore.json rename to src/main/resources/assets/appliedenergistics2/blockstates/quartz_ore.json diff --git a/core/src/main/resources/assets/appliedenergistics2/blockstates/quartz_pillar.json b/src/main/resources/assets/appliedenergistics2/blockstates/quartz_pillar.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/blockstates/quartz_pillar.json rename to src/main/resources/assets/appliedenergistics2/blockstates/quartz_pillar.json diff --git a/core/src/main/resources/assets/appliedenergistics2/blockstates/quartz_pillar_slab.json b/src/main/resources/assets/appliedenergistics2/blockstates/quartz_pillar_slab.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/blockstates/quartz_pillar_slab.json rename to src/main/resources/assets/appliedenergistics2/blockstates/quartz_pillar_slab.json diff --git a/core/src/main/resources/assets/appliedenergistics2/blockstates/quartz_pillar_stairs.json b/src/main/resources/assets/appliedenergistics2/blockstates/quartz_pillar_stairs.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/blockstates/quartz_pillar_stairs.json rename to src/main/resources/assets/appliedenergistics2/blockstates/quartz_pillar_stairs.json diff --git a/core/src/main/resources/assets/appliedenergistics2/blockstates/quartz_slab.json b/src/main/resources/assets/appliedenergistics2/blockstates/quartz_slab.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/blockstates/quartz_slab.json rename to src/main/resources/assets/appliedenergistics2/blockstates/quartz_slab.json diff --git a/core/src/main/resources/assets/appliedenergistics2/blockstates/quartz_stairs.json b/src/main/resources/assets/appliedenergistics2/blockstates/quartz_stairs.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/blockstates/quartz_stairs.json rename to src/main/resources/assets/appliedenergistics2/blockstates/quartz_stairs.json diff --git a/core/src/main/resources/assets/appliedenergistics2/blockstates/quartz_vibrant_glass.json b/src/main/resources/assets/appliedenergistics2/blockstates/quartz_vibrant_glass.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/blockstates/quartz_vibrant_glass.json rename to src/main/resources/assets/appliedenergistics2/blockstates/quartz_vibrant_glass.json diff --git a/core/src/main/resources/assets/appliedenergistics2/blockstates/security_station.json b/src/main/resources/assets/appliedenergistics2/blockstates/security_station.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/blockstates/security_station.json rename to src/main/resources/assets/appliedenergistics2/blockstates/security_station.json diff --git a/core/src/main/resources/assets/appliedenergistics2/blockstates/sky_compass.json b/src/main/resources/assets/appliedenergistics2/blockstates/sky_compass.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/blockstates/sky_compass.json rename to src/main/resources/assets/appliedenergistics2/blockstates/sky_compass.json diff --git a/core/src/main/resources/assets/appliedenergistics2/blockstates/sky_stone_block.json b/src/main/resources/assets/appliedenergistics2/blockstates/sky_stone_block.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/blockstates/sky_stone_block.json rename to src/main/resources/assets/appliedenergistics2/blockstates/sky_stone_block.json diff --git a/core/src/main/resources/assets/appliedenergistics2/blockstates/sky_stone_brick.json b/src/main/resources/assets/appliedenergistics2/blockstates/sky_stone_brick.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/blockstates/sky_stone_brick.json rename to src/main/resources/assets/appliedenergistics2/blockstates/sky_stone_brick.json diff --git a/core/src/main/resources/assets/appliedenergistics2/blockstates/sky_stone_brick_slab.json b/src/main/resources/assets/appliedenergistics2/blockstates/sky_stone_brick_slab.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/blockstates/sky_stone_brick_slab.json rename to src/main/resources/assets/appliedenergistics2/blockstates/sky_stone_brick_slab.json diff --git a/core/src/main/resources/assets/appliedenergistics2/blockstates/sky_stone_brick_stairs.json b/src/main/resources/assets/appliedenergistics2/blockstates/sky_stone_brick_stairs.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/blockstates/sky_stone_brick_stairs.json rename to src/main/resources/assets/appliedenergistics2/blockstates/sky_stone_brick_stairs.json diff --git a/core/src/main/resources/assets/appliedenergistics2/blockstates/sky_stone_chest.json b/src/main/resources/assets/appliedenergistics2/blockstates/sky_stone_chest.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/blockstates/sky_stone_chest.json rename to src/main/resources/assets/appliedenergistics2/blockstates/sky_stone_chest.json diff --git a/core/src/main/resources/assets/appliedenergistics2/blockstates/sky_stone_slab.json b/src/main/resources/assets/appliedenergistics2/blockstates/sky_stone_slab.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/blockstates/sky_stone_slab.json rename to src/main/resources/assets/appliedenergistics2/blockstates/sky_stone_slab.json diff --git a/core/src/main/resources/assets/appliedenergistics2/blockstates/sky_stone_small_brick.json b/src/main/resources/assets/appliedenergistics2/blockstates/sky_stone_small_brick.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/blockstates/sky_stone_small_brick.json rename to src/main/resources/assets/appliedenergistics2/blockstates/sky_stone_small_brick.json diff --git a/core/src/main/resources/assets/appliedenergistics2/blockstates/sky_stone_small_brick_slab.json b/src/main/resources/assets/appliedenergistics2/blockstates/sky_stone_small_brick_slab.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/blockstates/sky_stone_small_brick_slab.json rename to src/main/resources/assets/appliedenergistics2/blockstates/sky_stone_small_brick_slab.json diff --git a/core/src/main/resources/assets/appliedenergistics2/blockstates/sky_stone_small_brick_stairs.json b/src/main/resources/assets/appliedenergistics2/blockstates/sky_stone_small_brick_stairs.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/blockstates/sky_stone_small_brick_stairs.json rename to src/main/resources/assets/appliedenergistics2/blockstates/sky_stone_small_brick_stairs.json diff --git a/core/src/main/resources/assets/appliedenergistics2/blockstates/sky_stone_stairs.json b/src/main/resources/assets/appliedenergistics2/blockstates/sky_stone_stairs.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/blockstates/sky_stone_stairs.json rename to src/main/resources/assets/appliedenergistics2/blockstates/sky_stone_stairs.json diff --git a/core/src/main/resources/assets/appliedenergistics2/blockstates/smooth_sky_stone_block.json b/src/main/resources/assets/appliedenergistics2/blockstates/smooth_sky_stone_block.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/blockstates/smooth_sky_stone_block.json rename to src/main/resources/assets/appliedenergistics2/blockstates/smooth_sky_stone_block.json diff --git a/core/src/main/resources/assets/appliedenergistics2/blockstates/smooth_sky_stone_chest.json b/src/main/resources/assets/appliedenergistics2/blockstates/smooth_sky_stone_chest.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/blockstates/smooth_sky_stone_chest.json rename to src/main/resources/assets/appliedenergistics2/blockstates/smooth_sky_stone_chest.json diff --git a/core/src/main/resources/assets/appliedenergistics2/blockstates/smooth_sky_stone_slab.json b/src/main/resources/assets/appliedenergistics2/blockstates/smooth_sky_stone_slab.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/blockstates/smooth_sky_stone_slab.json rename to src/main/resources/assets/appliedenergistics2/blockstates/smooth_sky_stone_slab.json diff --git a/core/src/main/resources/assets/appliedenergistics2/blockstates/smooth_sky_stone_stairs.json b/src/main/resources/assets/appliedenergistics2/blockstates/smooth_sky_stone_stairs.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/blockstates/smooth_sky_stone_stairs.json rename to src/main/resources/assets/appliedenergistics2/blockstates/smooth_sky_stone_stairs.json diff --git a/core/src/main/resources/assets/appliedenergistics2/blockstates/spatial_io_port.json b/src/main/resources/assets/appliedenergistics2/blockstates/spatial_io_port.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/blockstates/spatial_io_port.json rename to src/main/resources/assets/appliedenergistics2/blockstates/spatial_io_port.json diff --git a/core/src/main/resources/assets/appliedenergistics2/blockstates/spatial_pylon.json b/src/main/resources/assets/appliedenergistics2/blockstates/spatial_pylon.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/blockstates/spatial_pylon.json rename to src/main/resources/assets/appliedenergistics2/blockstates/spatial_pylon.json diff --git a/core/src/main/resources/assets/appliedenergistics2/blockstates/tiny_tnt.json b/src/main/resources/assets/appliedenergistics2/blockstates/tiny_tnt.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/blockstates/tiny_tnt.json rename to src/main/resources/assets/appliedenergistics2/blockstates/tiny_tnt.json diff --git a/core/src/main/resources/assets/appliedenergistics2/blockstates/vibration_chamber.json b/src/main/resources/assets/appliedenergistics2/blockstates/vibration_chamber.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/blockstates/vibration_chamber.json rename to src/main/resources/assets/appliedenergistics2/blockstates/vibration_chamber.json diff --git a/core/src/main/resources/assets/appliedenergistics2/blockstates/wireless_access_point.json b/src/main/resources/assets/appliedenergistics2/blockstates/wireless_access_point.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/blockstates/wireless_access_point.json rename to src/main/resources/assets/appliedenergistics2/blockstates/wireless_access_point.json diff --git a/core/src/main/resources/assets/appliedenergistics2/lang/cs_cz.json b/src/main/resources/assets/appliedenergistics2/lang/cs_cz.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/lang/cs_cz.json rename to src/main/resources/assets/appliedenergistics2/lang/cs_cz.json diff --git a/core/src/main/resources/assets/appliedenergistics2/lang/de_de.json b/src/main/resources/assets/appliedenergistics2/lang/de_de.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/lang/de_de.json rename to src/main/resources/assets/appliedenergistics2/lang/de_de.json diff --git a/core/src/main/resources/assets/appliedenergistics2/lang/en_gb.json b/src/main/resources/assets/appliedenergistics2/lang/en_gb.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/lang/en_gb.json rename to src/main/resources/assets/appliedenergistics2/lang/en_gb.json diff --git a/core/src/main/resources/assets/appliedenergistics2/lang/en_us.json b/src/main/resources/assets/appliedenergistics2/lang/en_us.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/lang/en_us.json rename to src/main/resources/assets/appliedenergistics2/lang/en_us.json diff --git a/core/src/main/resources/assets/appliedenergistics2/lang/es_es.json b/src/main/resources/assets/appliedenergistics2/lang/es_es.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/lang/es_es.json rename to src/main/resources/assets/appliedenergistics2/lang/es_es.json diff --git a/core/src/main/resources/assets/appliedenergistics2/lang/fr_fr.json b/src/main/resources/assets/appliedenergistics2/lang/fr_fr.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/lang/fr_fr.json rename to src/main/resources/assets/appliedenergistics2/lang/fr_fr.json diff --git a/core/src/main/resources/assets/appliedenergistics2/lang/hu_hu.json b/src/main/resources/assets/appliedenergistics2/lang/hu_hu.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/lang/hu_hu.json rename to src/main/resources/assets/appliedenergistics2/lang/hu_hu.json diff --git a/core/src/main/resources/assets/appliedenergistics2/lang/it_it.json b/src/main/resources/assets/appliedenergistics2/lang/it_it.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/lang/it_it.json rename to src/main/resources/assets/appliedenergistics2/lang/it_it.json diff --git a/core/src/main/resources/assets/appliedenergistics2/lang/ko_kr.json b/src/main/resources/assets/appliedenergistics2/lang/ko_kr.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/lang/ko_kr.json rename to src/main/resources/assets/appliedenergistics2/lang/ko_kr.json diff --git a/core/src/main/resources/assets/appliedenergistics2/lang/pt_br.json b/src/main/resources/assets/appliedenergistics2/lang/pt_br.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/lang/pt_br.json rename to src/main/resources/assets/appliedenergistics2/lang/pt_br.json diff --git a/core/src/main/resources/assets/appliedenergistics2/lang/ro_ro.json b/src/main/resources/assets/appliedenergistics2/lang/ro_ro.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/lang/ro_ro.json rename to src/main/resources/assets/appliedenergistics2/lang/ro_ro.json diff --git a/core/src/main/resources/assets/appliedenergistics2/lang/ru_ru.json b/src/main/resources/assets/appliedenergistics2/lang/ru_ru.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/lang/ru_ru.json rename to src/main/resources/assets/appliedenergistics2/lang/ru_ru.json diff --git a/core/src/main/resources/assets/appliedenergistics2/lang/zh_cn.json b/src/main/resources/assets/appliedenergistics2/lang/zh_cn.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/lang/zh_cn.json rename to src/main/resources/assets/appliedenergistics2/lang/zh_cn.json diff --git a/core/src/main/resources/assets/appliedenergistics2/lang/zh_tw.json b/src/main/resources/assets/appliedenergistics2/lang/zh_tw.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/lang/zh_tw.json rename to src/main/resources/assets/appliedenergistics2/lang/zh_tw.json diff --git a/core/src/main/resources/assets/appliedenergistics2/logo.png b/src/main/resources/assets/appliedenergistics2/logo.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/logo.png rename to src/main/resources/assets/appliedenergistics2/logo.png diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/cell_workbench.json b/src/main/resources/assets/appliedenergistics2/models/block/cell_workbench.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/cell_workbench.json rename to src/main/resources/assets/appliedenergistics2/models/block/cell_workbench.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/charged_quartz_ore.json b/src/main/resources/assets/appliedenergistics2/models/block/charged_quartz_ore.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/charged_quartz_ore.json rename to src/main/resources/assets/appliedenergistics2/models/block/charged_quartz_ore.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/charger.json b/src/main/resources/assets/appliedenergistics2/models/block/charger.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/charger.json rename to src/main/resources/assets/appliedenergistics2/models/block/charger.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/chest/base.json b/src/main/resources/assets/appliedenergistics2/models/block/chest/base.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/chest/base.json rename to src/main/resources/assets/appliedenergistics2/models/block/chest/base.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/chest/cell_state_empty.json b/src/main/resources/assets/appliedenergistics2/models/block/chest/cell_state_empty.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/chest/cell_state_empty.json rename to src/main/resources/assets/appliedenergistics2/models/block/chest/cell_state_empty.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/chest/cell_state_full.json b/src/main/resources/assets/appliedenergistics2/models/block/chest/cell_state_full.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/chest/cell_state_full.json rename to src/main/resources/assets/appliedenergistics2/models/block/chest/cell_state_full.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/chest/cell_state_offline.json b/src/main/resources/assets/appliedenergistics2/models/block/chest/cell_state_offline.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/chest/cell_state_offline.json rename to src/main/resources/assets/appliedenergistics2/models/block/chest/cell_state_offline.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/chest/cell_state_online.json b/src/main/resources/assets/appliedenergistics2/models/block/chest/cell_state_online.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/chest/cell_state_online.json rename to src/main/resources/assets/appliedenergistics2/models/block/chest/cell_state_online.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/chest/cell_state_types_full.json b/src/main/resources/assets/appliedenergistics2/models/block/chest/cell_state_types_full.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/chest/cell_state_types_full.json rename to src/main/resources/assets/appliedenergistics2/models/block/chest/cell_state_types_full.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/chest/lights_off.json b/src/main/resources/assets/appliedenergistics2/models/block/chest/lights_off.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/chest/lights_off.json rename to src/main/resources/assets/appliedenergistics2/models/block/chest/lights_off.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/chest/lights_on.json b/src/main/resources/assets/appliedenergistics2/models/block/chest/lights_on.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/chest/lights_on.json rename to src/main/resources/assets/appliedenergistics2/models/block/chest/lights_on.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/chiseled_quartz_block.json b/src/main/resources/assets/appliedenergistics2/models/block/chiseled_quartz_block.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/chiseled_quartz_block.json rename to src/main/resources/assets/appliedenergistics2/models/block/chiseled_quartz_block.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/condenser.json b/src/main/resources/assets/appliedenergistics2/models/block/condenser.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/condenser.json rename to src/main/resources/assets/appliedenergistics2/models/block/condenser.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_block_conflicted.json b/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_block_conflicted.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_block_conflicted.json rename to src/main/resources/assets/appliedenergistics2/models/block/controller/controller_block_conflicted.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_block_offline.json b/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_block_offline.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_block_offline.json rename to src/main/resources/assets/appliedenergistics2/models/block/controller/controller_block_offline.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_block_online.json b/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_block_online.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_block_online.json rename to src/main/resources/assets/appliedenergistics2/models/block/controller/controller_block_online.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_column_conflicted.json b/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_column_conflicted.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_column_conflicted.json rename to src/main/resources/assets/appliedenergistics2/models/block/controller/controller_column_conflicted.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_column_offline.json b/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_column_offline.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_column_offline.json rename to src/main/resources/assets/appliedenergistics2/models/block/controller/controller_column_offline.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_column_online.json b/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_column_online.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_column_online.json rename to src/main/resources/assets/appliedenergistics2/models/block/controller/controller_column_online.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_inside_a.json b/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_inside_a.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_inside_a.json rename to src/main/resources/assets/appliedenergistics2/models/block/controller/controller_inside_a.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_inside_b.json b/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_inside_b.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/controller/controller_inside_b.json rename to src/main/resources/assets/appliedenergistics2/models/block/controller/controller_inside_b.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/crafting/16k_storage.json b/src/main/resources/assets/appliedenergistics2/models/block/crafting/16k_storage.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/crafting/16k_storage.json rename to src/main/resources/assets/appliedenergistics2/models/block/crafting/16k_storage.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/crafting/16k_storage_formed.json b/src/main/resources/assets/appliedenergistics2/models/block/crafting/16k_storage_formed.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/crafting/16k_storage_formed.json rename to src/main/resources/assets/appliedenergistics2/models/block/crafting/16k_storage_formed.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/crafting/1k_storage.json b/src/main/resources/assets/appliedenergistics2/models/block/crafting/1k_storage.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/crafting/1k_storage.json rename to src/main/resources/assets/appliedenergistics2/models/block/crafting/1k_storage.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/crafting/1k_storage_formed.json b/src/main/resources/assets/appliedenergistics2/models/block/crafting/1k_storage_formed.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/crafting/1k_storage_formed.json rename to src/main/resources/assets/appliedenergistics2/models/block/crafting/1k_storage_formed.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/crafting/4k_storage.json b/src/main/resources/assets/appliedenergistics2/models/block/crafting/4k_storage.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/crafting/4k_storage.json rename to src/main/resources/assets/appliedenergistics2/models/block/crafting/4k_storage.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/crafting/4k_storage_formed.json b/src/main/resources/assets/appliedenergistics2/models/block/crafting/4k_storage_formed.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/crafting/4k_storage_formed.json rename to src/main/resources/assets/appliedenergistics2/models/block/crafting/4k_storage_formed.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/crafting/64k_storage.json b/src/main/resources/assets/appliedenergistics2/models/block/crafting/64k_storage.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/crafting/64k_storage.json rename to src/main/resources/assets/appliedenergistics2/models/block/crafting/64k_storage.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/crafting/64k_storage_formed.json b/src/main/resources/assets/appliedenergistics2/models/block/crafting/64k_storage_formed.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/crafting/64k_storage_formed.json rename to src/main/resources/assets/appliedenergistics2/models/block/crafting/64k_storage_formed.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/crafting/accelerator.json b/src/main/resources/assets/appliedenergistics2/models/block/crafting/accelerator.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/crafting/accelerator.json rename to src/main/resources/assets/appliedenergistics2/models/block/crafting/accelerator.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/crafting/accelerator_formed.json b/src/main/resources/assets/appliedenergistics2/models/block/crafting/accelerator_formed.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/crafting/accelerator_formed.json rename to src/main/resources/assets/appliedenergistics2/models/block/crafting/accelerator_formed.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/crafting/monitor.json b/src/main/resources/assets/appliedenergistics2/models/block/crafting/monitor.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/crafting/monitor.json rename to src/main/resources/assets/appliedenergistics2/models/block/crafting/monitor.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/crafting/monitor_formed.json b/src/main/resources/assets/appliedenergistics2/models/block/crafting/monitor_formed.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/crafting/monitor_formed.json rename to src/main/resources/assets/appliedenergistics2/models/block/crafting/monitor_formed.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/crafting/unit.json b/src/main/resources/assets/appliedenergistics2/models/block/crafting/unit.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/crafting/unit.json rename to src/main/resources/assets/appliedenergistics2/models/block/crafting/unit.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/crafting/unit_formed.json b/src/main/resources/assets/appliedenergistics2/models/block/crafting/unit_formed.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/crafting/unit_formed.json rename to src/main/resources/assets/appliedenergistics2/models/block/crafting/unit_formed.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/crank.json b/src/main/resources/assets/appliedenergistics2/models/block/crank.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/crank.json rename to src/main/resources/assets/appliedenergistics2/models/block/crank.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/crank_inventory.json b/src/main/resources/assets/appliedenergistics2/models/block/crank_inventory.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/crank_inventory.json rename to src/main/resources/assets/appliedenergistics2/models/block/crank_inventory.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/cube/cube_ae.json b/src/main/resources/assets/appliedenergistics2/models/block/cube/cube_ae.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/cube/cube_ae.json rename to src/main/resources/assets/appliedenergistics2/models/block/cube/cube_ae.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/cube/cube_ae_all.json b/src/main/resources/assets/appliedenergistics2/models/block/cube/cube_ae_all.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/cube/cube_ae_all.json rename to src/main/resources/assets/appliedenergistics2/models/block/cube/cube_ae_all.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/cube/cube_ae_bottom_top.json b/src/main/resources/assets/appliedenergistics2/models/block/cube/cube_ae_bottom_top.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/cube/cube_ae_bottom_top.json rename to src/main/resources/assets/appliedenergistics2/models/block/cube/cube_ae_bottom_top.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/cube/cube_ae_machine.json b/src/main/resources/assets/appliedenergistics2/models/block/cube/cube_ae_machine.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/cube/cube_ae_machine.json rename to src/main/resources/assets/appliedenergistics2/models/block/cube/cube_ae_machine.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/debug/chunk_loader.json b/src/main/resources/assets/appliedenergistics2/models/block/debug/chunk_loader.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/debug/chunk_loader.json rename to src/main/resources/assets/appliedenergistics2/models/block/debug/chunk_loader.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/debug/cube_gen.json b/src/main/resources/assets/appliedenergistics2/models/block/debug/cube_gen.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/debug/cube_gen.json rename to src/main/resources/assets/appliedenergistics2/models/block/debug/cube_gen.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/debug/energy_gen.json b/src/main/resources/assets/appliedenergistics2/models/block/debug/energy_gen.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/debug/energy_gen.json rename to src/main/resources/assets/appliedenergistics2/models/block/debug/energy_gen.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/debug/item_gen.json b/src/main/resources/assets/appliedenergistics2/models/block/debug/item_gen.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/debug/item_gen.json rename to src/main/resources/assets/appliedenergistics2/models/block/debug/item_gen.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/debug/phantom_node.json b/src/main/resources/assets/appliedenergistics2/models/block/debug/phantom_node.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/debug/phantom_node.json rename to src/main/resources/assets/appliedenergistics2/models/block/debug/phantom_node.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/drive.json b/src/main/resources/assets/appliedenergistics2/models/block/drive.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/drive.json rename to src/main/resources/assets/appliedenergistics2/models/block/drive.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/drive/drive_base.json b/src/main/resources/assets/appliedenergistics2/models/block/drive/drive_base.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/drive/drive_base.json rename to src/main/resources/assets/appliedenergistics2/models/block/drive/drive_base.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/drive/drive_cell_empty.json b/src/main/resources/assets/appliedenergistics2/models/block/drive/drive_cell_empty.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/drive/drive_cell_empty.json rename to src/main/resources/assets/appliedenergistics2/models/block/drive/drive_cell_empty.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/drive/drive_cell_fluids.json b/src/main/resources/assets/appliedenergistics2/models/block/drive/drive_cell_fluids.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/drive/drive_cell_fluids.json rename to src/main/resources/assets/appliedenergistics2/models/block/drive/drive_cell_fluids.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/drive/drive_cell_items.json b/src/main/resources/assets/appliedenergistics2/models/block/drive/drive_cell_items.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/drive/drive_cell_items.json rename to src/main/resources/assets/appliedenergistics2/models/block/drive/drive_cell_items.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/drive/drive_cell_led_base.json b/src/main/resources/assets/appliedenergistics2/models/block/drive/drive_cell_led_base.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/drive/drive_cell_led_base.json rename to src/main/resources/assets/appliedenergistics2/models/block/drive/drive_cell_led_base.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/energy_acceptor.json b/src/main/resources/assets/appliedenergistics2/models/block/energy_acceptor.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/energy_acceptor.json rename to src/main/resources/assets/appliedenergistics2/models/block/energy_acceptor.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/creative_energy_cell.json b/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/creative_energy_cell.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/creative_energy_cell.json rename to src/main/resources/assets/appliedenergistics2/models/block/energy_cell/creative_energy_cell.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell0.json b/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell0.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell0.json rename to src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell0.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell1.json b/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell1.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell1.json rename to src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell1.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell2.json b/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell2.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell2.json rename to src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell2.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell3.json b/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell3.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell3.json rename to src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell3.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell4.json b/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell4.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell4.json rename to src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell4.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell5.json b/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell5.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell5.json rename to src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell5.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell6.json b/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell6.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell6.json rename to src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell6.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell7.json b/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell7.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell7.json rename to src/main/resources/assets/appliedenergistics2/models/block/energy_cell/dense_energy_cell7.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell0.json b/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell0.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell0.json rename to src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell0.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell1.json b/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell1.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell1.json rename to src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell1.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell2.json b/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell2.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell2.json rename to src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell2.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell3.json b/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell3.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell3.json rename to src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell3.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell4.json b/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell4.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell4.json rename to src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell4.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell5.json b/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell5.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell5.json rename to src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell5.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell6.json b/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell6.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell6.json rename to src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell6.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell7.json b/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell7.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell7.json rename to src/main/resources/assets/appliedenergistics2/models/block/energy_cell/energy_cell7.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/fluid_interface.json b/src/main/resources/assets/appliedenergistics2/models/block/fluid_interface.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/fluid_interface.json rename to src/main/resources/assets/appliedenergistics2/models/block/fluid_interface.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/fluix_block.json b/src/main/resources/assets/appliedenergistics2/models/block/fluix_block.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/fluix_block.json rename to src/main/resources/assets/appliedenergistics2/models/block/fluix_block.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/grindstone.json b/src/main/resources/assets/appliedenergistics2/models/block/grindstone.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/grindstone.json rename to src/main/resources/assets/appliedenergistics2/models/block/grindstone.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/inscriber.json b/src/main/resources/assets/appliedenergistics2/models/block/inscriber.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/inscriber.json rename to src/main/resources/assets/appliedenergistics2/models/block/inscriber.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/interface.json b/src/main/resources/assets/appliedenergistics2/models/block/interface.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/interface.json rename to src/main/resources/assets/appliedenergistics2/models/block/interface.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/interface_oriented.json b/src/main/resources/assets/appliedenergistics2/models/block/interface_oriented.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/interface_oriented.json rename to src/main/resources/assets/appliedenergistics2/models/block/interface_oriented.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/io_port.json b/src/main/resources/assets/appliedenergistics2/models/block/io_port.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/io_port.json rename to src/main/resources/assets/appliedenergistics2/models/block/io_port.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/matrix_frame.json b/src/main/resources/assets/appliedenergistics2/models/block/matrix_frame.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/matrix_frame.json rename to src/main/resources/assets/appliedenergistics2/models/block/matrix_frame.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/molecular_assembler.json b/src/main/resources/assets/appliedenergistics2/models/block/molecular_assembler.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/molecular_assembler.json rename to src/main/resources/assets/appliedenergistics2/models/block/molecular_assembler.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/molecular_assembler_lights.json b/src/main/resources/assets/appliedenergistics2/models/block/molecular_assembler_lights.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/molecular_assembler_lights.json rename to src/main/resources/assets/appliedenergistics2/models/block/molecular_assembler_lights.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/paint.json b/src/main/resources/assets/appliedenergistics2/models/block/paint.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/paint.json rename to src/main/resources/assets/appliedenergistics2/models/block/paint.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/qnb/link.json b/src/main/resources/assets/appliedenergistics2/models/block/qnb/link.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/qnb/link.json rename to src/main/resources/assets/appliedenergistics2/models/block/qnb/link.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/qnb/qnb_formed.json b/src/main/resources/assets/appliedenergistics2/models/block/qnb/qnb_formed.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/qnb/qnb_formed.json rename to src/main/resources/assets/appliedenergistics2/models/block/qnb/qnb_formed.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/qnb/ring.json b/src/main/resources/assets/appliedenergistics2/models/block/qnb/ring.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/qnb/ring.json rename to src/main/resources/assets/appliedenergistics2/models/block/qnb/ring.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/quartz_block.json b/src/main/resources/assets/appliedenergistics2/models/block/quartz_block.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/quartz_block.json rename to src/main/resources/assets/appliedenergistics2/models/block/quartz_block.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/quartz_fixture_standing.json b/src/main/resources/assets/appliedenergistics2/models/block/quartz_fixture_standing.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/quartz_fixture_standing.json rename to src/main/resources/assets/appliedenergistics2/models/block/quartz_fixture_standing.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/quartz_fixture_standing_odd.json b/src/main/resources/assets/appliedenergistics2/models/block/quartz_fixture_standing_odd.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/quartz_fixture_standing_odd.json rename to src/main/resources/assets/appliedenergistics2/models/block/quartz_fixture_standing_odd.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/quartz_fixture_wall.json b/src/main/resources/assets/appliedenergistics2/models/block/quartz_fixture_wall.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/quartz_fixture_wall.json rename to src/main/resources/assets/appliedenergistics2/models/block/quartz_fixture_wall.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/quartz_fixture_wall_odd.json b/src/main/resources/assets/appliedenergistics2/models/block/quartz_fixture_wall_odd.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/quartz_fixture_wall_odd.json rename to src/main/resources/assets/appliedenergistics2/models/block/quartz_fixture_wall_odd.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/quartz_glass.json b/src/main/resources/assets/appliedenergistics2/models/block/quartz_glass.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/quartz_glass.json rename to src/main/resources/assets/appliedenergistics2/models/block/quartz_glass.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/quartz_growth_accelerator_off.json b/src/main/resources/assets/appliedenergistics2/models/block/quartz_growth_accelerator_off.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/quartz_growth_accelerator_off.json rename to src/main/resources/assets/appliedenergistics2/models/block/quartz_growth_accelerator_off.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/quartz_growth_accelerator_on.json b/src/main/resources/assets/appliedenergistics2/models/block/quartz_growth_accelerator_on.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/quartz_growth_accelerator_on.json rename to src/main/resources/assets/appliedenergistics2/models/block/quartz_growth_accelerator_on.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/quartz_ore.json b/src/main/resources/assets/appliedenergistics2/models/block/quartz_ore.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/quartz_ore.json rename to src/main/resources/assets/appliedenergistics2/models/block/quartz_ore.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/quartz_pillar.json b/src/main/resources/assets/appliedenergistics2/models/block/quartz_pillar.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/quartz_pillar.json rename to src/main/resources/assets/appliedenergistics2/models/block/quartz_pillar.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/security_station_off.json b/src/main/resources/assets/appliedenergistics2/models/block/security_station_off.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/security_station_off.json rename to src/main/resources/assets/appliedenergistics2/models/block/security_station_off.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/security_station_on.json b/src/main/resources/assets/appliedenergistics2/models/block/security_station_on.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/security_station_on.json rename to src/main/resources/assets/appliedenergistics2/models/block/security_station_on.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/sky_compass.json b/src/main/resources/assets/appliedenergistics2/models/block/sky_compass.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/sky_compass.json rename to src/main/resources/assets/appliedenergistics2/models/block/sky_compass.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/sky_compass_base.json b/src/main/resources/assets/appliedenergistics2/models/block/sky_compass_base.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/sky_compass_base.json rename to src/main/resources/assets/appliedenergistics2/models/block/sky_compass_base.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/sky_compass_pointer.json b/src/main/resources/assets/appliedenergistics2/models/block/sky_compass_pointer.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/sky_compass_pointer.json rename to src/main/resources/assets/appliedenergistics2/models/block/sky_compass_pointer.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/sky_stone_block.json b/src/main/resources/assets/appliedenergistics2/models/block/sky_stone_block.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/sky_stone_block.json rename to src/main/resources/assets/appliedenergistics2/models/block/sky_stone_block.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/sky_stone_brick.json b/src/main/resources/assets/appliedenergistics2/models/block/sky_stone_brick.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/sky_stone_brick.json rename to src/main/resources/assets/appliedenergistics2/models/block/sky_stone_brick.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/sky_stone_small_brick.json b/src/main/resources/assets/appliedenergistics2/models/block/sky_stone_small_brick.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/sky_stone_small_brick.json rename to src/main/resources/assets/appliedenergistics2/models/block/sky_stone_small_brick.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/slabs/chiseled_quartz_half.json b/src/main/resources/assets/appliedenergistics2/models/block/slabs/chiseled_quartz_half.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/slabs/chiseled_quartz_half.json rename to src/main/resources/assets/appliedenergistics2/models/block/slabs/chiseled_quartz_half.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/slabs/chiseled_quartz_upper.json b/src/main/resources/assets/appliedenergistics2/models/block/slabs/chiseled_quartz_upper.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/slabs/chiseled_quartz_upper.json rename to src/main/resources/assets/appliedenergistics2/models/block/slabs/chiseled_quartz_upper.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/slabs/fluix_half.json b/src/main/resources/assets/appliedenergistics2/models/block/slabs/fluix_half.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/slabs/fluix_half.json rename to src/main/resources/assets/appliedenergistics2/models/block/slabs/fluix_half.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/slabs/fluix_upper.json b/src/main/resources/assets/appliedenergistics2/models/block/slabs/fluix_upper.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/slabs/fluix_upper.json rename to src/main/resources/assets/appliedenergistics2/models/block/slabs/fluix_upper.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/slabs/quartz_half.json b/src/main/resources/assets/appliedenergistics2/models/block/slabs/quartz_half.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/slabs/quartz_half.json rename to src/main/resources/assets/appliedenergistics2/models/block/slabs/quartz_half.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/slabs/quartz_pillar_half.json b/src/main/resources/assets/appliedenergistics2/models/block/slabs/quartz_pillar_half.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/slabs/quartz_pillar_half.json rename to src/main/resources/assets/appliedenergistics2/models/block/slabs/quartz_pillar_half.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/slabs/quartz_pillar_upper.json b/src/main/resources/assets/appliedenergistics2/models/block/slabs/quartz_pillar_upper.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/slabs/quartz_pillar_upper.json rename to src/main/resources/assets/appliedenergistics2/models/block/slabs/quartz_pillar_upper.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/slabs/quartz_upper.json b/src/main/resources/assets/appliedenergistics2/models/block/slabs/quartz_upper.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/slabs/quartz_upper.json rename to src/main/resources/assets/appliedenergistics2/models/block/slabs/quartz_upper.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/slabs/sky_stone_brick_half.json b/src/main/resources/assets/appliedenergistics2/models/block/slabs/sky_stone_brick_half.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/slabs/sky_stone_brick_half.json rename to src/main/resources/assets/appliedenergistics2/models/block/slabs/sky_stone_brick_half.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/slabs/sky_stone_brick_upper.json b/src/main/resources/assets/appliedenergistics2/models/block/slabs/sky_stone_brick_upper.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/slabs/sky_stone_brick_upper.json rename to src/main/resources/assets/appliedenergistics2/models/block/slabs/sky_stone_brick_upper.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/slabs/sky_stone_half.json b/src/main/resources/assets/appliedenergistics2/models/block/slabs/sky_stone_half.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/slabs/sky_stone_half.json rename to src/main/resources/assets/appliedenergistics2/models/block/slabs/sky_stone_half.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/slabs/sky_stone_small_brick_half.json b/src/main/resources/assets/appliedenergistics2/models/block/slabs/sky_stone_small_brick_half.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/slabs/sky_stone_small_brick_half.json rename to src/main/resources/assets/appliedenergistics2/models/block/slabs/sky_stone_small_brick_half.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/slabs/sky_stone_small_brick_upper.json b/src/main/resources/assets/appliedenergistics2/models/block/slabs/sky_stone_small_brick_upper.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/slabs/sky_stone_small_brick_upper.json rename to src/main/resources/assets/appliedenergistics2/models/block/slabs/sky_stone_small_brick_upper.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/slabs/sky_stone_upper.json b/src/main/resources/assets/appliedenergistics2/models/block/slabs/sky_stone_upper.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/slabs/sky_stone_upper.json rename to src/main/resources/assets/appliedenergistics2/models/block/slabs/sky_stone_upper.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/slabs/smooth_sky_stone_half.json b/src/main/resources/assets/appliedenergistics2/models/block/slabs/smooth_sky_stone_half.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/slabs/smooth_sky_stone_half.json rename to src/main/resources/assets/appliedenergistics2/models/block/slabs/smooth_sky_stone_half.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/slabs/smooth_sky_stone_upper.json b/src/main/resources/assets/appliedenergistics2/models/block/slabs/smooth_sky_stone_upper.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/slabs/smooth_sky_stone_upper.json rename to src/main/resources/assets/appliedenergistics2/models/block/slabs/smooth_sky_stone_upper.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/smooth_sky_stone_block.json b/src/main/resources/assets/appliedenergistics2/models/block/smooth_sky_stone_block.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/smooth_sky_stone_block.json rename to src/main/resources/assets/appliedenergistics2/models/block/smooth_sky_stone_block.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/spatial_io_port.json b/src/main/resources/assets/appliedenergistics2/models/block/spatial_io_port.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/spatial_io_port.json rename to src/main/resources/assets/appliedenergistics2/models/block/spatial_io_port.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/spatial_pylon.json b/src/main/resources/assets/appliedenergistics2/models/block/spatial_pylon.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/spatial_pylon.json rename to src/main/resources/assets/appliedenergistics2/models/block/spatial_pylon.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/stairs/chiseled_quartz.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/chiseled_quartz.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/stairs/chiseled_quartz.json rename to src/main/resources/assets/appliedenergistics2/models/block/stairs/chiseled_quartz.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/stairs/chiseled_quartz_inner.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/chiseled_quartz_inner.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/stairs/chiseled_quartz_inner.json rename to src/main/resources/assets/appliedenergistics2/models/block/stairs/chiseled_quartz_inner.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/stairs/chiseled_quartz_outer.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/chiseled_quartz_outer.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/stairs/chiseled_quartz_outer.json rename to src/main/resources/assets/appliedenergistics2/models/block/stairs/chiseled_quartz_outer.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/stairs/fluix.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/fluix.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/stairs/fluix.json rename to src/main/resources/assets/appliedenergistics2/models/block/stairs/fluix.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/stairs/fluix_inner.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/fluix_inner.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/stairs/fluix_inner.json rename to src/main/resources/assets/appliedenergistics2/models/block/stairs/fluix_inner.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/stairs/fluix_outer.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/fluix_outer.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/stairs/fluix_outer.json rename to src/main/resources/assets/appliedenergistics2/models/block/stairs/fluix_outer.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz.json rename to src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz_inner.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz_inner.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz_inner.json rename to src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz_inner.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz_outer.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz_outer.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz_outer.json rename to src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz_outer.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz_pillar.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz_pillar.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz_pillar.json rename to src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz_pillar.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz_pillar_inner.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz_pillar_inner.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz_pillar_inner.json rename to src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz_pillar_inner.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz_pillar_outer.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz_pillar_outer.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz_pillar_outer.json rename to src/main/resources/assets/appliedenergistics2/models/block/stairs/quartz_pillar_outer.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/stairs/sky_stone.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/sky_stone.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/stairs/sky_stone.json rename to src/main/resources/assets/appliedenergistics2/models/block/stairs/sky_stone.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/stairs/sky_stone_brick.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/sky_stone_brick.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/stairs/sky_stone_brick.json rename to src/main/resources/assets/appliedenergistics2/models/block/stairs/sky_stone_brick.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/stairs/sky_stone_brick_inner.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/sky_stone_brick_inner.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/stairs/sky_stone_brick_inner.json rename to src/main/resources/assets/appliedenergistics2/models/block/stairs/sky_stone_brick_inner.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/stairs/sky_stone_brick_outer.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/sky_stone_brick_outer.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/stairs/sky_stone_brick_outer.json rename to src/main/resources/assets/appliedenergistics2/models/block/stairs/sky_stone_brick_outer.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/stairs/sky_stone_inner.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/sky_stone_inner.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/stairs/sky_stone_inner.json rename to src/main/resources/assets/appliedenergistics2/models/block/stairs/sky_stone_inner.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/stairs/sky_stone_outer.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/sky_stone_outer.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/stairs/sky_stone_outer.json rename to src/main/resources/assets/appliedenergistics2/models/block/stairs/sky_stone_outer.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/stairs/sky_stone_small_brick.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/sky_stone_small_brick.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/stairs/sky_stone_small_brick.json rename to src/main/resources/assets/appliedenergistics2/models/block/stairs/sky_stone_small_brick.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/stairs/sky_stone_small_brick_inner.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/sky_stone_small_brick_inner.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/stairs/sky_stone_small_brick_inner.json rename to src/main/resources/assets/appliedenergistics2/models/block/stairs/sky_stone_small_brick_inner.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/stairs/sky_stone_small_brick_outer.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/sky_stone_small_brick_outer.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/stairs/sky_stone_small_brick_outer.json rename to src/main/resources/assets/appliedenergistics2/models/block/stairs/sky_stone_small_brick_outer.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/stairs/smooth_sky_stone.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/smooth_sky_stone.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/stairs/smooth_sky_stone.json rename to src/main/resources/assets/appliedenergistics2/models/block/stairs/smooth_sky_stone.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/stairs/smooth_sky_stone_inner.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/smooth_sky_stone_inner.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/stairs/smooth_sky_stone_inner.json rename to src/main/resources/assets/appliedenergistics2/models/block/stairs/smooth_sky_stone_inner.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/stairs/smooth_sky_stone_outer.json b/src/main/resources/assets/appliedenergistics2/models/block/stairs/smooth_sky_stone_outer.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/stairs/smooth_sky_stone_outer.json rename to src/main/resources/assets/appliedenergistics2/models/block/stairs/smooth_sky_stone_outer.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/tiny_tnt.json b/src/main/resources/assets/appliedenergistics2/models/block/tiny_tnt.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/tiny_tnt.json rename to src/main/resources/assets/appliedenergistics2/models/block/tiny_tnt.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/vibration_chamber_off.json b/src/main/resources/assets/appliedenergistics2/models/block/vibration_chamber_off.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/vibration_chamber_off.json rename to src/main/resources/assets/appliedenergistics2/models/block/vibration_chamber_off.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/vibration_chamber_on.json b/src/main/resources/assets/appliedenergistics2/models/block/vibration_chamber_on.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/vibration_chamber_on.json rename to src/main/resources/assets/appliedenergistics2/models/block/vibration_chamber_on.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/wireless_access_point_chassis.json b/src/main/resources/assets/appliedenergistics2/models/block/wireless_access_point_chassis.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/wireless_access_point_chassis.json rename to src/main/resources/assets/appliedenergistics2/models/block/wireless_access_point_chassis.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/wireless_access_point_off.json b/src/main/resources/assets/appliedenergistics2/models/block/wireless_access_point_off.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/wireless_access_point_off.json rename to src/main/resources/assets/appliedenergistics2/models/block/wireless_access_point_off.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/wireless_access_point_on.json b/src/main/resources/assets/appliedenergistics2/models/block/wireless_access_point_on.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/wireless_access_point_on.json rename to src/main/resources/assets/appliedenergistics2/models/block/wireless_access_point_on.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/wireless_access_point_status_has_channel.json b/src/main/resources/assets/appliedenergistics2/models/block/wireless_access_point_status_has_channel.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/wireless_access_point_status_has_channel.json rename to src/main/resources/assets/appliedenergistics2/models/block/wireless_access_point_status_has_channel.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/wireless_access_point_status_off.json b/src/main/resources/assets/appliedenergistics2/models/block/wireless_access_point_status_off.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/wireless_access_point_status_off.json rename to src/main/resources/assets/appliedenergistics2/models/block/wireless_access_point_status_off.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/block/wireless_access_point_status_on.json b/src/main/resources/assets/appliedenergistics2/models/block/wireless_access_point_status_on.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/block/wireless_access_point_status_on.json rename to src/main/resources/assets/appliedenergistics2/models/block/wireless_access_point_status_on.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/128_cubed_spatial_cell_component.json b/src/main/resources/assets/appliedenergistics2/models/item/128_cubed_spatial_cell_component.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/128_cubed_spatial_cell_component.json rename to src/main/resources/assets/appliedenergistics2/models/item/128_cubed_spatial_cell_component.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/128_cubed_spatial_storage_cell.json b/src/main/resources/assets/appliedenergistics2/models/item/128_cubed_spatial_storage_cell.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/128_cubed_spatial_storage_cell.json rename to src/main/resources/assets/appliedenergistics2/models/item/128_cubed_spatial_storage_cell.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/16_cubed_spatial_cell_component.json b/src/main/resources/assets/appliedenergistics2/models/item/16_cubed_spatial_cell_component.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/16_cubed_spatial_cell_component.json rename to src/main/resources/assets/appliedenergistics2/models/item/16_cubed_spatial_cell_component.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/16_cubed_spatial_storage_cell.json b/src/main/resources/assets/appliedenergistics2/models/item/16_cubed_spatial_storage_cell.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/16_cubed_spatial_storage_cell.json rename to src/main/resources/assets/appliedenergistics2/models/item/16_cubed_spatial_storage_cell.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/16k_cell_component.json b/src/main/resources/assets/appliedenergistics2/models/item/16k_cell_component.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/16k_cell_component.json rename to src/main/resources/assets/appliedenergistics2/models/item/16k_cell_component.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/16k_crafting_storage.json b/src/main/resources/assets/appliedenergistics2/models/item/16k_crafting_storage.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/16k_crafting_storage.json rename to src/main/resources/assets/appliedenergistics2/models/item/16k_crafting_storage.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/16k_fluid_cell_component.json b/src/main/resources/assets/appliedenergistics2/models/item/16k_fluid_cell_component.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/16k_fluid_cell_component.json rename to src/main/resources/assets/appliedenergistics2/models/item/16k_fluid_cell_component.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/16k_fluid_storage_cell.json b/src/main/resources/assets/appliedenergistics2/models/item/16k_fluid_storage_cell.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/16k_fluid_storage_cell.json rename to src/main/resources/assets/appliedenergistics2/models/item/16k_fluid_storage_cell.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/16k_storage_cell.json b/src/main/resources/assets/appliedenergistics2/models/item/16k_storage_cell.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/16k_storage_cell.json rename to src/main/resources/assets/appliedenergistics2/models/item/16k_storage_cell.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/1k_cell_component.json b/src/main/resources/assets/appliedenergistics2/models/item/1k_cell_component.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/1k_cell_component.json rename to src/main/resources/assets/appliedenergistics2/models/item/1k_cell_component.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/1k_crafting_storage.json b/src/main/resources/assets/appliedenergistics2/models/item/1k_crafting_storage.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/1k_crafting_storage.json rename to src/main/resources/assets/appliedenergistics2/models/item/1k_crafting_storage.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/1k_fluid_cell_component.json b/src/main/resources/assets/appliedenergistics2/models/item/1k_fluid_cell_component.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/1k_fluid_cell_component.json rename to src/main/resources/assets/appliedenergistics2/models/item/1k_fluid_cell_component.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/1k_fluid_storage_cell.json b/src/main/resources/assets/appliedenergistics2/models/item/1k_fluid_storage_cell.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/1k_fluid_storage_cell.json rename to src/main/resources/assets/appliedenergistics2/models/item/1k_fluid_storage_cell.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/1k_storage_cell.json b/src/main/resources/assets/appliedenergistics2/models/item/1k_storage_cell.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/1k_storage_cell.json rename to src/main/resources/assets/appliedenergistics2/models/item/1k_storage_cell.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/2_cubed_spatial_cell_component.json b/src/main/resources/assets/appliedenergistics2/models/item/2_cubed_spatial_cell_component.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/2_cubed_spatial_cell_component.json rename to src/main/resources/assets/appliedenergistics2/models/item/2_cubed_spatial_cell_component.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/2_cubed_spatial_storage_cell.json b/src/main/resources/assets/appliedenergistics2/models/item/2_cubed_spatial_storage_cell.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/2_cubed_spatial_storage_cell.json rename to src/main/resources/assets/appliedenergistics2/models/item/2_cubed_spatial_storage_cell.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/4k_cell_component.json b/src/main/resources/assets/appliedenergistics2/models/item/4k_cell_component.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/4k_cell_component.json rename to src/main/resources/assets/appliedenergistics2/models/item/4k_cell_component.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/4k_crafting_storage.json b/src/main/resources/assets/appliedenergistics2/models/item/4k_crafting_storage.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/4k_crafting_storage.json rename to src/main/resources/assets/appliedenergistics2/models/item/4k_crafting_storage.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/4k_fluid_cell_component.json b/src/main/resources/assets/appliedenergistics2/models/item/4k_fluid_cell_component.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/4k_fluid_cell_component.json rename to src/main/resources/assets/appliedenergistics2/models/item/4k_fluid_cell_component.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/4k_fluid_storage_cell.json b/src/main/resources/assets/appliedenergistics2/models/item/4k_fluid_storage_cell.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/4k_fluid_storage_cell.json rename to src/main/resources/assets/appliedenergistics2/models/item/4k_fluid_storage_cell.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/4k_storage_cell.json b/src/main/resources/assets/appliedenergistics2/models/item/4k_storage_cell.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/4k_storage_cell.json rename to src/main/resources/assets/appliedenergistics2/models/item/4k_storage_cell.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/64k_cell_component.json b/src/main/resources/assets/appliedenergistics2/models/item/64k_cell_component.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/64k_cell_component.json rename to src/main/resources/assets/appliedenergistics2/models/item/64k_cell_component.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/64k_crafting_storage.json b/src/main/resources/assets/appliedenergistics2/models/item/64k_crafting_storage.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/64k_crafting_storage.json rename to src/main/resources/assets/appliedenergistics2/models/item/64k_crafting_storage.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/64k_fluid_cell_component.json b/src/main/resources/assets/appliedenergistics2/models/item/64k_fluid_cell_component.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/64k_fluid_cell_component.json rename to src/main/resources/assets/appliedenergistics2/models/item/64k_fluid_cell_component.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/64k_fluid_storage_cell.json b/src/main/resources/assets/appliedenergistics2/models/item/64k_fluid_storage_cell.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/64k_fluid_storage_cell.json rename to src/main/resources/assets/appliedenergistics2/models/item/64k_fluid_storage_cell.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/64k_storage_cell.json b/src/main/resources/assets/appliedenergistics2/models/item/64k_storage_cell.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/64k_storage_cell.json rename to src/main/resources/assets/appliedenergistics2/models/item/64k_storage_cell.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/advanced_card.json b/src/main/resources/assets/appliedenergistics2/models/item/advanced_card.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/advanced_card.json rename to src/main/resources/assets/appliedenergistics2/models/item/advanced_card.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/annihilation_core.json b/src/main/resources/assets/appliedenergistics2/models/item/annihilation_core.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/annihilation_core.json rename to src/main/resources/assets/appliedenergistics2/models/item/annihilation_core.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/annihilation_plane.json b/src/main/resources/assets/appliedenergistics2/models/item/annihilation_plane.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/annihilation_plane.json rename to src/main/resources/assets/appliedenergistics2/models/item/annihilation_plane.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/basic_card.json b/src/main/resources/assets/appliedenergistics2/models/item/basic_card.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/basic_card.json rename to src/main/resources/assets/appliedenergistics2/models/item/basic_card.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/biometric_card.json b/src/main/resources/assets/appliedenergistics2/models/item/biometric_card.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/biometric_card.json rename to src/main/resources/assets/appliedenergistics2/models/item/biometric_card.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/biometric_card_base.json b/src/main/resources/assets/appliedenergistics2/models/item/biometric_card_base.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/biometric_card_base.json rename to src/main/resources/assets/appliedenergistics2/models/item/biometric_card_base.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/black_covered_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/black_covered_cable.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/black_covered_cable.json rename to src/main/resources/assets/appliedenergistics2/models/item/black_covered_cable.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/black_covered_dense_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/black_covered_dense_cable.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/black_covered_dense_cable.json rename to src/main/resources/assets/appliedenergistics2/models/item/black_covered_dense_cable.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/black_glass_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/black_glass_cable.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/black_glass_cable.json rename to src/main/resources/assets/appliedenergistics2/models/item/black_glass_cable.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/black_lumen_paint_ball.json b/src/main/resources/assets/appliedenergistics2/models/item/black_lumen_paint_ball.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/black_lumen_paint_ball.json rename to src/main/resources/assets/appliedenergistics2/models/item/black_lumen_paint_ball.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/black_paint_ball.json b/src/main/resources/assets/appliedenergistics2/models/item/black_paint_ball.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/black_paint_ball.json rename to src/main/resources/assets/appliedenergistics2/models/item/black_paint_ball.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/black_smart_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/black_smart_cable.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/black_smart_cable.json rename to src/main/resources/assets/appliedenergistics2/models/item/black_smart_cable.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/black_smart_dense_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/black_smart_dense_cable.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/black_smart_dense_cable.json rename to src/main/resources/assets/appliedenergistics2/models/item/black_smart_dense_cable.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/blank_pattern.json b/src/main/resources/assets/appliedenergistics2/models/item/blank_pattern.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/blank_pattern.json rename to src/main/resources/assets/appliedenergistics2/models/item/blank_pattern.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/blue_covered_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/blue_covered_cable.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/blue_covered_cable.json rename to src/main/resources/assets/appliedenergistics2/models/item/blue_covered_cable.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/blue_covered_dense_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/blue_covered_dense_cable.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/blue_covered_dense_cable.json rename to src/main/resources/assets/appliedenergistics2/models/item/blue_covered_dense_cable.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/blue_glass_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/blue_glass_cable.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/blue_glass_cable.json rename to src/main/resources/assets/appliedenergistics2/models/item/blue_glass_cable.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/blue_lumen_paint_ball.json b/src/main/resources/assets/appliedenergistics2/models/item/blue_lumen_paint_ball.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/blue_lumen_paint_ball.json rename to src/main/resources/assets/appliedenergistics2/models/item/blue_lumen_paint_ball.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/blue_paint_ball.json b/src/main/resources/assets/appliedenergistics2/models/item/blue_paint_ball.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/blue_paint_ball.json rename to src/main/resources/assets/appliedenergistics2/models/item/blue_paint_ball.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/blue_smart_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/blue_smart_cable.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/blue_smart_cable.json rename to src/main/resources/assets/appliedenergistics2/models/item/blue_smart_cable.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/blue_smart_dense_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/blue_smart_dense_cable.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/blue_smart_dense_cable.json rename to src/main/resources/assets/appliedenergistics2/models/item/blue_smart_dense_cable.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/brown_covered_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/brown_covered_cable.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/brown_covered_cable.json rename to src/main/resources/assets/appliedenergistics2/models/item/brown_covered_cable.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/brown_covered_dense_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/brown_covered_dense_cable.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/brown_covered_dense_cable.json rename to src/main/resources/assets/appliedenergistics2/models/item/brown_covered_dense_cable.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/brown_glass_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/brown_glass_cable.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/brown_glass_cable.json rename to src/main/resources/assets/appliedenergistics2/models/item/brown_glass_cable.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/brown_lumen_paint_ball.json b/src/main/resources/assets/appliedenergistics2/models/item/brown_lumen_paint_ball.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/brown_lumen_paint_ball.json rename to src/main/resources/assets/appliedenergistics2/models/item/brown_lumen_paint_ball.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/brown_paint_ball.json b/src/main/resources/assets/appliedenergistics2/models/item/brown_paint_ball.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/brown_paint_ball.json rename to src/main/resources/assets/appliedenergistics2/models/item/brown_paint_ball.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/brown_smart_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/brown_smart_cable.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/brown_smart_cable.json rename to src/main/resources/assets/appliedenergistics2/models/item/brown_smart_cable.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/brown_smart_dense_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/brown_smart_dense_cable.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/brown_smart_dense_cable.json rename to src/main/resources/assets/appliedenergistics2/models/item/brown_smart_dense_cable.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/cable_anchor.json b/src/main/resources/assets/appliedenergistics2/models/item/cable_anchor.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/cable_anchor.json rename to src/main/resources/assets/appliedenergistics2/models/item/cable_anchor.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/cable_bus.json b/src/main/resources/assets/appliedenergistics2/models/item/cable_bus.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/cable_bus.json rename to src/main/resources/assets/appliedenergistics2/models/item/cable_bus.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/cable_fluid_interface.json b/src/main/resources/assets/appliedenergistics2/models/item/cable_fluid_interface.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/cable_fluid_interface.json rename to src/main/resources/assets/appliedenergistics2/models/item/cable_fluid_interface.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/cable_interface.json b/src/main/resources/assets/appliedenergistics2/models/item/cable_interface.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/cable_interface.json rename to src/main/resources/assets/appliedenergistics2/models/item/cable_interface.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/calculation_processor.json b/src/main/resources/assets/appliedenergistics2/models/item/calculation_processor.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/calculation_processor.json rename to src/main/resources/assets/appliedenergistics2/models/item/calculation_processor.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/calculation_processor_press.json b/src/main/resources/assets/appliedenergistics2/models/item/calculation_processor_press.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/calculation_processor_press.json rename to src/main/resources/assets/appliedenergistics2/models/item/calculation_processor_press.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/capacity_card.json b/src/main/resources/assets/appliedenergistics2/models/item/capacity_card.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/capacity_card.json rename to src/main/resources/assets/appliedenergistics2/models/item/capacity_card.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/cell_workbench.json b/src/main/resources/assets/appliedenergistics2/models/item/cell_workbench.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/cell_workbench.json rename to src/main/resources/assets/appliedenergistics2/models/item/cell_workbench.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/certus_crystal_seed.json b/src/main/resources/assets/appliedenergistics2/models/item/certus_crystal_seed.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/certus_crystal_seed.json rename to src/main/resources/assets/appliedenergistics2/models/item/certus_crystal_seed.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/certus_crystal_seed_2.json b/src/main/resources/assets/appliedenergistics2/models/item/certus_crystal_seed_2.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/certus_crystal_seed_2.json rename to src/main/resources/assets/appliedenergistics2/models/item/certus_crystal_seed_2.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/certus_crystal_seed_3.json b/src/main/resources/assets/appliedenergistics2/models/item/certus_crystal_seed_3.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/certus_crystal_seed_3.json rename to src/main/resources/assets/appliedenergistics2/models/item/certus_crystal_seed_3.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/certus_quartz_axe.json b/src/main/resources/assets/appliedenergistics2/models/item/certus_quartz_axe.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/certus_quartz_axe.json rename to src/main/resources/assets/appliedenergistics2/models/item/certus_quartz_axe.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/certus_quartz_crystal.json b/src/main/resources/assets/appliedenergistics2/models/item/certus_quartz_crystal.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/certus_quartz_crystal.json rename to src/main/resources/assets/appliedenergistics2/models/item/certus_quartz_crystal.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/certus_quartz_cutting_knife.json b/src/main/resources/assets/appliedenergistics2/models/item/certus_quartz_cutting_knife.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/certus_quartz_cutting_knife.json rename to src/main/resources/assets/appliedenergistics2/models/item/certus_quartz_cutting_knife.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/certus_quartz_dust.json b/src/main/resources/assets/appliedenergistics2/models/item/certus_quartz_dust.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/certus_quartz_dust.json rename to src/main/resources/assets/appliedenergistics2/models/item/certus_quartz_dust.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/certus_quartz_hoe.json b/src/main/resources/assets/appliedenergistics2/models/item/certus_quartz_hoe.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/certus_quartz_hoe.json rename to src/main/resources/assets/appliedenergistics2/models/item/certus_quartz_hoe.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/certus_quartz_pickaxe.json b/src/main/resources/assets/appliedenergistics2/models/item/certus_quartz_pickaxe.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/certus_quartz_pickaxe.json rename to src/main/resources/assets/appliedenergistics2/models/item/certus_quartz_pickaxe.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/certus_quartz_shovel.json b/src/main/resources/assets/appliedenergistics2/models/item/certus_quartz_shovel.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/certus_quartz_shovel.json rename to src/main/resources/assets/appliedenergistics2/models/item/certus_quartz_shovel.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/certus_quartz_sword.json b/src/main/resources/assets/appliedenergistics2/models/item/certus_quartz_sword.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/certus_quartz_sword.json rename to src/main/resources/assets/appliedenergistics2/models/item/certus_quartz_sword.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/certus_quartz_wrench.json b/src/main/resources/assets/appliedenergistics2/models/item/certus_quartz_wrench.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/certus_quartz_wrench.json rename to src/main/resources/assets/appliedenergistics2/models/item/certus_quartz_wrench.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/charged_certus_quartz_crystal.json b/src/main/resources/assets/appliedenergistics2/models/item/charged_certus_quartz_crystal.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/charged_certus_quartz_crystal.json rename to src/main/resources/assets/appliedenergistics2/models/item/charged_certus_quartz_crystal.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/charged_quartz_ore.json b/src/main/resources/assets/appliedenergistics2/models/item/charged_quartz_ore.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/charged_quartz_ore.json rename to src/main/resources/assets/appliedenergistics2/models/item/charged_quartz_ore.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/charged_staff.json b/src/main/resources/assets/appliedenergistics2/models/item/charged_staff.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/charged_staff.json rename to src/main/resources/assets/appliedenergistics2/models/item/charged_staff.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/charger.json b/src/main/resources/assets/appliedenergistics2/models/item/charger.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/charger.json rename to src/main/resources/assets/appliedenergistics2/models/item/charger.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/chest.json b/src/main/resources/assets/appliedenergistics2/models/item/chest.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/chest.json rename to src/main/resources/assets/appliedenergistics2/models/item/chest.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/chiseled_quartz_block.json b/src/main/resources/assets/appliedenergistics2/models/item/chiseled_quartz_block.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/chiseled_quartz_block.json rename to src/main/resources/assets/appliedenergistics2/models/item/chiseled_quartz_block.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/chiseled_quartz_slab.json b/src/main/resources/assets/appliedenergistics2/models/item/chiseled_quartz_slab.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/chiseled_quartz_slab.json rename to src/main/resources/assets/appliedenergistics2/models/item/chiseled_quartz_slab.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/chiseled_quartz_stairs.json b/src/main/resources/assets/appliedenergistics2/models/item/chiseled_quartz_stairs.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/chiseled_quartz_stairs.json rename to src/main/resources/assets/appliedenergistics2/models/item/chiseled_quartz_stairs.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/color_applicator.json b/src/main/resources/assets/appliedenergistics2/models/item/color_applicator.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/color_applicator.json rename to src/main/resources/assets/appliedenergistics2/models/item/color_applicator.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/color_applicator_colored.json b/src/main/resources/assets/appliedenergistics2/models/item/color_applicator_colored.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/color_applicator_colored.json rename to src/main/resources/assets/appliedenergistics2/models/item/color_applicator_colored.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/condenser.json b/src/main/resources/assets/appliedenergistics2/models/item/condenser.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/condenser.json rename to src/main/resources/assets/appliedenergistics2/models/item/condenser.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/controller.json b/src/main/resources/assets/appliedenergistics2/models/item/controller.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/controller.json rename to src/main/resources/assets/appliedenergistics2/models/item/controller.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/conversion_monitor.json b/src/main/resources/assets/appliedenergistics2/models/item/conversion_monitor.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/conversion_monitor.json rename to src/main/resources/assets/appliedenergistics2/models/item/conversion_monitor.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/covered_cable_base.json b/src/main/resources/assets/appliedenergistics2/models/item/covered_cable_base.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/covered_cable_base.json rename to src/main/resources/assets/appliedenergistics2/models/item/covered_cable_base.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/covered_dense_cable_base.json b/src/main/resources/assets/appliedenergistics2/models/item/covered_dense_cable_base.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/covered_dense_cable_base.json rename to src/main/resources/assets/appliedenergistics2/models/item/covered_dense_cable_base.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/crafting_accelerator.json b/src/main/resources/assets/appliedenergistics2/models/item/crafting_accelerator.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/crafting_accelerator.json rename to src/main/resources/assets/appliedenergistics2/models/item/crafting_accelerator.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/crafting_card.json b/src/main/resources/assets/appliedenergistics2/models/item/crafting_card.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/crafting_card.json rename to src/main/resources/assets/appliedenergistics2/models/item/crafting_card.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/crafting_monitor.json b/src/main/resources/assets/appliedenergistics2/models/item/crafting_monitor.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/crafting_monitor.json rename to src/main/resources/assets/appliedenergistics2/models/item/crafting_monitor.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/crafting_terminal.json b/src/main/resources/assets/appliedenergistics2/models/item/crafting_terminal.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/crafting_terminal.json rename to src/main/resources/assets/appliedenergistics2/models/item/crafting_terminal.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/crafting_unit.json b/src/main/resources/assets/appliedenergistics2/models/item/crafting_unit.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/crafting_unit.json rename to src/main/resources/assets/appliedenergistics2/models/item/crafting_unit.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/crank.json b/src/main/resources/assets/appliedenergistics2/models/item/crank.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/crank.json rename to src/main/resources/assets/appliedenergistics2/models/item/crank.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/creative_energy_cell.json b/src/main/resources/assets/appliedenergistics2/models/item/creative_energy_cell.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/creative_energy_cell.json rename to src/main/resources/assets/appliedenergistics2/models/item/creative_energy_cell.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/creative_storage_cell.json b/src/main/resources/assets/appliedenergistics2/models/item/creative_storage_cell.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/creative_storage_cell.json rename to src/main/resources/assets/appliedenergistics2/models/item/creative_storage_cell.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/cyan_covered_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/cyan_covered_cable.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/cyan_covered_cable.json rename to src/main/resources/assets/appliedenergistics2/models/item/cyan_covered_cable.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/cyan_covered_dense_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/cyan_covered_dense_cable.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/cyan_covered_dense_cable.json rename to src/main/resources/assets/appliedenergistics2/models/item/cyan_covered_dense_cable.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/cyan_glass_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/cyan_glass_cable.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/cyan_glass_cable.json rename to src/main/resources/assets/appliedenergistics2/models/item/cyan_glass_cable.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/cyan_lumen_paint_ball.json b/src/main/resources/assets/appliedenergistics2/models/item/cyan_lumen_paint_ball.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/cyan_lumen_paint_ball.json rename to src/main/resources/assets/appliedenergistics2/models/item/cyan_lumen_paint_ball.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/cyan_paint_ball.json b/src/main/resources/assets/appliedenergistics2/models/item/cyan_paint_ball.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/cyan_paint_ball.json rename to src/main/resources/assets/appliedenergistics2/models/item/cyan_paint_ball.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/cyan_smart_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/cyan_smart_cable.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/cyan_smart_cable.json rename to src/main/resources/assets/appliedenergistics2/models/item/cyan_smart_cable.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/cyan_smart_dense_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/cyan_smart_dense_cable.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/cyan_smart_dense_cable.json rename to src/main/resources/assets/appliedenergistics2/models/item/cyan_smart_dense_cable.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/dark_monitor.json b/src/main/resources/assets/appliedenergistics2/models/item/dark_monitor.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/dark_monitor.json rename to src/main/resources/assets/appliedenergistics2/models/item/dark_monitor.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/debug_card.json b/src/main/resources/assets/appliedenergistics2/models/item/debug_card.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/debug_card.json rename to src/main/resources/assets/appliedenergistics2/models/item/debug_card.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/debug_chunk_loader.json b/src/main/resources/assets/appliedenergistics2/models/item/debug_chunk_loader.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/debug_chunk_loader.json rename to src/main/resources/assets/appliedenergistics2/models/item/debug_chunk_loader.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/debug_cube_gen.json b/src/main/resources/assets/appliedenergistics2/models/item/debug_cube_gen.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/debug_cube_gen.json rename to src/main/resources/assets/appliedenergistics2/models/item/debug_cube_gen.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/debug_energy_gen.json b/src/main/resources/assets/appliedenergistics2/models/item/debug_energy_gen.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/debug_energy_gen.json rename to src/main/resources/assets/appliedenergistics2/models/item/debug_energy_gen.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/debug_eraser.json b/src/main/resources/assets/appliedenergistics2/models/item/debug_eraser.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/debug_eraser.json rename to src/main/resources/assets/appliedenergistics2/models/item/debug_eraser.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/debug_item_gen.json b/src/main/resources/assets/appliedenergistics2/models/item/debug_item_gen.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/debug_item_gen.json rename to src/main/resources/assets/appliedenergistics2/models/item/debug_item_gen.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/debug_meteorite_placer.json b/src/main/resources/assets/appliedenergistics2/models/item/debug_meteorite_placer.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/debug_meteorite_placer.json rename to src/main/resources/assets/appliedenergistics2/models/item/debug_meteorite_placer.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/debug_part_placer.json b/src/main/resources/assets/appliedenergistics2/models/item/debug_part_placer.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/debug_part_placer.json rename to src/main/resources/assets/appliedenergistics2/models/item/debug_part_placer.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/debug_phantom_node.json b/src/main/resources/assets/appliedenergistics2/models/item/debug_phantom_node.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/debug_phantom_node.json rename to src/main/resources/assets/appliedenergistics2/models/item/debug_phantom_node.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/debug_replicator_card.json b/src/main/resources/assets/appliedenergistics2/models/item/debug_replicator_card.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/debug_replicator_card.json rename to src/main/resources/assets/appliedenergistics2/models/item/debug_replicator_card.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/dense_energy_cell.json b/src/main/resources/assets/appliedenergistics2/models/item/dense_energy_cell.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/dense_energy_cell.json rename to src/main/resources/assets/appliedenergistics2/models/item/dense_energy_cell.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/display_base.json b/src/main/resources/assets/appliedenergistics2/models/item/display_base.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/display_base.json rename to src/main/resources/assets/appliedenergistics2/models/item/display_base.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/drive.json b/src/main/resources/assets/appliedenergistics2/models/item/drive.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/drive.json rename to src/main/resources/assets/appliedenergistics2/models/item/drive.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/dummy_fluid_item_base.json b/src/main/resources/assets/appliedenergistics2/models/item/dummy_fluid_item_base.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/dummy_fluid_item_base.json rename to src/main/resources/assets/appliedenergistics2/models/item/dummy_fluid_item_base.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/empty_storage_cell.json b/src/main/resources/assets/appliedenergistics2/models/item/empty_storage_cell.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/empty_storage_cell.json rename to src/main/resources/assets/appliedenergistics2/models/item/empty_storage_cell.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/encoded_pattern.json b/src/main/resources/assets/appliedenergistics2/models/item/encoded_pattern.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/encoded_pattern.json rename to src/main/resources/assets/appliedenergistics2/models/item/encoded_pattern.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/encoded_pattern_base.json b/src/main/resources/assets/appliedenergistics2/models/item/encoded_pattern_base.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/encoded_pattern_base.json rename to src/main/resources/assets/appliedenergistics2/models/item/encoded_pattern_base.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/ender_dust.json b/src/main/resources/assets/appliedenergistics2/models/item/ender_dust.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/ender_dust.json rename to src/main/resources/assets/appliedenergistics2/models/item/ender_dust.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/energy_acceptor.json b/src/main/resources/assets/appliedenergistics2/models/item/energy_acceptor.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/energy_acceptor.json rename to src/main/resources/assets/appliedenergistics2/models/item/energy_acceptor.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/energy_cell.json b/src/main/resources/assets/appliedenergistics2/models/item/energy_cell.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/energy_cell.json rename to src/main/resources/assets/appliedenergistics2/models/item/energy_cell.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/engineering_processor.json b/src/main/resources/assets/appliedenergistics2/models/item/engineering_processor.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/engineering_processor.json rename to src/main/resources/assets/appliedenergistics2/models/item/engineering_processor.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/engineering_processor_press.json b/src/main/resources/assets/appliedenergistics2/models/item/engineering_processor_press.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/engineering_processor_press.json rename to src/main/resources/assets/appliedenergistics2/models/item/engineering_processor_press.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/entropy_manipulator.json b/src/main/resources/assets/appliedenergistics2/models/item/entropy_manipulator.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/entropy_manipulator.json rename to src/main/resources/assets/appliedenergistics2/models/item/entropy_manipulator.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/export_bus.json b/src/main/resources/assets/appliedenergistics2/models/item/export_bus.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/export_bus.json rename to src/main/resources/assets/appliedenergistics2/models/item/export_bus.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/facade.json b/src/main/resources/assets/appliedenergistics2/models/item/facade.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/facade.json rename to src/main/resources/assets/appliedenergistics2/models/item/facade.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/facade_base.json b/src/main/resources/assets/appliedenergistics2/models/item/facade_base.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/facade_base.json rename to src/main/resources/assets/appliedenergistics2/models/item/facade_base.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/fe_p2p_tunnel.json b/src/main/resources/assets/appliedenergistics2/models/item/fe_p2p_tunnel.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/fe_p2p_tunnel.json rename to src/main/resources/assets/appliedenergistics2/models/item/fe_p2p_tunnel.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/flour.json b/src/main/resources/assets/appliedenergistics2/models/item/flour.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/flour.json rename to src/main/resources/assets/appliedenergistics2/models/item/flour.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/fluid_annihilation_plane.json b/src/main/resources/assets/appliedenergistics2/models/item/fluid_annihilation_plane.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/fluid_annihilation_plane.json rename to src/main/resources/assets/appliedenergistics2/models/item/fluid_annihilation_plane.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/fluid_export_bus.json b/src/main/resources/assets/appliedenergistics2/models/item/fluid_export_bus.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/fluid_export_bus.json rename to src/main/resources/assets/appliedenergistics2/models/item/fluid_export_bus.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/fluid_formation_plane.json b/src/main/resources/assets/appliedenergistics2/models/item/fluid_formation_plane.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/fluid_formation_plane.json rename to src/main/resources/assets/appliedenergistics2/models/item/fluid_formation_plane.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/fluid_import_bus.json b/src/main/resources/assets/appliedenergistics2/models/item/fluid_import_bus.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/fluid_import_bus.json rename to src/main/resources/assets/appliedenergistics2/models/item/fluid_import_bus.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/fluid_interface.json b/src/main/resources/assets/appliedenergistics2/models/item/fluid_interface.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/fluid_interface.json rename to src/main/resources/assets/appliedenergistics2/models/item/fluid_interface.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/fluid_level_emitter.json b/src/main/resources/assets/appliedenergistics2/models/item/fluid_level_emitter.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/fluid_level_emitter.json rename to src/main/resources/assets/appliedenergistics2/models/item/fluid_level_emitter.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/fluid_p2p_tunnel.json b/src/main/resources/assets/appliedenergistics2/models/item/fluid_p2p_tunnel.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/fluid_p2p_tunnel.json rename to src/main/resources/assets/appliedenergistics2/models/item/fluid_p2p_tunnel.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/fluid_storage_bus.json b/src/main/resources/assets/appliedenergistics2/models/item/fluid_storage_bus.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/fluid_storage_bus.json rename to src/main/resources/assets/appliedenergistics2/models/item/fluid_storage_bus.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/fluid_terminal.json b/src/main/resources/assets/appliedenergistics2/models/item/fluid_terminal.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/fluid_terminal.json rename to src/main/resources/assets/appliedenergistics2/models/item/fluid_terminal.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/fluix_block.json b/src/main/resources/assets/appliedenergistics2/models/item/fluix_block.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/fluix_block.json rename to src/main/resources/assets/appliedenergistics2/models/item/fluix_block.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/fluix_covered_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/fluix_covered_cable.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/fluix_covered_cable.json rename to src/main/resources/assets/appliedenergistics2/models/item/fluix_covered_cable.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/fluix_covered_dense_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/fluix_covered_dense_cable.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/fluix_covered_dense_cable.json rename to src/main/resources/assets/appliedenergistics2/models/item/fluix_covered_dense_cable.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/fluix_crystal.json b/src/main/resources/assets/appliedenergistics2/models/item/fluix_crystal.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/fluix_crystal.json rename to src/main/resources/assets/appliedenergistics2/models/item/fluix_crystal.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/fluix_crystal_seed.json b/src/main/resources/assets/appliedenergistics2/models/item/fluix_crystal_seed.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/fluix_crystal_seed.json rename to src/main/resources/assets/appliedenergistics2/models/item/fluix_crystal_seed.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/fluix_crystal_seed_2.json b/src/main/resources/assets/appliedenergistics2/models/item/fluix_crystal_seed_2.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/fluix_crystal_seed_2.json rename to src/main/resources/assets/appliedenergistics2/models/item/fluix_crystal_seed_2.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/fluix_crystal_seed_3.json b/src/main/resources/assets/appliedenergistics2/models/item/fluix_crystal_seed_3.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/fluix_crystal_seed_3.json rename to src/main/resources/assets/appliedenergistics2/models/item/fluix_crystal_seed_3.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/fluix_dust.json b/src/main/resources/assets/appliedenergistics2/models/item/fluix_dust.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/fluix_dust.json rename to src/main/resources/assets/appliedenergistics2/models/item/fluix_dust.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/fluix_glass_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/fluix_glass_cable.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/fluix_glass_cable.json rename to src/main/resources/assets/appliedenergistics2/models/item/fluix_glass_cable.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/fluix_pearl.json b/src/main/resources/assets/appliedenergistics2/models/item/fluix_pearl.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/fluix_pearl.json rename to src/main/resources/assets/appliedenergistics2/models/item/fluix_pearl.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/fluix_slab.json b/src/main/resources/assets/appliedenergistics2/models/item/fluix_slab.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/fluix_slab.json rename to src/main/resources/assets/appliedenergistics2/models/item/fluix_slab.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/fluix_smart_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/fluix_smart_cable.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/fluix_smart_cable.json rename to src/main/resources/assets/appliedenergistics2/models/item/fluix_smart_cable.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/fluix_smart_dense_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/fluix_smart_dense_cable.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/fluix_smart_dense_cable.json rename to src/main/resources/assets/appliedenergistics2/models/item/fluix_smart_dense_cable.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/fluix_stairs.json b/src/main/resources/assets/appliedenergistics2/models/item/fluix_stairs.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/fluix_stairs.json rename to src/main/resources/assets/appliedenergistics2/models/item/fluix_stairs.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/formation_core.json b/src/main/resources/assets/appliedenergistics2/models/item/formation_core.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/formation_core.json rename to src/main/resources/assets/appliedenergistics2/models/item/formation_core.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/formation_plane.json b/src/main/resources/assets/appliedenergistics2/models/item/formation_plane.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/formation_plane.json rename to src/main/resources/assets/appliedenergistics2/models/item/formation_plane.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/fuzzy_card.json b/src/main/resources/assets/appliedenergistics2/models/item/fuzzy_card.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/fuzzy_card.json rename to src/main/resources/assets/appliedenergistics2/models/item/fuzzy_card.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/glass_cable_base.json b/src/main/resources/assets/appliedenergistics2/models/item/glass_cable_base.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/glass_cable_base.json rename to src/main/resources/assets/appliedenergistics2/models/item/glass_cable_base.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/gold_dust.json b/src/main/resources/assets/appliedenergistics2/models/item/gold_dust.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/gold_dust.json rename to src/main/resources/assets/appliedenergistics2/models/item/gold_dust.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/gray_covered_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/gray_covered_cable.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/gray_covered_cable.json rename to src/main/resources/assets/appliedenergistics2/models/item/gray_covered_cable.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/gray_covered_dense_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/gray_covered_dense_cable.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/gray_covered_dense_cable.json rename to src/main/resources/assets/appliedenergistics2/models/item/gray_covered_dense_cable.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/gray_glass_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/gray_glass_cable.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/gray_glass_cable.json rename to src/main/resources/assets/appliedenergistics2/models/item/gray_glass_cable.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/gray_lumen_paint_ball.json b/src/main/resources/assets/appliedenergistics2/models/item/gray_lumen_paint_ball.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/gray_lumen_paint_ball.json rename to src/main/resources/assets/appliedenergistics2/models/item/gray_lumen_paint_ball.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/gray_paint_ball.json b/src/main/resources/assets/appliedenergistics2/models/item/gray_paint_ball.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/gray_paint_ball.json rename to src/main/resources/assets/appliedenergistics2/models/item/gray_paint_ball.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/gray_smart_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/gray_smart_cable.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/gray_smart_cable.json rename to src/main/resources/assets/appliedenergistics2/models/item/gray_smart_cable.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/gray_smart_dense_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/gray_smart_dense_cable.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/gray_smart_dense_cable.json rename to src/main/resources/assets/appliedenergistics2/models/item/gray_smart_dense_cable.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/green_covered_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/green_covered_cable.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/green_covered_cable.json rename to src/main/resources/assets/appliedenergistics2/models/item/green_covered_cable.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/green_covered_dense_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/green_covered_dense_cable.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/green_covered_dense_cable.json rename to src/main/resources/assets/appliedenergistics2/models/item/green_covered_dense_cable.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/green_glass_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/green_glass_cable.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/green_glass_cable.json rename to src/main/resources/assets/appliedenergistics2/models/item/green_glass_cable.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/green_lumen_paint_ball.json b/src/main/resources/assets/appliedenergistics2/models/item/green_lumen_paint_ball.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/green_lumen_paint_ball.json rename to src/main/resources/assets/appliedenergistics2/models/item/green_lumen_paint_ball.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/green_paint_ball.json b/src/main/resources/assets/appliedenergistics2/models/item/green_paint_ball.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/green_paint_ball.json rename to src/main/resources/assets/appliedenergistics2/models/item/green_paint_ball.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/green_smart_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/green_smart_cable.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/green_smart_cable.json rename to src/main/resources/assets/appliedenergistics2/models/item/green_smart_cable.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/green_smart_dense_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/green_smart_dense_cable.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/green_smart_dense_cable.json rename to src/main/resources/assets/appliedenergistics2/models/item/green_smart_dense_cable.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/grindstone.json b/src/main/resources/assets/appliedenergistics2/models/item/grindstone.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/grindstone.json rename to src/main/resources/assets/appliedenergistics2/models/item/grindstone.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/ic2_p2p_tunnel.json b/src/main/resources/assets/appliedenergistics2/models/item/ic2_p2p_tunnel.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/ic2_p2p_tunnel.json rename to src/main/resources/assets/appliedenergistics2/models/item/ic2_p2p_tunnel.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/identity_annihilation_plane.json b/src/main/resources/assets/appliedenergistics2/models/item/identity_annihilation_plane.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/identity_annihilation_plane.json rename to src/main/resources/assets/appliedenergistics2/models/item/identity_annihilation_plane.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/import_bus.json b/src/main/resources/assets/appliedenergistics2/models/item/import_bus.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/import_bus.json rename to src/main/resources/assets/appliedenergistics2/models/item/import_bus.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/inscriber.json b/src/main/resources/assets/appliedenergistics2/models/item/inscriber.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/inscriber.json rename to src/main/resources/assets/appliedenergistics2/models/item/inscriber.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/interface.json b/src/main/resources/assets/appliedenergistics2/models/item/interface.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/interface.json rename to src/main/resources/assets/appliedenergistics2/models/item/interface.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/interface_terminal.json b/src/main/resources/assets/appliedenergistics2/models/item/interface_terminal.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/interface_terminal.json rename to src/main/resources/assets/appliedenergistics2/models/item/interface_terminal.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/invalid_type.json b/src/main/resources/assets/appliedenergistics2/models/item/invalid_type.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/invalid_type.json rename to src/main/resources/assets/appliedenergistics2/models/item/invalid_type.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/inverted_toggle_bus.json b/src/main/resources/assets/appliedenergistics2/models/item/inverted_toggle_bus.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/inverted_toggle_bus.json rename to src/main/resources/assets/appliedenergistics2/models/item/inverted_toggle_bus.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/inverter_card.json b/src/main/resources/assets/appliedenergistics2/models/item/inverter_card.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/inverter_card.json rename to src/main/resources/assets/appliedenergistics2/models/item/inverter_card.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/io_port.json b/src/main/resources/assets/appliedenergistics2/models/item/io_port.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/io_port.json rename to src/main/resources/assets/appliedenergistics2/models/item/io_port.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/iron_dust.json b/src/main/resources/assets/appliedenergistics2/models/item/iron_dust.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/iron_dust.json rename to src/main/resources/assets/appliedenergistics2/models/item/iron_dust.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/item_p2p_tunnel.json b/src/main/resources/assets/appliedenergistics2/models/item/item_p2p_tunnel.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/item_p2p_tunnel.json rename to src/main/resources/assets/appliedenergistics2/models/item/item_p2p_tunnel.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/level_emitter.json b/src/main/resources/assets/appliedenergistics2/models/item/level_emitter.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/level_emitter.json rename to src/main/resources/assets/appliedenergistics2/models/item/level_emitter.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/light_blue_covered_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/light_blue_covered_cable.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/light_blue_covered_cable.json rename to src/main/resources/assets/appliedenergistics2/models/item/light_blue_covered_cable.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/light_blue_covered_dense_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/light_blue_covered_dense_cable.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/light_blue_covered_dense_cable.json rename to src/main/resources/assets/appliedenergistics2/models/item/light_blue_covered_dense_cable.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/light_blue_glass_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/light_blue_glass_cable.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/light_blue_glass_cable.json rename to src/main/resources/assets/appliedenergistics2/models/item/light_blue_glass_cable.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/light_blue_lumen_paint_ball.json b/src/main/resources/assets/appliedenergistics2/models/item/light_blue_lumen_paint_ball.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/light_blue_lumen_paint_ball.json rename to src/main/resources/assets/appliedenergistics2/models/item/light_blue_lumen_paint_ball.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/light_blue_paint_ball.json b/src/main/resources/assets/appliedenergistics2/models/item/light_blue_paint_ball.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/light_blue_paint_ball.json rename to src/main/resources/assets/appliedenergistics2/models/item/light_blue_paint_ball.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/light_blue_smart_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/light_blue_smart_cable.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/light_blue_smart_cable.json rename to src/main/resources/assets/appliedenergistics2/models/item/light_blue_smart_cable.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/light_blue_smart_dense_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/light_blue_smart_dense_cable.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/light_blue_smart_dense_cable.json rename to src/main/resources/assets/appliedenergistics2/models/item/light_blue_smart_dense_cable.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/light_detector.json b/src/main/resources/assets/appliedenergistics2/models/item/light_detector.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/light_detector.json rename to src/main/resources/assets/appliedenergistics2/models/item/light_detector.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/light_gray_covered_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/light_gray_covered_cable.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/light_gray_covered_cable.json rename to src/main/resources/assets/appliedenergistics2/models/item/light_gray_covered_cable.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/light_gray_covered_dense_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/light_gray_covered_dense_cable.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/light_gray_covered_dense_cable.json rename to src/main/resources/assets/appliedenergistics2/models/item/light_gray_covered_dense_cable.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/light_gray_glass_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/light_gray_glass_cable.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/light_gray_glass_cable.json rename to src/main/resources/assets/appliedenergistics2/models/item/light_gray_glass_cable.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/light_gray_lumen_paint_ball.json b/src/main/resources/assets/appliedenergistics2/models/item/light_gray_lumen_paint_ball.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/light_gray_lumen_paint_ball.json rename to src/main/resources/assets/appliedenergistics2/models/item/light_gray_lumen_paint_ball.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/light_gray_paint_ball.json b/src/main/resources/assets/appliedenergistics2/models/item/light_gray_paint_ball.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/light_gray_paint_ball.json rename to src/main/resources/assets/appliedenergistics2/models/item/light_gray_paint_ball.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/light_gray_smart_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/light_gray_smart_cable.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/light_gray_smart_cable.json rename to src/main/resources/assets/appliedenergistics2/models/item/light_gray_smart_cable.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/light_gray_smart_dense_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/light_gray_smart_dense_cable.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/light_gray_smart_dense_cable.json rename to src/main/resources/assets/appliedenergistics2/models/item/light_gray_smart_dense_cable.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/light_p2p_tunnel.json b/src/main/resources/assets/appliedenergistics2/models/item/light_p2p_tunnel.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/light_p2p_tunnel.json rename to src/main/resources/assets/appliedenergistics2/models/item/light_p2p_tunnel.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/lime_covered_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/lime_covered_cable.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/lime_covered_cable.json rename to src/main/resources/assets/appliedenergistics2/models/item/lime_covered_cable.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/lime_covered_dense_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/lime_covered_dense_cable.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/lime_covered_dense_cable.json rename to src/main/resources/assets/appliedenergistics2/models/item/lime_covered_dense_cable.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/lime_glass_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/lime_glass_cable.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/lime_glass_cable.json rename to src/main/resources/assets/appliedenergistics2/models/item/lime_glass_cable.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/lime_lumen_paint_ball.json b/src/main/resources/assets/appliedenergistics2/models/item/lime_lumen_paint_ball.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/lime_lumen_paint_ball.json rename to src/main/resources/assets/appliedenergistics2/models/item/lime_lumen_paint_ball.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/lime_paint_ball.json b/src/main/resources/assets/appliedenergistics2/models/item/lime_paint_ball.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/lime_paint_ball.json rename to src/main/resources/assets/appliedenergistics2/models/item/lime_paint_ball.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/lime_smart_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/lime_smart_cable.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/lime_smart_cable.json rename to src/main/resources/assets/appliedenergistics2/models/item/lime_smart_cable.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/lime_smart_dense_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/lime_smart_dense_cable.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/lime_smart_dense_cable.json rename to src/main/resources/assets/appliedenergistics2/models/item/lime_smart_dense_cable.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/logic_processor.json b/src/main/resources/assets/appliedenergistics2/models/item/logic_processor.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/logic_processor.json rename to src/main/resources/assets/appliedenergistics2/models/item/logic_processor.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/logic_processor_press.json b/src/main/resources/assets/appliedenergistics2/models/item/logic_processor_press.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/logic_processor_press.json rename to src/main/resources/assets/appliedenergistics2/models/item/logic_processor_press.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/magenta_covered_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/magenta_covered_cable.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/magenta_covered_cable.json rename to src/main/resources/assets/appliedenergistics2/models/item/magenta_covered_cable.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/magenta_covered_dense_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/magenta_covered_dense_cable.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/magenta_covered_dense_cable.json rename to src/main/resources/assets/appliedenergistics2/models/item/magenta_covered_dense_cable.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/magenta_glass_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/magenta_glass_cable.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/magenta_glass_cable.json rename to src/main/resources/assets/appliedenergistics2/models/item/magenta_glass_cable.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/magenta_lumen_paint_ball.json b/src/main/resources/assets/appliedenergistics2/models/item/magenta_lumen_paint_ball.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/magenta_lumen_paint_ball.json rename to src/main/resources/assets/appliedenergistics2/models/item/magenta_lumen_paint_ball.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/magenta_paint_ball.json b/src/main/resources/assets/appliedenergistics2/models/item/magenta_paint_ball.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/magenta_paint_ball.json rename to src/main/resources/assets/appliedenergistics2/models/item/magenta_paint_ball.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/magenta_smart_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/magenta_smart_cable.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/magenta_smart_cable.json rename to src/main/resources/assets/appliedenergistics2/models/item/magenta_smart_cable.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/magenta_smart_dense_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/magenta_smart_dense_cable.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/magenta_smart_dense_cable.json rename to src/main/resources/assets/appliedenergistics2/models/item/magenta_smart_dense_cable.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/matrix_frame.json b/src/main/resources/assets/appliedenergistics2/models/item/matrix_frame.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/matrix_frame.json rename to src/main/resources/assets/appliedenergistics2/models/item/matrix_frame.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/matter_ball.json b/src/main/resources/assets/appliedenergistics2/models/item/matter_ball.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/matter_ball.json rename to src/main/resources/assets/appliedenergistics2/models/item/matter_ball.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/matter_cannon.json b/src/main/resources/assets/appliedenergistics2/models/item/matter_cannon.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/matter_cannon.json rename to src/main/resources/assets/appliedenergistics2/models/item/matter_cannon.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/me_p2p_tunnel.json b/src/main/resources/assets/appliedenergistics2/models/item/me_p2p_tunnel.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/me_p2p_tunnel.json rename to src/main/resources/assets/appliedenergistics2/models/item/me_p2p_tunnel.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/memory_card.json b/src/main/resources/assets/appliedenergistics2/models/item/memory_card.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/memory_card.json rename to src/main/resources/assets/appliedenergistics2/models/item/memory_card.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/memory_card_base.json b/src/main/resources/assets/appliedenergistics2/models/item/memory_card_base.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/memory_card_base.json rename to src/main/resources/assets/appliedenergistics2/models/item/memory_card_base.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/molecular_assembler.json b/src/main/resources/assets/appliedenergistics2/models/item/molecular_assembler.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/molecular_assembler.json rename to src/main/resources/assets/appliedenergistics2/models/item/molecular_assembler.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/monitor.json b/src/main/resources/assets/appliedenergistics2/models/item/monitor.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/monitor.json rename to src/main/resources/assets/appliedenergistics2/models/item/monitor.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/name_press.json b/src/main/resources/assets/appliedenergistics2/models/item/name_press.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/name_press.json rename to src/main/resources/assets/appliedenergistics2/models/item/name_press.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/nether_quartz_axe.json b/src/main/resources/assets/appliedenergistics2/models/item/nether_quartz_axe.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/nether_quartz_axe.json rename to src/main/resources/assets/appliedenergistics2/models/item/nether_quartz_axe.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/nether_quartz_cutting_knife.json b/src/main/resources/assets/appliedenergistics2/models/item/nether_quartz_cutting_knife.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/nether_quartz_cutting_knife.json rename to src/main/resources/assets/appliedenergistics2/models/item/nether_quartz_cutting_knife.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/nether_quartz_dust.json b/src/main/resources/assets/appliedenergistics2/models/item/nether_quartz_dust.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/nether_quartz_dust.json rename to src/main/resources/assets/appliedenergistics2/models/item/nether_quartz_dust.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/nether_quartz_hoe.json b/src/main/resources/assets/appliedenergistics2/models/item/nether_quartz_hoe.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/nether_quartz_hoe.json rename to src/main/resources/assets/appliedenergistics2/models/item/nether_quartz_hoe.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/nether_quartz_pickaxe.json b/src/main/resources/assets/appliedenergistics2/models/item/nether_quartz_pickaxe.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/nether_quartz_pickaxe.json rename to src/main/resources/assets/appliedenergistics2/models/item/nether_quartz_pickaxe.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/nether_quartz_seed.json b/src/main/resources/assets/appliedenergistics2/models/item/nether_quartz_seed.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/nether_quartz_seed.json rename to src/main/resources/assets/appliedenergistics2/models/item/nether_quartz_seed.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/nether_quartz_seed_2.json b/src/main/resources/assets/appliedenergistics2/models/item/nether_quartz_seed_2.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/nether_quartz_seed_2.json rename to src/main/resources/assets/appliedenergistics2/models/item/nether_quartz_seed_2.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/nether_quartz_seed_3.json b/src/main/resources/assets/appliedenergistics2/models/item/nether_quartz_seed_3.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/nether_quartz_seed_3.json rename to src/main/resources/assets/appliedenergistics2/models/item/nether_quartz_seed_3.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/nether_quartz_shovel.json b/src/main/resources/assets/appliedenergistics2/models/item/nether_quartz_shovel.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/nether_quartz_shovel.json rename to src/main/resources/assets/appliedenergistics2/models/item/nether_quartz_shovel.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/nether_quartz_sword.json b/src/main/resources/assets/appliedenergistics2/models/item/nether_quartz_sword.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/nether_quartz_sword.json rename to src/main/resources/assets/appliedenergistics2/models/item/nether_quartz_sword.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/nether_quartz_wrench.json b/src/main/resources/assets/appliedenergistics2/models/item/nether_quartz_wrench.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/nether_quartz_wrench.json rename to src/main/resources/assets/appliedenergistics2/models/item/nether_quartz_wrench.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/network_tool.json b/src/main/resources/assets/appliedenergistics2/models/item/network_tool.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/network_tool.json rename to src/main/resources/assets/appliedenergistics2/models/item/network_tool.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/orange_covered_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/orange_covered_cable.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/orange_covered_cable.json rename to src/main/resources/assets/appliedenergistics2/models/item/orange_covered_cable.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/orange_covered_dense_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/orange_covered_dense_cable.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/orange_covered_dense_cable.json rename to src/main/resources/assets/appliedenergistics2/models/item/orange_covered_dense_cable.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/orange_glass_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/orange_glass_cable.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/orange_glass_cable.json rename to src/main/resources/assets/appliedenergistics2/models/item/orange_glass_cable.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/orange_lumen_paint_ball.json b/src/main/resources/assets/appliedenergistics2/models/item/orange_lumen_paint_ball.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/orange_lumen_paint_ball.json rename to src/main/resources/assets/appliedenergistics2/models/item/orange_lumen_paint_ball.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/orange_paint_ball.json b/src/main/resources/assets/appliedenergistics2/models/item/orange_paint_ball.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/orange_paint_ball.json rename to src/main/resources/assets/appliedenergistics2/models/item/orange_paint_ball.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/orange_smart_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/orange_smart_cable.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/orange_smart_cable.json rename to src/main/resources/assets/appliedenergistics2/models/item/orange_smart_cable.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/orange_smart_dense_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/orange_smart_dense_cable.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/orange_smart_dense_cable.json rename to src/main/resources/assets/appliedenergistics2/models/item/orange_smart_dense_cable.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/p2p_tunnel_base.json b/src/main/resources/assets/appliedenergistics2/models/item/p2p_tunnel_base.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/p2p_tunnel_base.json rename to src/main/resources/assets/appliedenergistics2/models/item/p2p_tunnel_base.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/paint.json b/src/main/resources/assets/appliedenergistics2/models/item/paint.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/paint.json rename to src/main/resources/assets/appliedenergistics2/models/item/paint.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/part_base.json b/src/main/resources/assets/appliedenergistics2/models/item/part_base.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/part_base.json rename to src/main/resources/assets/appliedenergistics2/models/item/part_base.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/pattern_terminal.json b/src/main/resources/assets/appliedenergistics2/models/item/pattern_terminal.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/pattern_terminal.json rename to src/main/resources/assets/appliedenergistics2/models/item/pattern_terminal.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/pink_covered_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/pink_covered_cable.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/pink_covered_cable.json rename to src/main/resources/assets/appliedenergistics2/models/item/pink_covered_cable.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/pink_covered_dense_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/pink_covered_dense_cable.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/pink_covered_dense_cable.json rename to src/main/resources/assets/appliedenergistics2/models/item/pink_covered_dense_cable.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/pink_glass_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/pink_glass_cable.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/pink_glass_cable.json rename to src/main/resources/assets/appliedenergistics2/models/item/pink_glass_cable.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/pink_lumen_paint_ball.json b/src/main/resources/assets/appliedenergistics2/models/item/pink_lumen_paint_ball.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/pink_lumen_paint_ball.json rename to src/main/resources/assets/appliedenergistics2/models/item/pink_lumen_paint_ball.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/pink_paint_ball.json b/src/main/resources/assets/appliedenergistics2/models/item/pink_paint_ball.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/pink_paint_ball.json rename to src/main/resources/assets/appliedenergistics2/models/item/pink_paint_ball.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/pink_smart_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/pink_smart_cable.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/pink_smart_cable.json rename to src/main/resources/assets/appliedenergistics2/models/item/pink_smart_cable.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/pink_smart_dense_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/pink_smart_dense_cable.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/pink_smart_dense_cable.json rename to src/main/resources/assets/appliedenergistics2/models/item/pink_smart_dense_cable.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/portable_cell.json b/src/main/resources/assets/appliedenergistics2/models/item/portable_cell.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/portable_cell.json rename to src/main/resources/assets/appliedenergistics2/models/item/portable_cell.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/printed_calculation_processor.json b/src/main/resources/assets/appliedenergistics2/models/item/printed_calculation_processor.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/printed_calculation_processor.json rename to src/main/resources/assets/appliedenergistics2/models/item/printed_calculation_processor.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/printed_engineering_processor.json b/src/main/resources/assets/appliedenergistics2/models/item/printed_engineering_processor.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/printed_engineering_processor.json rename to src/main/resources/assets/appliedenergistics2/models/item/printed_engineering_processor.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/printed_logic_processor.json b/src/main/resources/assets/appliedenergistics2/models/item/printed_logic_processor.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/printed_logic_processor.json rename to src/main/resources/assets/appliedenergistics2/models/item/printed_logic_processor.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/printed_silicon.json b/src/main/resources/assets/appliedenergistics2/models/item/printed_silicon.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/printed_silicon.json rename to src/main/resources/assets/appliedenergistics2/models/item/printed_silicon.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/purified_certus_quartz_crystal.json b/src/main/resources/assets/appliedenergistics2/models/item/purified_certus_quartz_crystal.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/purified_certus_quartz_crystal.json rename to src/main/resources/assets/appliedenergistics2/models/item/purified_certus_quartz_crystal.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/purified_fluix_crystal.json b/src/main/resources/assets/appliedenergistics2/models/item/purified_fluix_crystal.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/purified_fluix_crystal.json rename to src/main/resources/assets/appliedenergistics2/models/item/purified_fluix_crystal.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/purified_nether_quartz_crystal.json b/src/main/resources/assets/appliedenergistics2/models/item/purified_nether_quartz_crystal.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/purified_nether_quartz_crystal.json rename to src/main/resources/assets/appliedenergistics2/models/item/purified_nether_quartz_crystal.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/purple_covered_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/purple_covered_cable.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/purple_covered_cable.json rename to src/main/resources/assets/appliedenergistics2/models/item/purple_covered_cable.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/purple_covered_dense_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/purple_covered_dense_cable.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/purple_covered_dense_cable.json rename to src/main/resources/assets/appliedenergistics2/models/item/purple_covered_dense_cable.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/purple_glass_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/purple_glass_cable.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/purple_glass_cable.json rename to src/main/resources/assets/appliedenergistics2/models/item/purple_glass_cable.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/purple_lumen_paint_ball.json b/src/main/resources/assets/appliedenergistics2/models/item/purple_lumen_paint_ball.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/purple_lumen_paint_ball.json rename to src/main/resources/assets/appliedenergistics2/models/item/purple_lumen_paint_ball.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/purple_paint_ball.json b/src/main/resources/assets/appliedenergistics2/models/item/purple_paint_ball.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/purple_paint_ball.json rename to src/main/resources/assets/appliedenergistics2/models/item/purple_paint_ball.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/purple_smart_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/purple_smart_cable.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/purple_smart_cable.json rename to src/main/resources/assets/appliedenergistics2/models/item/purple_smart_cable.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/purple_smart_dense_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/purple_smart_dense_cable.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/purple_smart_dense_cable.json rename to src/main/resources/assets/appliedenergistics2/models/item/purple_smart_dense_cable.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/quantum_entangled_singularity.json b/src/main/resources/assets/appliedenergistics2/models/item/quantum_entangled_singularity.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/quantum_entangled_singularity.json rename to src/main/resources/assets/appliedenergistics2/models/item/quantum_entangled_singularity.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/quantum_link.json b/src/main/resources/assets/appliedenergistics2/models/item/quantum_link.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/quantum_link.json rename to src/main/resources/assets/appliedenergistics2/models/item/quantum_link.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/quantum_ring.json b/src/main/resources/assets/appliedenergistics2/models/item/quantum_ring.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/quantum_ring.json rename to src/main/resources/assets/appliedenergistics2/models/item/quantum_ring.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/quartz_block.json b/src/main/resources/assets/appliedenergistics2/models/item/quartz_block.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/quartz_block.json rename to src/main/resources/assets/appliedenergistics2/models/item/quartz_block.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/quartz_fiber.json b/src/main/resources/assets/appliedenergistics2/models/item/quartz_fiber.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/quartz_fiber.json rename to src/main/resources/assets/appliedenergistics2/models/item/quartz_fiber.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/quartz_fixture.json b/src/main/resources/assets/appliedenergistics2/models/item/quartz_fixture.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/quartz_fixture.json rename to src/main/resources/assets/appliedenergistics2/models/item/quartz_fixture.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/quartz_glass.json b/src/main/resources/assets/appliedenergistics2/models/item/quartz_glass.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/quartz_glass.json rename to src/main/resources/assets/appliedenergistics2/models/item/quartz_glass.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/quartz_growth_accelerator.json b/src/main/resources/assets/appliedenergistics2/models/item/quartz_growth_accelerator.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/quartz_growth_accelerator.json rename to src/main/resources/assets/appliedenergistics2/models/item/quartz_growth_accelerator.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/quartz_ore.json b/src/main/resources/assets/appliedenergistics2/models/item/quartz_ore.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/quartz_ore.json rename to src/main/resources/assets/appliedenergistics2/models/item/quartz_ore.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/quartz_pillar.json b/src/main/resources/assets/appliedenergistics2/models/item/quartz_pillar.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/quartz_pillar.json rename to src/main/resources/assets/appliedenergistics2/models/item/quartz_pillar.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/quartz_pillar_slab.json b/src/main/resources/assets/appliedenergistics2/models/item/quartz_pillar_slab.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/quartz_pillar_slab.json rename to src/main/resources/assets/appliedenergistics2/models/item/quartz_pillar_slab.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/quartz_pillar_stairs.json b/src/main/resources/assets/appliedenergistics2/models/item/quartz_pillar_stairs.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/quartz_pillar_stairs.json rename to src/main/resources/assets/appliedenergistics2/models/item/quartz_pillar_stairs.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/quartz_slab.json b/src/main/resources/assets/appliedenergistics2/models/item/quartz_slab.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/quartz_slab.json rename to src/main/resources/assets/appliedenergistics2/models/item/quartz_slab.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/quartz_stairs.json b/src/main/resources/assets/appliedenergistics2/models/item/quartz_stairs.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/quartz_stairs.json rename to src/main/resources/assets/appliedenergistics2/models/item/quartz_stairs.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/quartz_vibrant_glass.json b/src/main/resources/assets/appliedenergistics2/models/item/quartz_vibrant_glass.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/quartz_vibrant_glass.json rename to src/main/resources/assets/appliedenergistics2/models/item/quartz_vibrant_glass.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/red_covered_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/red_covered_cable.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/red_covered_cable.json rename to src/main/resources/assets/appliedenergistics2/models/item/red_covered_cable.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/red_covered_dense_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/red_covered_dense_cable.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/red_covered_dense_cable.json rename to src/main/resources/assets/appliedenergistics2/models/item/red_covered_dense_cable.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/red_glass_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/red_glass_cable.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/red_glass_cable.json rename to src/main/resources/assets/appliedenergistics2/models/item/red_glass_cable.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/red_lumen_paint_ball.json b/src/main/resources/assets/appliedenergistics2/models/item/red_lumen_paint_ball.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/red_lumen_paint_ball.json rename to src/main/resources/assets/appliedenergistics2/models/item/red_lumen_paint_ball.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/red_paint_ball.json b/src/main/resources/assets/appliedenergistics2/models/item/red_paint_ball.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/red_paint_ball.json rename to src/main/resources/assets/appliedenergistics2/models/item/red_paint_ball.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/red_smart_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/red_smart_cable.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/red_smart_cable.json rename to src/main/resources/assets/appliedenergistics2/models/item/red_smart_cable.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/red_smart_dense_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/red_smart_dense_cable.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/red_smart_dense_cable.json rename to src/main/resources/assets/appliedenergistics2/models/item/red_smart_dense_cable.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/redstone_card.json b/src/main/resources/assets/appliedenergistics2/models/item/redstone_card.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/redstone_card.json rename to src/main/resources/assets/appliedenergistics2/models/item/redstone_card.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/redstone_p2p_tunnel.json b/src/main/resources/assets/appliedenergistics2/models/item/redstone_p2p_tunnel.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/redstone_p2p_tunnel.json rename to src/main/resources/assets/appliedenergistics2/models/item/redstone_p2p_tunnel.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/replicator_card.json b/src/main/resources/assets/appliedenergistics2/models/item/replicator_card.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/replicator_card.json rename to src/main/resources/assets/appliedenergistics2/models/item/replicator_card.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/security_station.json b/src/main/resources/assets/appliedenergistics2/models/item/security_station.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/security_station.json rename to src/main/resources/assets/appliedenergistics2/models/item/security_station.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/semi_dark_monitor.json b/src/main/resources/assets/appliedenergistics2/models/item/semi_dark_monitor.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/semi_dark_monitor.json rename to src/main/resources/assets/appliedenergistics2/models/item/semi_dark_monitor.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/silicon.json b/src/main/resources/assets/appliedenergistics2/models/item/silicon.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/silicon.json rename to src/main/resources/assets/appliedenergistics2/models/item/silicon.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/silicon_press.json b/src/main/resources/assets/appliedenergistics2/models/item/silicon_press.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/silicon_press.json rename to src/main/resources/assets/appliedenergistics2/models/item/silicon_press.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/singularity.json b/src/main/resources/assets/appliedenergistics2/models/item/singularity.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/singularity.json rename to src/main/resources/assets/appliedenergistics2/models/item/singularity.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/sky_compass.json b/src/main/resources/assets/appliedenergistics2/models/item/sky_compass.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/sky_compass.json rename to src/main/resources/assets/appliedenergistics2/models/item/sky_compass.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/sky_dust.json b/src/main/resources/assets/appliedenergistics2/models/item/sky_dust.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/sky_dust.json rename to src/main/resources/assets/appliedenergistics2/models/item/sky_dust.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/sky_stone_block.json b/src/main/resources/assets/appliedenergistics2/models/item/sky_stone_block.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/sky_stone_block.json rename to src/main/resources/assets/appliedenergistics2/models/item/sky_stone_block.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/sky_stone_brick.json b/src/main/resources/assets/appliedenergistics2/models/item/sky_stone_brick.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/sky_stone_brick.json rename to src/main/resources/assets/appliedenergistics2/models/item/sky_stone_brick.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/sky_stone_brick_slab.json b/src/main/resources/assets/appliedenergistics2/models/item/sky_stone_brick_slab.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/sky_stone_brick_slab.json rename to src/main/resources/assets/appliedenergistics2/models/item/sky_stone_brick_slab.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/sky_stone_brick_stairs.json b/src/main/resources/assets/appliedenergistics2/models/item/sky_stone_brick_stairs.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/sky_stone_brick_stairs.json rename to src/main/resources/assets/appliedenergistics2/models/item/sky_stone_brick_stairs.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/sky_stone_chest.json b/src/main/resources/assets/appliedenergistics2/models/item/sky_stone_chest.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/sky_stone_chest.json rename to src/main/resources/assets/appliedenergistics2/models/item/sky_stone_chest.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/sky_stone_slab.json b/src/main/resources/assets/appliedenergistics2/models/item/sky_stone_slab.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/sky_stone_slab.json rename to src/main/resources/assets/appliedenergistics2/models/item/sky_stone_slab.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/sky_stone_small_brick.json b/src/main/resources/assets/appliedenergistics2/models/item/sky_stone_small_brick.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/sky_stone_small_brick.json rename to src/main/resources/assets/appliedenergistics2/models/item/sky_stone_small_brick.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/sky_stone_small_brick_slab.json b/src/main/resources/assets/appliedenergistics2/models/item/sky_stone_small_brick_slab.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/sky_stone_small_brick_slab.json rename to src/main/resources/assets/appliedenergistics2/models/item/sky_stone_small_brick_slab.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/sky_stone_small_brick_stairs.json b/src/main/resources/assets/appliedenergistics2/models/item/sky_stone_small_brick_stairs.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/sky_stone_small_brick_stairs.json rename to src/main/resources/assets/appliedenergistics2/models/item/sky_stone_small_brick_stairs.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/sky_stone_stairs.json b/src/main/resources/assets/appliedenergistics2/models/item/sky_stone_stairs.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/sky_stone_stairs.json rename to src/main/resources/assets/appliedenergistics2/models/item/sky_stone_stairs.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/smart_cable_base.json b/src/main/resources/assets/appliedenergistics2/models/item/smart_cable_base.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/smart_cable_base.json rename to src/main/resources/assets/appliedenergistics2/models/item/smart_cable_base.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/smart_dense_cable_base.json b/src/main/resources/assets/appliedenergistics2/models/item/smart_dense_cable_base.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/smart_dense_cable_base.json rename to src/main/resources/assets/appliedenergistics2/models/item/smart_dense_cable_base.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/smooth_sky_stone_block.json b/src/main/resources/assets/appliedenergistics2/models/item/smooth_sky_stone_block.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/smooth_sky_stone_block.json rename to src/main/resources/assets/appliedenergistics2/models/item/smooth_sky_stone_block.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/smooth_sky_stone_chest.json b/src/main/resources/assets/appliedenergistics2/models/item/smooth_sky_stone_chest.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/smooth_sky_stone_chest.json rename to src/main/resources/assets/appliedenergistics2/models/item/smooth_sky_stone_chest.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/smooth_sky_stone_slab.json b/src/main/resources/assets/appliedenergistics2/models/item/smooth_sky_stone_slab.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/smooth_sky_stone_slab.json rename to src/main/resources/assets/appliedenergistics2/models/item/smooth_sky_stone_slab.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/smooth_sky_stone_stairs.json b/src/main/resources/assets/appliedenergistics2/models/item/smooth_sky_stone_stairs.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/smooth_sky_stone_stairs.json rename to src/main/resources/assets/appliedenergistics2/models/item/smooth_sky_stone_stairs.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/spatial_io_port.json b/src/main/resources/assets/appliedenergistics2/models/item/spatial_io_port.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/spatial_io_port.json rename to src/main/resources/assets/appliedenergistics2/models/item/spatial_io_port.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/spatial_pylon.json b/src/main/resources/assets/appliedenergistics2/models/item/spatial_pylon.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/spatial_pylon.json rename to src/main/resources/assets/appliedenergistics2/models/item/spatial_pylon.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/speed_card.json b/src/main/resources/assets/appliedenergistics2/models/item/speed_card.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/speed_card.json rename to src/main/resources/assets/appliedenergistics2/models/item/speed_card.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/storage_bus.json b/src/main/resources/assets/appliedenergistics2/models/item/storage_bus.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/storage_bus.json rename to src/main/resources/assets/appliedenergistics2/models/item/storage_bus.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/storage_monitor.json b/src/main/resources/assets/appliedenergistics2/models/item/storage_monitor.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/storage_monitor.json rename to src/main/resources/assets/appliedenergistics2/models/item/storage_monitor.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/terminal.json b/src/main/resources/assets/appliedenergistics2/models/item/terminal.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/terminal.json rename to src/main/resources/assets/appliedenergistics2/models/item/terminal.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/tiny_tnt.json b/src/main/resources/assets/appliedenergistics2/models/item/tiny_tnt.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/tiny_tnt.json rename to src/main/resources/assets/appliedenergistics2/models/item/tiny_tnt.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/toggle_bus.json b/src/main/resources/assets/appliedenergistics2/models/item/toggle_bus.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/toggle_bus.json rename to src/main/resources/assets/appliedenergistics2/models/item/toggle_bus.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/vibration_chamber.json b/src/main/resources/assets/appliedenergistics2/models/item/vibration_chamber.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/vibration_chamber.json rename to src/main/resources/assets/appliedenergistics2/models/item/vibration_chamber.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/view_cell.json b/src/main/resources/assets/appliedenergistics2/models/item/view_cell.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/view_cell.json rename to src/main/resources/assets/appliedenergistics2/models/item/view_cell.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/white_covered_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/white_covered_cable.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/white_covered_cable.json rename to src/main/resources/assets/appliedenergistics2/models/item/white_covered_cable.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/white_covered_dense_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/white_covered_dense_cable.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/white_covered_dense_cable.json rename to src/main/resources/assets/appliedenergistics2/models/item/white_covered_dense_cable.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/white_glass_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/white_glass_cable.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/white_glass_cable.json rename to src/main/resources/assets/appliedenergistics2/models/item/white_glass_cable.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/white_lumen_paint_ball.json b/src/main/resources/assets/appliedenergistics2/models/item/white_lumen_paint_ball.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/white_lumen_paint_ball.json rename to src/main/resources/assets/appliedenergistics2/models/item/white_lumen_paint_ball.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/white_paint_ball.json b/src/main/resources/assets/appliedenergistics2/models/item/white_paint_ball.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/white_paint_ball.json rename to src/main/resources/assets/appliedenergistics2/models/item/white_paint_ball.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/white_smart_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/white_smart_cable.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/white_smart_cable.json rename to src/main/resources/assets/appliedenergistics2/models/item/white_smart_cable.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/white_smart_dense_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/white_smart_dense_cable.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/white_smart_dense_cable.json rename to src/main/resources/assets/appliedenergistics2/models/item/white_smart_dense_cable.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/wireless_access_point.json b/src/main/resources/assets/appliedenergistics2/models/item/wireless_access_point.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/wireless_access_point.json rename to src/main/resources/assets/appliedenergistics2/models/item/wireless_access_point.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/wireless_booster.json b/src/main/resources/assets/appliedenergistics2/models/item/wireless_booster.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/wireless_booster.json rename to src/main/resources/assets/appliedenergistics2/models/item/wireless_booster.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/wireless_receiver.json b/src/main/resources/assets/appliedenergistics2/models/item/wireless_receiver.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/wireless_receiver.json rename to src/main/resources/assets/appliedenergistics2/models/item/wireless_receiver.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/wireless_terminal.json b/src/main/resources/assets/appliedenergistics2/models/item/wireless_terminal.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/wireless_terminal.json rename to src/main/resources/assets/appliedenergistics2/models/item/wireless_terminal.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/wooden_crank.json b/src/main/resources/assets/appliedenergistics2/models/item/wooden_crank.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/wooden_crank.json rename to src/main/resources/assets/appliedenergistics2/models/item/wooden_crank.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/wooden_gear.json b/src/main/resources/assets/appliedenergistics2/models/item/wooden_gear.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/wooden_gear.json rename to src/main/resources/assets/appliedenergistics2/models/item/wooden_gear.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/yellow_covered_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/yellow_covered_cable.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/yellow_covered_cable.json rename to src/main/resources/assets/appliedenergistics2/models/item/yellow_covered_cable.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/yellow_covered_dense_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/yellow_covered_dense_cable.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/yellow_covered_dense_cable.json rename to src/main/resources/assets/appliedenergistics2/models/item/yellow_covered_dense_cable.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/yellow_glass_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/yellow_glass_cable.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/yellow_glass_cable.json rename to src/main/resources/assets/appliedenergistics2/models/item/yellow_glass_cable.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/yellow_lumen_paint_ball.json b/src/main/resources/assets/appliedenergistics2/models/item/yellow_lumen_paint_ball.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/yellow_lumen_paint_ball.json rename to src/main/resources/assets/appliedenergistics2/models/item/yellow_lumen_paint_ball.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/yellow_paint_ball.json b/src/main/resources/assets/appliedenergistics2/models/item/yellow_paint_ball.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/yellow_paint_ball.json rename to src/main/resources/assets/appliedenergistics2/models/item/yellow_paint_ball.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/yellow_smart_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/yellow_smart_cable.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/yellow_smart_cable.json rename to src/main/resources/assets/appliedenergistics2/models/item/yellow_smart_cable.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/item/yellow_smart_dense_cable.json b/src/main/resources/assets/appliedenergistics2/models/item/yellow_smart_dense_cable.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/item/yellow_smart_dense_cable.json rename to src/main/resources/assets/appliedenergistics2/models/item/yellow_smart_dense_cable.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/part/annihilation_plane.json b/src/main/resources/assets/appliedenergistics2/models/part/annihilation_plane.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/part/annihilation_plane.json rename to src/main/resources/assets/appliedenergistics2/models/part/annihilation_plane.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/part/annihilation_plane_on.json b/src/main/resources/assets/appliedenergistics2/models/part/annihilation_plane_on.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/part/annihilation_plane_on.json rename to src/main/resources/assets/appliedenergistics2/models/part/annihilation_plane_on.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/part/cable/covered/center.json b/src/main/resources/assets/appliedenergistics2/models/part/cable/covered/center.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/part/cable/covered/center.json rename to src/main/resources/assets/appliedenergistics2/models/part/cable/covered/center.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/part/cable/covered/connection.json b/src/main/resources/assets/appliedenergistics2/models/part/cable/covered/connection.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/part/cable/covered/connection.json rename to src/main/resources/assets/appliedenergistics2/models/part/cable/covered/connection.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/part/cable/covered/straight.json b/src/main/resources/assets/appliedenergistics2/models/part/cable/covered/straight.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/part/cable/covered/straight.json rename to src/main/resources/assets/appliedenergistics2/models/part/cable/covered/straight.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/part/cable/dense_covered/center.json b/src/main/resources/assets/appliedenergistics2/models/part/cable/dense_covered/center.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/part/cable/dense_covered/center.json rename to src/main/resources/assets/appliedenergistics2/models/part/cable/dense_covered/center.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/part/cable/dense_covered/connection.json b/src/main/resources/assets/appliedenergistics2/models/part/cable/dense_covered/connection.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/part/cable/dense_covered/connection.json rename to src/main/resources/assets/appliedenergistics2/models/part/cable/dense_covered/connection.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/part/cable/dense_covered/straight.json b/src/main/resources/assets/appliedenergistics2/models/part/cable/dense_covered/straight.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/part/cable/dense_covered/straight.json rename to src/main/resources/assets/appliedenergistics2/models/part/cable/dense_covered/straight.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/part/cable/dense_smart/center.json b/src/main/resources/assets/appliedenergistics2/models/part/cable/dense_smart/center.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/part/cable/dense_smart/center.json rename to src/main/resources/assets/appliedenergistics2/models/part/cable/dense_smart/center.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/part/cable/dense_smart/connection.json b/src/main/resources/assets/appliedenergistics2/models/part/cable/dense_smart/connection.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/part/cable/dense_smart/connection.json rename to src/main/resources/assets/appliedenergistics2/models/part/cable/dense_smart/connection.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/part/cable/dense_smart/straight.json b/src/main/resources/assets/appliedenergistics2/models/part/cable/dense_smart/straight.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/part/cable/dense_smart/straight.json rename to src/main/resources/assets/appliedenergistics2/models/part/cable/dense_smart/straight.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/part/cable/glass/center.json b/src/main/resources/assets/appliedenergistics2/models/part/cable/glass/center.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/part/cable/glass/center.json rename to src/main/resources/assets/appliedenergistics2/models/part/cable/glass/center.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/part/cable/glass/connection.json b/src/main/resources/assets/appliedenergistics2/models/part/cable/glass/connection.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/part/cable/glass/connection.json rename to src/main/resources/assets/appliedenergistics2/models/part/cable/glass/connection.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/part/cable/glass/straight.json b/src/main/resources/assets/appliedenergistics2/models/part/cable/glass/straight.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/part/cable/glass/straight.json rename to src/main/resources/assets/appliedenergistics2/models/part/cable/glass/straight.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/part/cable/smart/center.json b/src/main/resources/assets/appliedenergistics2/models/part/cable/smart/center.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/part/cable/smart/center.json rename to src/main/resources/assets/appliedenergistics2/models/part/cable/smart/center.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/part/cable/smart/connection.json b/src/main/resources/assets/appliedenergistics2/models/part/cable/smart/connection.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/part/cable/smart/connection.json rename to src/main/resources/assets/appliedenergistics2/models/part/cable/smart/connection.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/part/cable/smart/straight.json b/src/main/resources/assets/appliedenergistics2/models/part/cable/smart/straight.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/part/cable/smart/straight.json rename to src/main/resources/assets/appliedenergistics2/models/part/cable/smart/straight.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/part/cable_anchor.json b/src/main/resources/assets/appliedenergistics2/models/part/cable_anchor.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/part/cable_anchor.json rename to src/main/resources/assets/appliedenergistics2/models/part/cable_anchor.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/part/cable_anchor_short.json b/src/main/resources/assets/appliedenergistics2/models/part/cable_anchor_short.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/part/cable_anchor_short.json rename to src/main/resources/assets/appliedenergistics2/models/part/cable_anchor_short.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/part/cable_facade.json b/src/main/resources/assets/appliedenergistics2/models/part/cable_facade.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/part/cable_facade.json rename to src/main/resources/assets/appliedenergistics2/models/part/cable_facade.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/part/conversion_monitor_locked_off.json b/src/main/resources/assets/appliedenergistics2/models/part/conversion_monitor_locked_off.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/part/conversion_monitor_locked_off.json rename to src/main/resources/assets/appliedenergistics2/models/part/conversion_monitor_locked_off.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/part/conversion_monitor_locked_on.json b/src/main/resources/assets/appliedenergistics2/models/part/conversion_monitor_locked_on.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/part/conversion_monitor_locked_on.json rename to src/main/resources/assets/appliedenergistics2/models/part/conversion_monitor_locked_on.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/part/conversion_monitor_off.json b/src/main/resources/assets/appliedenergistics2/models/part/conversion_monitor_off.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/part/conversion_monitor_off.json rename to src/main/resources/assets/appliedenergistics2/models/part/conversion_monitor_off.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/part/conversion_monitor_on.json b/src/main/resources/assets/appliedenergistics2/models/part/conversion_monitor_on.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/part/conversion_monitor_on.json rename to src/main/resources/assets/appliedenergistics2/models/part/conversion_monitor_on.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/part/crafting_terminal.json b/src/main/resources/assets/appliedenergistics2/models/part/crafting_terminal.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/part/crafting_terminal.json rename to src/main/resources/assets/appliedenergistics2/models/part/crafting_terminal.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/part/crafting_terminal_off.json b/src/main/resources/assets/appliedenergistics2/models/part/crafting_terminal_off.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/part/crafting_terminal_off.json rename to src/main/resources/assets/appliedenergistics2/models/part/crafting_terminal_off.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/part/crafting_terminal_on.json b/src/main/resources/assets/appliedenergistics2/models/part/crafting_terminal_on.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/part/crafting_terminal_on.json rename to src/main/resources/assets/appliedenergistics2/models/part/crafting_terminal_on.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/part/display_base.json b/src/main/resources/assets/appliedenergistics2/models/part/display_base.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/part/display_base.json rename to src/main/resources/assets/appliedenergistics2/models/part/display_base.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/part/display_off.json b/src/main/resources/assets/appliedenergistics2/models/part/display_off.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/part/display_off.json rename to src/main/resources/assets/appliedenergistics2/models/part/display_off.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/part/display_status_has_channel.json b/src/main/resources/assets/appliedenergistics2/models/part/display_status_has_channel.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/part/display_status_has_channel.json rename to src/main/resources/assets/appliedenergistics2/models/part/display_status_has_channel.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/part/display_status_off.json b/src/main/resources/assets/appliedenergistics2/models/part/display_status_off.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/part/display_status_off.json rename to src/main/resources/assets/appliedenergistics2/models/part/display_status_off.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/part/display_status_on.json b/src/main/resources/assets/appliedenergistics2/models/part/display_status_on.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/part/display_status_on.json rename to src/main/resources/assets/appliedenergistics2/models/part/display_status_on.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/part/export_bus_base.json b/src/main/resources/assets/appliedenergistics2/models/part/export_bus_base.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/part/export_bus_base.json rename to src/main/resources/assets/appliedenergistics2/models/part/export_bus_base.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/part/export_bus_has_channel.json b/src/main/resources/assets/appliedenergistics2/models/part/export_bus_has_channel.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/part/export_bus_has_channel.json rename to src/main/resources/assets/appliedenergistics2/models/part/export_bus_has_channel.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/part/export_bus_off.json b/src/main/resources/assets/appliedenergistics2/models/part/export_bus_off.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/part/export_bus_off.json rename to src/main/resources/assets/appliedenergistics2/models/part/export_bus_off.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/part/export_bus_on.json b/src/main/resources/assets/appliedenergistics2/models/part/export_bus_on.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/part/export_bus_on.json rename to src/main/resources/assets/appliedenergistics2/models/part/export_bus_on.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/part/fluid_annihilation_plane.json b/src/main/resources/assets/appliedenergistics2/models/part/fluid_annihilation_plane.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/part/fluid_annihilation_plane.json rename to src/main/resources/assets/appliedenergistics2/models/part/fluid_annihilation_plane.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/part/fluid_annihilation_plane_on.json b/src/main/resources/assets/appliedenergistics2/models/part/fluid_annihilation_plane_on.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/part/fluid_annihilation_plane_on.json rename to src/main/resources/assets/appliedenergistics2/models/part/fluid_annihilation_plane_on.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/part/fluid_export_bus_base.json b/src/main/resources/assets/appliedenergistics2/models/part/fluid_export_bus_base.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/part/fluid_export_bus_base.json rename to src/main/resources/assets/appliedenergistics2/models/part/fluid_export_bus_base.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/part/fluid_export_bus_has_channel.json b/src/main/resources/assets/appliedenergistics2/models/part/fluid_export_bus_has_channel.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/part/fluid_export_bus_has_channel.json rename to src/main/resources/assets/appliedenergistics2/models/part/fluid_export_bus_has_channel.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/part/fluid_export_bus_off.json b/src/main/resources/assets/appliedenergistics2/models/part/fluid_export_bus_off.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/part/fluid_export_bus_off.json rename to src/main/resources/assets/appliedenergistics2/models/part/fluid_export_bus_off.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/part/fluid_export_bus_on.json b/src/main/resources/assets/appliedenergistics2/models/part/fluid_export_bus_on.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/part/fluid_export_bus_on.json rename to src/main/resources/assets/appliedenergistics2/models/part/fluid_export_bus_on.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/part/fluid_formation_plane.json b/src/main/resources/assets/appliedenergistics2/models/part/fluid_formation_plane.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/part/fluid_formation_plane.json rename to src/main/resources/assets/appliedenergistics2/models/part/fluid_formation_plane.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/part/fluid_formation_plane_on.json b/src/main/resources/assets/appliedenergistics2/models/part/fluid_formation_plane_on.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/part/fluid_formation_plane_on.json rename to src/main/resources/assets/appliedenergistics2/models/part/fluid_formation_plane_on.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/part/fluid_import_bus_base.json b/src/main/resources/assets/appliedenergistics2/models/part/fluid_import_bus_base.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/part/fluid_import_bus_base.json rename to src/main/resources/assets/appliedenergistics2/models/part/fluid_import_bus_base.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/part/fluid_import_bus_has_channel.json b/src/main/resources/assets/appliedenergistics2/models/part/fluid_import_bus_has_channel.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/part/fluid_import_bus_has_channel.json rename to src/main/resources/assets/appliedenergistics2/models/part/fluid_import_bus_has_channel.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/part/fluid_import_bus_off.json b/src/main/resources/assets/appliedenergistics2/models/part/fluid_import_bus_off.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/part/fluid_import_bus_off.json rename to src/main/resources/assets/appliedenergistics2/models/part/fluid_import_bus_off.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/part/fluid_import_bus_on.json b/src/main/resources/assets/appliedenergistics2/models/part/fluid_import_bus_on.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/part/fluid_import_bus_on.json rename to src/main/resources/assets/appliedenergistics2/models/part/fluid_import_bus_on.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/part/fluid_interface_base.json b/src/main/resources/assets/appliedenergistics2/models/part/fluid_interface_base.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/part/fluid_interface_base.json rename to src/main/resources/assets/appliedenergistics2/models/part/fluid_interface_base.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/part/fluid_interface_has_channel.json b/src/main/resources/assets/appliedenergistics2/models/part/fluid_interface_has_channel.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/part/fluid_interface_has_channel.json rename to src/main/resources/assets/appliedenergistics2/models/part/fluid_interface_has_channel.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/part/fluid_interface_off.json b/src/main/resources/assets/appliedenergistics2/models/part/fluid_interface_off.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/part/fluid_interface_off.json rename to src/main/resources/assets/appliedenergistics2/models/part/fluid_interface_off.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/part/fluid_interface_on.json b/src/main/resources/assets/appliedenergistics2/models/part/fluid_interface_on.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/part/fluid_interface_on.json rename to src/main/resources/assets/appliedenergistics2/models/part/fluid_interface_on.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/part/fluid_storage_bus_base.json b/src/main/resources/assets/appliedenergistics2/models/part/fluid_storage_bus_base.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/part/fluid_storage_bus_base.json rename to src/main/resources/assets/appliedenergistics2/models/part/fluid_storage_bus_base.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/part/fluid_storage_bus_has_channel.json b/src/main/resources/assets/appliedenergistics2/models/part/fluid_storage_bus_has_channel.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/part/fluid_storage_bus_has_channel.json rename to src/main/resources/assets/appliedenergistics2/models/part/fluid_storage_bus_has_channel.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/part/fluid_storage_bus_off.json b/src/main/resources/assets/appliedenergistics2/models/part/fluid_storage_bus_off.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/part/fluid_storage_bus_off.json rename to src/main/resources/assets/appliedenergistics2/models/part/fluid_storage_bus_off.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/part/fluid_storage_bus_on.json b/src/main/resources/assets/appliedenergistics2/models/part/fluid_storage_bus_on.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/part/fluid_storage_bus_on.json rename to src/main/resources/assets/appliedenergistics2/models/part/fluid_storage_bus_on.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/part/fluid_terminal.json b/src/main/resources/assets/appliedenergistics2/models/part/fluid_terminal.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/part/fluid_terminal.json rename to src/main/resources/assets/appliedenergistics2/models/part/fluid_terminal.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/part/fluid_terminal_off.json b/src/main/resources/assets/appliedenergistics2/models/part/fluid_terminal_off.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/part/fluid_terminal_off.json rename to src/main/resources/assets/appliedenergistics2/models/part/fluid_terminal_off.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/part/fluid_terminal_on.json b/src/main/resources/assets/appliedenergistics2/models/part/fluid_terminal_on.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/part/fluid_terminal_on.json rename to src/main/resources/assets/appliedenergistics2/models/part/fluid_terminal_on.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/part/formation_plane.json b/src/main/resources/assets/appliedenergistics2/models/part/formation_plane.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/part/formation_plane.json rename to src/main/resources/assets/appliedenergistics2/models/part/formation_plane.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/part/formation_plane_on.json b/src/main/resources/assets/appliedenergistics2/models/part/formation_plane_on.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/part/formation_plane_on.json rename to src/main/resources/assets/appliedenergistics2/models/part/formation_plane_on.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/part/identity_annihilation_plane.json b/src/main/resources/assets/appliedenergistics2/models/part/identity_annihilation_plane.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/part/identity_annihilation_plane.json rename to src/main/resources/assets/appliedenergistics2/models/part/identity_annihilation_plane.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/part/identity_annihilation_plane_on.json b/src/main/resources/assets/appliedenergistics2/models/part/identity_annihilation_plane_on.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/part/identity_annihilation_plane_on.json rename to src/main/resources/assets/appliedenergistics2/models/part/identity_annihilation_plane_on.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/part/import_bus_base.json b/src/main/resources/assets/appliedenergistics2/models/part/import_bus_base.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/part/import_bus_base.json rename to src/main/resources/assets/appliedenergistics2/models/part/import_bus_base.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/part/import_bus_has_channel.json b/src/main/resources/assets/appliedenergistics2/models/part/import_bus_has_channel.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/part/import_bus_has_channel.json rename to src/main/resources/assets/appliedenergistics2/models/part/import_bus_has_channel.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/part/import_bus_off.json b/src/main/resources/assets/appliedenergistics2/models/part/import_bus_off.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/part/import_bus_off.json rename to src/main/resources/assets/appliedenergistics2/models/part/import_bus_off.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/part/import_bus_on.json b/src/main/resources/assets/appliedenergistics2/models/part/import_bus_on.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/part/import_bus_on.json rename to src/main/resources/assets/appliedenergistics2/models/part/import_bus_on.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/part/interface_base.json b/src/main/resources/assets/appliedenergistics2/models/part/interface_base.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/part/interface_base.json rename to src/main/resources/assets/appliedenergistics2/models/part/interface_base.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/part/interface_has_channel.json b/src/main/resources/assets/appliedenergistics2/models/part/interface_has_channel.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/part/interface_has_channel.json rename to src/main/resources/assets/appliedenergistics2/models/part/interface_has_channel.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/part/interface_off.json b/src/main/resources/assets/appliedenergistics2/models/part/interface_off.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/part/interface_off.json rename to src/main/resources/assets/appliedenergistics2/models/part/interface_off.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/part/interface_on.json b/src/main/resources/assets/appliedenergistics2/models/part/interface_on.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/part/interface_on.json rename to src/main/resources/assets/appliedenergistics2/models/part/interface_on.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/part/interface_terminal_off.json b/src/main/resources/assets/appliedenergistics2/models/part/interface_terminal_off.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/part/interface_terminal_off.json rename to src/main/resources/assets/appliedenergistics2/models/part/interface_terminal_off.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/part/interface_terminal_on.json b/src/main/resources/assets/appliedenergistics2/models/part/interface_terminal_on.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/part/interface_terminal_on.json rename to src/main/resources/assets/appliedenergistics2/models/part/interface_terminal_on.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/part/inverted_toggle_bus_base.json b/src/main/resources/assets/appliedenergistics2/models/part/inverted_toggle_bus_base.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/part/inverted_toggle_bus_base.json rename to src/main/resources/assets/appliedenergistics2/models/part/inverted_toggle_bus_base.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/part/level_emitter_base_off.json b/src/main/resources/assets/appliedenergistics2/models/part/level_emitter_base_off.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/part/level_emitter_base_off.json rename to src/main/resources/assets/appliedenergistics2/models/part/level_emitter_base_off.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/part/level_emitter_base_on.json b/src/main/resources/assets/appliedenergistics2/models/part/level_emitter_base_on.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/part/level_emitter_base_on.json rename to src/main/resources/assets/appliedenergistics2/models/part/level_emitter_base_on.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/part/level_emitter_status_has_channel.json b/src/main/resources/assets/appliedenergistics2/models/part/level_emitter_status_has_channel.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/part/level_emitter_status_has_channel.json rename to src/main/resources/assets/appliedenergistics2/models/part/level_emitter_status_has_channel.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/part/level_emitter_status_off.json b/src/main/resources/assets/appliedenergistics2/models/part/level_emitter_status_off.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/part/level_emitter_status_off.json rename to src/main/resources/assets/appliedenergistics2/models/part/level_emitter_status_off.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/part/level_emitter_status_on.json b/src/main/resources/assets/appliedenergistics2/models/part/level_emitter_status_on.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/part/level_emitter_status_on.json rename to src/main/resources/assets/appliedenergistics2/models/part/level_emitter_status_on.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/part/monitor_base.json b/src/main/resources/assets/appliedenergistics2/models/part/monitor_base.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/part/monitor_base.json rename to src/main/resources/assets/appliedenergistics2/models/part/monitor_base.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/part/monitor_bright_off.json b/src/main/resources/assets/appliedenergistics2/models/part/monitor_bright_off.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/part/monitor_bright_off.json rename to src/main/resources/assets/appliedenergistics2/models/part/monitor_bright_off.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/part/monitor_bright_on.json b/src/main/resources/assets/appliedenergistics2/models/part/monitor_bright_on.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/part/monitor_bright_on.json rename to src/main/resources/assets/appliedenergistics2/models/part/monitor_bright_on.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/part/monitor_dark_off.json b/src/main/resources/assets/appliedenergistics2/models/part/monitor_dark_off.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/part/monitor_dark_off.json rename to src/main/resources/assets/appliedenergistics2/models/part/monitor_dark_off.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/part/monitor_dark_on.json b/src/main/resources/assets/appliedenergistics2/models/part/monitor_dark_on.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/part/monitor_dark_on.json rename to src/main/resources/assets/appliedenergistics2/models/part/monitor_dark_on.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/part/monitor_medium_off.json b/src/main/resources/assets/appliedenergistics2/models/part/monitor_medium_off.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/part/monitor_medium_off.json rename to src/main/resources/assets/appliedenergistics2/models/part/monitor_medium_off.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/part/monitor_medium_on.json b/src/main/resources/assets/appliedenergistics2/models/part/monitor_medium_on.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/part/monitor_medium_on.json rename to src/main/resources/assets/appliedenergistics2/models/part/monitor_medium_on.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/part/p2p/p2p_tunnel_base.json b/src/main/resources/assets/appliedenergistics2/models/part/p2p/p2p_tunnel_base.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/part/p2p/p2p_tunnel_base.json rename to src/main/resources/assets/appliedenergistics2/models/part/p2p/p2p_tunnel_base.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/part/p2p/p2p_tunnel_fe.json b/src/main/resources/assets/appliedenergistics2/models/part/p2p/p2p_tunnel_fe.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/part/p2p/p2p_tunnel_fe.json rename to src/main/resources/assets/appliedenergistics2/models/part/p2p/p2p_tunnel_fe.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/part/p2p/p2p_tunnel_fluids.json b/src/main/resources/assets/appliedenergistics2/models/part/p2p/p2p_tunnel_fluids.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/part/p2p/p2p_tunnel_fluids.json rename to src/main/resources/assets/appliedenergistics2/models/part/p2p/p2p_tunnel_fluids.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/part/p2p/p2p_tunnel_frequency.json b/src/main/resources/assets/appliedenergistics2/models/part/p2p/p2p_tunnel_frequency.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/part/p2p/p2p_tunnel_frequency.json rename to src/main/resources/assets/appliedenergistics2/models/part/p2p/p2p_tunnel_frequency.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/part/p2p/p2p_tunnel_ic2.json b/src/main/resources/assets/appliedenergistics2/models/part/p2p/p2p_tunnel_ic2.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/part/p2p/p2p_tunnel_ic2.json rename to src/main/resources/assets/appliedenergistics2/models/part/p2p/p2p_tunnel_ic2.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/part/p2p/p2p_tunnel_items.json b/src/main/resources/assets/appliedenergistics2/models/part/p2p/p2p_tunnel_items.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/part/p2p/p2p_tunnel_items.json rename to src/main/resources/assets/appliedenergistics2/models/part/p2p/p2p_tunnel_items.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/part/p2p/p2p_tunnel_light.json b/src/main/resources/assets/appliedenergistics2/models/part/p2p/p2p_tunnel_light.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/part/p2p/p2p_tunnel_light.json rename to src/main/resources/assets/appliedenergistics2/models/part/p2p/p2p_tunnel_light.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/part/p2p/p2p_tunnel_me.json b/src/main/resources/assets/appliedenergistics2/models/part/p2p/p2p_tunnel_me.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/part/p2p/p2p_tunnel_me.json rename to src/main/resources/assets/appliedenergistics2/models/part/p2p/p2p_tunnel_me.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/part/p2p/p2p_tunnel_redstone.json b/src/main/resources/assets/appliedenergistics2/models/part/p2p/p2p_tunnel_redstone.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/part/p2p/p2p_tunnel_redstone.json rename to src/main/resources/assets/appliedenergistics2/models/part/p2p/p2p_tunnel_redstone.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/part/p2p/p2p_tunnel_status_has_channel.json b/src/main/resources/assets/appliedenergistics2/models/part/p2p/p2p_tunnel_status_has_channel.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/part/p2p/p2p_tunnel_status_has_channel.json rename to src/main/resources/assets/appliedenergistics2/models/part/p2p/p2p_tunnel_status_has_channel.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/part/p2p/p2p_tunnel_status_off.json b/src/main/resources/assets/appliedenergistics2/models/part/p2p/p2p_tunnel_status_off.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/part/p2p/p2p_tunnel_status_off.json rename to src/main/resources/assets/appliedenergistics2/models/part/p2p/p2p_tunnel_status_off.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/part/p2p/p2p_tunnel_status_on.json b/src/main/resources/assets/appliedenergistics2/models/part/p2p/p2p_tunnel_status_on.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/part/p2p/p2p_tunnel_status_on.json rename to src/main/resources/assets/appliedenergistics2/models/part/p2p/p2p_tunnel_status_on.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/part/pattern_terminal_off.json b/src/main/resources/assets/appliedenergistics2/models/part/pattern_terminal_off.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/part/pattern_terminal_off.json rename to src/main/resources/assets/appliedenergistics2/models/part/pattern_terminal_off.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/part/pattern_terminal_on.json b/src/main/resources/assets/appliedenergistics2/models/part/pattern_terminal_on.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/part/pattern_terminal_on.json rename to src/main/resources/assets/appliedenergistics2/models/part/pattern_terminal_on.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/part/quartz_fiber.json b/src/main/resources/assets/appliedenergistics2/models/part/quartz_fiber.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/part/quartz_fiber.json rename to src/main/resources/assets/appliedenergistics2/models/part/quartz_fiber.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/part/storage_bus_base.json b/src/main/resources/assets/appliedenergistics2/models/part/storage_bus_base.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/part/storage_bus_base.json rename to src/main/resources/assets/appliedenergistics2/models/part/storage_bus_base.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/part/storage_bus_has_channel.json b/src/main/resources/assets/appliedenergistics2/models/part/storage_bus_has_channel.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/part/storage_bus_has_channel.json rename to src/main/resources/assets/appliedenergistics2/models/part/storage_bus_has_channel.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/part/storage_bus_off.json b/src/main/resources/assets/appliedenergistics2/models/part/storage_bus_off.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/part/storage_bus_off.json rename to src/main/resources/assets/appliedenergistics2/models/part/storage_bus_off.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/part/storage_bus_on.json b/src/main/resources/assets/appliedenergistics2/models/part/storage_bus_on.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/part/storage_bus_on.json rename to src/main/resources/assets/appliedenergistics2/models/part/storage_bus_on.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/part/storage_monitor_locked_off.json b/src/main/resources/assets/appliedenergistics2/models/part/storage_monitor_locked_off.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/part/storage_monitor_locked_off.json rename to src/main/resources/assets/appliedenergistics2/models/part/storage_monitor_locked_off.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/part/storage_monitor_locked_on.json b/src/main/resources/assets/appliedenergistics2/models/part/storage_monitor_locked_on.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/part/storage_monitor_locked_on.json rename to src/main/resources/assets/appliedenergistics2/models/part/storage_monitor_locked_on.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/part/storage_monitor_off.json b/src/main/resources/assets/appliedenergistics2/models/part/storage_monitor_off.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/part/storage_monitor_off.json rename to src/main/resources/assets/appliedenergistics2/models/part/storage_monitor_off.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/part/storage_monitor_on.json b/src/main/resources/assets/appliedenergistics2/models/part/storage_monitor_on.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/part/storage_monitor_on.json rename to src/main/resources/assets/appliedenergistics2/models/part/storage_monitor_on.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/part/terminal_off.json b/src/main/resources/assets/appliedenergistics2/models/part/terminal_off.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/part/terminal_off.json rename to src/main/resources/assets/appliedenergistics2/models/part/terminal_off.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/part/terminal_on.json b/src/main/resources/assets/appliedenergistics2/models/part/terminal_on.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/part/terminal_on.json rename to src/main/resources/assets/appliedenergistics2/models/part/terminal_on.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/part/toggle_bus_base.json b/src/main/resources/assets/appliedenergistics2/models/part/toggle_bus_base.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/part/toggle_bus_base.json rename to src/main/resources/assets/appliedenergistics2/models/part/toggle_bus_base.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/part/toggle_bus_status_has_channel.json b/src/main/resources/assets/appliedenergistics2/models/part/toggle_bus_status_has_channel.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/part/toggle_bus_status_has_channel.json rename to src/main/resources/assets/appliedenergistics2/models/part/toggle_bus_status_has_channel.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/part/toggle_bus_status_off.json b/src/main/resources/assets/appliedenergistics2/models/part/toggle_bus_status_off.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/part/toggle_bus_status_off.json rename to src/main/resources/assets/appliedenergistics2/models/part/toggle_bus_status_off.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/part/toggle_bus_status_on.json b/src/main/resources/assets/appliedenergistics2/models/part/toggle_bus_status_on.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/part/toggle_bus_status_on.json rename to src/main/resources/assets/appliedenergistics2/models/part/toggle_bus_status_on.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/part/transition_plane_has_channel.json b/src/main/resources/assets/appliedenergistics2/models/part/transition_plane_has_channel.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/part/transition_plane_has_channel.json rename to src/main/resources/assets/appliedenergistics2/models/part/transition_plane_has_channel.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/part/transition_plane_off.json b/src/main/resources/assets/appliedenergistics2/models/part/transition_plane_off.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/part/transition_plane_off.json rename to src/main/resources/assets/appliedenergistics2/models/part/transition_plane_off.json diff --git a/core/src/main/resources/assets/appliedenergistics2/models/part/transition_plane_on.json b/src/main/resources/assets/appliedenergistics2/models/part/transition_plane_on.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/models/part/transition_plane_on.json rename to src/main/resources/assets/appliedenergistics2/models/part/transition_plane_on.json diff --git a/core/src/main/resources/assets/appliedenergistics2/particles/assembler_fx.json b/src/main/resources/assets/appliedenergistics2/particles/assembler_fx.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/particles/assembler_fx.json rename to src/main/resources/assets/appliedenergistics2/particles/assembler_fx.json diff --git a/core/src/main/resources/assets/appliedenergistics2/particles/charged_ore_fx.json b/src/main/resources/assets/appliedenergistics2/particles/charged_ore_fx.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/particles/charged_ore_fx.json rename to src/main/resources/assets/appliedenergistics2/particles/charged_ore_fx.json diff --git a/core/src/main/resources/assets/appliedenergistics2/particles/crafting_fx.json b/src/main/resources/assets/appliedenergistics2/particles/crafting_fx.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/particles/crafting_fx.json rename to src/main/resources/assets/appliedenergistics2/particles/crafting_fx.json diff --git a/core/src/main/resources/assets/appliedenergistics2/particles/energy_fx.json b/src/main/resources/assets/appliedenergistics2/particles/energy_fx.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/particles/energy_fx.json rename to src/main/resources/assets/appliedenergistics2/particles/energy_fx.json diff --git a/core/src/main/resources/assets/appliedenergistics2/particles/lightning_arc_fx.json b/src/main/resources/assets/appliedenergistics2/particles/lightning_arc_fx.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/particles/lightning_arc_fx.json rename to src/main/resources/assets/appliedenergistics2/particles/lightning_arc_fx.json diff --git a/core/src/main/resources/assets/appliedenergistics2/particles/lightning_fx.json b/src/main/resources/assets/appliedenergistics2/particles/lightning_fx.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/particles/lightning_fx.json rename to src/main/resources/assets/appliedenergistics2/particles/lightning_fx.json diff --git a/core/src/main/resources/assets/appliedenergistics2/particles/matter_cannon_fx.json b/src/main/resources/assets/appliedenergistics2/particles/matter_cannon_fx.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/particles/matter_cannon_fx.json rename to src/main/resources/assets/appliedenergistics2/particles/matter_cannon_fx.json diff --git a/core/src/main/resources/assets/appliedenergistics2/particles/vibrant_fx.json b/src/main/resources/assets/appliedenergistics2/particles/vibrant_fx.json similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/particles/vibrant_fx.json rename to src/main/resources/assets/appliedenergistics2/particles/vibrant_fx.json diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/cell_workbench.png b/src/main/resources/assets/appliedenergistics2/textures/block/cell_workbench.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/cell_workbench.png rename to src/main/resources/assets/appliedenergistics2/textures/block/cell_workbench.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/cell_workbench_bottom.png b/src/main/resources/assets/appliedenergistics2/textures/block/cell_workbench_bottom.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/cell_workbench_bottom.png rename to src/main/resources/assets/appliedenergistics2/textures/block/cell_workbench_bottom.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/cell_workbench_side.png b/src/main/resources/assets/appliedenergistics2/textures/block/cell_workbench_side.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/cell_workbench_side.png rename to src/main/resources/assets/appliedenergistics2/textures/block/cell_workbench_side.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/charged_quartz_ore.png b/src/main/resources/assets/appliedenergistics2/textures/block/charged_quartz_ore.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/charged_quartz_ore.png rename to src/main/resources/assets/appliedenergistics2/textures/block/charged_quartz_ore.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/charged_quartz_ore_light.png b/src/main/resources/assets/appliedenergistics2/textures/block/charged_quartz_ore_light.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/charged_quartz_ore_light.png rename to src/main/resources/assets/appliedenergistics2/textures/block/charged_quartz_ore_light.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/charger.png b/src/main/resources/assets/appliedenergistics2/textures/block/charger.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/charger.png rename to src/main/resources/assets/appliedenergistics2/textures/block/charger.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/charger_inside.png b/src/main/resources/assets/appliedenergistics2/textures/block/charger_inside.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/charger_inside.png rename to src/main/resources/assets/appliedenergistics2/textures/block/charger_inside.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/charger_side.png b/src/main/resources/assets/appliedenergistics2/textures/block/charger_side.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/charger_side.png rename to src/main/resources/assets/appliedenergistics2/textures/block/charger_side.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/chest/bottom.png b/src/main/resources/assets/appliedenergistics2/textures/block/chest/bottom.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/chest/bottom.png rename to src/main/resources/assets/appliedenergistics2/textures/block/chest/bottom.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/chest/cell_state_backdrop.png b/src/main/resources/assets/appliedenergistics2/textures/block/chest/cell_state_backdrop.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/chest/cell_state_backdrop.png rename to src/main/resources/assets/appliedenergistics2/textures/block/chest/cell_state_backdrop.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/chest/cell_state_empty.png b/src/main/resources/assets/appliedenergistics2/textures/block/chest/cell_state_empty.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/chest/cell_state_empty.png rename to src/main/resources/assets/appliedenergistics2/textures/block/chest/cell_state_empty.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/chest/cell_state_full.png b/src/main/resources/assets/appliedenergistics2/textures/block/chest/cell_state_full.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/chest/cell_state_full.png rename to src/main/resources/assets/appliedenergistics2/textures/block/chest/cell_state_full.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/chest/cell_state_offline.png b/src/main/resources/assets/appliedenergistics2/textures/block/chest/cell_state_offline.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/chest/cell_state_offline.png rename to src/main/resources/assets/appliedenergistics2/textures/block/chest/cell_state_offline.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/chest/cell_state_online.png b/src/main/resources/assets/appliedenergistics2/textures/block/chest/cell_state_online.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/chest/cell_state_online.png rename to src/main/resources/assets/appliedenergistics2/textures/block/chest/cell_state_online.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/chest/cell_state_types_full.png b/src/main/resources/assets/appliedenergistics2/textures/block/chest/cell_state_types_full.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/chest/cell_state_types_full.png rename to src/main/resources/assets/appliedenergistics2/textures/block/chest/cell_state_types_full.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/chest/front.png b/src/main/resources/assets/appliedenergistics2/textures/block/chest/front.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/chest/front.png rename to src/main/resources/assets/appliedenergistics2/textures/block/chest/front.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/chest/front_item.png b/src/main/resources/assets/appliedenergistics2/textures/block/chest/front_item.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/chest/front_item.png rename to src/main/resources/assets/appliedenergistics2/textures/block/chest/front_item.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/chest/lights_off.png b/src/main/resources/assets/appliedenergistics2/textures/block/chest/lights_off.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/chest/lights_off.png rename to src/main/resources/assets/appliedenergistics2/textures/block/chest/lights_off.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/chest/lights_on_bright.png b/src/main/resources/assets/appliedenergistics2/textures/block/chest/lights_on_bright.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/chest/lights_on_bright.png rename to src/main/resources/assets/appliedenergistics2/textures/block/chest/lights_on_bright.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/chest/lights_on_dark.png b/src/main/resources/assets/appliedenergistics2/textures/block/chest/lights_on_dark.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/chest/lights_on_dark.png rename to src/main/resources/assets/appliedenergistics2/textures/block/chest/lights_on_dark.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/chest/lights_on_medium.png b/src/main/resources/assets/appliedenergistics2/textures/block/chest/lights_on_medium.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/chest/lights_on_medium.png rename to src/main/resources/assets/appliedenergistics2/textures/block/chest/lights_on_medium.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/chest/side.png b/src/main/resources/assets/appliedenergistics2/textures/block/chest/side.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/chest/side.png rename to src/main/resources/assets/appliedenergistics2/textures/block/chest/side.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/chest/top.png b/src/main/resources/assets/appliedenergistics2/textures/block/chest/top.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/chest/top.png rename to src/main/resources/assets/appliedenergistics2/textures/block/chest/top.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/chest/top_item.png b/src/main/resources/assets/appliedenergistics2/textures/block/chest/top_item.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/chest/top_item.png rename to src/main/resources/assets/appliedenergistics2/textures/block/chest/top_item.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/chiseled_quartz_block_side.png b/src/main/resources/assets/appliedenergistics2/textures/block/chiseled_quartz_block_side.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/chiseled_quartz_block_side.png rename to src/main/resources/assets/appliedenergistics2/textures/block/chiseled_quartz_block_side.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/chiseled_quartz_block_top.png b/src/main/resources/assets/appliedenergistics2/textures/block/chiseled_quartz_block_top.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/chiseled_quartz_block_top.png rename to src/main/resources/assets/appliedenergistics2/textures/block/chiseled_quartz_block_top.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/condenser.png b/src/main/resources/assets/appliedenergistics2/textures/block/condenser.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/condenser.png rename to src/main/resources/assets/appliedenergistics2/textures/block/condenser.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/controller.png b/src/main/resources/assets/appliedenergistics2/textures/block/controller.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/controller.png rename to src/main/resources/assets/appliedenergistics2/textures/block/controller.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/controller_column.png b/src/main/resources/assets/appliedenergistics2/textures/block/controller_column.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/controller_column.png rename to src/main/resources/assets/appliedenergistics2/textures/block/controller_column.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/controller_column_conflict.png b/src/main/resources/assets/appliedenergistics2/textures/block/controller_column_conflict.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/controller_column_conflict.png rename to src/main/resources/assets/appliedenergistics2/textures/block/controller_column_conflict.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/controller_column_lights.png b/src/main/resources/assets/appliedenergistics2/textures/block/controller_column_lights.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/controller_column_lights.png rename to src/main/resources/assets/appliedenergistics2/textures/block/controller_column_lights.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/controller_column_lights.png.mcmeta b/src/main/resources/assets/appliedenergistics2/textures/block/controller_column_lights.png.mcmeta similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/controller_column_lights.png.mcmeta rename to src/main/resources/assets/appliedenergistics2/textures/block/controller_column_lights.png.mcmeta diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/controller_column_powered.png b/src/main/resources/assets/appliedenergistics2/textures/block/controller_column_powered.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/controller_column_powered.png rename to src/main/resources/assets/appliedenergistics2/textures/block/controller_column_powered.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/controller_conflict.png b/src/main/resources/assets/appliedenergistics2/textures/block/controller_conflict.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/controller_conflict.png rename to src/main/resources/assets/appliedenergistics2/textures/block/controller_conflict.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/controller_inside_a.png b/src/main/resources/assets/appliedenergistics2/textures/block/controller_inside_a.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/controller_inside_a.png rename to src/main/resources/assets/appliedenergistics2/textures/block/controller_inside_a.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/controller_inside_b.png b/src/main/resources/assets/appliedenergistics2/textures/block/controller_inside_b.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/controller_inside_b.png rename to src/main/resources/assets/appliedenergistics2/textures/block/controller_inside_b.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/controller_lights.png b/src/main/resources/assets/appliedenergistics2/textures/block/controller_lights.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/controller_lights.png rename to src/main/resources/assets/appliedenergistics2/textures/block/controller_lights.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/controller_lights.png.mcmeta b/src/main/resources/assets/appliedenergistics2/textures/block/controller_lights.png.mcmeta similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/controller_lights.png.mcmeta rename to src/main/resources/assets/appliedenergistics2/textures/block/controller_lights.png.mcmeta diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/controller_powered.png b/src/main/resources/assets/appliedenergistics2/textures/block/controller_powered.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/controller_powered.png rename to src/main/resources/assets/appliedenergistics2/textures/block/controller_powered.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/crafting/16k_storage.png b/src/main/resources/assets/appliedenergistics2/textures/block/crafting/16k_storage.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/crafting/16k_storage.png rename to src/main/resources/assets/appliedenergistics2/textures/block/crafting/16k_storage.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/crafting/16k_storage_light.png b/src/main/resources/assets/appliedenergistics2/textures/block/crafting/16k_storage_light.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/crafting/16k_storage_light.png rename to src/main/resources/assets/appliedenergistics2/textures/block/crafting/16k_storage_light.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/crafting/1k_storage.png b/src/main/resources/assets/appliedenergistics2/textures/block/crafting/1k_storage.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/crafting/1k_storage.png rename to src/main/resources/assets/appliedenergistics2/textures/block/crafting/1k_storage.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/crafting/1k_storage_light.png b/src/main/resources/assets/appliedenergistics2/textures/block/crafting/1k_storage_light.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/crafting/1k_storage_light.png rename to src/main/resources/assets/appliedenergistics2/textures/block/crafting/1k_storage_light.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/crafting/4k_storage.png b/src/main/resources/assets/appliedenergistics2/textures/block/crafting/4k_storage.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/crafting/4k_storage.png rename to src/main/resources/assets/appliedenergistics2/textures/block/crafting/4k_storage.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/crafting/4k_storage_light.png b/src/main/resources/assets/appliedenergistics2/textures/block/crafting/4k_storage_light.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/crafting/4k_storage_light.png rename to src/main/resources/assets/appliedenergistics2/textures/block/crafting/4k_storage_light.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/crafting/64k_storage.png b/src/main/resources/assets/appliedenergistics2/textures/block/crafting/64k_storage.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/crafting/64k_storage.png rename to src/main/resources/assets/appliedenergistics2/textures/block/crafting/64k_storage.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/crafting/64k_storage_light.png b/src/main/resources/assets/appliedenergistics2/textures/block/crafting/64k_storage_light.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/crafting/64k_storage_light.png rename to src/main/resources/assets/appliedenergistics2/textures/block/crafting/64k_storage_light.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/crafting/accelerator.png b/src/main/resources/assets/appliedenergistics2/textures/block/crafting/accelerator.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/crafting/accelerator.png rename to src/main/resources/assets/appliedenergistics2/textures/block/crafting/accelerator.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/crafting/accelerator_light.png b/src/main/resources/assets/appliedenergistics2/textures/block/crafting/accelerator_light.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/crafting/accelerator_light.png rename to src/main/resources/assets/appliedenergistics2/textures/block/crafting/accelerator_light.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/crafting/light_base.png b/src/main/resources/assets/appliedenergistics2/textures/block/crafting/light_base.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/crafting/light_base.png rename to src/main/resources/assets/appliedenergistics2/textures/block/crafting/light_base.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/crafting/monitor.png b/src/main/resources/assets/appliedenergistics2/textures/block/crafting/monitor.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/crafting/monitor.png rename to src/main/resources/assets/appliedenergistics2/textures/block/crafting/monitor.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/crafting/monitor_base.png b/src/main/resources/assets/appliedenergistics2/textures/block/crafting/monitor_base.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/crafting/monitor_base.png rename to src/main/resources/assets/appliedenergistics2/textures/block/crafting/monitor_base.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/crafting/monitor_light_bright.png b/src/main/resources/assets/appliedenergistics2/textures/block/crafting/monitor_light_bright.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/crafting/monitor_light_bright.png rename to src/main/resources/assets/appliedenergistics2/textures/block/crafting/monitor_light_bright.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/crafting/monitor_light_dark.png b/src/main/resources/assets/appliedenergistics2/textures/block/crafting/monitor_light_dark.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/crafting/monitor_light_dark.png rename to src/main/resources/assets/appliedenergistics2/textures/block/crafting/monitor_light_dark.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/crafting/monitor_light_medium.png b/src/main/resources/assets/appliedenergistics2/textures/block/crafting/monitor_light_medium.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/crafting/monitor_light_medium.png rename to src/main/resources/assets/appliedenergistics2/textures/block/crafting/monitor_light_medium.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/crafting/ring_corner.png b/src/main/resources/assets/appliedenergistics2/textures/block/crafting/ring_corner.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/crafting/ring_corner.png rename to src/main/resources/assets/appliedenergistics2/textures/block/crafting/ring_corner.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/crafting/ring_side_hor.png b/src/main/resources/assets/appliedenergistics2/textures/block/crafting/ring_side_hor.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/crafting/ring_side_hor.png rename to src/main/resources/assets/appliedenergistics2/textures/block/crafting/ring_side_hor.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/crafting/ring_side_ver.png b/src/main/resources/assets/appliedenergistics2/textures/block/crafting/ring_side_ver.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/crafting/ring_side_ver.png rename to src/main/resources/assets/appliedenergistics2/textures/block/crafting/ring_side_ver.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/crafting/unit.png b/src/main/resources/assets/appliedenergistics2/textures/block/crafting/unit.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/crafting/unit.png rename to src/main/resources/assets/appliedenergistics2/textures/block/crafting/unit.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/crafting/unit_base.png b/src/main/resources/assets/appliedenergistics2/textures/block/crafting/unit_base.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/crafting/unit_base.png rename to src/main/resources/assets/appliedenergistics2/textures/block/crafting/unit_base.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/crank.png b/src/main/resources/assets/appliedenergistics2/textures/block/crank.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/crank.png rename to src/main/resources/assets/appliedenergistics2/textures/block/crank.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/creative_energy_cell.png b/src/main/resources/assets/appliedenergistics2/textures/block/creative_energy_cell.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/creative_energy_cell.png rename to src/main/resources/assets/appliedenergistics2/textures/block/creative_energy_cell.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/debug/chunk_loader.png b/src/main/resources/assets/appliedenergistics2/textures/block/debug/chunk_loader.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/debug/chunk_loader.png rename to src/main/resources/assets/appliedenergistics2/textures/block/debug/chunk_loader.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/debug/cube_gen.png b/src/main/resources/assets/appliedenergistics2/textures/block/debug/cube_gen.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/debug/cube_gen.png rename to src/main/resources/assets/appliedenergistics2/textures/block/debug/cube_gen.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/debug/energy_gen.png b/src/main/resources/assets/appliedenergistics2/textures/block/debug/energy_gen.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/debug/energy_gen.png rename to src/main/resources/assets/appliedenergistics2/textures/block/debug/energy_gen.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/debug/item_gen.png b/src/main/resources/assets/appliedenergistics2/textures/block/debug/item_gen.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/debug/item_gen.png rename to src/main/resources/assets/appliedenergistics2/textures/block/debug/item_gen.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/debug/phantom_node.png b/src/main/resources/assets/appliedenergistics2/textures/block/debug/phantom_node.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/debug/phantom_node.png rename to src/main/resources/assets/appliedenergistics2/textures/block/debug/phantom_node.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/dense_energy_cell.png b/src/main/resources/assets/appliedenergistics2/textures/block/dense_energy_cell.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/dense_energy_cell.png rename to src/main/resources/assets/appliedenergistics2/textures/block/dense_energy_cell.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/dense_energy_cell0.png b/src/main/resources/assets/appliedenergistics2/textures/block/dense_energy_cell0.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/dense_energy_cell0.png rename to src/main/resources/assets/appliedenergistics2/textures/block/dense_energy_cell0.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/dense_energy_cell1.png b/src/main/resources/assets/appliedenergistics2/textures/block/dense_energy_cell1.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/dense_energy_cell1.png rename to src/main/resources/assets/appliedenergistics2/textures/block/dense_energy_cell1.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/dense_energy_cell2.png b/src/main/resources/assets/appliedenergistics2/textures/block/dense_energy_cell2.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/dense_energy_cell2.png rename to src/main/resources/assets/appliedenergistics2/textures/block/dense_energy_cell2.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/dense_energy_cell3.png b/src/main/resources/assets/appliedenergistics2/textures/block/dense_energy_cell3.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/dense_energy_cell3.png rename to src/main/resources/assets/appliedenergistics2/textures/block/dense_energy_cell3.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/dense_energy_cell4.png b/src/main/resources/assets/appliedenergistics2/textures/block/dense_energy_cell4.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/dense_energy_cell4.png rename to src/main/resources/assets/appliedenergistics2/textures/block/dense_energy_cell4.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/dense_energy_cell5.png b/src/main/resources/assets/appliedenergistics2/textures/block/dense_energy_cell5.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/dense_energy_cell5.png rename to src/main/resources/assets/appliedenergistics2/textures/block/dense_energy_cell5.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/dense_energy_cell6.png b/src/main/resources/assets/appliedenergistics2/textures/block/dense_energy_cell6.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/dense_energy_cell6.png rename to src/main/resources/assets/appliedenergistics2/textures/block/dense_energy_cell6.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/dense_energy_cell7.png b/src/main/resources/assets/appliedenergistics2/textures/block/dense_energy_cell7.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/dense_energy_cell7.png rename to src/main/resources/assets/appliedenergistics2/textures/block/dense_energy_cell7.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/drive/drive_bottom.png b/src/main/resources/assets/appliedenergistics2/textures/block/drive/drive_bottom.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/drive/drive_bottom.png rename to src/main/resources/assets/appliedenergistics2/textures/block/drive/drive_bottom.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/drive/drive_cell_states.png b/src/main/resources/assets/appliedenergistics2/textures/block/drive/drive_cell_states.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/drive/drive_cell_states.png rename to src/main/resources/assets/appliedenergistics2/textures/block/drive/drive_cell_states.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/drive/drive_front.png b/src/main/resources/assets/appliedenergistics2/textures/block/drive/drive_front.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/drive/drive_front.png rename to src/main/resources/assets/appliedenergistics2/textures/block/drive/drive_front.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/drive/drive_front_flat.png b/src/main/resources/assets/appliedenergistics2/textures/block/drive/drive_front_flat.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/drive/drive_front_flat.png rename to src/main/resources/assets/appliedenergistics2/textures/block/drive/drive_front_flat.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/drive/drive_inside.png b/src/main/resources/assets/appliedenergistics2/textures/block/drive/drive_inside.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/drive/drive_inside.png rename to src/main/resources/assets/appliedenergistics2/textures/block/drive/drive_inside.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/drive/drive_side.png b/src/main/resources/assets/appliedenergistics2/textures/block/drive/drive_side.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/drive/drive_side.png rename to src/main/resources/assets/appliedenergistics2/textures/block/drive/drive_side.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/drive/drive_top.png b/src/main/resources/assets/appliedenergistics2/textures/block/drive/drive_top.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/drive/drive_top.png rename to src/main/resources/assets/appliedenergistics2/textures/block/drive/drive_top.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/drive/fluid_cell.png b/src/main/resources/assets/appliedenergistics2/textures/block/drive/fluid_cell.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/drive/fluid_cell.png rename to src/main/resources/assets/appliedenergistics2/textures/block/drive/fluid_cell.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/drive/item_cell.png b/src/main/resources/assets/appliedenergistics2/textures/block/drive/item_cell.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/drive/item_cell.png rename to src/main/resources/assets/appliedenergistics2/textures/block/drive/item_cell.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/energy_acceptor.png b/src/main/resources/assets/appliedenergistics2/textures/block/energy_acceptor.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/energy_acceptor.png rename to src/main/resources/assets/appliedenergistics2/textures/block/energy_acceptor.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/energy_cell.png b/src/main/resources/assets/appliedenergistics2/textures/block/energy_cell.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/energy_cell.png rename to src/main/resources/assets/appliedenergistics2/textures/block/energy_cell.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/energy_cell0.png b/src/main/resources/assets/appliedenergistics2/textures/block/energy_cell0.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/energy_cell0.png rename to src/main/resources/assets/appliedenergistics2/textures/block/energy_cell0.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/energy_cell1.png b/src/main/resources/assets/appliedenergistics2/textures/block/energy_cell1.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/energy_cell1.png rename to src/main/resources/assets/appliedenergistics2/textures/block/energy_cell1.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/energy_cell2.png b/src/main/resources/assets/appliedenergistics2/textures/block/energy_cell2.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/energy_cell2.png rename to src/main/resources/assets/appliedenergistics2/textures/block/energy_cell2.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/energy_cell3.png b/src/main/resources/assets/appliedenergistics2/textures/block/energy_cell3.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/energy_cell3.png rename to src/main/resources/assets/appliedenergistics2/textures/block/energy_cell3.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/energy_cell4.png b/src/main/resources/assets/appliedenergistics2/textures/block/energy_cell4.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/energy_cell4.png rename to src/main/resources/assets/appliedenergistics2/textures/block/energy_cell4.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/energy_cell5.png b/src/main/resources/assets/appliedenergistics2/textures/block/energy_cell5.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/energy_cell5.png rename to src/main/resources/assets/appliedenergistics2/textures/block/energy_cell5.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/energy_cell6.png b/src/main/resources/assets/appliedenergistics2/textures/block/energy_cell6.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/energy_cell6.png rename to src/main/resources/assets/appliedenergistics2/textures/block/energy_cell6.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/energy_cell7.png b/src/main/resources/assets/appliedenergistics2/textures/block/energy_cell7.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/energy_cell7.png rename to src/main/resources/assets/appliedenergistics2/textures/block/energy_cell7.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/fluid_interface.png b/src/main/resources/assets/appliedenergistics2/textures/block/fluid_interface.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/fluid_interface.png rename to src/main/resources/assets/appliedenergistics2/textures/block/fluid_interface.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/fluix_block.png b/src/main/resources/assets/appliedenergistics2/textures/block/fluix_block.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/fluix_block.png rename to src/main/resources/assets/appliedenergistics2/textures/block/fluix_block.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_a.png b/src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_a.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_a.png rename to src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_a.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_b.png b/src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_b.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_b.png rename to src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_b.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_c.png b/src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_c.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_c.png rename to src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_c.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_d.png b/src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_d.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_d.png rename to src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_d.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_frame0001.png b/src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_frame0001.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_frame0001.png rename to src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_frame0001.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_frame0010.png b/src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_frame0010.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_frame0010.png rename to src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_frame0010.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_frame0011.png b/src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_frame0011.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_frame0011.png rename to src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_frame0011.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_frame0100.png b/src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_frame0100.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_frame0100.png rename to src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_frame0100.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_frame0101.png b/src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_frame0101.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_frame0101.png rename to src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_frame0101.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_frame0110.png b/src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_frame0110.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_frame0110.png rename to src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_frame0110.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_frame0111.png b/src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_frame0111.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_frame0111.png rename to src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_frame0111.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_frame1000.png b/src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_frame1000.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_frame1000.png rename to src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_frame1000.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_frame1001.png b/src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_frame1001.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_frame1001.png rename to src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_frame1001.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_frame1010.png b/src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_frame1010.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_frame1010.png rename to src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_frame1010.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_frame1011.png b/src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_frame1011.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_frame1011.png rename to src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_frame1011.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_frame1100.png b/src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_frame1100.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_frame1100.png rename to src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_frame1100.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_frame1101.png b/src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_frame1101.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_frame1101.png rename to src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_frame1101.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_frame1110.png b/src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_frame1110.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_frame1110.png rename to src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_frame1110.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_frame1111.png b/src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_frame1111.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_frame1111.png rename to src/main/resources/assets/appliedenergistics2/textures/block/glass/quartz_glass_frame1111.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/grindstone.png b/src/main/resources/assets/appliedenergistics2/textures/block/grindstone.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/grindstone.png rename to src/main/resources/assets/appliedenergistics2/textures/block/grindstone.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/grindstone_bottom.png b/src/main/resources/assets/appliedenergistics2/textures/block/grindstone_bottom.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/grindstone_bottom.png rename to src/main/resources/assets/appliedenergistics2/textures/block/grindstone_bottom.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/grindstone_front.png b/src/main/resources/assets/appliedenergistics2/textures/block/grindstone_front.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/grindstone_front.png rename to src/main/resources/assets/appliedenergistics2/textures/block/grindstone_front.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/grindstone_side.png b/src/main/resources/assets/appliedenergistics2/textures/block/grindstone_side.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/grindstone_side.png rename to src/main/resources/assets/appliedenergistics2/textures/block/grindstone_side.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/inscriber.png b/src/main/resources/assets/appliedenergistics2/textures/block/inscriber.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/inscriber.png rename to src/main/resources/assets/appliedenergistics2/textures/block/inscriber.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/inscriber_inside.png b/src/main/resources/assets/appliedenergistics2/textures/block/inscriber_inside.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/inscriber_inside.png rename to src/main/resources/assets/appliedenergistics2/textures/block/inscriber_inside.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/interface.png b/src/main/resources/assets/appliedenergistics2/textures/block/interface.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/interface.png rename to src/main/resources/assets/appliedenergistics2/textures/block/interface.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/interface_alternate.png b/src/main/resources/assets/appliedenergistics2/textures/block/interface_alternate.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/interface_alternate.png rename to src/main/resources/assets/appliedenergistics2/textures/block/interface_alternate.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/interface_alternate_arrow.png b/src/main/resources/assets/appliedenergistics2/textures/block/interface_alternate_arrow.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/interface_alternate_arrow.png rename to src/main/resources/assets/appliedenergistics2/textures/block/interface_alternate_arrow.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/io_port.png b/src/main/resources/assets/appliedenergistics2/textures/block/io_port.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/io_port.png rename to src/main/resources/assets/appliedenergistics2/textures/block/io_port.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/io_port_bottom.png b/src/main/resources/assets/appliedenergistics2/textures/block/io_port_bottom.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/io_port_bottom.png rename to src/main/resources/assets/appliedenergistics2/textures/block/io_port_bottom.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/io_port_side.png b/src/main/resources/assets/appliedenergistics2/textures/block/io_port_side.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/io_port_side.png rename to src/main/resources/assets/appliedenergistics2/textures/block/io_port_side.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/molecular_assembler.png b/src/main/resources/assets/appliedenergistics2/textures/block/molecular_assembler.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/molecular_assembler.png rename to src/main/resources/assets/appliedenergistics2/textures/block/molecular_assembler.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/molecular_assembler_lights.png b/src/main/resources/assets/appliedenergistics2/textures/block/molecular_assembler_lights.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/molecular_assembler_lights.png rename to src/main/resources/assets/appliedenergistics2/textures/block/molecular_assembler_lights.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/molecular_assembler_lights.png.mcmeta b/src/main/resources/assets/appliedenergistics2/textures/block/molecular_assembler_lights.png.mcmeta similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/molecular_assembler_lights.png.mcmeta rename to src/main/resources/assets/appliedenergistics2/textures/block/molecular_assembler_lights.png.mcmeta diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/paint1.png b/src/main/resources/assets/appliedenergistics2/textures/block/paint1.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/paint1.png rename to src/main/resources/assets/appliedenergistics2/textures/block/paint1.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/paint2.png b/src/main/resources/assets/appliedenergistics2/textures/block/paint2.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/paint2.png rename to src/main/resources/assets/appliedenergistics2/textures/block/paint2.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/paint3.png b/src/main/resources/assets/appliedenergistics2/textures/block/paint3.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/paint3.png rename to src/main/resources/assets/appliedenergistics2/textures/block/paint3.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/quantum_link.png b/src/main/resources/assets/appliedenergistics2/textures/block/quantum_link.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/quantum_link.png rename to src/main/resources/assets/appliedenergistics2/textures/block/quantum_link.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/quantum_ring.png b/src/main/resources/assets/appliedenergistics2/textures/block/quantum_ring.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/quantum_ring.png rename to src/main/resources/assets/appliedenergistics2/textures/block/quantum_ring.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/quantum_ring_light.png b/src/main/resources/assets/appliedenergistics2/textures/block/quantum_ring_light.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/quantum_ring_light.png rename to src/main/resources/assets/appliedenergistics2/textures/block/quantum_ring_light.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/quantum_ring_light_corner.png b/src/main/resources/assets/appliedenergistics2/textures/block/quantum_ring_light_corner.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/quantum_ring_light_corner.png rename to src/main/resources/assets/appliedenergistics2/textures/block/quantum_ring_light_corner.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/quartz_block.png b/src/main/resources/assets/appliedenergistics2/textures/block/quartz_block.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/quartz_block.png rename to src/main/resources/assets/appliedenergistics2/textures/block/quartz_block.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/quartz_fixture.png b/src/main/resources/assets/appliedenergistics2/textures/block/quartz_fixture.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/quartz_fixture.png rename to src/main/resources/assets/appliedenergistics2/textures/block/quartz_fixture.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/quartz_fixture_metal.png b/src/main/resources/assets/appliedenergistics2/textures/block/quartz_fixture_metal.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/quartz_fixture_metal.png rename to src/main/resources/assets/appliedenergistics2/textures/block/quartz_fixture_metal.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/quartz_growth_accelerator.png b/src/main/resources/assets/appliedenergistics2/textures/block/quartz_growth_accelerator.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/quartz_growth_accelerator.png rename to src/main/resources/assets/appliedenergistics2/textures/block/quartz_growth_accelerator.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/quartz_growth_accelerator_on.png b/src/main/resources/assets/appliedenergistics2/textures/block/quartz_growth_accelerator_on.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/quartz_growth_accelerator_on.png rename to src/main/resources/assets/appliedenergistics2/textures/block/quartz_growth_accelerator_on.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/quartz_growth_accelerator_on.png.mcmeta b/src/main/resources/assets/appliedenergistics2/textures/block/quartz_growth_accelerator_on.png.mcmeta similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/quartz_growth_accelerator_on.png.mcmeta rename to src/main/resources/assets/appliedenergistics2/textures/block/quartz_growth_accelerator_on.png.mcmeta diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/quartz_growth_accelerator_side.png b/src/main/resources/assets/appliedenergistics2/textures/block/quartz_growth_accelerator_side.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/quartz_growth_accelerator_side.png rename to src/main/resources/assets/appliedenergistics2/textures/block/quartz_growth_accelerator_side.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/quartz_growth_accelerator_side_on.png b/src/main/resources/assets/appliedenergistics2/textures/block/quartz_growth_accelerator_side_on.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/quartz_growth_accelerator_side_on.png rename to src/main/resources/assets/appliedenergistics2/textures/block/quartz_growth_accelerator_side_on.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/quartz_growth_accelerator_side_on.png.mcmeta b/src/main/resources/assets/appliedenergistics2/textures/block/quartz_growth_accelerator_side_on.png.mcmeta similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/quartz_growth_accelerator_side_on.png.mcmeta rename to src/main/resources/assets/appliedenergistics2/textures/block/quartz_growth_accelerator_side_on.png.mcmeta diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/quartz_ore.png b/src/main/resources/assets/appliedenergistics2/textures/block/quartz_ore.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/quartz_ore.png rename to src/main/resources/assets/appliedenergistics2/textures/block/quartz_ore.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/quartz_pillar_side.png b/src/main/resources/assets/appliedenergistics2/textures/block/quartz_pillar_side.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/quartz_pillar_side.png rename to src/main/resources/assets/appliedenergistics2/textures/block/quartz_pillar_side.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/quartz_pillar_top.png b/src/main/resources/assets/appliedenergistics2/textures/block/quartz_pillar_top.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/quartz_pillar_top.png rename to src/main/resources/assets/appliedenergistics2/textures/block/quartz_pillar_top.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/security_station_bottom.png b/src/main/resources/assets/appliedenergistics2/textures/block/security_station_bottom.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/security_station_bottom.png rename to src/main/resources/assets/appliedenergistics2/textures/block/security_station_bottom.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/security_station_light_bright.png b/src/main/resources/assets/appliedenergistics2/textures/block/security_station_light_bright.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/security_station_light_bright.png rename to src/main/resources/assets/appliedenergistics2/textures/block/security_station_light_bright.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/security_station_light_dark.png b/src/main/resources/assets/appliedenergistics2/textures/block/security_station_light_dark.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/security_station_light_dark.png rename to src/main/resources/assets/appliedenergistics2/textures/block/security_station_light_dark.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/security_station_light_medium.png b/src/main/resources/assets/appliedenergistics2/textures/block/security_station_light_medium.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/security_station_light_medium.png rename to src/main/resources/assets/appliedenergistics2/textures/block/security_station_light_medium.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/security_station_side.png b/src/main/resources/assets/appliedenergistics2/textures/block/security_station_side.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/security_station_side.png rename to src/main/resources/assets/appliedenergistics2/textures/block/security_station_side.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/security_station_top.png b/src/main/resources/assets/appliedenergistics2/textures/block/security_station_top.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/security_station_top.png rename to src/main/resources/assets/appliedenergistics2/textures/block/security_station_top.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/sky_compass.png b/src/main/resources/assets/appliedenergistics2/textures/block/sky_compass.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/sky_compass.png rename to src/main/resources/assets/appliedenergistics2/textures/block/sky_compass.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/sky_stone_block.png b/src/main/resources/assets/appliedenergistics2/textures/block/sky_stone_block.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/sky_stone_block.png rename to src/main/resources/assets/appliedenergistics2/textures/block/sky_stone_block.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/sky_stone_brick.png b/src/main/resources/assets/appliedenergistics2/textures/block/sky_stone_brick.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/sky_stone_brick.png rename to src/main/resources/assets/appliedenergistics2/textures/block/sky_stone_brick.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/sky_stone_small_brick.png b/src/main/resources/assets/appliedenergistics2/textures/block/sky_stone_small_brick.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/sky_stone_small_brick.png rename to src/main/resources/assets/appliedenergistics2/textures/block/sky_stone_small_brick.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/smooth_sky_stone_block.png b/src/main/resources/assets/appliedenergistics2/textures/block/smooth_sky_stone_block.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/smooth_sky_stone_block.png rename to src/main/resources/assets/appliedenergistics2/textures/block/smooth_sky_stone_block.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/spatial_io_port.png b/src/main/resources/assets/appliedenergistics2/textures/block/spatial_io_port.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/spatial_io_port.png rename to src/main/resources/assets/appliedenergistics2/textures/block/spatial_io_port.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/spatial_io_port_bottom.png b/src/main/resources/assets/appliedenergistics2/textures/block/spatial_io_port_bottom.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/spatial_io_port_bottom.png rename to src/main/resources/assets/appliedenergistics2/textures/block/spatial_io_port_bottom.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/spatial_io_port_side.png b/src/main/resources/assets/appliedenergistics2/textures/block/spatial_io_port_side.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/spatial_io_port_side.png rename to src/main/resources/assets/appliedenergistics2/textures/block/spatial_io_port_side.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/spatial_pylon/base.png b/src/main/resources/assets/appliedenergistics2/textures/block/spatial_pylon/base.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/spatial_pylon/base.png rename to src/main/resources/assets/appliedenergistics2/textures/block/spatial_pylon/base.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/spatial_pylon/base_end.png b/src/main/resources/assets/appliedenergistics2/textures/block/spatial_pylon/base_end.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/spatial_pylon/base_end.png rename to src/main/resources/assets/appliedenergistics2/textures/block/spatial_pylon/base_end.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/spatial_pylon/base_spanned.png b/src/main/resources/assets/appliedenergistics2/textures/block/spatial_pylon/base_spanned.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/spatial_pylon/base_spanned.png rename to src/main/resources/assets/appliedenergistics2/textures/block/spatial_pylon/base_spanned.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/spatial_pylon/dim.png b/src/main/resources/assets/appliedenergistics2/textures/block/spatial_pylon/dim.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/spatial_pylon/dim.png rename to src/main/resources/assets/appliedenergistics2/textures/block/spatial_pylon/dim.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/spatial_pylon/dim_end.png b/src/main/resources/assets/appliedenergistics2/textures/block/spatial_pylon/dim_end.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/spatial_pylon/dim_end.png rename to src/main/resources/assets/appliedenergistics2/textures/block/spatial_pylon/dim_end.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/spatial_pylon/dim_spanned.png b/src/main/resources/assets/appliedenergistics2/textures/block/spatial_pylon/dim_spanned.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/spatial_pylon/dim_spanned.png rename to src/main/resources/assets/appliedenergistics2/textures/block/spatial_pylon/dim_spanned.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/spatial_pylon/red.png b/src/main/resources/assets/appliedenergistics2/textures/block/spatial_pylon/red.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/spatial_pylon/red.png rename to src/main/resources/assets/appliedenergistics2/textures/block/spatial_pylon/red.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/spatial_pylon/red_end.png b/src/main/resources/assets/appliedenergistics2/textures/block/spatial_pylon/red_end.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/spatial_pylon/red_end.png rename to src/main/resources/assets/appliedenergistics2/textures/block/spatial_pylon/red_end.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/spatial_pylon/red_spanned.png b/src/main/resources/assets/appliedenergistics2/textures/block/spatial_pylon/red_spanned.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/spatial_pylon/red_spanned.png rename to src/main/resources/assets/appliedenergistics2/textures/block/spatial_pylon/red_spanned.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/tnt_bottom.png b/src/main/resources/assets/appliedenergistics2/textures/block/tnt_bottom.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/tnt_bottom.png rename to src/main/resources/assets/appliedenergistics2/textures/block/tnt_bottom.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/tnt_side.png b/src/main/resources/assets/appliedenergistics2/textures/block/tnt_side.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/tnt_side.png rename to src/main/resources/assets/appliedenergistics2/textures/block/tnt_side.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/tnt_top.png b/src/main/resources/assets/appliedenergistics2/textures/block/tnt_top.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/tnt_top.png rename to src/main/resources/assets/appliedenergistics2/textures/block/tnt_top.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/vibration_chamber.png b/src/main/resources/assets/appliedenergistics2/textures/block/vibration_chamber.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/vibration_chamber.png rename to src/main/resources/assets/appliedenergistics2/textures/block/vibration_chamber.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/vibration_chamber_front.png b/src/main/resources/assets/appliedenergistics2/textures/block/vibration_chamber_front.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/vibration_chamber_front.png rename to src/main/resources/assets/appliedenergistics2/textures/block/vibration_chamber_front.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/vibration_chamber_front_on.png b/src/main/resources/assets/appliedenergistics2/textures/block/vibration_chamber_front_on.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/vibration_chamber_front_on.png rename to src/main/resources/assets/appliedenergistics2/textures/block/vibration_chamber_front_on.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/wireless_access_point.png b/src/main/resources/assets/appliedenergistics2/textures/block/wireless_access_point.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/wireless_access_point.png rename to src/main/resources/assets/appliedenergistics2/textures/block/wireless_access_point.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/wireless_access_point_inside.png b/src/main/resources/assets/appliedenergistics2/textures/block/wireless_access_point_inside.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/wireless_access_point_inside.png rename to src/main/resources/assets/appliedenergistics2/textures/block/wireless_access_point_inside.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/block/wireless_access_point_on.png b/src/main/resources/assets/appliedenergistics2/textures/block/wireless_access_point_on.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/block/wireless_access_point_on.png rename to src/main/resources/assets/appliedenergistics2/textures/block/wireless_access_point_on.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/guis/bus.png b/src/main/resources/assets/appliedenergistics2/textures/guis/bus.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/guis/bus.png rename to src/main/resources/assets/appliedenergistics2/textures/guis/bus.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/guis/cellworkbench.png b/src/main/resources/assets/appliedenergistics2/textures/guis/cellworkbench.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/guis/cellworkbench.png rename to src/main/resources/assets/appliedenergistics2/textures/guis/cellworkbench.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/guis/chest.png b/src/main/resources/assets/appliedenergistics2/textures/guis/chest.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/guis/chest.png rename to src/main/resources/assets/appliedenergistics2/textures/guis/chest.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/guis/condenser.png b/src/main/resources/assets/appliedenergistics2/textures/guis/condenser.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/guis/condenser.png rename to src/main/resources/assets/appliedenergistics2/textures/guis/condenser.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/guis/craft_amt.png b/src/main/resources/assets/appliedenergistics2/textures/guis/craft_amt.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/guis/craft_amt.png rename to src/main/resources/assets/appliedenergistics2/textures/guis/craft_amt.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/guis/crafting.png b/src/main/resources/assets/appliedenergistics2/textures/guis/crafting.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/guis/crafting.png rename to src/main/resources/assets/appliedenergistics2/textures/guis/crafting.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/guis/craftingcpu.png b/src/main/resources/assets/appliedenergistics2/textures/guis/craftingcpu.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/guis/craftingcpu.png rename to src/main/resources/assets/appliedenergistics2/textures/guis/craftingcpu.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/guis/craftingreport.png b/src/main/resources/assets/appliedenergistics2/textures/guis/craftingreport.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/guis/craftingreport.png rename to src/main/resources/assets/appliedenergistics2/textures/guis/craftingreport.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/guis/drive.png b/src/main/resources/assets/appliedenergistics2/textures/guis/drive.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/guis/drive.png rename to src/main/resources/assets/appliedenergistics2/textures/guis/drive.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/guis/grinder.png b/src/main/resources/assets/appliedenergistics2/textures/guis/grinder.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/guis/grinder.png rename to src/main/resources/assets/appliedenergistics2/textures/guis/grinder.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/guis/inscriber.png b/src/main/resources/assets/appliedenergistics2/textures/guis/inscriber.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/guis/inscriber.png rename to src/main/resources/assets/appliedenergistics2/textures/guis/inscriber.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/guis/interface.png b/src/main/resources/assets/appliedenergistics2/textures/guis/interface.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/guis/interface.png rename to src/main/resources/assets/appliedenergistics2/textures/guis/interface.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/guis/interfacefluid.png b/src/main/resources/assets/appliedenergistics2/textures/guis/interfacefluid.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/guis/interfacefluid.png rename to src/main/resources/assets/appliedenergistics2/textures/guis/interfacefluid.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/guis/interfaceterminal.png b/src/main/resources/assets/appliedenergistics2/textures/guis/interfaceterminal.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/guis/interfaceterminal.png rename to src/main/resources/assets/appliedenergistics2/textures/guis/interfaceterminal.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/guis/io_port.png b/src/main/resources/assets/appliedenergistics2/textures/guis/io_port.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/guis/io_port.png rename to src/main/resources/assets/appliedenergistics2/textures/guis/io_port.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/guis/lvlemitter.png b/src/main/resources/assets/appliedenergistics2/textures/guis/lvlemitter.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/guis/lvlemitter.png rename to src/main/resources/assets/appliedenergistics2/textures/guis/lvlemitter.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/guis/molecular_assembler.png b/src/main/resources/assets/appliedenergistics2/textures/guis/molecular_assembler.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/guis/molecular_assembler.png rename to src/main/resources/assets/appliedenergistics2/textures/guis/molecular_assembler.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/guis/networkstatus.png b/src/main/resources/assets/appliedenergistics2/textures/guis/networkstatus.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/guis/networkstatus.png rename to src/main/resources/assets/appliedenergistics2/textures/guis/networkstatus.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/guis/pattern.png b/src/main/resources/assets/appliedenergistics2/textures/guis/pattern.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/guis/pattern.png rename to src/main/resources/assets/appliedenergistics2/textures/guis/pattern.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/guis/pattern2.png b/src/main/resources/assets/appliedenergistics2/textures/guis/pattern2.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/guis/pattern2.png rename to src/main/resources/assets/appliedenergistics2/textures/guis/pattern2.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/guis/priority.png b/src/main/resources/assets/appliedenergistics2/textures/guis/priority.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/guis/priority.png rename to src/main/resources/assets/appliedenergistics2/textures/guis/priority.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/guis/quartzknife.png b/src/main/resources/assets/appliedenergistics2/textures/guis/quartzknife.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/guis/quartzknife.png rename to src/main/resources/assets/appliedenergistics2/textures/guis/quartzknife.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/guis/security_station.png b/src/main/resources/assets/appliedenergistics2/textures/guis/security_station.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/guis/security_station.png rename to src/main/resources/assets/appliedenergistics2/textures/guis/security_station.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/guis/skychest.png b/src/main/resources/assets/appliedenergistics2/textures/guis/skychest.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/guis/skychest.png rename to src/main/resources/assets/appliedenergistics2/textures/guis/skychest.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/guis/spatialio.png b/src/main/resources/assets/appliedenergistics2/textures/guis/spatialio.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/guis/spatialio.png rename to src/main/resources/assets/appliedenergistics2/textures/guis/spatialio.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/guis/states.png b/src/main/resources/assets/appliedenergistics2/textures/guis/states.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/guis/states.png rename to src/main/resources/assets/appliedenergistics2/textures/guis/states.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/guis/storagebus.png b/src/main/resources/assets/appliedenergistics2/textures/guis/storagebus.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/guis/storagebus.png rename to src/main/resources/assets/appliedenergistics2/textures/guis/storagebus.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/guis/terminal.png b/src/main/resources/assets/appliedenergistics2/textures/guis/terminal.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/guis/terminal.png rename to src/main/resources/assets/appliedenergistics2/textures/guis/terminal.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/guis/toolbox.png b/src/main/resources/assets/appliedenergistics2/textures/guis/toolbox.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/guis/toolbox.png rename to src/main/resources/assets/appliedenergistics2/textures/guis/toolbox.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/guis/vibchamber.png b/src/main/resources/assets/appliedenergistics2/textures/guis/vibchamber.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/guis/vibchamber.png rename to src/main/resources/assets/appliedenergistics2/textures/guis/vibchamber.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/guis/wireless.png b/src/main/resources/assets/appliedenergistics2/textures/guis/wireless.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/guis/wireless.png rename to src/main/resources/assets/appliedenergistics2/textures/guis/wireless.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/128_cubed_spatial_cell_component.png b/src/main/resources/assets/appliedenergistics2/textures/item/128_cubed_spatial_cell_component.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/128_cubed_spatial_cell_component.png rename to src/main/resources/assets/appliedenergistics2/textures/item/128_cubed_spatial_cell_component.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/128_cubed_spatial_storage_cell.png b/src/main/resources/assets/appliedenergistics2/textures/item/128_cubed_spatial_storage_cell.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/128_cubed_spatial_storage_cell.png rename to src/main/resources/assets/appliedenergistics2/textures/item/128_cubed_spatial_storage_cell.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/16_cubed_spatial_cell_component.png b/src/main/resources/assets/appliedenergistics2/textures/item/16_cubed_spatial_cell_component.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/16_cubed_spatial_cell_component.png rename to src/main/resources/assets/appliedenergistics2/textures/item/16_cubed_spatial_cell_component.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/16_cubed_spatial_storage_cell.png b/src/main/resources/assets/appliedenergistics2/textures/item/16_cubed_spatial_storage_cell.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/16_cubed_spatial_storage_cell.png rename to src/main/resources/assets/appliedenergistics2/textures/item/16_cubed_spatial_storage_cell.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/16k_cell_component.png b/src/main/resources/assets/appliedenergistics2/textures/item/16k_cell_component.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/16k_cell_component.png rename to src/main/resources/assets/appliedenergistics2/textures/item/16k_cell_component.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/16k_fluid_cell_component.png b/src/main/resources/assets/appliedenergistics2/textures/item/16k_fluid_cell_component.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/16k_fluid_cell_component.png rename to src/main/resources/assets/appliedenergistics2/textures/item/16k_fluid_cell_component.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/16k_fluid_storage_cell.png b/src/main/resources/assets/appliedenergistics2/textures/item/16k_fluid_storage_cell.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/16k_fluid_storage_cell.png rename to src/main/resources/assets/appliedenergistics2/textures/item/16k_fluid_storage_cell.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/16k_storage_cell.png b/src/main/resources/assets/appliedenergistics2/textures/item/16k_storage_cell.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/16k_storage_cell.png rename to src/main/resources/assets/appliedenergistics2/textures/item/16k_storage_cell.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/1k_cell_component.png b/src/main/resources/assets/appliedenergistics2/textures/item/1k_cell_component.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/1k_cell_component.png rename to src/main/resources/assets/appliedenergistics2/textures/item/1k_cell_component.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/1k_fluid_cell_component.png b/src/main/resources/assets/appliedenergistics2/textures/item/1k_fluid_cell_component.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/1k_fluid_cell_component.png rename to src/main/resources/assets/appliedenergistics2/textures/item/1k_fluid_cell_component.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/1k_fluid_storage_cell.png b/src/main/resources/assets/appliedenergistics2/textures/item/1k_fluid_storage_cell.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/1k_fluid_storage_cell.png rename to src/main/resources/assets/appliedenergistics2/textures/item/1k_fluid_storage_cell.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/1k_storage_cell.png b/src/main/resources/assets/appliedenergistics2/textures/item/1k_storage_cell.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/1k_storage_cell.png rename to src/main/resources/assets/appliedenergistics2/textures/item/1k_storage_cell.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/2_cubed_spatial_cell_component.png b/src/main/resources/assets/appliedenergistics2/textures/item/2_cubed_spatial_cell_component.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/2_cubed_spatial_cell_component.png rename to src/main/resources/assets/appliedenergistics2/textures/item/2_cubed_spatial_cell_component.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/2_cubed_spatial_storage_cell.png b/src/main/resources/assets/appliedenergistics2/textures/item/2_cubed_spatial_storage_cell.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/2_cubed_spatial_storage_cell.png rename to src/main/resources/assets/appliedenergistics2/textures/item/2_cubed_spatial_storage_cell.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/4k_cell_component.png b/src/main/resources/assets/appliedenergistics2/textures/item/4k_cell_component.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/4k_cell_component.png rename to src/main/resources/assets/appliedenergistics2/textures/item/4k_cell_component.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/4k_fluid_cell_component.png b/src/main/resources/assets/appliedenergistics2/textures/item/4k_fluid_cell_component.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/4k_fluid_cell_component.png rename to src/main/resources/assets/appliedenergistics2/textures/item/4k_fluid_cell_component.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/4k_fluid_storage_cell.png b/src/main/resources/assets/appliedenergistics2/textures/item/4k_fluid_storage_cell.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/4k_fluid_storage_cell.png rename to src/main/resources/assets/appliedenergistics2/textures/item/4k_fluid_storage_cell.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/4k_storage_cell.png b/src/main/resources/assets/appliedenergistics2/textures/item/4k_storage_cell.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/4k_storage_cell.png rename to src/main/resources/assets/appliedenergistics2/textures/item/4k_storage_cell.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/64k_cell_component.png b/src/main/resources/assets/appliedenergistics2/textures/item/64k_cell_component.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/64k_cell_component.png rename to src/main/resources/assets/appliedenergistics2/textures/item/64k_cell_component.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/64k_fluid_cell_component.png b/src/main/resources/assets/appliedenergistics2/textures/item/64k_fluid_cell_component.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/64k_fluid_cell_component.png rename to src/main/resources/assets/appliedenergistics2/textures/item/64k_fluid_cell_component.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/64k_fluid_storage_cell.png b/src/main/resources/assets/appliedenergistics2/textures/item/64k_fluid_storage_cell.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/64k_fluid_storage_cell.png rename to src/main/resources/assets/appliedenergistics2/textures/item/64k_fluid_storage_cell.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/64k_storage_cell.png b/src/main/resources/assets/appliedenergistics2/textures/item/64k_storage_cell.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/64k_storage_cell.png rename to src/main/resources/assets/appliedenergistics2/textures/item/64k_storage_cell.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/advanced_card.png b/src/main/resources/assets/appliedenergistics2/textures/item/advanced_card.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/advanced_card.png rename to src/main/resources/assets/appliedenergistics2/textures/item/advanced_card.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/annihilation_core.png b/src/main/resources/assets/appliedenergistics2/textures/item/annihilation_core.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/annihilation_core.png rename to src/main/resources/assets/appliedenergistics2/textures/item/annihilation_core.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/basic_card.png b/src/main/resources/assets/appliedenergistics2/textures/item/basic_card.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/basic_card.png rename to src/main/resources/assets/appliedenergistics2/textures/item/basic_card.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/biometric_card.png b/src/main/resources/assets/appliedenergistics2/textures/item/biometric_card.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/biometric_card.png rename to src/main/resources/assets/appliedenergistics2/textures/item/biometric_card.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/biometric_card_hash.png b/src/main/resources/assets/appliedenergistics2/textures/item/biometric_card_hash.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/biometric_card_hash.png rename to src/main/resources/assets/appliedenergistics2/textures/item/biometric_card_hash.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/blank_pattern.png b/src/main/resources/assets/appliedenergistics2/textures/item/blank_pattern.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/blank_pattern.png rename to src/main/resources/assets/appliedenergistics2/textures/item/blank_pattern.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/calculation_processor.png b/src/main/resources/assets/appliedenergistics2/textures/item/calculation_processor.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/calculation_processor.png rename to src/main/resources/assets/appliedenergistics2/textures/item/calculation_processor.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/calculation_processor_press.png b/src/main/resources/assets/appliedenergistics2/textures/item/calculation_processor_press.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/calculation_processor_press.png rename to src/main/resources/assets/appliedenergistics2/textures/item/calculation_processor_press.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/card_capacity.png b/src/main/resources/assets/appliedenergistics2/textures/item/card_capacity.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/card_capacity.png rename to src/main/resources/assets/appliedenergistics2/textures/item/card_capacity.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/card_crafting.png b/src/main/resources/assets/appliedenergistics2/textures/item/card_crafting.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/card_crafting.png rename to src/main/resources/assets/appliedenergistics2/textures/item/card_crafting.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/card_fuzzy.png b/src/main/resources/assets/appliedenergistics2/textures/item/card_fuzzy.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/card_fuzzy.png rename to src/main/resources/assets/appliedenergistics2/textures/item/card_fuzzy.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/card_inverter.png b/src/main/resources/assets/appliedenergistics2/textures/item/card_inverter.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/card_inverter.png rename to src/main/resources/assets/appliedenergistics2/textures/item/card_inverter.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/card_redstone.png b/src/main/resources/assets/appliedenergistics2/textures/item/card_redstone.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/card_redstone.png rename to src/main/resources/assets/appliedenergistics2/textures/item/card_redstone.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/card_speed.png b/src/main/resources/assets/appliedenergistics2/textures/item/card_speed.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/card_speed.png rename to src/main/resources/assets/appliedenergistics2/textures/item/card_speed.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/certus_quartz_axe.png b/src/main/resources/assets/appliedenergistics2/textures/item/certus_quartz_axe.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/certus_quartz_axe.png rename to src/main/resources/assets/appliedenergistics2/textures/item/certus_quartz_axe.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/certus_quartz_crystal.png b/src/main/resources/assets/appliedenergistics2/textures/item/certus_quartz_crystal.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/certus_quartz_crystal.png rename to src/main/resources/assets/appliedenergistics2/textures/item/certus_quartz_crystal.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/certus_quartz_crystal_charged.png b/src/main/resources/assets/appliedenergistics2/textures/item/certus_quartz_crystal_charged.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/certus_quartz_crystal_charged.png rename to src/main/resources/assets/appliedenergistics2/textures/item/certus_quartz_crystal_charged.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/certus_quartz_cutting_knife.png b/src/main/resources/assets/appliedenergistics2/textures/item/certus_quartz_cutting_knife.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/certus_quartz_cutting_knife.png rename to src/main/resources/assets/appliedenergistics2/textures/item/certus_quartz_cutting_knife.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/certus_quartz_dust.png b/src/main/resources/assets/appliedenergistics2/textures/item/certus_quartz_dust.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/certus_quartz_dust.png rename to src/main/resources/assets/appliedenergistics2/textures/item/certus_quartz_dust.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/certus_quartz_hoe.png b/src/main/resources/assets/appliedenergistics2/textures/item/certus_quartz_hoe.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/certus_quartz_hoe.png rename to src/main/resources/assets/appliedenergistics2/textures/item/certus_quartz_hoe.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/certus_quartz_pickaxe.png b/src/main/resources/assets/appliedenergistics2/textures/item/certus_quartz_pickaxe.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/certus_quartz_pickaxe.png rename to src/main/resources/assets/appliedenergistics2/textures/item/certus_quartz_pickaxe.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/certus_quartz_shovel.png b/src/main/resources/assets/appliedenergistics2/textures/item/certus_quartz_shovel.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/certus_quartz_shovel.png rename to src/main/resources/assets/appliedenergistics2/textures/item/certus_quartz_shovel.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/certus_quartz_sword.png b/src/main/resources/assets/appliedenergistics2/textures/item/certus_quartz_sword.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/certus_quartz_sword.png rename to src/main/resources/assets/appliedenergistics2/textures/item/certus_quartz_sword.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/certus_quartz_wrench.png b/src/main/resources/assets/appliedenergistics2/textures/item/certus_quartz_wrench.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/certus_quartz_wrench.png rename to src/main/resources/assets/appliedenergistics2/textures/item/certus_quartz_wrench.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/charged_staff.png b/src/main/resources/assets/appliedenergistics2/textures/item/charged_staff.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/charged_staff.png rename to src/main/resources/assets/appliedenergistics2/textures/item/charged_staff.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/color_applicator.png b/src/main/resources/assets/appliedenergistics2/textures/item/color_applicator.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/color_applicator.png rename to src/main/resources/assets/appliedenergistics2/textures/item/color_applicator.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/color_applicator_tip_bright.png b/src/main/resources/assets/appliedenergistics2/textures/item/color_applicator_tip_bright.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/color_applicator_tip_bright.png rename to src/main/resources/assets/appliedenergistics2/textures/item/color_applicator_tip_bright.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/color_applicator_tip_dark.png b/src/main/resources/assets/appliedenergistics2/textures/item/color_applicator_tip_dark.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/color_applicator_tip_dark.png rename to src/main/resources/assets/appliedenergistics2/textures/item/color_applicator_tip_dark.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/color_applicator_tip_medium.png b/src/main/resources/assets/appliedenergistics2/textures/item/color_applicator_tip_medium.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/color_applicator_tip_medium.png rename to src/main/resources/assets/appliedenergistics2/textures/item/color_applicator_tip_medium.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/crank.png b/src/main/resources/assets/appliedenergistics2/textures/item/crank.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/crank.png rename to src/main/resources/assets/appliedenergistics2/textures/item/crank.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/creative_storage_cell.png b/src/main/resources/assets/appliedenergistics2/textures/item/creative_storage_cell.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/creative_storage_cell.png rename to src/main/resources/assets/appliedenergistics2/textures/item/creative_storage_cell.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/crystal_seed_certus.png b/src/main/resources/assets/appliedenergistics2/textures/item/crystal_seed_certus.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/crystal_seed_certus.png rename to src/main/resources/assets/appliedenergistics2/textures/item/crystal_seed_certus.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/crystal_seed_certus2.png b/src/main/resources/assets/appliedenergistics2/textures/item/crystal_seed_certus2.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/crystal_seed_certus2.png rename to src/main/resources/assets/appliedenergistics2/textures/item/crystal_seed_certus2.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/crystal_seed_certus3.png b/src/main/resources/assets/appliedenergistics2/textures/item/crystal_seed_certus3.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/crystal_seed_certus3.png rename to src/main/resources/assets/appliedenergistics2/textures/item/crystal_seed_certus3.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/crystal_seed_fluix.png b/src/main/resources/assets/appliedenergistics2/textures/item/crystal_seed_fluix.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/crystal_seed_fluix.png rename to src/main/resources/assets/appliedenergistics2/textures/item/crystal_seed_fluix.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/crystal_seed_fluix2.png b/src/main/resources/assets/appliedenergistics2/textures/item/crystal_seed_fluix2.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/crystal_seed_fluix2.png rename to src/main/resources/assets/appliedenergistics2/textures/item/crystal_seed_fluix2.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/crystal_seed_fluix3.png b/src/main/resources/assets/appliedenergistics2/textures/item/crystal_seed_fluix3.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/crystal_seed_fluix3.png rename to src/main/resources/assets/appliedenergistics2/textures/item/crystal_seed_fluix3.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/crystal_seed_nether.png b/src/main/resources/assets/appliedenergistics2/textures/item/crystal_seed_nether.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/crystal_seed_nether.png rename to src/main/resources/assets/appliedenergistics2/textures/item/crystal_seed_nether.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/crystal_seed_nether2.png b/src/main/resources/assets/appliedenergistics2/textures/item/crystal_seed_nether2.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/crystal_seed_nether2.png rename to src/main/resources/assets/appliedenergistics2/textures/item/crystal_seed_nether2.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/crystal_seed_nether3.png b/src/main/resources/assets/appliedenergistics2/textures/item/crystal_seed_nether3.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/crystal_seed_nether3.png rename to src/main/resources/assets/appliedenergistics2/textures/item/crystal_seed_nether3.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/debug/chunk_loader.png b/src/main/resources/assets/appliedenergistics2/textures/item/debug/chunk_loader.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/debug/chunk_loader.png rename to src/main/resources/assets/appliedenergistics2/textures/item/debug/chunk_loader.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/debug/cube_gen.png b/src/main/resources/assets/appliedenergistics2/textures/item/debug/cube_gen.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/debug/cube_gen.png rename to src/main/resources/assets/appliedenergistics2/textures/item/debug/cube_gen.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/debug/energy_gen.png b/src/main/resources/assets/appliedenergistics2/textures/item/debug/energy_gen.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/debug/energy_gen.png rename to src/main/resources/assets/appliedenergistics2/textures/item/debug/energy_gen.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/debug/eraser.png b/src/main/resources/assets/appliedenergistics2/textures/item/debug/eraser.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/debug/eraser.png rename to src/main/resources/assets/appliedenergistics2/textures/item/debug/eraser.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/debug/item_gen.png b/src/main/resources/assets/appliedenergistics2/textures/item/debug/item_gen.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/debug/item_gen.png rename to src/main/resources/assets/appliedenergistics2/textures/item/debug/item_gen.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/debug/meteorite_placer.png b/src/main/resources/assets/appliedenergistics2/textures/item/debug/meteorite_placer.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/debug/meteorite_placer.png rename to src/main/resources/assets/appliedenergistics2/textures/item/debug/meteorite_placer.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/debug/part_placer.png b/src/main/resources/assets/appliedenergistics2/textures/item/debug/part_placer.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/debug/part_placer.png rename to src/main/resources/assets/appliedenergistics2/textures/item/debug/part_placer.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/debug/phantom_node.png b/src/main/resources/assets/appliedenergistics2/textures/item/debug/phantom_node.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/debug/phantom_node.png rename to src/main/resources/assets/appliedenergistics2/textures/item/debug/phantom_node.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/debug/replicator_card.png b/src/main/resources/assets/appliedenergistics2/textures/item/debug/replicator_card.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/debug/replicator_card.png rename to src/main/resources/assets/appliedenergistics2/textures/item/debug/replicator_card.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/debug_card.png b/src/main/resources/assets/appliedenergistics2/textures/item/debug_card.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/debug_card.png rename to src/main/resources/assets/appliedenergistics2/textures/item/debug_card.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/empty_storage_cell.png b/src/main/resources/assets/appliedenergistics2/textures/item/empty_storage_cell.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/empty_storage_cell.png rename to src/main/resources/assets/appliedenergistics2/textures/item/empty_storage_cell.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/encoded_pattern.png b/src/main/resources/assets/appliedenergistics2/textures/item/encoded_pattern.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/encoded_pattern.png rename to src/main/resources/assets/appliedenergistics2/textures/item/encoded_pattern.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/ender_dust.png b/src/main/resources/assets/appliedenergistics2/textures/item/ender_dust.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/ender_dust.png rename to src/main/resources/assets/appliedenergistics2/textures/item/ender_dust.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/engineering_processor.png b/src/main/resources/assets/appliedenergistics2/textures/item/engineering_processor.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/engineering_processor.png rename to src/main/resources/assets/appliedenergistics2/textures/item/engineering_processor.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/engineering_processor_press.png b/src/main/resources/assets/appliedenergistics2/textures/item/engineering_processor_press.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/engineering_processor_press.png rename to src/main/resources/assets/appliedenergistics2/textures/item/engineering_processor_press.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/entropy_manipulator.png b/src/main/resources/assets/appliedenergistics2/textures/item/entropy_manipulator.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/entropy_manipulator.png rename to src/main/resources/assets/appliedenergistics2/textures/item/entropy_manipulator.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/flour.png b/src/main/resources/assets/appliedenergistics2/textures/item/flour.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/flour.png rename to src/main/resources/assets/appliedenergistics2/textures/item/flour.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/fluix_crystal.png b/src/main/resources/assets/appliedenergistics2/textures/item/fluix_crystal.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/fluix_crystal.png rename to src/main/resources/assets/appliedenergistics2/textures/item/fluix_crystal.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/fluix_dust.png b/src/main/resources/assets/appliedenergistics2/textures/item/fluix_dust.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/fluix_dust.png rename to src/main/resources/assets/appliedenergistics2/textures/item/fluix_dust.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/fluix_pearl.png b/src/main/resources/assets/appliedenergistics2/textures/item/fluix_pearl.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/fluix_pearl.png rename to src/main/resources/assets/appliedenergistics2/textures/item/fluix_pearl.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/formation_core.png b/src/main/resources/assets/appliedenergistics2/textures/item/formation_core.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/formation_core.png rename to src/main/resources/assets/appliedenergistics2/textures/item/formation_core.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/gold_dust.png b/src/main/resources/assets/appliedenergistics2/textures/item/gold_dust.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/gold_dust.png rename to src/main/resources/assets/appliedenergistics2/textures/item/gold_dust.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/iron_dust.png b/src/main/resources/assets/appliedenergistics2/textures/item/iron_dust.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/iron_dust.png rename to src/main/resources/assets/appliedenergistics2/textures/item/iron_dust.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/logic_processor.png b/src/main/resources/assets/appliedenergistics2/textures/item/logic_processor.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/logic_processor.png rename to src/main/resources/assets/appliedenergistics2/textures/item/logic_processor.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/logic_processor_press.png b/src/main/resources/assets/appliedenergistics2/textures/item/logic_processor_press.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/logic_processor_press.png rename to src/main/resources/assets/appliedenergistics2/textures/item/logic_processor_press.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/material_wooden_crank.png b/src/main/resources/assets/appliedenergistics2/textures/item/material_wooden_crank.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/material_wooden_crank.png rename to src/main/resources/assets/appliedenergistics2/textures/item/material_wooden_crank.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/matter_ball.png b/src/main/resources/assets/appliedenergistics2/textures/item/matter_ball.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/matter_ball.png rename to src/main/resources/assets/appliedenergistics2/textures/item/matter_ball.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/matter_cannon.png b/src/main/resources/assets/appliedenergistics2/textures/item/matter_cannon.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/matter_cannon.png rename to src/main/resources/assets/appliedenergistics2/textures/item/matter_cannon.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/memory_card.png b/src/main/resources/assets/appliedenergistics2/textures/item/memory_card.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/memory_card.png rename to src/main/resources/assets/appliedenergistics2/textures/item/memory_card.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/memory_card_hash.png b/src/main/resources/assets/appliedenergistics2/textures/item/memory_card_hash.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/memory_card_hash.png rename to src/main/resources/assets/appliedenergistics2/textures/item/memory_card_hash.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/name_press.png b/src/main/resources/assets/appliedenergistics2/textures/item/name_press.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/name_press.png rename to src/main/resources/assets/appliedenergistics2/textures/item/name_press.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/nether_quartz_axe.png b/src/main/resources/assets/appliedenergistics2/textures/item/nether_quartz_axe.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/nether_quartz_axe.png rename to src/main/resources/assets/appliedenergistics2/textures/item/nether_quartz_axe.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/nether_quartz_cutting_knife.png b/src/main/resources/assets/appliedenergistics2/textures/item/nether_quartz_cutting_knife.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/nether_quartz_cutting_knife.png rename to src/main/resources/assets/appliedenergistics2/textures/item/nether_quartz_cutting_knife.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/nether_quartz_dust.png b/src/main/resources/assets/appliedenergistics2/textures/item/nether_quartz_dust.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/nether_quartz_dust.png rename to src/main/resources/assets/appliedenergistics2/textures/item/nether_quartz_dust.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/nether_quartz_hoe.png b/src/main/resources/assets/appliedenergistics2/textures/item/nether_quartz_hoe.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/nether_quartz_hoe.png rename to src/main/resources/assets/appliedenergistics2/textures/item/nether_quartz_hoe.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/nether_quartz_pickaxe.png b/src/main/resources/assets/appliedenergistics2/textures/item/nether_quartz_pickaxe.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/nether_quartz_pickaxe.png rename to src/main/resources/assets/appliedenergistics2/textures/item/nether_quartz_pickaxe.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/nether_quartz_shovel.png b/src/main/resources/assets/appliedenergistics2/textures/item/nether_quartz_shovel.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/nether_quartz_shovel.png rename to src/main/resources/assets/appliedenergistics2/textures/item/nether_quartz_shovel.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/nether_quartz_sword.png b/src/main/resources/assets/appliedenergistics2/textures/item/nether_quartz_sword.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/nether_quartz_sword.png rename to src/main/resources/assets/appliedenergistics2/textures/item/nether_quartz_sword.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/nether_quartz_wrench.png b/src/main/resources/assets/appliedenergistics2/textures/item/nether_quartz_wrench.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/nether_quartz_wrench.png rename to src/main/resources/assets/appliedenergistics2/textures/item/nether_quartz_wrench.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/network_tool.png b/src/main/resources/assets/appliedenergistics2/textures/item/network_tool.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/network_tool.png rename to src/main/resources/assets/appliedenergistics2/textures/item/network_tool.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/paint_ball.png b/src/main/resources/assets/appliedenergistics2/textures/item/paint_ball.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/paint_ball.png rename to src/main/resources/assets/appliedenergistics2/textures/item/paint_ball.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/paint_ball_shimmer.png b/src/main/resources/assets/appliedenergistics2/textures/item/paint_ball_shimmer.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/paint_ball_shimmer.png rename to src/main/resources/assets/appliedenergistics2/textures/item/paint_ball_shimmer.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/paint_ball_shimmer.png.mcmeta b/src/main/resources/assets/appliedenergistics2/textures/item/paint_ball_shimmer.png.mcmeta similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/paint_ball_shimmer.png.mcmeta rename to src/main/resources/assets/appliedenergistics2/textures/item/paint_ball_shimmer.png.mcmeta diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/part/annihilation_plane.png b/src/main/resources/assets/appliedenergistics2/textures/item/part/annihilation_plane.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/part/annihilation_plane.png rename to src/main/resources/assets/appliedenergistics2/textures/item/part/annihilation_plane.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/part/conversion_monitor.png b/src/main/resources/assets/appliedenergistics2/textures/item/part/conversion_monitor.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/part/conversion_monitor.png rename to src/main/resources/assets/appliedenergistics2/textures/item/part/conversion_monitor.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/part/crafting_terminal.png b/src/main/resources/assets/appliedenergistics2/textures/item/part/crafting_terminal.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/part/crafting_terminal.png rename to src/main/resources/assets/appliedenergistics2/textures/item/part/crafting_terminal.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/part/export_bus.png b/src/main/resources/assets/appliedenergistics2/textures/item/part/export_bus.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/part/export_bus.png rename to src/main/resources/assets/appliedenergistics2/textures/item/part/export_bus.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/part/fluid_annihilation_plane.png b/src/main/resources/assets/appliedenergistics2/textures/item/part/fluid_annihilation_plane.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/part/fluid_annihilation_plane.png rename to src/main/resources/assets/appliedenergistics2/textures/item/part/fluid_annihilation_plane.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/part/fluid_export_bus.png b/src/main/resources/assets/appliedenergistics2/textures/item/part/fluid_export_bus.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/part/fluid_export_bus.png rename to src/main/resources/assets/appliedenergistics2/textures/item/part/fluid_export_bus.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/part/fluid_formation_plane.png b/src/main/resources/assets/appliedenergistics2/textures/item/part/fluid_formation_plane.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/part/fluid_formation_plane.png rename to src/main/resources/assets/appliedenergistics2/textures/item/part/fluid_formation_plane.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/part/fluid_import_bus.png b/src/main/resources/assets/appliedenergistics2/textures/item/part/fluid_import_bus.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/part/fluid_import_bus.png rename to src/main/resources/assets/appliedenergistics2/textures/item/part/fluid_import_bus.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/part/fluid_interface.png b/src/main/resources/assets/appliedenergistics2/textures/item/part/fluid_interface.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/part/fluid_interface.png rename to src/main/resources/assets/appliedenergistics2/textures/item/part/fluid_interface.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/part/fluid_storage_bus.png b/src/main/resources/assets/appliedenergistics2/textures/item/part/fluid_storage_bus.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/part/fluid_storage_bus.png rename to src/main/resources/assets/appliedenergistics2/textures/item/part/fluid_storage_bus.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/part/fluid_terminal.png b/src/main/resources/assets/appliedenergistics2/textures/item/part/fluid_terminal.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/part/fluid_terminal.png rename to src/main/resources/assets/appliedenergistics2/textures/item/part/fluid_terminal.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/part/formation_plane.png b/src/main/resources/assets/appliedenergistics2/textures/item/part/formation_plane.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/part/formation_plane.png rename to src/main/resources/assets/appliedenergistics2/textures/item/part/formation_plane.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/part/identity_annihilation_plane.png b/src/main/resources/assets/appliedenergistics2/textures/item/part/identity_annihilation_plane.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/part/identity_annihilation_plane.png rename to src/main/resources/assets/appliedenergistics2/textures/item/part/identity_annihilation_plane.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/part/import_bus.png b/src/main/resources/assets/appliedenergistics2/textures/item/part/import_bus.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/part/import_bus.png rename to src/main/resources/assets/appliedenergistics2/textures/item/part/import_bus.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/part/interface.png b/src/main/resources/assets/appliedenergistics2/textures/item/part/interface.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/part/interface.png rename to src/main/resources/assets/appliedenergistics2/textures/item/part/interface.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/part/interface_terminal.png b/src/main/resources/assets/appliedenergistics2/textures/item/part/interface_terminal.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/part/interface_terminal.png rename to src/main/resources/assets/appliedenergistics2/textures/item/part/interface_terminal.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/part/inverted_toggle_bus.png b/src/main/resources/assets/appliedenergistics2/textures/item/part/inverted_toggle_bus.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/part/inverted_toggle_bus.png rename to src/main/resources/assets/appliedenergistics2/textures/item/part/inverted_toggle_bus.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/part/level_emitter_off.png b/src/main/resources/assets/appliedenergistics2/textures/item/part/level_emitter_off.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/part/level_emitter_off.png rename to src/main/resources/assets/appliedenergistics2/textures/item/part/level_emitter_off.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/part/p2p_tunnel_back.png b/src/main/resources/assets/appliedenergistics2/textures/item/part/p2p_tunnel_back.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/part/p2p_tunnel_back.png rename to src/main/resources/assets/appliedenergistics2/textures/item/part/p2p_tunnel_back.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/part/p2p_tunnel_back2.png b/src/main/resources/assets/appliedenergistics2/textures/item/part/p2p_tunnel_back2.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/part/p2p_tunnel_back2.png rename to src/main/resources/assets/appliedenergistics2/textures/item/part/p2p_tunnel_back2.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/part/p2p_tunnel_front.png b/src/main/resources/assets/appliedenergistics2/textures/item/part/p2p_tunnel_front.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/part/p2p_tunnel_front.png rename to src/main/resources/assets/appliedenergistics2/textures/item/part/p2p_tunnel_front.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/part/pattern_terminal.png b/src/main/resources/assets/appliedenergistics2/textures/item/part/pattern_terminal.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/part/pattern_terminal.png rename to src/main/resources/assets/appliedenergistics2/textures/item/part/pattern_terminal.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/part/quartz_fiber.png b/src/main/resources/assets/appliedenergistics2/textures/item/part/quartz_fiber.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/part/quartz_fiber.png rename to src/main/resources/assets/appliedenergistics2/textures/item/part/quartz_fiber.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/part/storage_bus.png b/src/main/resources/assets/appliedenergistics2/textures/item/part/storage_bus.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/part/storage_bus.png rename to src/main/resources/assets/appliedenergistics2/textures/item/part/storage_bus.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/part/storage_monitor.png b/src/main/resources/assets/appliedenergistics2/textures/item/part/storage_monitor.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/part/storage_monitor.png rename to src/main/resources/assets/appliedenergistics2/textures/item/part/storage_monitor.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/part/terminal.png b/src/main/resources/assets/appliedenergistics2/textures/item/part/terminal.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/part/terminal.png rename to src/main/resources/assets/appliedenergistics2/textures/item/part/terminal.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/part/toggle_bus.png b/src/main/resources/assets/appliedenergistics2/textures/item/part/toggle_bus.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/part/toggle_bus.png rename to src/main/resources/assets/appliedenergistics2/textures/item/part/toggle_bus.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/portable_cell.png b/src/main/resources/assets/appliedenergistics2/textures/item/portable_cell.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/portable_cell.png rename to src/main/resources/assets/appliedenergistics2/textures/item/portable_cell.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/printed_calculation_processor.png b/src/main/resources/assets/appliedenergistics2/textures/item/printed_calculation_processor.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/printed_calculation_processor.png rename to src/main/resources/assets/appliedenergistics2/textures/item/printed_calculation_processor.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/printed_engineering_processor.png b/src/main/resources/assets/appliedenergistics2/textures/item/printed_engineering_processor.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/printed_engineering_processor.png rename to src/main/resources/assets/appliedenergistics2/textures/item/printed_engineering_processor.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/printed_logic_processor.png b/src/main/resources/assets/appliedenergistics2/textures/item/printed_logic_processor.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/printed_logic_processor.png rename to src/main/resources/assets/appliedenergistics2/textures/item/printed_logic_processor.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/printed_silicon.png b/src/main/resources/assets/appliedenergistics2/textures/item/printed_silicon.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/printed_silicon.png rename to src/main/resources/assets/appliedenergistics2/textures/item/printed_silicon.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/purified_certus_quartz_crystal.png b/src/main/resources/assets/appliedenergistics2/textures/item/purified_certus_quartz_crystal.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/purified_certus_quartz_crystal.png rename to src/main/resources/assets/appliedenergistics2/textures/item/purified_certus_quartz_crystal.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/purified_fluix_crystal.png b/src/main/resources/assets/appliedenergistics2/textures/item/purified_fluix_crystal.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/purified_fluix_crystal.png rename to src/main/resources/assets/appliedenergistics2/textures/item/purified_fluix_crystal.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/purified_nether_quartz_crystal.png b/src/main/resources/assets/appliedenergistics2/textures/item/purified_nether_quartz_crystal.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/purified_nether_quartz_crystal.png rename to src/main/resources/assets/appliedenergistics2/textures/item/purified_nether_quartz_crystal.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/quantum_entangled_singularity.png b/src/main/resources/assets/appliedenergistics2/textures/item/quantum_entangled_singularity.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/quantum_entangled_singularity.png rename to src/main/resources/assets/appliedenergistics2/textures/item/quantum_entangled_singularity.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/quartz_glass.png b/src/main/resources/assets/appliedenergistics2/textures/item/quartz_glass.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/quartz_glass.png rename to src/main/resources/assets/appliedenergistics2/textures/item/quartz_glass.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/silicon.png b/src/main/resources/assets/appliedenergistics2/textures/item/silicon.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/silicon.png rename to src/main/resources/assets/appliedenergistics2/textures/item/silicon.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/silicon_press.png b/src/main/resources/assets/appliedenergistics2/textures/item/silicon_press.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/silicon_press.png rename to src/main/resources/assets/appliedenergistics2/textures/item/silicon_press.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/singularity.png b/src/main/resources/assets/appliedenergistics2/textures/item/singularity.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/singularity.png rename to src/main/resources/assets/appliedenergistics2/textures/item/singularity.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/sky_dust.png b/src/main/resources/assets/appliedenergistics2/textures/item/sky_dust.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/sky_dust.png rename to src/main/resources/assets/appliedenergistics2/textures/item/sky_dust.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/spatial_pylon.png b/src/main/resources/assets/appliedenergistics2/textures/item/spatial_pylon.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/spatial_pylon.png rename to src/main/resources/assets/appliedenergistics2/textures/item/spatial_pylon.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/view_cell.png b/src/main/resources/assets/appliedenergistics2/textures/item/view_cell.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/view_cell.png rename to src/main/resources/assets/appliedenergistics2/textures/item/view_cell.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/white.png b/src/main/resources/assets/appliedenergistics2/textures/item/white.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/white.png rename to src/main/resources/assets/appliedenergistics2/textures/item/white.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/wireless_booster.png b/src/main/resources/assets/appliedenergistics2/textures/item/wireless_booster.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/wireless_booster.png rename to src/main/resources/assets/appliedenergistics2/textures/item/wireless_booster.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/wireless_receiver.png b/src/main/resources/assets/appliedenergistics2/textures/item/wireless_receiver.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/wireless_receiver.png rename to src/main/resources/assets/appliedenergistics2/textures/item/wireless_receiver.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/wireless_terminal.png b/src/main/resources/assets/appliedenergistics2/textures/item/wireless_terminal.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/wireless_terminal.png rename to src/main/resources/assets/appliedenergistics2/textures/item/wireless_terminal.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/item/wooden_gear.png b/src/main/resources/assets/appliedenergistics2/textures/item/wooden_gear.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/item/wooden_gear.png rename to src/main/resources/assets/appliedenergistics2/textures/item/wooden_gear.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/models/skyblockchest.png b/src/main/resources/assets/appliedenergistics2/textures/models/skyblockchest.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/models/skyblockchest.png rename to src/main/resources/assets/appliedenergistics2/textures/models/skyblockchest.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/models/skychest.png b/src/main/resources/assets/appliedenergistics2/textures/models/skychest.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/models/skychest.png rename to src/main/resources/assets/appliedenergistics2/textures/models/skychest.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/orientation/BlockMatrixFrame.png b/src/main/resources/assets/appliedenergistics2/textures/orientation/BlockMatrixFrame.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/orientation/BlockMatrixFrame.png rename to src/main/resources/assets/appliedenergistics2/textures/orientation/BlockMatrixFrame.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/orientation/BlockMatrixFrameBack.png b/src/main/resources/assets/appliedenergistics2/textures/orientation/BlockMatrixFrameBack.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/orientation/BlockMatrixFrameBack.png rename to src/main/resources/assets/appliedenergistics2/textures/orientation/BlockMatrixFrameBack.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/orientation/BlockMatrixFrameBottom.png b/src/main/resources/assets/appliedenergistics2/textures/orientation/BlockMatrixFrameBottom.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/orientation/BlockMatrixFrameBottom.png rename to src/main/resources/assets/appliedenergistics2/textures/orientation/BlockMatrixFrameBottom.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/orientation/BlockMatrixFrameEast.png b/src/main/resources/assets/appliedenergistics2/textures/orientation/BlockMatrixFrameEast.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/orientation/BlockMatrixFrameEast.png rename to src/main/resources/assets/appliedenergistics2/textures/orientation/BlockMatrixFrameEast.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/orientation/BlockMatrixFrameFront.png b/src/main/resources/assets/appliedenergistics2/textures/orientation/BlockMatrixFrameFront.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/orientation/BlockMatrixFrameFront.png rename to src/main/resources/assets/appliedenergistics2/textures/orientation/BlockMatrixFrameFront.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/orientation/BlockMatrixFrameWest.png b/src/main/resources/assets/appliedenergistics2/textures/orientation/BlockMatrixFrameWest.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/orientation/BlockMatrixFrameWest.png rename to src/main/resources/assets/appliedenergistics2/textures/orientation/BlockMatrixFrameWest.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/particle/energy.png b/src/main/resources/assets/appliedenergistics2/textures/particle/energy.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/particle/energy.png rename to src/main/resources/assets/appliedenergistics2/textures/particle/energy.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/particle/matter_cannon.png b/src/main/resources/assets/appliedenergistics2/textures/particle/matter_cannon.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/particle/matter_cannon.png rename to src/main/resources/assets/appliedenergistics2/textures/particle/matter_cannon.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/annihilation_plane_on.png b/src/main/resources/assets/appliedenergistics2/textures/parts/annihilation_plane_on.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/annihilation_plane_on.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/annihilation_plane_on.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/annihilation_plane_on.png.mcmeta b/src/main/resources/assets/appliedenergistics2/textures/parts/annihilation_plane_on.png.mcmeta similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/annihilation_plane_on.png.mcmeta rename to src/main/resources/assets/appliedenergistics2/textures/parts/annihilation_plane_on.png.mcmeta diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/covered/black.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/covered/black.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/covered/black.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/covered/black.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/covered/blue.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/covered/blue.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/covered/blue.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/covered/blue.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/covered/brown.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/covered/brown.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/covered/brown.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/covered/brown.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/covered/cyan.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/covered/cyan.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/covered/cyan.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/covered/cyan.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/covered/gray.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/covered/gray.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/covered/gray.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/covered/gray.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/covered/green.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/covered/green.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/covered/green.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/covered/green.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/covered/light_blue.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/covered/light_blue.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/covered/light_blue.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/covered/light_blue.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/covered/light_gray.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/covered/light_gray.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/covered/light_gray.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/covered/light_gray.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/covered/lime.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/covered/lime.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/covered/lime.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/covered/lime.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/covered/magenta.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/covered/magenta.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/covered/magenta.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/covered/magenta.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/covered/orange.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/covered/orange.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/covered/orange.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/covered/orange.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/covered/pink.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/covered/pink.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/covered/pink.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/covered/pink.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/covered/purple.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/covered/purple.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/covered/purple.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/covered/purple.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/covered/red.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/covered/red.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/covered/red.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/covered/red.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/covered/transparent.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/covered/transparent.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/covered/transparent.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/covered/transparent.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/covered/white.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/covered/white.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/covered/white.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/covered/white.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/covered/yellow.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/covered/yellow.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/covered/yellow.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/covered/yellow.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense_smart/black.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense_smart/black.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense_smart/black.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense_smart/black.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense_smart/blue.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense_smart/blue.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense_smart/blue.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense_smart/blue.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense_smart/brown.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense_smart/brown.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense_smart/brown.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense_smart/brown.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense_smart/cyan.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense_smart/cyan.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense_smart/cyan.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense_smart/cyan.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense_smart/gray.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense_smart/gray.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense_smart/gray.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense_smart/gray.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense_smart/green.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense_smart/green.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense_smart/green.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense_smart/green.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense_smart/light_blue.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense_smart/light_blue.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense_smart/light_blue.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense_smart/light_blue.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense_smart/light_gray.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense_smart/light_gray.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense_smart/light_gray.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense_smart/light_gray.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense_smart/lime.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense_smart/lime.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense_smart/lime.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense_smart/lime.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense_smart/magenta.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense_smart/magenta.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense_smart/magenta.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense_smart/magenta.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense_smart/orange.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense_smart/orange.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense_smart/orange.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense_smart/orange.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense_smart/pink.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense_smart/pink.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense_smart/pink.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense_smart/pink.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense_smart/purple.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense_smart/purple.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense_smart/purple.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense_smart/purple.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense_smart/red.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense_smart/red.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense_smart/red.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense_smart/red.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense_smart/transparent.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense_smart/transparent.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense_smart/transparent.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense_smart/transparent.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense_smart/white.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense_smart/white.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense_smart/white.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense_smart/white.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense_smart/yellow.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense_smart/yellow.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense_smart/yellow.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/dense_smart/yellow.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/glass/black.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/glass/black.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/glass/black.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/glass/black.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/glass/blue.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/glass/blue.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/glass/blue.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/glass/blue.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/glass/brown.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/glass/brown.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/glass/brown.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/glass/brown.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/glass/cyan.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/glass/cyan.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/glass/cyan.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/glass/cyan.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/glass/gray.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/glass/gray.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/glass/gray.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/glass/gray.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/glass/green.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/glass/green.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/glass/green.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/glass/green.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/glass/light_blue.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/glass/light_blue.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/glass/light_blue.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/glass/light_blue.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/glass/light_gray.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/glass/light_gray.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/glass/light_gray.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/glass/light_gray.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/glass/lime.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/glass/lime.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/glass/lime.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/glass/lime.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/glass/magenta.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/glass/magenta.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/glass/magenta.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/glass/magenta.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/glass/orange.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/glass/orange.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/glass/orange.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/glass/orange.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/glass/pink.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/glass/pink.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/glass/pink.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/glass/pink.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/glass/purple.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/glass/purple.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/glass/purple.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/glass/purple.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/glass/red.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/glass/red.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/glass/red.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/glass/red.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/glass/transparent.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/glass/transparent.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/glass/transparent.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/glass/transparent.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/glass/white.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/glass/white.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/glass/white.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/glass/white.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/glass/yellow.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/glass/yellow.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/glass/yellow.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/core/glass/yellow.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/black.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/black.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/black.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/black.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/blue.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/blue.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/blue.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/blue.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/brown.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/brown.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/brown.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/brown.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/cyan.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/cyan.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/cyan.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/cyan.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/gray.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/gray.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/gray.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/gray.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/green.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/green.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/green.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/green.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/light_blue.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/light_blue.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/light_blue.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/light_blue.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/light_gray.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/light_gray.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/light_gray.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/light_gray.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/lime.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/lime.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/lime.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/lime.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/magenta.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/magenta.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/magenta.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/magenta.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/orange.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/orange.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/orange.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/orange.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/pink.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/pink.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/pink.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/pink.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/purple.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/purple.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/purple.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/purple.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/red.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/red.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/red.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/red.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/transparent.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/transparent.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/transparent.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/transparent.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/white.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/white.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/white.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/white.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/yellow.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/yellow.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/yellow.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/covered/yellow.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/black.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/black.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/black.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/black.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/blue.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/blue.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/blue.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/blue.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/brown.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/brown.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/brown.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/brown.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/cyan.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/cyan.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/cyan.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/cyan.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/gray.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/gray.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/gray.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/gray.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/green.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/green.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/green.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/green.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/light_blue.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/light_blue.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/light_blue.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/light_blue.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/light_gray.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/light_gray.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/light_gray.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/light_gray.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/lime.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/lime.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/lime.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/lime.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/magenta.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/magenta.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/magenta.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/magenta.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/orange.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/orange.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/orange.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/orange.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/pink.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/pink.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/pink.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/pink.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/purple.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/purple.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/purple.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/purple.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/red.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/red.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/red.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/red.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/transparent.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/transparent.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/transparent.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/transparent.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/white.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/white.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/white.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/white.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/yellow.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/yellow.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/yellow.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_covered/yellow.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/0.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/0.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/0.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/0.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/1.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/1.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/1.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/1.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/10.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/10.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/10.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/10.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/11.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/11.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/11.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/11.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/12.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/12.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/12.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/12.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/13.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/13.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/13.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/13.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/14.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/14.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/14.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/14.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/15.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/15.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/15.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/15.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/16.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/16.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/16.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/16.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/17.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/17.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/17.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/17.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/18.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/18.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/18.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/18.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/19.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/19.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/19.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/19.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/2.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/2.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/2.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/2.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/20.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/20.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/20.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/20.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/21.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/21.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/21.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/21.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/22.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/22.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/22.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/22.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/23.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/23.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/23.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/23.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/24.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/24.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/24.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/24.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/25.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/25.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/25.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/25.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/26.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/26.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/26.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/26.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/27.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/27.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/27.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/27.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/28.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/28.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/28.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/28.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/29.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/29.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/29.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/29.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/3.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/3.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/3.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/3.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/30.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/30.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/30.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/30.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/31.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/31.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/31.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/31.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/32.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/32.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/32.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/32.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/4.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/4.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/4.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/4.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/5.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/5.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/5.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/5.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/6.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/6.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/6.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/6.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/7.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/7.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/7.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/7.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/8.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/8.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/8.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/8.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/9.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/9.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/9.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/9.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/black.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/black.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/black.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/black.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/blue.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/blue.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/blue.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/blue.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/brown.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/brown.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/brown.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/brown.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/cyan.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/cyan.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/cyan.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/cyan.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/gray.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/gray.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/gray.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/gray.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/green.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/green.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/green.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/green.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/light_blue.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/light_blue.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/light_blue.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/light_blue.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/light_gray.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/light_gray.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/light_gray.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/light_gray.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/lime.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/lime.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/lime.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/lime.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/magenta.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/magenta.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/magenta.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/magenta.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/orange.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/orange.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/orange.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/orange.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/pink.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/pink.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/pink.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/pink.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/purple.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/purple.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/purple.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/purple.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/red.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/red.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/red.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/red.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/transparent.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/transparent.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/transparent.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/transparent.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/white.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/white.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/white.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/white.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/yellow.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/yellow.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/yellow.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/dense_smart/yellow.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/black.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/black.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/black.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/black.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/blue.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/blue.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/blue.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/blue.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/brown.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/brown.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/brown.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/brown.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/cyan.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/cyan.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/cyan.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/cyan.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/gray.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/gray.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/gray.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/gray.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/green.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/green.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/green.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/green.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/light_blue.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/light_blue.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/light_blue.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/light_blue.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/light_gray.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/light_gray.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/light_gray.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/light_gray.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/lime.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/lime.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/lime.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/lime.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/magenta.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/magenta.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/magenta.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/magenta.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/orange.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/orange.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/orange.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/orange.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/pink.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/pink.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/pink.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/pink.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/purple.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/purple.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/purple.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/purple.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/red.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/red.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/red.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/red.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/transparent.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/transparent.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/transparent.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/transparent.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/white.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/white.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/white.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/white.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/yellow.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/yellow.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/yellow.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/glass/yellow.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/black.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/black.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/black.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/black.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/blue.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/blue.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/blue.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/blue.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/brown.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/brown.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/brown.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/brown.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/channels_00.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/channels_00.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/channels_00.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/channels_00.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/channels_01.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/channels_01.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/channels_01.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/channels_01.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/channels_02.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/channels_02.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/channels_02.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/channels_02.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/channels_03.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/channels_03.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/channels_03.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/channels_03.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/channels_04.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/channels_04.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/channels_04.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/channels_04.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/channels_10.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/channels_10.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/channels_10.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/channels_10.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/channels_11.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/channels_11.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/channels_11.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/channels_11.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/channels_12.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/channels_12.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/channels_12.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/channels_12.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/channels_13.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/channels_13.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/channels_13.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/channels_13.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/channels_14.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/channels_14.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/channels_14.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/channels_14.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/cyan.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/cyan.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/cyan.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/cyan.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/gray.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/gray.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/gray.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/gray.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/green.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/green.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/green.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/green.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/light_blue.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/light_blue.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/light_blue.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/light_blue.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/light_gray.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/light_gray.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/light_gray.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/light_gray.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/lime.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/lime.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/lime.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/lime.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/magenta.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/magenta.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/magenta.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/magenta.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/orange.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/orange.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/orange.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/orange.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/pink.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/pink.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/pink.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/pink.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/purple.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/purple.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/purple.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/purple.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/red.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/red.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/red.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/red.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/transparent.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/transparent.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/transparent.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/transparent.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/white.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/white.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/white.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/white.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/yellow.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/yellow.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/yellow.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable/smart/yellow.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/cable_anchor.png b/src/main/resources/assets/appliedenergistics2/textures/parts/cable_anchor.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/cable_anchor.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/cable_anchor.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/conversion_monitor_bright.png b/src/main/resources/assets/appliedenergistics2/textures/parts/conversion_monitor_bright.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/conversion_monitor_bright.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/conversion_monitor_bright.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/conversion_monitor_dark.png b/src/main/resources/assets/appliedenergistics2/textures/parts/conversion_monitor_dark.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/conversion_monitor_dark.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/conversion_monitor_dark.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/conversion_monitor_medium.png b/src/main/resources/assets/appliedenergistics2/textures/parts/conversion_monitor_medium.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/conversion_monitor_medium.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/conversion_monitor_medium.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/conversion_monitor_medium_locked.png b/src/main/resources/assets/appliedenergistics2/textures/parts/conversion_monitor_medium_locked.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/conversion_monitor_medium_locked.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/conversion_monitor_medium_locked.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/crafting_terminal/back.png b/src/main/resources/assets/appliedenergistics2/textures/parts/crafting_terminal/back.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/crafting_terminal/back.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/crafting_terminal/back.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/crafting_terminal/backlights.png b/src/main/resources/assets/appliedenergistics2/textures/parts/crafting_terminal/backlights.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/crafting_terminal/backlights.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/crafting_terminal/backlights.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/crafting_terminal/frame.png b/src/main/resources/assets/appliedenergistics2/textures/parts/crafting_terminal/frame.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/crafting_terminal/frame.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/crafting_terminal/frame.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/crafting_terminal/l0.png b/src/main/resources/assets/appliedenergistics2/textures/parts/crafting_terminal/l0.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/crafting_terminal/l0.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/crafting_terminal/l0.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/crafting_terminal/l1.png b/src/main/resources/assets/appliedenergistics2/textures/parts/crafting_terminal/l1.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/crafting_terminal/l1.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/crafting_terminal/l1.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/crafting_terminal/l2.png b/src/main/resources/assets/appliedenergistics2/textures/parts/crafting_terminal/l2.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/crafting_terminal/l2.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/crafting_terminal/l2.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/crafting_terminal/sides.png b/src/main/resources/assets/appliedenergistics2/textures/parts/crafting_terminal/sides.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/crafting_terminal/sides.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/crafting_terminal/sides.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/crafting_terminal/sidesstatus.png b/src/main/resources/assets/appliedenergistics2/textures/parts/crafting_terminal/sidesstatus.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/crafting_terminal/sidesstatus.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/crafting_terminal/sidesstatus.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/crafting_terminal_bright.png b/src/main/resources/assets/appliedenergistics2/textures/parts/crafting_terminal_bright.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/crafting_terminal_bright.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/crafting_terminal_bright.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/crafting_terminal_dark.png b/src/main/resources/assets/appliedenergistics2/textures/parts/crafting_terminal_dark.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/crafting_terminal_dark.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/crafting_terminal_dark.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/crafting_terminal_medium.png b/src/main/resources/assets/appliedenergistics2/textures/parts/crafting_terminal_medium.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/crafting_terminal_medium.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/crafting_terminal_medium.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/export_bus_sides.png b/src/main/resources/assets/appliedenergistics2/textures/parts/export_bus_sides.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/export_bus_sides.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/export_bus_sides.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/fluid_annihilation_plane_on.png b/src/main/resources/assets/appliedenergistics2/textures/parts/fluid_annihilation_plane_on.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/fluid_annihilation_plane_on.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/fluid_annihilation_plane_on.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/fluid_annihilation_plane_on.png.mcmeta b/src/main/resources/assets/appliedenergistics2/textures/parts/fluid_annihilation_plane_on.png.mcmeta similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/fluid_annihilation_plane_on.png.mcmeta rename to src/main/resources/assets/appliedenergistics2/textures/parts/fluid_annihilation_plane_on.png.mcmeta diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/fluid_formation_plane_on.png b/src/main/resources/assets/appliedenergistics2/textures/parts/fluid_formation_plane_on.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/fluid_formation_plane_on.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/fluid_formation_plane_on.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/fluid_formation_plane_on.png.mcmeta b/src/main/resources/assets/appliedenergistics2/textures/parts/fluid_formation_plane_on.png.mcmeta similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/fluid_formation_plane_on.png.mcmeta rename to src/main/resources/assets/appliedenergistics2/textures/parts/fluid_formation_plane_on.png.mcmeta diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/fluid_terminal/back.png b/src/main/resources/assets/appliedenergistics2/textures/parts/fluid_terminal/back.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/fluid_terminal/back.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/fluid_terminal/back.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/fluid_terminal/backlights.png b/src/main/resources/assets/appliedenergistics2/textures/parts/fluid_terminal/backlights.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/fluid_terminal/backlights.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/fluid_terminal/backlights.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/fluid_terminal/frame.png b/src/main/resources/assets/appliedenergistics2/textures/parts/fluid_terminal/frame.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/fluid_terminal/frame.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/fluid_terminal/frame.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/fluid_terminal/lights_bright.png b/src/main/resources/assets/appliedenergistics2/textures/parts/fluid_terminal/lights_bright.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/fluid_terminal/lights_bright.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/fluid_terminal/lights_bright.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/fluid_terminal/lights_dark.png b/src/main/resources/assets/appliedenergistics2/textures/parts/fluid_terminal/lights_dark.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/fluid_terminal/lights_dark.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/fluid_terminal/lights_dark.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/fluid_terminal/lights_medium.png b/src/main/resources/assets/appliedenergistics2/textures/parts/fluid_terminal/lights_medium.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/fluid_terminal/lights_medium.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/fluid_terminal/lights_medium.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/fluid_terminal/sides.png b/src/main/resources/assets/appliedenergistics2/textures/parts/fluid_terminal/sides.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/fluid_terminal/sides.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/fluid_terminal/sides.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/fluid_terminal/sidesstatus.png b/src/main/resources/assets/appliedenergistics2/textures/parts/fluid_terminal/sidesstatus.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/fluid_terminal/sidesstatus.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/fluid_terminal/sidesstatus.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/formation_plane_on.png b/src/main/resources/assets/appliedenergistics2/textures/parts/formation_plane_on.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/formation_plane_on.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/formation_plane_on.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/formation_plane_on.png.mcmeta b/src/main/resources/assets/appliedenergistics2/textures/parts/formation_plane_on.png.mcmeta similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/formation_plane_on.png.mcmeta rename to src/main/resources/assets/appliedenergistics2/textures/parts/formation_plane_on.png.mcmeta diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/identity_annihilation_plane_on.png b/src/main/resources/assets/appliedenergistics2/textures/parts/identity_annihilation_plane_on.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/identity_annihilation_plane_on.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/identity_annihilation_plane_on.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/identity_annihilation_plane_on.png.mcmeta b/src/main/resources/assets/appliedenergistics2/textures/parts/identity_annihilation_plane_on.png.mcmeta similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/identity_annihilation_plane_on.png.mcmeta rename to src/main/resources/assets/appliedenergistics2/textures/parts/identity_annihilation_plane_on.png.mcmeta diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/import_bus_sides.png b/src/main/resources/assets/appliedenergistics2/textures/parts/import_bus_sides.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/import_bus_sides.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/import_bus_sides.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/interface_terminal_bright.png b/src/main/resources/assets/appliedenergistics2/textures/parts/interface_terminal_bright.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/interface_terminal_bright.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/interface_terminal_bright.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/interface_terminal_dark.png b/src/main/resources/assets/appliedenergistics2/textures/parts/interface_terminal_dark.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/interface_terminal_dark.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/interface_terminal_dark.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/interface_terminal_medium.png b/src/main/resources/assets/appliedenergistics2/textures/parts/interface_terminal_medium.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/interface_terminal_medium.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/interface_terminal_medium.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/level_emitter_off.png b/src/main/resources/assets/appliedenergistics2/textures/parts/level_emitter_off.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/level_emitter_off.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/level_emitter_off.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/level_emitter_on.png b/src/main/resources/assets/appliedenergistics2/textures/parts/level_emitter_on.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/level_emitter_on.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/level_emitter_on.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/monitor_back.png b/src/main/resources/assets/appliedenergistics2/textures/parts/monitor_back.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/monitor_back.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/monitor_back.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/monitor_bright.png b/src/main/resources/assets/appliedenergistics2/textures/parts/monitor_bright.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/monitor_bright.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/monitor_bright.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/monitor_colored.png b/src/main/resources/assets/appliedenergistics2/textures/parts/monitor_colored.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/monitor_colored.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/monitor_colored.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/monitor_front.png b/src/main/resources/assets/appliedenergistics2/textures/parts/monitor_front.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/monitor_front.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/monitor_front.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/monitor_light.png b/src/main/resources/assets/appliedenergistics2/textures/parts/monitor_light.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/monitor_light.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/monitor_light.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/monitor_sides.png b/src/main/resources/assets/appliedenergistics2/textures/parts/monitor_sides.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/monitor_sides.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/monitor_sides.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/monitor_sides_status.png b/src/main/resources/assets/appliedenergistics2/textures/parts/monitor_sides_status.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/monitor_sides_status.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/monitor_sides_status.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/monitor_sides_status_has_channel.png b/src/main/resources/assets/appliedenergistics2/textures/parts/monitor_sides_status_has_channel.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/monitor_sides_status_has_channel.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/monitor_sides_status_has_channel.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/monitor_sides_status_off.png b/src/main/resources/assets/appliedenergistics2/textures/parts/monitor_sides_status_off.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/monitor_sides_status_off.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/monitor_sides_status_off.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/monitor_sides_status_on.png b/src/main/resources/assets/appliedenergistics2/textures/parts/monitor_sides_status_on.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/monitor_sides_status_on.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/monitor_sides_status_on.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/p2p_tunnel_frequency.png b/src/main/resources/assets/appliedenergistics2/textures/parts/p2p_tunnel_frequency.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/p2p_tunnel_frequency.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/p2p_tunnel_frequency.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/p2p_tunnel_sides.png b/src/main/resources/assets/appliedenergistics2/textures/parts/p2p_tunnel_sides.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/p2p_tunnel_sides.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/p2p_tunnel_sides.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/pattern_terminal_bright.png b/src/main/resources/assets/appliedenergistics2/textures/parts/pattern_terminal_bright.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/pattern_terminal_bright.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/pattern_terminal_bright.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/pattern_terminal_dark.png b/src/main/resources/assets/appliedenergistics2/textures/parts/pattern_terminal_dark.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/pattern_terminal_dark.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/pattern_terminal_dark.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/pattern_terminal_medium.png b/src/main/resources/assets/appliedenergistics2/textures/parts/pattern_terminal_medium.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/pattern_terminal_medium.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/pattern_terminal_medium.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/plane_sides.png b/src/main/resources/assets/appliedenergistics2/textures/parts/plane_sides.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/plane_sides.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/plane_sides.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/storage_bus_back.png b/src/main/resources/assets/appliedenergistics2/textures/parts/storage_bus_back.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/storage_bus_back.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/storage_bus_back.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/storage_bus_sides.png b/src/main/resources/assets/appliedenergistics2/textures/parts/storage_bus_sides.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/storage_bus_sides.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/storage_bus_sides.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/storage_monitor_bright.png b/src/main/resources/assets/appliedenergistics2/textures/parts/storage_monitor_bright.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/storage_monitor_bright.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/storage_monitor_bright.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/storage_monitor_dark.png b/src/main/resources/assets/appliedenergistics2/textures/parts/storage_monitor_dark.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/storage_monitor_dark.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/storage_monitor_dark.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/storage_monitor_dark_locked.png b/src/main/resources/assets/appliedenergistics2/textures/parts/storage_monitor_dark_locked.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/storage_monitor_dark_locked.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/storage_monitor_dark_locked.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/storage_monitor_medium.png b/src/main/resources/assets/appliedenergistics2/textures/parts/storage_monitor_medium.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/storage_monitor_medium.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/storage_monitor_medium.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/terminal_bright.png b/src/main/resources/assets/appliedenergistics2/textures/parts/terminal_bright.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/terminal_bright.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/terminal_bright.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/terminal_dark.png b/src/main/resources/assets/appliedenergistics2/textures/parts/terminal_dark.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/terminal_dark.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/terminal_dark.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/terminal_medium.png b/src/main/resources/assets/appliedenergistics2/textures/parts/terminal_medium.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/terminal_medium.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/terminal_medium.png diff --git a/core/src/main/resources/assets/appliedenergistics2/textures/parts/transition_plane_back.png b/src/main/resources/assets/appliedenergistics2/textures/parts/transition_plane_back.png similarity index 100% rename from core/src/main/resources/assets/appliedenergistics2/textures/parts/transition_plane_back.png rename to src/main/resources/assets/appliedenergistics2/textures/parts/transition_plane_back.png diff --git a/core/src/main/resources/data/appliedenergistics2/advancements/main/charged_quartz.json b/src/main/resources/data/appliedenergistics2/advancements/main/charged_quartz.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/advancements/main/charged_quartz.json rename to src/main/resources/data/appliedenergistics2/advancements/main/charged_quartz.json diff --git a/core/src/main/resources/data/appliedenergistics2/advancements/main/charger.json b/src/main/resources/data/appliedenergistics2/advancements/main/charger.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/advancements/main/charger.json rename to src/main/resources/data/appliedenergistics2/advancements/main/charger.json diff --git a/core/src/main/resources/data/appliedenergistics2/advancements/main/compass.json b/src/main/resources/data/appliedenergistics2/advancements/main/compass.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/advancements/main/compass.json rename to src/main/resources/data/appliedenergistics2/advancements/main/compass.json diff --git a/core/src/main/resources/data/appliedenergistics2/advancements/main/controller.json b/src/main/resources/data/appliedenergistics2/advancements/main/controller.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/advancements/main/controller.json rename to src/main/resources/data/appliedenergistics2/advancements/main/controller.json diff --git a/core/src/main/resources/data/appliedenergistics2/advancements/main/crafting_cpu.json b/src/main/resources/data/appliedenergistics2/advancements/main/crafting_cpu.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/advancements/main/crafting_cpu.json rename to src/main/resources/data/appliedenergistics2/advancements/main/crafting_cpu.json diff --git a/core/src/main/resources/data/appliedenergistics2/advancements/main/crafting_terminal.json b/src/main/resources/data/appliedenergistics2/advancements/main/crafting_terminal.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/advancements/main/crafting_terminal.json rename to src/main/resources/data/appliedenergistics2/advancements/main/crafting_terminal.json diff --git a/core/src/main/resources/data/appliedenergistics2/advancements/main/facade.json b/src/main/resources/data/appliedenergistics2/advancements/main/facade.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/advancements/main/facade.json rename to src/main/resources/data/appliedenergistics2/advancements/main/facade.json diff --git a/core/src/main/resources/data/appliedenergistics2/advancements/main/fluix.json b/src/main/resources/data/appliedenergistics2/advancements/main/fluix.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/advancements/main/fluix.json rename to src/main/resources/data/appliedenergistics2/advancements/main/fluix.json diff --git a/core/src/main/resources/data/appliedenergistics2/advancements/main/glass_cable.json b/src/main/resources/data/appliedenergistics2/advancements/main/glass_cable.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/advancements/main/glass_cable.json rename to src/main/resources/data/appliedenergistics2/advancements/main/glass_cable.json diff --git a/core/src/main/resources/data/appliedenergistics2/advancements/main/growth_accelerator.json b/src/main/resources/data/appliedenergistics2/advancements/main/growth_accelerator.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/advancements/main/growth_accelerator.json rename to src/main/resources/data/appliedenergistics2/advancements/main/growth_accelerator.json diff --git a/core/src/main/resources/data/appliedenergistics2/advancements/main/interface.json b/src/main/resources/data/appliedenergistics2/advancements/main/interface.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/advancements/main/interface.json rename to src/main/resources/data/appliedenergistics2/advancements/main/interface.json diff --git a/core/src/main/resources/data/appliedenergistics2/advancements/main/ioport.json b/src/main/resources/data/appliedenergistics2/advancements/main/ioport.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/advancements/main/ioport.json rename to src/main/resources/data/appliedenergistics2/advancements/main/ioport.json diff --git a/core/src/main/resources/data/appliedenergistics2/advancements/main/network1.json b/src/main/resources/data/appliedenergistics2/advancements/main/network1.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/advancements/main/network1.json rename to src/main/resources/data/appliedenergistics2/advancements/main/network1.json diff --git a/core/src/main/resources/data/appliedenergistics2/advancements/main/network2.json b/src/main/resources/data/appliedenergistics2/advancements/main/network2.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/advancements/main/network2.json rename to src/main/resources/data/appliedenergistics2/advancements/main/network2.json diff --git a/core/src/main/resources/data/appliedenergistics2/advancements/main/network3.json b/src/main/resources/data/appliedenergistics2/advancements/main/network3.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/advancements/main/network3.json rename to src/main/resources/data/appliedenergistics2/advancements/main/network3.json diff --git a/core/src/main/resources/data/appliedenergistics2/advancements/main/network_tool.json b/src/main/resources/data/appliedenergistics2/advancements/main/network_tool.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/advancements/main/network_tool.json rename to src/main/resources/data/appliedenergistics2/advancements/main/network_tool.json diff --git a/core/src/main/resources/data/appliedenergistics2/advancements/main/p2p.json b/src/main/resources/data/appliedenergistics2/advancements/main/p2p.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/advancements/main/p2p.json rename to src/main/resources/data/appliedenergistics2/advancements/main/p2p.json diff --git a/core/src/main/resources/data/appliedenergistics2/advancements/main/pattern_terminal.json b/src/main/resources/data/appliedenergistics2/advancements/main/pattern_terminal.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/advancements/main/pattern_terminal.json rename to src/main/resources/data/appliedenergistics2/advancements/main/pattern_terminal.json diff --git a/core/src/main/resources/data/appliedenergistics2/advancements/main/portable_cell.json b/src/main/resources/data/appliedenergistics2/advancements/main/portable_cell.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/advancements/main/portable_cell.json rename to src/main/resources/data/appliedenergistics2/advancements/main/portable_cell.json diff --git a/core/src/main/resources/data/appliedenergistics2/advancements/main/presses.json b/src/main/resources/data/appliedenergistics2/advancements/main/presses.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/advancements/main/presses.json rename to src/main/resources/data/appliedenergistics2/advancements/main/presses.json diff --git a/core/src/main/resources/data/appliedenergistics2/advancements/main/qnb.json b/src/main/resources/data/appliedenergistics2/advancements/main/qnb.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/advancements/main/qnb.json rename to src/main/resources/data/appliedenergistics2/advancements/main/qnb.json diff --git a/core/src/main/resources/data/appliedenergistics2/advancements/main/root.json b/src/main/resources/data/appliedenergistics2/advancements/main/root.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/advancements/main/root.json rename to src/main/resources/data/appliedenergistics2/advancements/main/root.json diff --git a/core/src/main/resources/data/appliedenergistics2/advancements/main/spatial_explorer.json b/src/main/resources/data/appliedenergistics2/advancements/main/spatial_explorer.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/advancements/main/spatial_explorer.json rename to src/main/resources/data/appliedenergistics2/advancements/main/spatial_explorer.json diff --git a/core/src/main/resources/data/appliedenergistics2/advancements/main/spatial_ioport.json b/src/main/resources/data/appliedenergistics2/advancements/main/spatial_ioport.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/advancements/main/spatial_ioport.json rename to src/main/resources/data/appliedenergistics2/advancements/main/spatial_ioport.json diff --git a/core/src/main/resources/data/appliedenergistics2/advancements/main/storage_bus.json b/src/main/resources/data/appliedenergistics2/advancements/main/storage_bus.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/advancements/main/storage_bus.json rename to src/main/resources/data/appliedenergistics2/advancements/main/storage_bus.json diff --git a/core/src/main/resources/data/appliedenergistics2/advancements/main/storage_cell.json b/src/main/resources/data/appliedenergistics2/advancements/main/storage_cell.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/advancements/main/storage_cell.json rename to src/main/resources/data/appliedenergistics2/advancements/main/storage_cell.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/decorative/certus_quartz_block.json b/src/main/resources/data/appliedenergistics2/recipes/decorative/certus_quartz_block.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/decorative/certus_quartz_block.json rename to src/main/resources/data/appliedenergistics2/recipes/decorative/certus_quartz_block.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/decorative/certus_quartz_block_pure.json b/src/main/resources/data/appliedenergistics2/recipes/decorative/certus_quartz_block_pure.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/decorative/certus_quartz_block_pure.json rename to src/main/resources/data/appliedenergistics2/recipes/decorative/certus_quartz_block_pure.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/decorative/certus_quartz_pillar.json b/src/main/resources/data/appliedenergistics2/recipes/decorative/certus_quartz_pillar.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/decorative/certus_quartz_pillar.json rename to src/main/resources/data/appliedenergistics2/recipes/decorative/certus_quartz_pillar.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/decorative/chiseled_quartz_block.json b/src/main/resources/data/appliedenergistics2/recipes/decorative/chiseled_quartz_block.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/decorative/chiseled_quartz_block.json rename to src/main/resources/data/appliedenergistics2/recipes/decorative/chiseled_quartz_block.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/decorative/fluix_block.json b/src/main/resources/data/appliedenergistics2/recipes/decorative/fluix_block.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/decorative/fluix_block.json rename to src/main/resources/data/appliedenergistics2/recipes/decorative/fluix_block.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/decorative/fluix_block_pure.json b/src/main/resources/data/appliedenergistics2/recipes/decorative/fluix_block_pure.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/decorative/fluix_block_pure.json rename to src/main/resources/data/appliedenergistics2/recipes/decorative/fluix_block_pure.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/decorative/light_detector.json b/src/main/resources/data/appliedenergistics2/recipes/decorative/light_detector.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/decorative/light_detector.json rename to src/main/resources/data/appliedenergistics2/recipes/decorative/light_detector.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/decorative/quartz_block_pure.json b/src/main/resources/data/appliedenergistics2/recipes/decorative/quartz_block_pure.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/decorative/quartz_block_pure.json rename to src/main/resources/data/appliedenergistics2/recipes/decorative/quartz_block_pure.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/decorative/quartz_fixture.json b/src/main/resources/data/appliedenergistics2/recipes/decorative/quartz_fixture.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/decorative/quartz_fixture.json rename to src/main/resources/data/appliedenergistics2/recipes/decorative/quartz_fixture.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/decorative/quartz_glass.json b/src/main/resources/data/appliedenergistics2/recipes/decorative/quartz_glass.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/decorative/quartz_glass.json rename to src/main/resources/data/appliedenergistics2/recipes/decorative/quartz_glass.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/decorative/quartz_vibrant_glass.json b/src/main/resources/data/appliedenergistics2/recipes/decorative/quartz_vibrant_glass.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/decorative/quartz_vibrant_glass.json rename to src/main/resources/data/appliedenergistics2/recipes/decorative/quartz_vibrant_glass.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/decorative/sky_stone_brick.json b/src/main/resources/data/appliedenergistics2/recipes/decorative/sky_stone_brick.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/decorative/sky_stone_brick.json rename to src/main/resources/data/appliedenergistics2/recipes/decorative/sky_stone_brick.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/decorative/sky_stone_small_brick.json b/src/main/resources/data/appliedenergistics2/recipes/decorative/sky_stone_small_brick.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/decorative/sky_stone_small_brick.json rename to src/main/resources/data/appliedenergistics2/recipes/decorative/sky_stone_small_brick.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/decorative/sky_stone_smooth.json b/src/main/resources/data/appliedenergistics2/recipes/decorative/sky_stone_smooth.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/decorative/sky_stone_smooth.json rename to src/main/resources/data/appliedenergistics2/recipes/decorative/sky_stone_smooth.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/grinder/bonemeal.json b/src/main/resources/data/appliedenergistics2/recipes/grinder/bonemeal.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/grinder/bonemeal.json rename to src/main/resources/data/appliedenergistics2/recipes/grinder/bonemeal.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/grinder/certus_quartz_dust.json b/src/main/resources/data/appliedenergistics2/recipes/grinder/certus_quartz_dust.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/grinder/certus_quartz_dust.json rename to src/main/resources/data/appliedenergistics2/recipes/grinder/certus_quartz_dust.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/grinder/certus_quartz_dust_ore.json b/src/main/resources/data/appliedenergistics2/recipes/grinder/certus_quartz_dust_ore.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/grinder/certus_quartz_dust_ore.json rename to src/main/resources/data/appliedenergistics2/recipes/grinder/certus_quartz_dust_ore.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/grinder/ender_dust.json b/src/main/resources/data/appliedenergistics2/recipes/grinder/ender_dust.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/grinder/ender_dust.json rename to src/main/resources/data/appliedenergistics2/recipes/grinder/ender_dust.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/grinder/flint.json b/src/main/resources/data/appliedenergistics2/recipes/grinder/flint.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/grinder/flint.json rename to src/main/resources/data/appliedenergistics2/recipes/grinder/flint.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/grinder/flour.json b/src/main/resources/data/appliedenergistics2/recipes/grinder/flour.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/grinder/flour.json rename to src/main/resources/data/appliedenergistics2/recipes/grinder/flour.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/grinder/fluix_dust.json b/src/main/resources/data/appliedenergistics2/recipes/grinder/fluix_dust.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/grinder/fluix_dust.json rename to src/main/resources/data/appliedenergistics2/recipes/grinder/fluix_dust.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/grinder/gold_dust_ingot.json b/src/main/resources/data/appliedenergistics2/recipes/grinder/gold_dust_ingot.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/grinder/gold_dust_ingot.json rename to src/main/resources/data/appliedenergistics2/recipes/grinder/gold_dust_ingot.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/grinder/gold_dust_ore.json b/src/main/resources/data/appliedenergistics2/recipes/grinder/gold_dust_ore.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/grinder/gold_dust_ore.json rename to src/main/resources/data/appliedenergistics2/recipes/grinder/gold_dust_ore.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/grinder/iron_dust_ingot.json b/src/main/resources/data/appliedenergistics2/recipes/grinder/iron_dust_ingot.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/grinder/iron_dust_ingot.json rename to src/main/resources/data/appliedenergistics2/recipes/grinder/iron_dust_ingot.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/grinder/iron_dust_ore.json b/src/main/resources/data/appliedenergistics2/recipes/grinder/iron_dust_ore.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/grinder/iron_dust_ore.json rename to src/main/resources/data/appliedenergistics2/recipes/grinder/iron_dust_ore.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/grinder/nether_quartz_dust.json b/src/main/resources/data/appliedenergistics2/recipes/grinder/nether_quartz_dust.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/grinder/nether_quartz_dust.json rename to src/main/resources/data/appliedenergistics2/recipes/grinder/nether_quartz_dust.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/grinder/nether_quartz_dust_ore.json b/src/main/resources/data/appliedenergistics2/recipes/grinder/nether_quartz_dust_ore.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/grinder/nether_quartz_dust_ore.json rename to src/main/resources/data/appliedenergistics2/recipes/grinder/nether_quartz_dust_ore.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/grinder/sky_dust.json b/src/main/resources/data/appliedenergistics2/recipes/grinder/sky_dust.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/grinder/sky_dust.json rename to src/main/resources/data/appliedenergistics2/recipes/grinder/sky_dust.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/inscriber/calculation_processor.json b/src/main/resources/data/appliedenergistics2/recipes/inscriber/calculation_processor.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/inscriber/calculation_processor.json rename to src/main/resources/data/appliedenergistics2/recipes/inscriber/calculation_processor.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/inscriber/calculation_processor_press.json b/src/main/resources/data/appliedenergistics2/recipes/inscriber/calculation_processor_press.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/inscriber/calculation_processor_press.json rename to src/main/resources/data/appliedenergistics2/recipes/inscriber/calculation_processor_press.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/inscriber/calculation_processor_print.json b/src/main/resources/data/appliedenergistics2/recipes/inscriber/calculation_processor_print.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/inscriber/calculation_processor_print.json rename to src/main/resources/data/appliedenergistics2/recipes/inscriber/calculation_processor_print.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/inscriber/engineering_processor.json b/src/main/resources/data/appliedenergistics2/recipes/inscriber/engineering_processor.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/inscriber/engineering_processor.json rename to src/main/resources/data/appliedenergistics2/recipes/inscriber/engineering_processor.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/inscriber/engineering_processor_press.json b/src/main/resources/data/appliedenergistics2/recipes/inscriber/engineering_processor_press.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/inscriber/engineering_processor_press.json rename to src/main/resources/data/appliedenergistics2/recipes/inscriber/engineering_processor_press.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/inscriber/engineering_processor_print.json b/src/main/resources/data/appliedenergistics2/recipes/inscriber/engineering_processor_print.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/inscriber/engineering_processor_print.json rename to src/main/resources/data/appliedenergistics2/recipes/inscriber/engineering_processor_print.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/inscriber/logic_processor.json b/src/main/resources/data/appliedenergistics2/recipes/inscriber/logic_processor.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/inscriber/logic_processor.json rename to src/main/resources/data/appliedenergistics2/recipes/inscriber/logic_processor.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/inscriber/logic_processor_press.json b/src/main/resources/data/appliedenergistics2/recipes/inscriber/logic_processor_press.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/inscriber/logic_processor_press.json rename to src/main/resources/data/appliedenergistics2/recipes/inscriber/logic_processor_press.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/inscriber/logic_processor_print.json b/src/main/resources/data/appliedenergistics2/recipes/inscriber/logic_processor_print.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/inscriber/logic_processor_print.json rename to src/main/resources/data/appliedenergistics2/recipes/inscriber/logic_processor_print.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/inscriber/silicon_press.json b/src/main/resources/data/appliedenergistics2/recipes/inscriber/silicon_press.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/inscriber/silicon_press.json rename to src/main/resources/data/appliedenergistics2/recipes/inscriber/silicon_press.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/inscriber/silicon_print.json b/src/main/resources/data/appliedenergistics2/recipes/inscriber/silicon_print.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/inscriber/silicon_print.json rename to src/main/resources/data/appliedenergistics2/recipes/inscriber/silicon_print.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/materials/advancedcard.json b/src/main/resources/data/appliedenergistics2/recipes/materials/advancedcard.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/materials/advancedcard.json rename to src/main/resources/data/appliedenergistics2/recipes/materials/advancedcard.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/materials/annihilationcore.json b/src/main/resources/data/appliedenergistics2/recipes/materials/annihilationcore.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/materials/annihilationcore.json rename to src/main/resources/data/appliedenergistics2/recipes/materials/annihilationcore.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/materials/basiccard.json b/src/main/resources/data/appliedenergistics2/recipes/materials/basiccard.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/materials/basiccard.json rename to src/main/resources/data/appliedenergistics2/recipes/materials/basiccard.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/materials/cardcapacity.json b/src/main/resources/data/appliedenergistics2/recipes/materials/cardcapacity.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/materials/cardcapacity.json rename to src/main/resources/data/appliedenergistics2/recipes/materials/cardcapacity.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/materials/cardcrafting.json b/src/main/resources/data/appliedenergistics2/recipes/materials/cardcrafting.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/materials/cardcrafting.json rename to src/main/resources/data/appliedenergistics2/recipes/materials/cardcrafting.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/materials/cardfuzzy.json b/src/main/resources/data/appliedenergistics2/recipes/materials/cardfuzzy.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/materials/cardfuzzy.json rename to src/main/resources/data/appliedenergistics2/recipes/materials/cardfuzzy.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/materials/cardinverter.json b/src/main/resources/data/appliedenergistics2/recipes/materials/cardinverter.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/materials/cardinverter.json rename to src/main/resources/data/appliedenergistics2/recipes/materials/cardinverter.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/materials/cardredstone.json b/src/main/resources/data/appliedenergistics2/recipes/materials/cardredstone.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/materials/cardredstone.json rename to src/main/resources/data/appliedenergistics2/recipes/materials/cardredstone.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/materials/cardspeed.json b/src/main/resources/data/appliedenergistics2/recipes/materials/cardspeed.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/materials/cardspeed.json rename to src/main/resources/data/appliedenergistics2/recipes/materials/cardspeed.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/materials/formationcore.json b/src/main/resources/data/appliedenergistics2/recipes/materials/formationcore.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/materials/formationcore.json rename to src/main/resources/data/appliedenergistics2/recipes/materials/formationcore.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/misc/chests_sky_stone.json b/src/main/resources/data/appliedenergistics2/recipes/misc/chests_sky_stone.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/misc/chests_sky_stone.json rename to src/main/resources/data/appliedenergistics2/recipes/misc/chests_sky_stone.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/misc/chests_smooth_sky_stone.json b/src/main/resources/data/appliedenergistics2/recipes/misc/chests_smooth_sky_stone.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/misc/chests_smooth_sky_stone.json rename to src/main/resources/data/appliedenergistics2/recipes/misc/chests_smooth_sky_stone.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/misc/deconstruction_certus_chiseled_quartz.json b/src/main/resources/data/appliedenergistics2/recipes/misc/deconstruction_certus_chiseled_quartz.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/misc/deconstruction_certus_chiseled_quartz.json rename to src/main/resources/data/appliedenergistics2/recipes/misc/deconstruction_certus_chiseled_quartz.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/misc/deconstruction_certus_quartz_block.json b/src/main/resources/data/appliedenergistics2/recipes/misc/deconstruction_certus_quartz_block.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/misc/deconstruction_certus_quartz_block.json rename to src/main/resources/data/appliedenergistics2/recipes/misc/deconstruction_certus_quartz_block.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/misc/deconstruction_certus_quartz_pillar.json b/src/main/resources/data/appliedenergistics2/recipes/misc/deconstruction_certus_quartz_pillar.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/misc/deconstruction_certus_quartz_pillar.json rename to src/main/resources/data/appliedenergistics2/recipes/misc/deconstruction_certus_quartz_pillar.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/misc/deconstruction_fluix_block.json b/src/main/resources/data/appliedenergistics2/recipes/misc/deconstruction_fluix_block.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/misc/deconstruction_fluix_block.json rename to src/main/resources/data/appliedenergistics2/recipes/misc/deconstruction_fluix_block.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/misc/fluixpearl.json b/src/main/resources/data/appliedenergistics2/recipes/misc/fluixpearl.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/misc/fluixpearl.json rename to src/main/resources/data/appliedenergistics2/recipes/misc/fluixpearl.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/misc/grindstone.json b/src/main/resources/data/appliedenergistics2/recipes/misc/grindstone.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/misc/grindstone.json rename to src/main/resources/data/appliedenergistics2/recipes/misc/grindstone.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/misc/grindstone_crank.json b/src/main/resources/data/appliedenergistics2/recipes/misc/grindstone_crank.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/misc/grindstone_crank.json rename to src/main/resources/data/appliedenergistics2/recipes/misc/grindstone_crank.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/misc/grindstone_woodengear.json b/src/main/resources/data/appliedenergistics2/recipes/misc/grindstone_woodengear.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/misc/grindstone_woodengear.json rename to src/main/resources/data/appliedenergistics2/recipes/misc/grindstone_woodengear.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/misc/meteors_sky_compass.json b/src/main/resources/data/appliedenergistics2/recipes/misc/meteors_sky_compass.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/misc/meteors_sky_compass.json rename to src/main/resources/data/appliedenergistics2/recipes/misc/meteors_sky_compass.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/misc/seeds_certus.json b/src/main/resources/data/appliedenergistics2/recipes/misc/seeds_certus.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/misc/seeds_certus.json rename to src/main/resources/data/appliedenergistics2/recipes/misc/seeds_certus.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/misc/seeds_fluix.json b/src/main/resources/data/appliedenergistics2/recipes/misc/seeds_fluix.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/misc/seeds_fluix.json rename to src/main/resources/data/appliedenergistics2/recipes/misc/seeds_fluix.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/misc/seeds_nether.json b/src/main/resources/data/appliedenergistics2/recipes/misc/seeds_nether.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/misc/seeds_nether.json rename to src/main/resources/data/appliedenergistics2/recipes/misc/seeds_nether.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/misc/tiny_tnt.json b/src/main/resources/data/appliedenergistics2/recipes/misc/tiny_tnt.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/misc/tiny_tnt.json rename to src/main/resources/data/appliedenergistics2/recipes/misc/tiny_tnt.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/misc/vanilla_comparator.json b/src/main/resources/data/appliedenergistics2/recipes/misc/vanilla_comparator.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/misc/vanilla_comparator.json rename to src/main/resources/data/appliedenergistics2/recipes/misc/vanilla_comparator.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/misc/vanilla_daylight_detector.json b/src/main/resources/data/appliedenergistics2/recipes/misc/vanilla_daylight_detector.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/misc/vanilla_daylight_detector.json rename to src/main/resources/data/appliedenergistics2/recipes/misc/vanilla_daylight_detector.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/blocks/cell_workbench.json b/src/main/resources/data/appliedenergistics2/recipes/network/blocks/cell_workbench.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/blocks/cell_workbench.json rename to src/main/resources/data/appliedenergistics2/recipes/network/blocks/cell_workbench.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/blocks/controller.json b/src/main/resources/data/appliedenergistics2/recipes/network/blocks/controller.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/blocks/controller.json rename to src/main/resources/data/appliedenergistics2/recipes/network/blocks/controller.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/blocks/crystal_processing_charger.json b/src/main/resources/data/appliedenergistics2/recipes/network/blocks/crystal_processing_charger.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/blocks/crystal_processing_charger.json rename to src/main/resources/data/appliedenergistics2/recipes/network/blocks/crystal_processing_charger.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/blocks/crystal_processing_quartz_growth_accelerator.json b/src/main/resources/data/appliedenergistics2/recipes/network/blocks/crystal_processing_quartz_growth_accelerator.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/blocks/crystal_processing_quartz_growth_accelerator.json rename to src/main/resources/data/appliedenergistics2/recipes/network/blocks/crystal_processing_quartz_growth_accelerator.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/blocks/energy_dense_energy_cell.json b/src/main/resources/data/appliedenergistics2/recipes/network/blocks/energy_dense_energy_cell.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/blocks/energy_dense_energy_cell.json rename to src/main/resources/data/appliedenergistics2/recipes/network/blocks/energy_dense_energy_cell.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/blocks/energy_energy_acceptor.json b/src/main/resources/data/appliedenergistics2/recipes/network/blocks/energy_energy_acceptor.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/blocks/energy_energy_acceptor.json rename to src/main/resources/data/appliedenergistics2/recipes/network/blocks/energy_energy_acceptor.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/blocks/energy_energy_cell.json b/src/main/resources/data/appliedenergistics2/recipes/network/blocks/energy_energy_cell.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/blocks/energy_energy_cell.json rename to src/main/resources/data/appliedenergistics2/recipes/network/blocks/energy_energy_cell.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/blocks/energy_vibration_chamber.json b/src/main/resources/data/appliedenergistics2/recipes/network/blocks/energy_vibration_chamber.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/blocks/energy_vibration_chamber.json rename to src/main/resources/data/appliedenergistics2/recipes/network/blocks/energy_vibration_chamber.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/blocks/fluid_interfaces_interface.json b/src/main/resources/data/appliedenergistics2/recipes/network/blocks/fluid_interfaces_interface.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/blocks/fluid_interfaces_interface.json rename to src/main/resources/data/appliedenergistics2/recipes/network/blocks/fluid_interfaces_interface.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/blocks/fluid_interfaces_interface_alt.json b/src/main/resources/data/appliedenergistics2/recipes/network/blocks/fluid_interfaces_interface_alt.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/blocks/fluid_interfaces_interface_alt.json rename to src/main/resources/data/appliedenergistics2/recipes/network/blocks/fluid_interfaces_interface_alt.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/blocks/fluid_interfaces_interface_part.json b/src/main/resources/data/appliedenergistics2/recipes/network/blocks/fluid_interfaces_interface_part.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/blocks/fluid_interfaces_interface_part.json rename to src/main/resources/data/appliedenergistics2/recipes/network/blocks/fluid_interfaces_interface_part.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/blocks/inscribers.json b/src/main/resources/data/appliedenergistics2/recipes/network/blocks/inscribers.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/blocks/inscribers.json rename to src/main/resources/data/appliedenergistics2/recipes/network/blocks/inscribers.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/blocks/interfaces_interface.json b/src/main/resources/data/appliedenergistics2/recipes/network/blocks/interfaces_interface.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/blocks/interfaces_interface.json rename to src/main/resources/data/appliedenergistics2/recipes/network/blocks/interfaces_interface.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/blocks/interfaces_interface_alt.json b/src/main/resources/data/appliedenergistics2/recipes/network/blocks/interfaces_interface_alt.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/blocks/interfaces_interface_alt.json rename to src/main/resources/data/appliedenergistics2/recipes/network/blocks/interfaces_interface_alt.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/blocks/interfaces_interface_part.json b/src/main/resources/data/appliedenergistics2/recipes/network/blocks/interfaces_interface_part.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/blocks/interfaces_interface_part.json rename to src/main/resources/data/appliedenergistics2/recipes/network/blocks/interfaces_interface_part.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/blocks/io_condenser.json b/src/main/resources/data/appliedenergistics2/recipes/network/blocks/io_condenser.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/blocks/io_condenser.json rename to src/main/resources/data/appliedenergistics2/recipes/network/blocks/io_condenser.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/blocks/io_port.json b/src/main/resources/data/appliedenergistics2/recipes/network/blocks/io_port.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/blocks/io_port.json rename to src/main/resources/data/appliedenergistics2/recipes/network/blocks/io_port.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/blocks/quantum_link.json b/src/main/resources/data/appliedenergistics2/recipes/network/blocks/quantum_link.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/blocks/quantum_link.json rename to src/main/resources/data/appliedenergistics2/recipes/network/blocks/quantum_link.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/blocks/quantum_ring.json b/src/main/resources/data/appliedenergistics2/recipes/network/blocks/quantum_ring.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/blocks/quantum_ring.json rename to src/main/resources/data/appliedenergistics2/recipes/network/blocks/quantum_ring.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/blocks/security_station.json b/src/main/resources/data/appliedenergistics2/recipes/network/blocks/security_station.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/blocks/security_station.json rename to src/main/resources/data/appliedenergistics2/recipes/network/blocks/security_station.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/blocks/spatial_io_port.json b/src/main/resources/data/appliedenergistics2/recipes/network/blocks/spatial_io_port.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/blocks/spatial_io_port.json rename to src/main/resources/data/appliedenergistics2/recipes/network/blocks/spatial_io_port.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/blocks/spatial_io_pylon.json b/src/main/resources/data/appliedenergistics2/recipes/network/blocks/spatial_io_pylon.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/blocks/spatial_io_pylon.json rename to src/main/resources/data/appliedenergistics2/recipes/network/blocks/spatial_io_pylon.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/blocks/storage_chest.json b/src/main/resources/data/appliedenergistics2/recipes/network/blocks/storage_chest.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/blocks/storage_chest.json rename to src/main/resources/data/appliedenergistics2/recipes/network/blocks/storage_chest.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/blocks/storage_drive.json b/src/main/resources/data/appliedenergistics2/recipes/network/blocks/storage_drive.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/blocks/storage_drive.json rename to src/main/resources/data/appliedenergistics2/recipes/network/blocks/storage_drive.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_black.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_black.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_black.json rename to src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_black.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_blue.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_blue.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_blue.json rename to src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_blue.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_brown.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_brown.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_brown.json rename to src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_brown.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_cyan.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_cyan.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_cyan.json rename to src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_cyan.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_fluix.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_fluix.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_fluix.json rename to src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_fluix.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_fluix_clean.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_fluix_clean.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_fluix_clean.json rename to src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_fluix_clean.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_gray.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_gray.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_gray.json rename to src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_gray.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_green.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_green.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_green.json rename to src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_green.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_light_blue.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_light_blue.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_light_blue.json rename to src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_light_blue.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_light_gray.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_light_gray.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_light_gray.json rename to src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_light_gray.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_lime.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_lime.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_lime.json rename to src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_lime.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_magenta.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_magenta.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_magenta.json rename to src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_magenta.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_orange.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_orange.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_orange.json rename to src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_orange.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_pink.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_pink.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_pink.json rename to src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_pink.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_purple.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_purple.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_purple.json rename to src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_purple.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_red.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_red.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_red.json rename to src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_red.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_white.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_white.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_white.json rename to src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_white.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_yellow.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_yellow.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_yellow.json rename to src/main/resources/data/appliedenergistics2/recipes/network/cables/covered_yellow.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_black.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_black.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_black.json rename to src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_black.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_blue.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_blue.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_blue.json rename to src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_blue.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_brown.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_brown.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_brown.json rename to src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_brown.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_cyan.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_cyan.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_cyan.json rename to src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_cyan.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_fluix.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_fluix.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_fluix.json rename to src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_fluix.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_fluix_clean.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_fluix_clean.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_fluix_clean.json rename to src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_fluix_clean.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_gray.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_gray.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_gray.json rename to src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_gray.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_green.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_green.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_green.json rename to src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_green.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_light_blue.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_light_blue.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_light_blue.json rename to src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_light_blue.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_light_gray.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_light_gray.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_light_gray.json rename to src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_light_gray.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_lime.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_lime.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_lime.json rename to src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_lime.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_magenta.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_magenta.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_magenta.json rename to src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_magenta.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_orange.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_orange.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_orange.json rename to src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_orange.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_pink.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_pink.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_pink.json rename to src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_pink.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_purple.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_purple.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_purple.json rename to src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_purple.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_red.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_red.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_red.json rename to src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_red.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_white.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_white.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_white.json rename to src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_white.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_yellow.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_yellow.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_yellow.json rename to src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_covered_yellow.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_black.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_black.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_black.json rename to src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_black.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_blue.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_blue.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_blue.json rename to src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_blue.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_brown.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_brown.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_brown.json rename to src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_brown.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_cyan.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_cyan.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_cyan.json rename to src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_cyan.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_fluix.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_fluix.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_fluix.json rename to src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_fluix.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_fluix_clean.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_fluix_clean.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_fluix_clean.json rename to src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_fluix_clean.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_gray.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_gray.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_gray.json rename to src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_gray.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_green.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_green.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_green.json rename to src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_green.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_light_blue.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_light_blue.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_light_blue.json rename to src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_light_blue.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_light_gray.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_light_gray.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_light_gray.json rename to src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_light_gray.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_lime.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_lime.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_lime.json rename to src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_lime.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_magenta.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_magenta.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_magenta.json rename to src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_magenta.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_orange.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_orange.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_orange.json rename to src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_orange.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_pink.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_pink.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_pink.json rename to src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_pink.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_purple.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_purple.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_purple.json rename to src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_purple.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_red.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_red.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_red.json rename to src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_red.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_white.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_white.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_white.json rename to src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_white.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_yellow.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_yellow.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_yellow.json rename to src/main/resources/data/appliedenergistics2/recipes/network/cables/dense_smart_yellow.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_black.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_black.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_black.json rename to src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_black.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_blue.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_blue.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_blue.json rename to src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_blue.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_brown.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_brown.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_brown.json rename to src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_brown.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_cyan.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_cyan.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_cyan.json rename to src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_cyan.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_fluix.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_fluix.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_fluix.json rename to src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_fluix.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_fluix_clean.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_fluix_clean.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_fluix_clean.json rename to src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_fluix_clean.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_gray.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_gray.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_gray.json rename to src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_gray.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_green.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_green.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_green.json rename to src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_green.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_light_blue.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_light_blue.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_light_blue.json rename to src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_light_blue.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_light_gray.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_light_gray.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_light_gray.json rename to src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_light_gray.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_lime.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_lime.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_lime.json rename to src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_lime.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_magenta.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_magenta.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_magenta.json rename to src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_magenta.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_orange.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_orange.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_orange.json rename to src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_orange.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_pink.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_pink.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_pink.json rename to src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_pink.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_purple.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_purple.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_purple.json rename to src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_purple.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_red.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_red.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_red.json rename to src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_red.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_white.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_white.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_white.json rename to src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_white.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_yellow.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_yellow.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_yellow.json rename to src/main/resources/data/appliedenergistics2/recipes/network/cables/glass_yellow.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_black.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_black.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_black.json rename to src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_black.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_blue.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_blue.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_blue.json rename to src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_blue.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_brown.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_brown.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_brown.json rename to src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_brown.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_cyan.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_cyan.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_cyan.json rename to src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_cyan.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_fluix.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_fluix.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_fluix.json rename to src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_fluix.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_fluix_clean.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_fluix_clean.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_fluix_clean.json rename to src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_fluix_clean.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_gray.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_gray.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_gray.json rename to src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_gray.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_green.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_green.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_green.json rename to src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_green.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_light_blue.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_light_blue.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_light_blue.json rename to src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_light_blue.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_light_gray.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_light_gray.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_light_gray.json rename to src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_light_gray.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_lime.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_lime.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_lime.json rename to src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_lime.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_magenta.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_magenta.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_magenta.json rename to src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_magenta.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_orange.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_orange.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_orange.json rename to src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_orange.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_pink.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_pink.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_pink.json rename to src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_pink.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_purple.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_purple.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_purple.json rename to src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_purple.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_red.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_red.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_red.json rename to src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_red.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_white.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_white.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_white.json rename to src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_white.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_yellow.json b/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_yellow.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_yellow.json rename to src/main/resources/data/appliedenergistics2/recipes/network/cables/smart_yellow.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/cells/empty_storage_cell.json b/src/main/resources/data/appliedenergistics2/recipes/network/cells/empty_storage_cell.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/cells/empty_storage_cell.json rename to src/main/resources/data/appliedenergistics2/recipes/network/cells/empty_storage_cell.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_cell_16k.json b/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_cell_16k.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_cell_16k.json rename to src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_cell_16k.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_cell_16k_storage.json b/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_cell_16k_storage.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_cell_16k_storage.json rename to src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_cell_16k_storage.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_cell_1k.json b/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_cell_1k.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_cell_1k.json rename to src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_cell_1k.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_cell_1k_storage.json b/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_cell_1k_storage.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_cell_1k_storage.json rename to src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_cell_1k_storage.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_cell_4k.json b/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_cell_4k.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_cell_4k.json rename to src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_cell_4k.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_cell_4k_storage.json b/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_cell_4k_storage.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_cell_4k_storage.json rename to src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_cell_4k_storage.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_cell_64k.json b/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_cell_64k.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_cell_64k.json rename to src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_cell_64k.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_cell_64k_storage.json b/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_cell_64k_storage.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_cell_64k_storage.json rename to src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_cell_64k_storage.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_components_cell_16k_part.json b/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_components_cell_16k_part.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_components_cell_16k_part.json rename to src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_components_cell_16k_part.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_components_cell_1k_part.json b/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_components_cell_1k_part.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_components_cell_1k_part.json rename to src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_components_cell_1k_part.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_components_cell_4k_part.json b/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_components_cell_4k_part.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_components_cell_4k_part.json rename to src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_components_cell_4k_part.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_components_cell_64k_part.json b/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_components_cell_64k_part.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_components_cell_64k_part.json rename to src/main/resources/data/appliedenergistics2/recipes/network/cells/fluid_storage_components_cell_64k_part.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_components.json b/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_components.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_components.json rename to src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_components.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_components_0.json b/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_components_0.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_components_0.json rename to src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_components_0.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_components_1.json b/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_components_1.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_components_1.json rename to src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_components_1.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_storage_cell_128_cubed.json b/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_storage_cell_128_cubed.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_storage_cell_128_cubed.json rename to src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_storage_cell_128_cubed.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_storage_cell_128_cubed_storage.json b/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_storage_cell_128_cubed_storage.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_storage_cell_128_cubed_storage.json rename to src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_storage_cell_128_cubed_storage.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_storage_cell_16_cubed.json b/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_storage_cell_16_cubed.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_storage_cell_16_cubed.json rename to src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_storage_cell_16_cubed.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_storage_cell_16_cubed_storage.json b/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_storage_cell_16_cubed_storage.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_storage_cell_16_cubed_storage.json rename to src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_storage_cell_16_cubed_storage.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_storage_cell_2_cubed.json b/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_storage_cell_2_cubed.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_storage_cell_2_cubed.json rename to src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_storage_cell_2_cubed.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_storage_cell_2_cubed_storage.json b/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_storage_cell_2_cubed_storage.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_storage_cell_2_cubed_storage.json rename to src/main/resources/data/appliedenergistics2/recipes/network/cells/spatial_storage_cell_2_cubed_storage.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_cell_16k.json b/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_cell_16k.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_cell_16k.json rename to src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_cell_16k.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_cell_16k_storage.json b/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_cell_16k_storage.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_cell_16k_storage.json rename to src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_cell_16k_storage.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_cell_1k.json b/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_cell_1k.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_cell_1k.json rename to src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_cell_1k.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_cell_1k_storage.json b/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_cell_1k_storage.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_cell_1k_storage.json rename to src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_cell_1k_storage.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_cell_4k.json b/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_cell_4k.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_cell_4k.json rename to src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_cell_4k.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_cell_4k_storage.json b/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_cell_4k_storage.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_cell_4k_storage.json rename to src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_cell_4k_storage.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_cell_64k.json b/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_cell_64k.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_cell_64k.json rename to src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_cell_64k.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_cell_64k_storage.json b/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_cell_64k_storage.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_cell_64k_storage.json rename to src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_cell_64k_storage.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_components_cell_16k_part.json b/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_components_cell_16k_part.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_components_cell_16k_part.json rename to src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_components_cell_16k_part.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_components_cell_1k_part.json b/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_components_cell_1k_part.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_components_cell_1k_part.json rename to src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_components_cell_1k_part.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_components_cell_4k_part.json b/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_components_cell_4k_part.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_components_cell_4k_part.json rename to src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_components_cell_4k_part.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_components_cell_64k_part.json b/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_components_cell_64k_part.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_components_cell_64k_part.json rename to src/main/resources/data/appliedenergistics2/recipes/network/cells/storage_components_cell_64k_part.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/cells/view_cell.json b/src/main/resources/data/appliedenergistics2/recipes/network/cells/view_cell.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/cells/view_cell.json rename to src/main/resources/data/appliedenergistics2/recipes/network/cells/view_cell.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/cells/view_cell_storage.json b/src/main/resources/data/appliedenergistics2/recipes/network/cells/view_cell_storage.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/cells/view_cell_storage.json rename to src/main/resources/data/appliedenergistics2/recipes/network/cells/view_cell_storage.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/crafting/16k_cpu_crafting_storage.json b/src/main/resources/data/appliedenergistics2/recipes/network/crafting/16k_cpu_crafting_storage.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/crafting/16k_cpu_crafting_storage.json rename to src/main/resources/data/appliedenergistics2/recipes/network/crafting/16k_cpu_crafting_storage.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/crafting/1k_cpu_crafting_storage.json b/src/main/resources/data/appliedenergistics2/recipes/network/crafting/1k_cpu_crafting_storage.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/crafting/1k_cpu_crafting_storage.json rename to src/main/resources/data/appliedenergistics2/recipes/network/crafting/1k_cpu_crafting_storage.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/crafting/4k_cpu_crafting_storage.json b/src/main/resources/data/appliedenergistics2/recipes/network/crafting/4k_cpu_crafting_storage.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/crafting/4k_cpu_crafting_storage.json rename to src/main/resources/data/appliedenergistics2/recipes/network/crafting/4k_cpu_crafting_storage.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/crafting/64k_cpu_crafting_storage.json b/src/main/resources/data/appliedenergistics2/recipes/network/crafting/64k_cpu_crafting_storage.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/crafting/64k_cpu_crafting_storage.json rename to src/main/resources/data/appliedenergistics2/recipes/network/crafting/64k_cpu_crafting_storage.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/crafting/cpu_crafting_accelerator.json b/src/main/resources/data/appliedenergistics2/recipes/network/crafting/cpu_crafting_accelerator.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/crafting/cpu_crafting_accelerator.json rename to src/main/resources/data/appliedenergistics2/recipes/network/crafting/cpu_crafting_accelerator.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/crafting/cpu_crafting_monitor.json b/src/main/resources/data/appliedenergistics2/recipes/network/crafting/cpu_crafting_monitor.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/crafting/cpu_crafting_monitor.json rename to src/main/resources/data/appliedenergistics2/recipes/network/crafting/cpu_crafting_monitor.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/crafting/cpu_crafting_unit.json b/src/main/resources/data/appliedenergistics2/recipes/network/crafting/cpu_crafting_unit.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/crafting/cpu_crafting_unit.json rename to src/main/resources/data/appliedenergistics2/recipes/network/crafting/cpu_crafting_unit.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/crafting/molecular_assembler.json b/src/main/resources/data/appliedenergistics2/recipes/network/crafting/molecular_assembler.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/crafting/molecular_assembler.json rename to src/main/resources/data/appliedenergistics2/recipes/network/crafting/molecular_assembler.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/crafting/patterns_blank.json b/src/main/resources/data/appliedenergistics2/recipes/network/crafting/patterns_blank.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/crafting/patterns_blank.json rename to src/main/resources/data/appliedenergistics2/recipes/network/crafting/patterns_blank.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/parts/cable_anchor.json b/src/main/resources/data/appliedenergistics2/recipes/network/parts/cable_anchor.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/parts/cable_anchor.json rename to src/main/resources/data/appliedenergistics2/recipes/network/parts/cable_anchor.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/parts/export_bus.json b/src/main/resources/data/appliedenergistics2/recipes/network/parts/export_bus.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/parts/export_bus.json rename to src/main/resources/data/appliedenergistics2/recipes/network/parts/export_bus.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/parts/export_bus_fluid.json b/src/main/resources/data/appliedenergistics2/recipes/network/parts/export_bus_fluid.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/parts/export_bus_fluid.json rename to src/main/resources/data/appliedenergistics2/recipes/network/parts/export_bus_fluid.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/parts/fluid_level_emitter.json b/src/main/resources/data/appliedenergistics2/recipes/network/parts/fluid_level_emitter.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/parts/fluid_level_emitter.json rename to src/main/resources/data/appliedenergistics2/recipes/network/parts/fluid_level_emitter.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/parts/import_bus.json b/src/main/resources/data/appliedenergistics2/recipes/network/parts/import_bus.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/parts/import_bus.json rename to src/main/resources/data/appliedenergistics2/recipes/network/parts/import_bus.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/parts/import_bus_fluid.json b/src/main/resources/data/appliedenergistics2/recipes/network/parts/import_bus_fluid.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/parts/import_bus_fluid.json rename to src/main/resources/data/appliedenergistics2/recipes/network/parts/import_bus_fluid.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/parts/level_emitter.json b/src/main/resources/data/appliedenergistics2/recipes/network/parts/level_emitter.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/parts/level_emitter.json rename to src/main/resources/data/appliedenergistics2/recipes/network/parts/level_emitter.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/parts/monitors_conversion.json b/src/main/resources/data/appliedenergistics2/recipes/network/parts/monitors_conversion.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/parts/monitors_conversion.json rename to src/main/resources/data/appliedenergistics2/recipes/network/parts/monitors_conversion.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/parts/monitors_storage.json b/src/main/resources/data/appliedenergistics2/recipes/network/parts/monitors_storage.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/parts/monitors_storage.json rename to src/main/resources/data/appliedenergistics2/recipes/network/parts/monitors_storage.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/parts/panels_dark_monitor.json b/src/main/resources/data/appliedenergistics2/recipes/network/parts/panels_dark_monitor.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/parts/panels_dark_monitor.json rename to src/main/resources/data/appliedenergistics2/recipes/network/parts/panels_dark_monitor.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/parts/panels_monitor.json b/src/main/resources/data/appliedenergistics2/recipes/network/parts/panels_monitor.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/parts/panels_monitor.json rename to src/main/resources/data/appliedenergistics2/recipes/network/parts/panels_monitor.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/parts/panels_semi_dark_monitor.json b/src/main/resources/data/appliedenergistics2/recipes/network/parts/panels_semi_dark_monitor.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/parts/panels_semi_dark_monitor.json rename to src/main/resources/data/appliedenergistics2/recipes/network/parts/panels_semi_dark_monitor.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/parts/panels_semi_dark_monitor_alt.json b/src/main/resources/data/appliedenergistics2/recipes/network/parts/panels_semi_dark_monitor_alt.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/parts/panels_semi_dark_monitor_alt.json rename to src/main/resources/data/appliedenergistics2/recipes/network/parts/panels_semi_dark_monitor_alt.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/parts/planes_annihilation_alt.json b/src/main/resources/data/appliedenergistics2/recipes/network/parts/planes_annihilation_alt.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/parts/planes_annihilation_alt.json rename to src/main/resources/data/appliedenergistics2/recipes/network/parts/planes_annihilation_alt.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/parts/planes_annihilation_alt2.json b/src/main/resources/data/appliedenergistics2/recipes/network/parts/planes_annihilation_alt2.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/parts/planes_annihilation_alt2.json rename to src/main/resources/data/appliedenergistics2/recipes/network/parts/planes_annihilation_alt2.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/parts/planes_annihilation_fluid.json b/src/main/resources/data/appliedenergistics2/recipes/network/parts/planes_annihilation_fluid.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/parts/planes_annihilation_fluid.json rename to src/main/resources/data/appliedenergistics2/recipes/network/parts/planes_annihilation_fluid.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/parts/planes_annihilation_fluid_alt.json b/src/main/resources/data/appliedenergistics2/recipes/network/parts/planes_annihilation_fluid_alt.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/parts/planes_annihilation_fluid_alt.json rename to src/main/resources/data/appliedenergistics2/recipes/network/parts/planes_annihilation_fluid_alt.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/parts/planes_annihilatition_identity.json b/src/main/resources/data/appliedenergistics2/recipes/network/parts/planes_annihilatition_identity.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/parts/planes_annihilatition_identity.json rename to src/main/resources/data/appliedenergistics2/recipes/network/parts/planes_annihilatition_identity.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/parts/planes_formation.json b/src/main/resources/data/appliedenergistics2/recipes/network/parts/planes_formation.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/parts/planes_formation.json rename to src/main/resources/data/appliedenergistics2/recipes/network/parts/planes_formation.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/parts/planes_formation_alt.json b/src/main/resources/data/appliedenergistics2/recipes/network/parts/planes_formation_alt.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/parts/planes_formation_alt.json rename to src/main/resources/data/appliedenergistics2/recipes/network/parts/planes_formation_alt.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/parts/planes_formation_fluid.json b/src/main/resources/data/appliedenergistics2/recipes/network/parts/planes_formation_fluid.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/parts/planes_formation_fluid.json rename to src/main/resources/data/appliedenergistics2/recipes/network/parts/planes_formation_fluid.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/parts/planes_formation_fluid_alt.json b/src/main/resources/data/appliedenergistics2/recipes/network/parts/planes_formation_fluid_alt.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/parts/planes_formation_fluid_alt.json rename to src/main/resources/data/appliedenergistics2/recipes/network/parts/planes_formation_fluid_alt.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/parts/quartz_fiber_part.json b/src/main/resources/data/appliedenergistics2/recipes/network/parts/quartz_fiber_part.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/parts/quartz_fiber_part.json rename to src/main/resources/data/appliedenergistics2/recipes/network/parts/quartz_fiber_part.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/parts/storage_bus.json b/src/main/resources/data/appliedenergistics2/recipes/network/parts/storage_bus.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/parts/storage_bus.json rename to src/main/resources/data/appliedenergistics2/recipes/network/parts/storage_bus.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/parts/storage_bus_fluid.json b/src/main/resources/data/appliedenergistics2/recipes/network/parts/storage_bus_fluid.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/parts/storage_bus_fluid.json rename to src/main/resources/data/appliedenergistics2/recipes/network/parts/storage_bus_fluid.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/parts/terminals.json b/src/main/resources/data/appliedenergistics2/recipes/network/parts/terminals.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/parts/terminals.json rename to src/main/resources/data/appliedenergistics2/recipes/network/parts/terminals.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/parts/terminals_crafting.json b/src/main/resources/data/appliedenergistics2/recipes/network/parts/terminals_crafting.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/parts/terminals_crafting.json rename to src/main/resources/data/appliedenergistics2/recipes/network/parts/terminals_crafting.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/parts/terminals_fluid.json b/src/main/resources/data/appliedenergistics2/recipes/network/parts/terminals_fluid.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/parts/terminals_fluid.json rename to src/main/resources/data/appliedenergistics2/recipes/network/parts/terminals_fluid.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/parts/terminals_interface.json b/src/main/resources/data/appliedenergistics2/recipes/network/parts/terminals_interface.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/parts/terminals_interface.json rename to src/main/resources/data/appliedenergistics2/recipes/network/parts/terminals_interface.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/parts/terminals_pattern.json b/src/main/resources/data/appliedenergistics2/recipes/network/parts/terminals_pattern.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/parts/terminals_pattern.json rename to src/main/resources/data/appliedenergistics2/recipes/network/parts/terminals_pattern.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/parts/toggle_bus.json b/src/main/resources/data/appliedenergistics2/recipes/network/parts/toggle_bus.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/parts/toggle_bus.json rename to src/main/resources/data/appliedenergistics2/recipes/network/parts/toggle_bus.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/parts/toggle_bus_alt.json b/src/main/resources/data/appliedenergistics2/recipes/network/parts/toggle_bus_alt.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/parts/toggle_bus_alt.json rename to src/main/resources/data/appliedenergistics2/recipes/network/parts/toggle_bus_alt.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/parts/toggle_bus_inverted_alt.json b/src/main/resources/data/appliedenergistics2/recipes/network/parts/toggle_bus_inverted_alt.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/parts/toggle_bus_inverted_alt.json rename to src/main/resources/data/appliedenergistics2/recipes/network/parts/toggle_bus_inverted_alt.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/parts/tunnels_me.json b/src/main/resources/data/appliedenergistics2/recipes/network/parts/tunnels_me.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/parts/tunnels_me.json rename to src/main/resources/data/appliedenergistics2/recipes/network/parts/tunnels_me.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/wireless_access_point.json b/src/main/resources/data/appliedenergistics2/recipes/network/wireless_access_point.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/wireless_access_point.json rename to src/main/resources/data/appliedenergistics2/recipes/network/wireless_access_point.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/wireless_booster.json b/src/main/resources/data/appliedenergistics2/recipes/network/wireless_booster.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/wireless_booster.json rename to src/main/resources/data/appliedenergistics2/recipes/network/wireless_booster.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/wireless_part.json b/src/main/resources/data/appliedenergistics2/recipes/network/wireless_part.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/wireless_part.json rename to src/main/resources/data/appliedenergistics2/recipes/network/wireless_part.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/network/wireless_terminal.json b/src/main/resources/data/appliedenergistics2/recipes/network/wireless_terminal.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/network/wireless_terminal.json rename to src/main/resources/data/appliedenergistics2/recipes/network/wireless_terminal.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/smelting/bread.json b/src/main/resources/data/appliedenergistics2/recipes/smelting/bread.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/smelting/bread.json rename to src/main/resources/data/appliedenergistics2/recipes/smelting/bread.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/smelting/gold_ingot.json b/src/main/resources/data/appliedenergistics2/recipes/smelting/gold_ingot.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/smelting/gold_ingot.json rename to src/main/resources/data/appliedenergistics2/recipes/smelting/gold_ingot.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/smelting/iron_ingot.json b/src/main/resources/data/appliedenergistics2/recipes/smelting/iron_ingot.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/smelting/iron_ingot.json rename to src/main/resources/data/appliedenergistics2/recipes/smelting/iron_ingot.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/smelting/silicon.json b/src/main/resources/data/appliedenergistics2/recipes/smelting/silicon.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/smelting/silicon.json rename to src/main/resources/data/appliedenergistics2/recipes/smelting/silicon.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/smelting/smooth_sky_stone_block.json b/src/main/resources/data/appliedenergistics2/recipes/smelting/smooth_sky_stone_block.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/smelting/smooth_sky_stone_block.json rename to src/main/resources/data/appliedenergistics2/recipes/smelting/smooth_sky_stone_block.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/special/disassemble.json b/src/main/resources/data/appliedenergistics2/recipes/special/disassemble.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/special/disassemble.json rename to src/main/resources/data/appliedenergistics2/recipes/special/disassemble.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/special/facade.json b/src/main/resources/data/appliedenergistics2/recipes/special/facade.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/special/facade.json rename to src/main/resources/data/appliedenergistics2/recipes/special/facade.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/tools/certus_quartz_axe.json b/src/main/resources/data/appliedenergistics2/recipes/tools/certus_quartz_axe.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/tools/certus_quartz_axe.json rename to src/main/resources/data/appliedenergistics2/recipes/tools/certus_quartz_axe.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/tools/certus_quartz_cutting_knife.json b/src/main/resources/data/appliedenergistics2/recipes/tools/certus_quartz_cutting_knife.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/tools/certus_quartz_cutting_knife.json rename to src/main/resources/data/appliedenergistics2/recipes/tools/certus_quartz_cutting_knife.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/tools/certus_quartz_hoe.json b/src/main/resources/data/appliedenergistics2/recipes/tools/certus_quartz_hoe.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/tools/certus_quartz_hoe.json rename to src/main/resources/data/appliedenergistics2/recipes/tools/certus_quartz_hoe.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/tools/certus_quartz_pickaxe.json b/src/main/resources/data/appliedenergistics2/recipes/tools/certus_quartz_pickaxe.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/tools/certus_quartz_pickaxe.json rename to src/main/resources/data/appliedenergistics2/recipes/tools/certus_quartz_pickaxe.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/tools/certus_quartz_spade.json b/src/main/resources/data/appliedenergistics2/recipes/tools/certus_quartz_spade.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/tools/certus_quartz_spade.json rename to src/main/resources/data/appliedenergistics2/recipes/tools/certus_quartz_spade.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/tools/certus_quartz_sword.json b/src/main/resources/data/appliedenergistics2/recipes/tools/certus_quartz_sword.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/tools/certus_quartz_sword.json rename to src/main/resources/data/appliedenergistics2/recipes/tools/certus_quartz_sword.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/tools/certus_quartz_wrench.json b/src/main/resources/data/appliedenergistics2/recipes/tools/certus_quartz_wrench.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/tools/certus_quartz_wrench.json rename to src/main/resources/data/appliedenergistics2/recipes/tools/certus_quartz_wrench.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/tools/matter_cannon.json b/src/main/resources/data/appliedenergistics2/recipes/tools/matter_cannon.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/tools/matter_cannon.json rename to src/main/resources/data/appliedenergistics2/recipes/tools/matter_cannon.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/tools/misctools_charged_staff.json b/src/main/resources/data/appliedenergistics2/recipes/tools/misctools_charged_staff.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/tools/misctools_charged_staff.json rename to src/main/resources/data/appliedenergistics2/recipes/tools/misctools_charged_staff.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/tools/misctools_entropy_manipulator.json b/src/main/resources/data/appliedenergistics2/recipes/tools/misctools_entropy_manipulator.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/tools/misctools_entropy_manipulator.json rename to src/main/resources/data/appliedenergistics2/recipes/tools/misctools_entropy_manipulator.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/tools/nether_quartz_axe.json b/src/main/resources/data/appliedenergistics2/recipes/tools/nether_quartz_axe.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/tools/nether_quartz_axe.json rename to src/main/resources/data/appliedenergistics2/recipes/tools/nether_quartz_axe.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/tools/nether_quartz_cutting_knife.json b/src/main/resources/data/appliedenergistics2/recipes/tools/nether_quartz_cutting_knife.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/tools/nether_quartz_cutting_knife.json rename to src/main/resources/data/appliedenergistics2/recipes/tools/nether_quartz_cutting_knife.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/tools/nether_quartz_hoe.json b/src/main/resources/data/appliedenergistics2/recipes/tools/nether_quartz_hoe.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/tools/nether_quartz_hoe.json rename to src/main/resources/data/appliedenergistics2/recipes/tools/nether_quartz_hoe.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/tools/nether_quartz_pickaxe.json b/src/main/resources/data/appliedenergistics2/recipes/tools/nether_quartz_pickaxe.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/tools/nether_quartz_pickaxe.json rename to src/main/resources/data/appliedenergistics2/recipes/tools/nether_quartz_pickaxe.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/tools/nether_quartz_spade.json b/src/main/resources/data/appliedenergistics2/recipes/tools/nether_quartz_spade.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/tools/nether_quartz_spade.json rename to src/main/resources/data/appliedenergistics2/recipes/tools/nether_quartz_spade.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/tools/nether_quartz_sword.json b/src/main/resources/data/appliedenergistics2/recipes/tools/nether_quartz_sword.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/tools/nether_quartz_sword.json rename to src/main/resources/data/appliedenergistics2/recipes/tools/nether_quartz_sword.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/tools/nether_quartz_wrench.json b/src/main/resources/data/appliedenergistics2/recipes/tools/nether_quartz_wrench.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/tools/nether_quartz_wrench.json rename to src/main/resources/data/appliedenergistics2/recipes/tools/nether_quartz_wrench.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/tools/network_biometric_card.json b/src/main/resources/data/appliedenergistics2/recipes/tools/network_biometric_card.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/tools/network_biometric_card.json rename to src/main/resources/data/appliedenergistics2/recipes/tools/network_biometric_card.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/tools/network_color_applicator.json b/src/main/resources/data/appliedenergistics2/recipes/tools/network_color_applicator.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/tools/network_color_applicator.json rename to src/main/resources/data/appliedenergistics2/recipes/tools/network_color_applicator.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/tools/network_memory_card.json b/src/main/resources/data/appliedenergistics2/recipes/tools/network_memory_card.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/tools/network_memory_card.json rename to src/main/resources/data/appliedenergistics2/recipes/tools/network_memory_card.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/tools/network_portable_cell.json b/src/main/resources/data/appliedenergistics2/recipes/tools/network_portable_cell.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/tools/network_portable_cell.json rename to src/main/resources/data/appliedenergistics2/recipes/tools/network_portable_cell.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/tools/network_tool.json b/src/main/resources/data/appliedenergistics2/recipes/tools/network_tool.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/tools/network_tool.json rename to src/main/resources/data/appliedenergistics2/recipes/tools/network_tool.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_black.json b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_black.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_black.json rename to src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_black.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_blue.json b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_blue.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_blue.json rename to src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_blue.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_brown.json b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_brown.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_brown.json rename to src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_brown.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_cyan.json b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_cyan.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_cyan.json rename to src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_cyan.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_gray.json b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_gray.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_gray.json rename to src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_gray.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_green.json b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_green.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_green.json rename to src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_green.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_light_blue.json b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_light_blue.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_light_blue.json rename to src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_light_blue.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_light_gray.json b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_light_gray.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_light_gray.json rename to src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_light_gray.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lime.json b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lime.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lime.json rename to src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lime.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_black.json b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_black.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_black.json rename to src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_black.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_blue.json b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_blue.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_blue.json rename to src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_blue.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_brown.json b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_brown.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_brown.json rename to src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_brown.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_cyan.json b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_cyan.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_cyan.json rename to src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_cyan.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_gray.json b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_gray.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_gray.json rename to src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_gray.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_green.json b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_green.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_green.json rename to src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_green.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_light_blue.json b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_light_blue.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_light_blue.json rename to src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_light_blue.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_light_gray.json b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_light_gray.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_light_gray.json rename to src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_light_gray.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_lime.json b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_lime.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_lime.json rename to src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_lime.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_magenta.json b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_magenta.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_magenta.json rename to src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_magenta.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_orange.json b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_orange.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_orange.json rename to src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_orange.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_pink.json b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_pink.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_pink.json rename to src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_pink.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_purple.json b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_purple.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_purple.json rename to src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_purple.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_red.json b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_red.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_red.json rename to src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_red.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_white.json b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_white.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_white.json rename to src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_white.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_yellow.json b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_yellow.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_yellow.json rename to src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_lumen_yellow.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_magenta.json b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_magenta.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_magenta.json rename to src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_magenta.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_orange.json b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_orange.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_orange.json rename to src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_orange.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_pink.json b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_pink.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_pink.json rename to src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_pink.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_purple.json b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_purple.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_purple.json rename to src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_purple.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_red.json b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_red.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_red.json rename to src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_red.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_white.json b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_white.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_white.json rename to src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_white.json diff --git a/core/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_yellow.json b/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_yellow.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_yellow.json rename to src/main/resources/data/appliedenergistics2/recipes/tools/paintballs_yellow.json diff --git a/core/src/main/resources/data/appliedenergistics2/tags/blocks/blacklisted/annihilation_plane.json b/src/main/resources/data/appliedenergistics2/tags/blocks/blacklisted/annihilation_plane.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/tags/blocks/blacklisted/annihilation_plane.json rename to src/main/resources/data/appliedenergistics2/tags/blocks/blacklisted/annihilation_plane.json diff --git a/core/src/main/resources/data/appliedenergistics2/tags/blocks/whitelisted/facades.json b/src/main/resources/data/appliedenergistics2/tags/blocks/whitelisted/facades.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/tags/blocks/whitelisted/facades.json rename to src/main/resources/data/appliedenergistics2/tags/blocks/whitelisted/facades.json diff --git a/core/src/main/resources/data/appliedenergistics2/tags/fluids/blacklisted/fluid_annihilation_plane.json b/src/main/resources/data/appliedenergistics2/tags/fluids/blacklisted/fluid_annihilation_plane.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/tags/fluids/blacklisted/fluid_annihilation_plane.json rename to src/main/resources/data/appliedenergistics2/tags/fluids/blacklisted/fluid_annihilation_plane.json diff --git a/core/src/main/resources/data/appliedenergistics2/tags/items/blacklisted/annihilation_plane.json b/src/main/resources/data/appliedenergistics2/tags/items/blacklisted/annihilation_plane.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/tags/items/blacklisted/annihilation_plane.json rename to src/main/resources/data/appliedenergistics2/tags/items/blacklisted/annihilation_plane.json diff --git a/core/src/main/resources/data/appliedenergistics2/tags/items/covered_cable.json b/src/main/resources/data/appliedenergistics2/tags/items/covered_cable.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/tags/items/covered_cable.json rename to src/main/resources/data/appliedenergistics2/tags/items/covered_cable.json diff --git a/core/src/main/resources/data/appliedenergistics2/tags/items/covered_dense_cable.json b/src/main/resources/data/appliedenergistics2/tags/items/covered_dense_cable.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/tags/items/covered_dense_cable.json rename to src/main/resources/data/appliedenergistics2/tags/items/covered_dense_cable.json diff --git a/core/src/main/resources/data/appliedenergistics2/tags/items/crystals/certus.json b/src/main/resources/data/appliedenergistics2/tags/items/crystals/certus.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/tags/items/crystals/certus.json rename to src/main/resources/data/appliedenergistics2/tags/items/crystals/certus.json diff --git a/core/src/main/resources/data/appliedenergistics2/tags/items/crystals/certus_quartz.json b/src/main/resources/data/appliedenergistics2/tags/items/crystals/certus_quartz.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/tags/items/crystals/certus_quartz.json rename to src/main/resources/data/appliedenergistics2/tags/items/crystals/certus_quartz.json diff --git a/core/src/main/resources/data/appliedenergistics2/tags/items/crystals/fluix.json b/src/main/resources/data/appliedenergistics2/tags/items/crystals/fluix.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/tags/items/crystals/fluix.json rename to src/main/resources/data/appliedenergistics2/tags/items/crystals/fluix.json diff --git a/core/src/main/resources/data/appliedenergistics2/tags/items/crystals/nether.json b/src/main/resources/data/appliedenergistics2/tags/items/crystals/nether.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/tags/items/crystals/nether.json rename to src/main/resources/data/appliedenergistics2/tags/items/crystals/nether.json diff --git a/core/src/main/resources/data/appliedenergistics2/tags/items/crystals/quartz.json b/src/main/resources/data/appliedenergistics2/tags/items/crystals/quartz.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/tags/items/crystals/quartz.json rename to src/main/resources/data/appliedenergistics2/tags/items/crystals/quartz.json diff --git a/core/src/main/resources/data/appliedenergistics2/tags/items/dusts/certus_quartz.json b/src/main/resources/data/appliedenergistics2/tags/items/dusts/certus_quartz.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/tags/items/dusts/certus_quartz.json rename to src/main/resources/data/appliedenergistics2/tags/items/dusts/certus_quartz.json diff --git a/core/src/main/resources/data/appliedenergistics2/tags/items/dusts/ender.json b/src/main/resources/data/appliedenergistics2/tags/items/dusts/ender.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/tags/items/dusts/ender.json rename to src/main/resources/data/appliedenergistics2/tags/items/dusts/ender.json diff --git a/core/src/main/resources/data/appliedenergistics2/tags/items/dusts/fluix.json b/src/main/resources/data/appliedenergistics2/tags/items/dusts/fluix.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/tags/items/dusts/fluix.json rename to src/main/resources/data/appliedenergistics2/tags/items/dusts/fluix.json diff --git a/core/src/main/resources/data/appliedenergistics2/tags/items/dusts/nether_quartz.json b/src/main/resources/data/appliedenergistics2/tags/items/dusts/nether_quartz.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/tags/items/dusts/nether_quartz.json rename to src/main/resources/data/appliedenergistics2/tags/items/dusts/nether_quartz.json diff --git a/core/src/main/resources/data/appliedenergistics2/tags/items/dusts/quartz.json b/src/main/resources/data/appliedenergistics2/tags/items/dusts/quartz.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/tags/items/dusts/quartz.json rename to src/main/resources/data/appliedenergistics2/tags/items/dusts/quartz.json diff --git a/core/src/main/resources/data/appliedenergistics2/tags/items/fluid_interface.json b/src/main/resources/data/appliedenergistics2/tags/items/fluid_interface.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/tags/items/fluid_interface.json rename to src/main/resources/data/appliedenergistics2/tags/items/fluid_interface.json diff --git a/core/src/main/resources/data/appliedenergistics2/tags/items/gears/wooden.json b/src/main/resources/data/appliedenergistics2/tags/items/gears/wooden.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/tags/items/gears/wooden.json rename to src/main/resources/data/appliedenergistics2/tags/items/gears/wooden.json diff --git a/core/src/main/resources/data/appliedenergistics2/tags/items/glass.json b/src/main/resources/data/appliedenergistics2/tags/items/glass.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/tags/items/glass.json rename to src/main/resources/data/appliedenergistics2/tags/items/glass.json diff --git a/core/src/main/resources/data/appliedenergistics2/tags/items/glass_cable.json b/src/main/resources/data/appliedenergistics2/tags/items/glass_cable.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/tags/items/glass_cable.json rename to src/main/resources/data/appliedenergistics2/tags/items/glass_cable.json diff --git a/core/src/main/resources/data/appliedenergistics2/tags/items/illuminated_panel.json b/src/main/resources/data/appliedenergistics2/tags/items/illuminated_panel.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/tags/items/illuminated_panel.json rename to src/main/resources/data/appliedenergistics2/tags/items/illuminated_panel.json diff --git a/core/src/main/resources/data/appliedenergistics2/tags/items/interface.json b/src/main/resources/data/appliedenergistics2/tags/items/interface.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/tags/items/interface.json rename to src/main/resources/data/appliedenergistics2/tags/items/interface.json diff --git a/core/src/main/resources/data/appliedenergistics2/tags/items/knife.json b/src/main/resources/data/appliedenergistics2/tags/items/knife.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/tags/items/knife.json rename to src/main/resources/data/appliedenergistics2/tags/items/knife.json diff --git a/core/src/main/resources/data/appliedenergistics2/tags/items/metal_ingots.json b/src/main/resources/data/appliedenergistics2/tags/items/metal_ingots.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/tags/items/metal_ingots.json rename to src/main/resources/data/appliedenergistics2/tags/items/metal_ingots.json diff --git a/core/src/main/resources/data/appliedenergistics2/tags/items/nether_quartz_dust.json b/src/main/resources/data/appliedenergistics2/tags/items/nether_quartz_dust.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/tags/items/nether_quartz_dust.json rename to src/main/resources/data/appliedenergistics2/tags/items/nether_quartz_dust.json diff --git a/core/src/main/resources/data/appliedenergistics2/tags/items/quartz_wrench.json b/src/main/resources/data/appliedenergistics2/tags/items/quartz_wrench.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/tags/items/quartz_wrench.json rename to src/main/resources/data/appliedenergistics2/tags/items/quartz_wrench.json diff --git a/core/src/main/resources/data/appliedenergistics2/tags/items/silicon.json b/src/main/resources/data/appliedenergistics2/tags/items/silicon.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/tags/items/silicon.json rename to src/main/resources/data/appliedenergistics2/tags/items/silicon.json diff --git a/core/src/main/resources/data/appliedenergistics2/tags/items/smart_cable.json b/src/main/resources/data/appliedenergistics2/tags/items/smart_cable.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/tags/items/smart_cable.json rename to src/main/resources/data/appliedenergistics2/tags/items/smart_cable.json diff --git a/core/src/main/resources/data/appliedenergistics2/tags/items/smart_dense_cable.json b/src/main/resources/data/appliedenergistics2/tags/items/smart_dense_cable.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/tags/items/smart_dense_cable.json rename to src/main/resources/data/appliedenergistics2/tags/items/smart_dense_cable.json diff --git a/core/src/main/resources/data/appliedenergistics2/tags/items/wool.json b/src/main/resources/data/appliedenergistics2/tags/items/wool.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/tags/items/wool.json rename to src/main/resources/data/appliedenergistics2/tags/items/wool.json diff --git a/core/src/main/resources/data/appliedenergistics2/tags/items/workbench.json b/src/main/resources/data/appliedenergistics2/tags/items/workbench.json similarity index 100% rename from core/src/main/resources/data/appliedenergistics2/tags/items/workbench.json rename to src/main/resources/data/appliedenergistics2/tags/items/workbench.json diff --git a/core/src/main/resources/data/forge/tags/blocks/terracotta.json b/src/main/resources/data/forge/tags/blocks/terracotta.json similarity index 100% rename from core/src/main/resources/data/forge/tags/blocks/terracotta.json rename to src/main/resources/data/forge/tags/blocks/terracotta.json diff --git a/core/src/main/resources/data/forge/tags/items/dusts/gold.json b/src/main/resources/data/forge/tags/items/dusts/gold.json similarity index 100% rename from core/src/main/resources/data/forge/tags/items/dusts/gold.json rename to src/main/resources/data/forge/tags/items/dusts/gold.json diff --git a/core/src/main/resources/data/forge/tags/items/dusts/iron.json b/src/main/resources/data/forge/tags/items/dusts/iron.json similarity index 100% rename from core/src/main/resources/data/forge/tags/items/dusts/iron.json rename to src/main/resources/data/forge/tags/items/dusts/iron.json diff --git a/core/src/main/resources/data/forge/tags/items/gems/certus_quartz.json b/src/main/resources/data/forge/tags/items/gems/certus_quartz.json similarity index 100% rename from core/src/main/resources/data/forge/tags/items/gems/certus_quartz.json rename to src/main/resources/data/forge/tags/items/gems/certus_quartz.json diff --git a/core/src/main/resources/data/forge/tags/items/ores/certus_quartz.json b/src/main/resources/data/forge/tags/items/ores/certus_quartz.json similarity index 100% rename from core/src/main/resources/data/forge/tags/items/ores/certus_quartz.json rename to src/main/resources/data/forge/tags/items/ores/certus_quartz.json diff --git a/core/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json similarity index 100% rename from core/src/main/resources/fabric.mod.json rename to src/main/resources/fabric.mod.json diff --git a/src/main/java/appeng/block/crafting/AbstractCraftingUnitBlock.java b/src/unported/java/appeng/block/crafting/AbstractCraftingUnitBlock.java similarity index 100% rename from src/main/java/appeng/block/crafting/AbstractCraftingUnitBlock.java rename to src/unported/java/appeng/block/crafting/AbstractCraftingUnitBlock.java diff --git a/src/main/java/appeng/block/crafting/CraftingMonitorBlock.java b/src/unported/java/appeng/block/crafting/CraftingMonitorBlock.java similarity index 100% rename from src/main/java/appeng/block/crafting/CraftingMonitorBlock.java rename to src/unported/java/appeng/block/crafting/CraftingMonitorBlock.java diff --git a/src/main/java/appeng/block/crafting/CraftingStorageBlock.java b/src/unported/java/appeng/block/crafting/CraftingStorageBlock.java similarity index 100% rename from src/main/java/appeng/block/crafting/CraftingStorageBlock.java rename to src/unported/java/appeng/block/crafting/CraftingStorageBlock.java diff --git a/src/main/java/appeng/block/crafting/CraftingStorageItem.java b/src/unported/java/appeng/block/crafting/CraftingStorageItem.java similarity index 100% rename from src/main/java/appeng/block/crafting/CraftingStorageItem.java rename to src/unported/java/appeng/block/crafting/CraftingStorageItem.java diff --git a/src/main/java/appeng/block/crafting/CraftingUnitBlock.java b/src/unported/java/appeng/block/crafting/CraftingUnitBlock.java similarity index 100% rename from src/main/java/appeng/block/crafting/CraftingUnitBlock.java rename to src/unported/java/appeng/block/crafting/CraftingUnitBlock.java diff --git a/src/main/java/appeng/block/crafting/MolecularAssemblerBlock.java b/src/unported/java/appeng/block/crafting/MolecularAssemblerBlock.java similarity index 100% rename from src/main/java/appeng/block/crafting/MolecularAssemblerBlock.java rename to src/unported/java/appeng/block/crafting/MolecularAssemblerBlock.java diff --git a/src/main/java/appeng/block/grindstone/CrankBlock.java b/src/unported/java/appeng/block/grindstone/CrankBlock.java similarity index 100% rename from src/main/java/appeng/block/grindstone/CrankBlock.java rename to src/unported/java/appeng/block/grindstone/CrankBlock.java diff --git a/src/main/java/appeng/block/grindstone/GrinderBlock.java b/src/unported/java/appeng/block/grindstone/GrinderBlock.java similarity index 100% rename from src/main/java/appeng/block/grindstone/GrinderBlock.java rename to src/unported/java/appeng/block/grindstone/GrinderBlock.java diff --git a/src/main/java/appeng/block/misc/CellWorkbenchBlock.java b/src/unported/java/appeng/block/misc/CellWorkbenchBlock.java similarity index 100% rename from src/main/java/appeng/block/misc/CellWorkbenchBlock.java rename to src/unported/java/appeng/block/misc/CellWorkbenchBlock.java diff --git a/src/main/java/appeng/block/misc/ChargerBlock.java b/src/unported/java/appeng/block/misc/ChargerBlock.java similarity index 100% rename from src/main/java/appeng/block/misc/ChargerBlock.java rename to src/unported/java/appeng/block/misc/ChargerBlock.java diff --git a/src/main/java/appeng/block/misc/CondenserBlock.java b/src/unported/java/appeng/block/misc/CondenserBlock.java similarity index 100% rename from src/main/java/appeng/block/misc/CondenserBlock.java rename to src/unported/java/appeng/block/misc/CondenserBlock.java diff --git a/src/main/java/appeng/block/misc/InscriberBlock.java b/src/unported/java/appeng/block/misc/InscriberBlock.java similarity index 100% rename from src/main/java/appeng/block/misc/InscriberBlock.java rename to src/unported/java/appeng/block/misc/InscriberBlock.java diff --git a/src/main/java/appeng/block/misc/InscriberRendering.java b/src/unported/java/appeng/block/misc/InscriberRendering.java similarity index 100% rename from src/main/java/appeng/block/misc/InscriberRendering.java rename to src/unported/java/appeng/block/misc/InscriberRendering.java diff --git a/src/main/java/appeng/block/misc/InterfaceBlock.java b/src/unported/java/appeng/block/misc/InterfaceBlock.java similarity index 100% rename from src/main/java/appeng/block/misc/InterfaceBlock.java rename to src/unported/java/appeng/block/misc/InterfaceBlock.java diff --git a/src/main/java/appeng/block/misc/QuartzGrowthAcceleratorBlock.java b/src/unported/java/appeng/block/misc/QuartzGrowthAcceleratorBlock.java similarity index 100% rename from src/main/java/appeng/block/misc/QuartzGrowthAcceleratorBlock.java rename to src/unported/java/appeng/block/misc/QuartzGrowthAcceleratorBlock.java diff --git a/src/main/java/appeng/block/misc/SecurityStationBlock.java b/src/unported/java/appeng/block/misc/SecurityStationBlock.java similarity index 100% rename from src/main/java/appeng/block/misc/SecurityStationBlock.java rename to src/unported/java/appeng/block/misc/SecurityStationBlock.java diff --git a/src/main/java/appeng/block/misc/SecurityStationRendering.java b/src/unported/java/appeng/block/misc/SecurityStationRendering.java similarity index 100% rename from src/main/java/appeng/block/misc/SecurityStationRendering.java rename to src/unported/java/appeng/block/misc/SecurityStationRendering.java diff --git a/src/main/java/appeng/block/misc/VibrationChamberBlock.java b/src/unported/java/appeng/block/misc/VibrationChamberBlock.java similarity index 100% rename from src/main/java/appeng/block/misc/VibrationChamberBlock.java rename to src/unported/java/appeng/block/misc/VibrationChamberBlock.java diff --git a/src/main/java/appeng/block/networking/ControllerBlock.java b/src/unported/java/appeng/block/networking/ControllerBlock.java similarity index 100% rename from src/main/java/appeng/block/networking/ControllerBlock.java rename to src/unported/java/appeng/block/networking/ControllerBlock.java diff --git a/src/main/java/appeng/block/networking/ControllerRendering.java b/src/unported/java/appeng/block/networking/ControllerRendering.java similarity index 100% rename from src/main/java/appeng/block/networking/ControllerRendering.java rename to src/unported/java/appeng/block/networking/ControllerRendering.java diff --git a/src/main/java/appeng/block/networking/CreativeEnergyCellBlock.java b/src/unported/java/appeng/block/networking/CreativeEnergyCellBlock.java similarity index 100% rename from src/main/java/appeng/block/networking/CreativeEnergyCellBlock.java rename to src/unported/java/appeng/block/networking/CreativeEnergyCellBlock.java diff --git a/src/main/java/appeng/block/networking/DenseEnergyCellBlock.java b/src/unported/java/appeng/block/networking/DenseEnergyCellBlock.java similarity index 100% rename from src/main/java/appeng/block/networking/DenseEnergyCellBlock.java rename to src/unported/java/appeng/block/networking/DenseEnergyCellBlock.java diff --git a/src/main/java/appeng/block/networking/EnergyAcceptorBlock.java b/src/unported/java/appeng/block/networking/EnergyAcceptorBlock.java similarity index 100% rename from src/main/java/appeng/block/networking/EnergyAcceptorBlock.java rename to src/unported/java/appeng/block/networking/EnergyAcceptorBlock.java diff --git a/src/main/java/appeng/block/networking/EnergyCellBlock.java b/src/unported/java/appeng/block/networking/EnergyCellBlock.java similarity index 100% rename from src/main/java/appeng/block/networking/EnergyCellBlock.java rename to src/unported/java/appeng/block/networking/EnergyCellBlock.java diff --git a/src/main/java/appeng/block/networking/WirelessBlock.java b/src/unported/java/appeng/block/networking/WirelessBlock.java similarity index 100% rename from src/main/java/appeng/block/networking/WirelessBlock.java rename to src/unported/java/appeng/block/networking/WirelessBlock.java diff --git a/src/main/java/appeng/block/networking/WirelessRendering.java b/src/unported/java/appeng/block/networking/WirelessRendering.java similarity index 100% rename from src/main/java/appeng/block/networking/WirelessRendering.java rename to src/unported/java/appeng/block/networking/WirelessRendering.java diff --git a/src/main/java/appeng/block/paint/PaintSplotches.java b/src/unported/java/appeng/block/paint/PaintSplotches.java similarity index 100% rename from src/main/java/appeng/block/paint/PaintSplotches.java rename to src/unported/java/appeng/block/paint/PaintSplotches.java diff --git a/src/main/java/appeng/block/paint/PaintSplotchesBakedModel.java b/src/unported/java/appeng/block/paint/PaintSplotchesBakedModel.java similarity index 100% rename from src/main/java/appeng/block/paint/PaintSplotchesBakedModel.java rename to src/unported/java/appeng/block/paint/PaintSplotchesBakedModel.java diff --git a/src/main/java/appeng/block/paint/PaintSplotchesBlock.java b/src/unported/java/appeng/block/paint/PaintSplotchesBlock.java similarity index 100% rename from src/main/java/appeng/block/paint/PaintSplotchesBlock.java rename to src/unported/java/appeng/block/paint/PaintSplotchesBlock.java diff --git a/src/main/java/appeng/block/paint/PaintSplotchesModel.java b/src/unported/java/appeng/block/paint/PaintSplotchesModel.java similarity index 100% rename from src/main/java/appeng/block/paint/PaintSplotchesModel.java rename to src/unported/java/appeng/block/paint/PaintSplotchesModel.java diff --git a/src/main/java/appeng/block/paint/PaintSplotchesRendering.java b/src/unported/java/appeng/block/paint/PaintSplotchesRendering.java similarity index 100% rename from src/main/java/appeng/block/paint/PaintSplotchesRendering.java rename to src/unported/java/appeng/block/paint/PaintSplotchesRendering.java diff --git a/src/main/java/appeng/block/qnb/QnbFormedBakedModel.java b/src/unported/java/appeng/block/qnb/QnbFormedBakedModel.java similarity index 100% rename from src/main/java/appeng/block/qnb/QnbFormedBakedModel.java rename to src/unported/java/appeng/block/qnb/QnbFormedBakedModel.java diff --git a/src/main/java/appeng/block/qnb/QnbFormedModel.java b/src/unported/java/appeng/block/qnb/QnbFormedModel.java similarity index 100% rename from src/main/java/appeng/block/qnb/QnbFormedModel.java rename to src/unported/java/appeng/block/qnb/QnbFormedModel.java diff --git a/src/main/java/appeng/block/qnb/QnbFormedState.java b/src/unported/java/appeng/block/qnb/QnbFormedState.java similarity index 100% rename from src/main/java/appeng/block/qnb/QnbFormedState.java rename to src/unported/java/appeng/block/qnb/QnbFormedState.java diff --git a/src/main/java/appeng/block/qnb/QuantumBaseBlock.java b/src/unported/java/appeng/block/qnb/QuantumBaseBlock.java similarity index 100% rename from src/main/java/appeng/block/qnb/QuantumBaseBlock.java rename to src/unported/java/appeng/block/qnb/QuantumBaseBlock.java diff --git a/src/main/java/appeng/block/qnb/QuantumBridgeRendering.java b/src/unported/java/appeng/block/qnb/QuantumBridgeRendering.java similarity index 100% rename from src/main/java/appeng/block/qnb/QuantumBridgeRendering.java rename to src/unported/java/appeng/block/qnb/QuantumBridgeRendering.java diff --git a/src/main/java/appeng/block/qnb/QuantumLinkChamberBlock.java b/src/unported/java/appeng/block/qnb/QuantumLinkChamberBlock.java similarity index 100% rename from src/main/java/appeng/block/qnb/QuantumLinkChamberBlock.java rename to src/unported/java/appeng/block/qnb/QuantumLinkChamberBlock.java diff --git a/src/main/java/appeng/block/qnb/QuantumRingBlock.java b/src/unported/java/appeng/block/qnb/QuantumRingBlock.java similarity index 100% rename from src/main/java/appeng/block/qnb/QuantumRingBlock.java rename to src/unported/java/appeng/block/qnb/QuantumRingBlock.java diff --git a/src/main/java/appeng/block/spatial/MatrixFrameBlock.java b/src/unported/java/appeng/block/spatial/MatrixFrameBlock.java similarity index 100% rename from src/main/java/appeng/block/spatial/MatrixFrameBlock.java rename to src/unported/java/appeng/block/spatial/MatrixFrameBlock.java diff --git a/src/main/java/appeng/block/spatial/SpatialIOPortBlock.java b/src/unported/java/appeng/block/spatial/SpatialIOPortBlock.java similarity index 100% rename from src/main/java/appeng/block/spatial/SpatialIOPortBlock.java rename to src/unported/java/appeng/block/spatial/SpatialIOPortBlock.java diff --git a/src/main/java/appeng/block/spatial/SpatialPylonBlock.java b/src/unported/java/appeng/block/spatial/SpatialPylonBlock.java similarity index 100% rename from src/main/java/appeng/block/spatial/SpatialPylonBlock.java rename to src/unported/java/appeng/block/spatial/SpatialPylonBlock.java diff --git a/src/main/java/appeng/block/storage/ChestBlock.java b/src/unported/java/appeng/block/storage/ChestBlock.java similarity index 100% rename from src/main/java/appeng/block/storage/ChestBlock.java rename to src/unported/java/appeng/block/storage/ChestBlock.java diff --git a/src/main/java/appeng/block/storage/ChestRendering.java b/src/unported/java/appeng/block/storage/ChestRendering.java similarity index 100% rename from src/main/java/appeng/block/storage/ChestRendering.java rename to src/unported/java/appeng/block/storage/ChestRendering.java diff --git a/src/main/java/appeng/block/storage/DriveBlock.java b/src/unported/java/appeng/block/storage/DriveBlock.java similarity index 100% rename from src/main/java/appeng/block/storage/DriveBlock.java rename to src/unported/java/appeng/block/storage/DriveBlock.java diff --git a/src/main/java/appeng/block/storage/DriveRendering.java b/src/unported/java/appeng/block/storage/DriveRendering.java similarity index 100% rename from src/main/java/appeng/block/storage/DriveRendering.java rename to src/unported/java/appeng/block/storage/DriveRendering.java diff --git a/src/main/java/appeng/block/storage/DriveSlotCellType.java b/src/unported/java/appeng/block/storage/DriveSlotCellType.java similarity index 100% rename from src/main/java/appeng/block/storage/DriveSlotCellType.java rename to src/unported/java/appeng/block/storage/DriveSlotCellType.java diff --git a/src/main/java/appeng/block/storage/DriveSlotState.java b/src/unported/java/appeng/block/storage/DriveSlotState.java similarity index 100% rename from src/main/java/appeng/block/storage/DriveSlotState.java rename to src/unported/java/appeng/block/storage/DriveSlotState.java diff --git a/src/main/java/appeng/block/storage/DriveSlotsState.java b/src/unported/java/appeng/block/storage/DriveSlotsState.java similarity index 100% rename from src/main/java/appeng/block/storage/DriveSlotsState.java rename to src/unported/java/appeng/block/storage/DriveSlotsState.java diff --git a/src/main/java/appeng/block/storage/IOPortBlock.java b/src/unported/java/appeng/block/storage/IOPortBlock.java similarity index 100% rename from src/main/java/appeng/block/storage/IOPortBlock.java rename to src/unported/java/appeng/block/storage/IOPortBlock.java diff --git a/src/main/java/appeng/capabilities/Capabilities.java b/src/unported/java/appeng/capabilities/Capabilities.java similarity index 100% rename from src/main/java/appeng/capabilities/Capabilities.java rename to src/unported/java/appeng/capabilities/Capabilities.java diff --git a/src/main/java/appeng/capabilities/NullMENetworkAccessor.java b/src/unported/java/appeng/capabilities/NullMENetworkAccessor.java similarity index 100% rename from src/main/java/appeng/capabilities/NullMENetworkAccessor.java rename to src/unported/java/appeng/capabilities/NullMENetworkAccessor.java diff --git a/src/main/java/appeng/capabilities/NullSpatialDimension.java b/src/unported/java/appeng/capabilities/NullSpatialDimension.java similarity index 100% rename from src/main/java/appeng/capabilities/NullSpatialDimension.java rename to src/unported/java/appeng/capabilities/NullSpatialDimension.java diff --git a/src/main/java/appeng/client/ClientHelper.java b/src/unported/java/appeng/client/ClientHelper.java similarity index 100% rename from src/main/java/appeng/client/ClientHelper.java rename to src/unported/java/appeng/client/ClientHelper.java diff --git a/src/main/java/appeng/client/gui/AEBaseMEScreen.java b/src/unported/java/appeng/client/gui/AEBaseMEScreen.java similarity index 100% rename from src/main/java/appeng/client/gui/AEBaseMEScreen.java rename to src/unported/java/appeng/client/gui/AEBaseMEScreen.java diff --git a/src/main/java/appeng/client/gui/AEBaseScreen.java b/src/unported/java/appeng/client/gui/AEBaseScreen.java similarity index 100% rename from src/main/java/appeng/client/gui/AEBaseScreen.java rename to src/unported/java/appeng/client/gui/AEBaseScreen.java diff --git a/src/main/java/appeng/client/gui/Size1Slot.java b/src/unported/java/appeng/client/gui/Size1Slot.java similarity index 100% rename from src/main/java/appeng/client/gui/Size1Slot.java rename to src/unported/java/appeng/client/gui/Size1Slot.java diff --git a/src/main/java/appeng/client/gui/implementations/AESubScreen.java b/src/unported/java/appeng/client/gui/implementations/AESubScreen.java similarity index 100% rename from src/main/java/appeng/client/gui/implementations/AESubScreen.java rename to src/unported/java/appeng/client/gui/implementations/AESubScreen.java diff --git a/src/main/java/appeng/client/gui/implementations/CellWorkbenchScreen.java b/src/unported/java/appeng/client/gui/implementations/CellWorkbenchScreen.java similarity index 100% rename from src/main/java/appeng/client/gui/implementations/CellWorkbenchScreen.java rename to src/unported/java/appeng/client/gui/implementations/CellWorkbenchScreen.java diff --git a/src/main/java/appeng/client/gui/implementations/ChestScreen.java b/src/unported/java/appeng/client/gui/implementations/ChestScreen.java similarity index 100% rename from src/main/java/appeng/client/gui/implementations/ChestScreen.java rename to src/unported/java/appeng/client/gui/implementations/ChestScreen.java diff --git a/src/main/java/appeng/client/gui/implementations/CondenserScreen.java b/src/unported/java/appeng/client/gui/implementations/CondenserScreen.java similarity index 100% rename from src/main/java/appeng/client/gui/implementations/CondenserScreen.java rename to src/unported/java/appeng/client/gui/implementations/CondenserScreen.java diff --git a/src/main/java/appeng/client/gui/implementations/CraftAmountScreen.java b/src/unported/java/appeng/client/gui/implementations/CraftAmountScreen.java similarity index 100% rename from src/main/java/appeng/client/gui/implementations/CraftAmountScreen.java rename to src/unported/java/appeng/client/gui/implementations/CraftAmountScreen.java diff --git a/src/main/java/appeng/client/gui/implementations/CraftConfirmScreen.java b/src/unported/java/appeng/client/gui/implementations/CraftConfirmScreen.java similarity index 100% rename from src/main/java/appeng/client/gui/implementations/CraftConfirmScreen.java rename to src/unported/java/appeng/client/gui/implementations/CraftConfirmScreen.java diff --git a/src/main/java/appeng/client/gui/implementations/CraftingCPUScreen.java b/src/unported/java/appeng/client/gui/implementations/CraftingCPUScreen.java similarity index 100% rename from src/main/java/appeng/client/gui/implementations/CraftingCPUScreen.java rename to src/unported/java/appeng/client/gui/implementations/CraftingCPUScreen.java diff --git a/src/main/java/appeng/client/gui/implementations/CraftingStatusScreen.java b/src/unported/java/appeng/client/gui/implementations/CraftingStatusScreen.java similarity index 100% rename from src/main/java/appeng/client/gui/implementations/CraftingStatusScreen.java rename to src/unported/java/appeng/client/gui/implementations/CraftingStatusScreen.java diff --git a/src/main/java/appeng/client/gui/implementations/CraftingTermScreen.java b/src/unported/java/appeng/client/gui/implementations/CraftingTermScreen.java similarity index 100% rename from src/main/java/appeng/client/gui/implementations/CraftingTermScreen.java rename to src/unported/java/appeng/client/gui/implementations/CraftingTermScreen.java diff --git a/src/main/java/appeng/client/gui/implementations/DriveScreen.java b/src/unported/java/appeng/client/gui/implementations/DriveScreen.java similarity index 100% rename from src/main/java/appeng/client/gui/implementations/DriveScreen.java rename to src/unported/java/appeng/client/gui/implementations/DriveScreen.java diff --git a/src/main/java/appeng/client/gui/implementations/FormationPlaneScreen.java b/src/unported/java/appeng/client/gui/implementations/FormationPlaneScreen.java similarity index 100% rename from src/main/java/appeng/client/gui/implementations/FormationPlaneScreen.java rename to src/unported/java/appeng/client/gui/implementations/FormationPlaneScreen.java diff --git a/src/main/java/appeng/client/gui/implementations/GrinderScreen.java b/src/unported/java/appeng/client/gui/implementations/GrinderScreen.java similarity index 100% rename from src/main/java/appeng/client/gui/implementations/GrinderScreen.java rename to src/unported/java/appeng/client/gui/implementations/GrinderScreen.java diff --git a/src/main/java/appeng/client/gui/implementations/IOPortScreen.java b/src/unported/java/appeng/client/gui/implementations/IOPortScreen.java similarity index 100% rename from src/main/java/appeng/client/gui/implementations/IOPortScreen.java rename to src/unported/java/appeng/client/gui/implementations/IOPortScreen.java diff --git a/src/main/java/appeng/client/gui/implementations/InscriberScreen.java b/src/unported/java/appeng/client/gui/implementations/InscriberScreen.java similarity index 100% rename from src/main/java/appeng/client/gui/implementations/InscriberScreen.java rename to src/unported/java/appeng/client/gui/implementations/InscriberScreen.java diff --git a/src/main/java/appeng/client/gui/implementations/InterfaceScreen.java b/src/unported/java/appeng/client/gui/implementations/InterfaceScreen.java similarity index 100% rename from src/main/java/appeng/client/gui/implementations/InterfaceScreen.java rename to src/unported/java/appeng/client/gui/implementations/InterfaceScreen.java diff --git a/src/main/java/appeng/client/gui/implementations/InterfaceTerminalScreen.java b/src/unported/java/appeng/client/gui/implementations/InterfaceTerminalScreen.java similarity index 100% rename from src/main/java/appeng/client/gui/implementations/InterfaceTerminalScreen.java rename to src/unported/java/appeng/client/gui/implementations/InterfaceTerminalScreen.java diff --git a/src/main/java/appeng/client/gui/implementations/LevelEmitterScreen.java b/src/unported/java/appeng/client/gui/implementations/LevelEmitterScreen.java similarity index 100% rename from src/main/java/appeng/client/gui/implementations/LevelEmitterScreen.java rename to src/unported/java/appeng/client/gui/implementations/LevelEmitterScreen.java diff --git a/src/main/java/appeng/client/gui/implementations/MEMonitorableScreen.java b/src/unported/java/appeng/client/gui/implementations/MEMonitorableScreen.java similarity index 100% rename from src/main/java/appeng/client/gui/implementations/MEMonitorableScreen.java rename to src/unported/java/appeng/client/gui/implementations/MEMonitorableScreen.java diff --git a/src/main/java/appeng/client/gui/implementations/MEPortableCellScreen.java b/src/unported/java/appeng/client/gui/implementations/MEPortableCellScreen.java similarity index 100% rename from src/main/java/appeng/client/gui/implementations/MEPortableCellScreen.java rename to src/unported/java/appeng/client/gui/implementations/MEPortableCellScreen.java diff --git a/src/main/java/appeng/client/gui/implementations/MolecularAssemblerScreen.java b/src/unported/java/appeng/client/gui/implementations/MolecularAssemblerScreen.java similarity index 100% rename from src/main/java/appeng/client/gui/implementations/MolecularAssemblerScreen.java rename to src/unported/java/appeng/client/gui/implementations/MolecularAssemblerScreen.java diff --git a/src/main/java/appeng/client/gui/implementations/NetworkStatusScreen.java b/src/unported/java/appeng/client/gui/implementations/NetworkStatusScreen.java similarity index 100% rename from src/main/java/appeng/client/gui/implementations/NetworkStatusScreen.java rename to src/unported/java/appeng/client/gui/implementations/NetworkStatusScreen.java diff --git a/src/main/java/appeng/client/gui/implementations/NetworkToolScreen.java b/src/unported/java/appeng/client/gui/implementations/NetworkToolScreen.java similarity index 100% rename from src/main/java/appeng/client/gui/implementations/NetworkToolScreen.java rename to src/unported/java/appeng/client/gui/implementations/NetworkToolScreen.java diff --git a/src/main/java/appeng/client/gui/implementations/PatternTermScreen.java b/src/unported/java/appeng/client/gui/implementations/PatternTermScreen.java similarity index 100% rename from src/main/java/appeng/client/gui/implementations/PatternTermScreen.java rename to src/unported/java/appeng/client/gui/implementations/PatternTermScreen.java diff --git a/src/main/java/appeng/client/gui/implementations/PriorityScreen.java b/src/unported/java/appeng/client/gui/implementations/PriorityScreen.java similarity index 100% rename from src/main/java/appeng/client/gui/implementations/PriorityScreen.java rename to src/unported/java/appeng/client/gui/implementations/PriorityScreen.java diff --git a/src/main/java/appeng/client/gui/implementations/QNBScreen.java b/src/unported/java/appeng/client/gui/implementations/QNBScreen.java similarity index 100% rename from src/main/java/appeng/client/gui/implementations/QNBScreen.java rename to src/unported/java/appeng/client/gui/implementations/QNBScreen.java diff --git a/src/main/java/appeng/client/gui/implementations/QuartzKnifeScreen.java b/src/unported/java/appeng/client/gui/implementations/QuartzKnifeScreen.java similarity index 100% rename from src/main/java/appeng/client/gui/implementations/QuartzKnifeScreen.java rename to src/unported/java/appeng/client/gui/implementations/QuartzKnifeScreen.java diff --git a/src/main/java/appeng/client/gui/implementations/SecurityStationScreen.java b/src/unported/java/appeng/client/gui/implementations/SecurityStationScreen.java similarity index 100% rename from src/main/java/appeng/client/gui/implementations/SecurityStationScreen.java rename to src/unported/java/appeng/client/gui/implementations/SecurityStationScreen.java diff --git a/src/main/java/appeng/client/gui/implementations/SkyChestScreen.java b/src/unported/java/appeng/client/gui/implementations/SkyChestScreen.java similarity index 100% rename from src/main/java/appeng/client/gui/implementations/SkyChestScreen.java rename to src/unported/java/appeng/client/gui/implementations/SkyChestScreen.java diff --git a/src/main/java/appeng/client/gui/implementations/SpatialIOPortScreen.java b/src/unported/java/appeng/client/gui/implementations/SpatialIOPortScreen.java similarity index 100% rename from src/main/java/appeng/client/gui/implementations/SpatialIOPortScreen.java rename to src/unported/java/appeng/client/gui/implementations/SpatialIOPortScreen.java diff --git a/src/main/java/appeng/client/gui/implementations/StorageBusScreen.java b/src/unported/java/appeng/client/gui/implementations/StorageBusScreen.java similarity index 100% rename from src/main/java/appeng/client/gui/implementations/StorageBusScreen.java rename to src/unported/java/appeng/client/gui/implementations/StorageBusScreen.java diff --git a/src/main/java/appeng/client/gui/implementations/UpgradeableScreen.java b/src/unported/java/appeng/client/gui/implementations/UpgradeableScreen.java similarity index 100% rename from src/main/java/appeng/client/gui/implementations/UpgradeableScreen.java rename to src/unported/java/appeng/client/gui/implementations/UpgradeableScreen.java diff --git a/src/main/java/appeng/client/gui/implementations/VibrationChamberScreen.java b/src/unported/java/appeng/client/gui/implementations/VibrationChamberScreen.java similarity index 100% rename from src/main/java/appeng/client/gui/implementations/VibrationChamberScreen.java rename to src/unported/java/appeng/client/gui/implementations/VibrationChamberScreen.java diff --git a/src/main/java/appeng/client/gui/implementations/WirelessScreen.java b/src/unported/java/appeng/client/gui/implementations/WirelessScreen.java similarity index 100% rename from src/main/java/appeng/client/gui/implementations/WirelessScreen.java rename to src/unported/java/appeng/client/gui/implementations/WirelessScreen.java diff --git a/src/main/java/appeng/client/gui/implementations/WirelessTermScreen.java b/src/unported/java/appeng/client/gui/implementations/WirelessTermScreen.java similarity index 100% rename from src/main/java/appeng/client/gui/implementations/WirelessTermScreen.java rename to src/unported/java/appeng/client/gui/implementations/WirelessTermScreen.java diff --git a/src/main/java/appeng/client/gui/widgets/AETextField.java b/src/unported/java/appeng/client/gui/widgets/AETextField.java similarity index 100% rename from src/main/java/appeng/client/gui/widgets/AETextField.java rename to src/unported/java/appeng/client/gui/widgets/AETextField.java diff --git a/src/main/java/appeng/client/gui/widgets/ActionButton.java b/src/unported/java/appeng/client/gui/widgets/ActionButton.java similarity index 100% rename from src/main/java/appeng/client/gui/widgets/ActionButton.java rename to src/unported/java/appeng/client/gui/widgets/ActionButton.java diff --git a/src/main/java/appeng/client/gui/widgets/CommonButtons.java b/src/unported/java/appeng/client/gui/widgets/CommonButtons.java similarity index 100% rename from src/main/java/appeng/client/gui/widgets/CommonButtons.java rename to src/unported/java/appeng/client/gui/widgets/CommonButtons.java diff --git a/src/main/java/appeng/client/gui/widgets/CustomSlotWidget.java b/src/unported/java/appeng/client/gui/widgets/CustomSlotWidget.java similarity index 100% rename from src/main/java/appeng/client/gui/widgets/CustomSlotWidget.java rename to src/unported/java/appeng/client/gui/widgets/CustomSlotWidget.java diff --git a/src/main/java/appeng/client/gui/widgets/IScrollSource.java b/src/unported/java/appeng/client/gui/widgets/IScrollSource.java similarity index 100% rename from src/main/java/appeng/client/gui/widgets/IScrollSource.java rename to src/unported/java/appeng/client/gui/widgets/IScrollSource.java diff --git a/src/main/java/appeng/client/gui/widgets/ISortSource.java b/src/unported/java/appeng/client/gui/widgets/ISortSource.java similarity index 100% rename from src/main/java/appeng/client/gui/widgets/ISortSource.java rename to src/unported/java/appeng/client/gui/widgets/ISortSource.java diff --git a/src/main/java/appeng/client/gui/widgets/ITooltip.java b/src/unported/java/appeng/client/gui/widgets/ITooltip.java similarity index 100% rename from src/main/java/appeng/client/gui/widgets/ITooltip.java rename to src/unported/java/appeng/client/gui/widgets/ITooltip.java diff --git a/src/main/java/appeng/client/gui/widgets/IconButton.java b/src/unported/java/appeng/client/gui/widgets/IconButton.java similarity index 100% rename from src/main/java/appeng/client/gui/widgets/IconButton.java rename to src/unported/java/appeng/client/gui/widgets/IconButton.java diff --git a/src/main/java/appeng/client/gui/widgets/NumberBox.java b/src/unported/java/appeng/client/gui/widgets/NumberBox.java similarity index 100% rename from src/main/java/appeng/client/gui/widgets/NumberBox.java rename to src/unported/java/appeng/client/gui/widgets/NumberBox.java diff --git a/src/main/java/appeng/client/gui/widgets/ProgressBar.java b/src/unported/java/appeng/client/gui/widgets/ProgressBar.java similarity index 100% rename from src/main/java/appeng/client/gui/widgets/ProgressBar.java rename to src/unported/java/appeng/client/gui/widgets/ProgressBar.java diff --git a/src/main/java/appeng/client/gui/widgets/Scrollbar.java b/src/unported/java/appeng/client/gui/widgets/Scrollbar.java similarity index 100% rename from src/main/java/appeng/client/gui/widgets/Scrollbar.java rename to src/unported/java/appeng/client/gui/widgets/Scrollbar.java diff --git a/src/main/java/appeng/client/gui/widgets/ServerSettingToggleButton.java b/src/unported/java/appeng/client/gui/widgets/ServerSettingToggleButton.java similarity index 100% rename from src/main/java/appeng/client/gui/widgets/ServerSettingToggleButton.java rename to src/unported/java/appeng/client/gui/widgets/ServerSettingToggleButton.java diff --git a/src/main/java/appeng/client/gui/widgets/SettingToggleButton.java b/src/unported/java/appeng/client/gui/widgets/SettingToggleButton.java similarity index 100% rename from src/main/java/appeng/client/gui/widgets/SettingToggleButton.java rename to src/unported/java/appeng/client/gui/widgets/SettingToggleButton.java diff --git a/src/main/java/appeng/client/gui/widgets/TabButton.java b/src/unported/java/appeng/client/gui/widgets/TabButton.java similarity index 100% rename from src/main/java/appeng/client/gui/widgets/TabButton.java rename to src/unported/java/appeng/client/gui/widgets/TabButton.java diff --git a/src/main/java/appeng/client/gui/widgets/ToggleButton.java b/src/unported/java/appeng/client/gui/widgets/ToggleButton.java similarity index 100% rename from src/main/java/appeng/client/gui/widgets/ToggleButton.java rename to src/unported/java/appeng/client/gui/widgets/ToggleButton.java diff --git a/src/main/java/appeng/client/me/ClientDCInternalInv.java b/src/unported/java/appeng/client/me/ClientDCInternalInv.java similarity index 100% rename from src/main/java/appeng/client/me/ClientDCInternalInv.java rename to src/unported/java/appeng/client/me/ClientDCInternalInv.java diff --git a/src/main/java/appeng/client/me/FluidRepo.java b/src/unported/java/appeng/client/me/FluidRepo.java similarity index 100% rename from src/main/java/appeng/client/me/FluidRepo.java rename to src/unported/java/appeng/client/me/FluidRepo.java diff --git a/src/main/java/appeng/client/me/InternalFluidSlotME.java b/src/unported/java/appeng/client/me/InternalFluidSlotME.java similarity index 100% rename from src/main/java/appeng/client/me/InternalFluidSlotME.java rename to src/unported/java/appeng/client/me/InternalFluidSlotME.java diff --git a/src/main/java/appeng/client/me/InternalSlotME.java b/src/unported/java/appeng/client/me/InternalSlotME.java similarity index 100% rename from src/main/java/appeng/client/me/InternalSlotME.java rename to src/unported/java/appeng/client/me/InternalSlotME.java diff --git a/src/main/java/appeng/client/me/ItemRepo.java b/src/unported/java/appeng/client/me/ItemRepo.java similarity index 100% rename from src/main/java/appeng/client/me/ItemRepo.java rename to src/unported/java/appeng/client/me/ItemRepo.java diff --git a/src/main/java/appeng/client/me/SlotDisconnected.java b/src/unported/java/appeng/client/me/SlotDisconnected.java similarity index 100% rename from src/main/java/appeng/client/me/SlotDisconnected.java rename to src/unported/java/appeng/client/me/SlotDisconnected.java diff --git a/src/main/java/appeng/client/me/SlotFluidME.java b/src/unported/java/appeng/client/me/SlotFluidME.java similarity index 100% rename from src/main/java/appeng/client/me/SlotFluidME.java rename to src/unported/java/appeng/client/me/SlotFluidME.java diff --git a/src/main/java/appeng/client/me/SlotME.java b/src/unported/java/appeng/client/me/SlotME.java similarity index 100% rename from src/main/java/appeng/client/me/SlotME.java rename to src/unported/java/appeng/client/me/SlotME.java diff --git a/src/main/java/appeng/client/render/ColorableTileBlockColor.java b/src/unported/java/appeng/client/render/ColorableTileBlockColor.java similarity index 100% rename from src/main/java/appeng/client/render/ColorableTileBlockColor.java rename to src/unported/java/appeng/client/render/ColorableTileBlockColor.java diff --git a/src/main/java/appeng/client/render/DelegateBakedModel.java b/src/unported/java/appeng/client/render/DelegateBakedModel.java similarity index 100% rename from src/main/java/appeng/client/render/DelegateBakedModel.java rename to src/unported/java/appeng/client/render/DelegateBakedModel.java diff --git a/src/main/java/appeng/client/render/DummyFluidBakedModel.java b/src/unported/java/appeng/client/render/DummyFluidBakedModel.java similarity index 100% rename from src/main/java/appeng/client/render/DummyFluidBakedModel.java rename to src/unported/java/appeng/client/render/DummyFluidBakedModel.java diff --git a/src/main/java/appeng/client/render/DummyFluidDispatcherBakedModel.java b/src/unported/java/appeng/client/render/DummyFluidDispatcherBakedModel.java similarity index 100% rename from src/main/java/appeng/client/render/DummyFluidDispatcherBakedModel.java rename to src/unported/java/appeng/client/render/DummyFluidDispatcherBakedModel.java diff --git a/src/main/java/appeng/client/render/DummyFluidItemModel.java b/src/unported/java/appeng/client/render/DummyFluidItemModel.java similarity index 100% rename from src/main/java/appeng/client/render/DummyFluidItemModel.java rename to src/unported/java/appeng/client/render/DummyFluidItemModel.java diff --git a/src/main/java/appeng/client/render/FacadeBakedItemModel.java b/src/unported/java/appeng/client/render/FacadeBakedItemModel.java similarity index 100% rename from src/main/java/appeng/client/render/FacadeBakedItemModel.java rename to src/unported/java/appeng/client/render/FacadeBakedItemModel.java diff --git a/src/main/java/appeng/client/render/FacadeDispatcherBakedModel.java b/src/unported/java/appeng/client/render/FacadeDispatcherBakedModel.java similarity index 100% rename from src/main/java/appeng/client/render/FacadeDispatcherBakedModel.java rename to src/unported/java/appeng/client/render/FacadeDispatcherBakedModel.java diff --git a/src/main/java/appeng/client/render/FacadeItemModel.java b/src/unported/java/appeng/client/render/FacadeItemModel.java similarity index 100% rename from src/main/java/appeng/client/render/FacadeItemModel.java rename to src/unported/java/appeng/client/render/FacadeItemModel.java diff --git a/src/main/java/appeng/client/render/SimpleModelLoader.java b/src/unported/java/appeng/client/render/SimpleModelLoader.java similarity index 100% rename from src/main/java/appeng/client/render/SimpleModelLoader.java rename to src/unported/java/appeng/client/render/SimpleModelLoader.java diff --git a/src/main/java/appeng/client/render/SpatialSkyRender.java b/src/unported/java/appeng/client/render/SpatialSkyRender.java similarity index 100% rename from src/main/java/appeng/client/render/SpatialSkyRender.java rename to src/unported/java/appeng/client/render/SpatialSkyRender.java diff --git a/src/main/java/appeng/client/render/StackSizeRenderer.java b/src/unported/java/appeng/client/render/StackSizeRenderer.java similarity index 100% rename from src/main/java/appeng/client/render/StackSizeRenderer.java rename to src/unported/java/appeng/client/render/StackSizeRenderer.java diff --git a/src/main/java/appeng/client/render/StaticBlockColor.java b/src/unported/java/appeng/client/render/StaticBlockColor.java similarity index 100% rename from src/main/java/appeng/client/render/StaticBlockColor.java rename to src/unported/java/appeng/client/render/StaticBlockColor.java diff --git a/src/main/java/appeng/client/render/TesrRenderHelper.java b/src/unported/java/appeng/client/render/TesrRenderHelper.java similarity index 100% rename from src/main/java/appeng/client/render/TesrRenderHelper.java rename to src/unported/java/appeng/client/render/TesrRenderHelper.java diff --git a/src/main/java/appeng/client/render/cablebus/FacadeBlockAccess.java b/src/unported/java/appeng/client/render/cablebus/FacadeBlockAccess.java similarity index 100% rename from src/main/java/appeng/client/render/cablebus/FacadeBlockAccess.java rename to src/unported/java/appeng/client/render/cablebus/FacadeBlockAccess.java diff --git a/src/main/java/appeng/client/render/cablebus/P2PTunnelFrequencyBakedModel.java b/src/unported/java/appeng/client/render/cablebus/P2PTunnelFrequencyBakedModel.java similarity index 100% rename from src/main/java/appeng/client/render/cablebus/P2PTunnelFrequencyBakedModel.java rename to src/unported/java/appeng/client/render/cablebus/P2PTunnelFrequencyBakedModel.java diff --git a/src/main/java/appeng/client/render/cablebus/P2PTunnelFrequencyModel.java b/src/unported/java/appeng/client/render/cablebus/P2PTunnelFrequencyModel.java similarity index 100% rename from src/main/java/appeng/client/render/cablebus/P2PTunnelFrequencyModel.java rename to src/unported/java/appeng/client/render/cablebus/P2PTunnelFrequencyModel.java diff --git a/src/main/java/appeng/client/render/cablebus/P2PTunnelFrequencyModelData.java b/src/unported/java/appeng/client/render/cablebus/P2PTunnelFrequencyModelData.java similarity index 100% rename from src/main/java/appeng/client/render/cablebus/P2PTunnelFrequencyModelData.java rename to src/unported/java/appeng/client/render/cablebus/P2PTunnelFrequencyModelData.java diff --git a/src/main/java/appeng/client/render/crafting/CraftingCubeBakedModel.java b/src/unported/java/appeng/client/render/crafting/CraftingCubeBakedModel.java similarity index 100% rename from src/main/java/appeng/client/render/crafting/CraftingCubeBakedModel.java rename to src/unported/java/appeng/client/render/crafting/CraftingCubeBakedModel.java diff --git a/src/main/java/appeng/client/render/crafting/CraftingCubeModel.java b/src/unported/java/appeng/client/render/crafting/CraftingCubeModel.java similarity index 100% rename from src/main/java/appeng/client/render/crafting/CraftingCubeModel.java rename to src/unported/java/appeng/client/render/crafting/CraftingCubeModel.java diff --git a/src/main/java/appeng/client/render/crafting/CraftingCubeModelLoader.java b/src/unported/java/appeng/client/render/crafting/CraftingCubeModelLoader.java similarity index 100% rename from src/main/java/appeng/client/render/crafting/CraftingCubeModelLoader.java rename to src/unported/java/appeng/client/render/crafting/CraftingCubeModelLoader.java diff --git a/src/main/java/appeng/client/render/crafting/CraftingCubeRendering.java b/src/unported/java/appeng/client/render/crafting/CraftingCubeRendering.java similarity index 100% rename from src/main/java/appeng/client/render/crafting/CraftingCubeRendering.java rename to src/unported/java/appeng/client/render/crafting/CraftingCubeRendering.java diff --git a/src/main/java/appeng/client/render/crafting/CraftingMonitorTESR.java b/src/unported/java/appeng/client/render/crafting/CraftingMonitorTESR.java similarity index 100% rename from src/main/java/appeng/client/render/crafting/CraftingMonitorTESR.java rename to src/unported/java/appeng/client/render/crafting/CraftingMonitorTESR.java diff --git a/src/main/java/appeng/client/render/crafting/EncodedPatternBakedModel.java b/src/unported/java/appeng/client/render/crafting/EncodedPatternBakedModel.java similarity index 100% rename from src/main/java/appeng/client/render/crafting/EncodedPatternBakedModel.java rename to src/unported/java/appeng/client/render/crafting/EncodedPatternBakedModel.java diff --git a/src/main/java/appeng/client/render/crafting/EncodedPatternModel.java b/src/unported/java/appeng/client/render/crafting/EncodedPatternModel.java similarity index 100% rename from src/main/java/appeng/client/render/crafting/EncodedPatternModel.java rename to src/unported/java/appeng/client/render/crafting/EncodedPatternModel.java diff --git a/src/main/java/appeng/client/render/crafting/EncodedPatternModelLoader.java b/src/unported/java/appeng/client/render/crafting/EncodedPatternModelLoader.java similarity index 100% rename from src/main/java/appeng/client/render/crafting/EncodedPatternModelLoader.java rename to src/unported/java/appeng/client/render/crafting/EncodedPatternModelLoader.java diff --git a/src/main/java/appeng/client/render/crafting/LightBakedModel.java b/src/unported/java/appeng/client/render/crafting/LightBakedModel.java similarity index 100% rename from src/main/java/appeng/client/render/crafting/LightBakedModel.java rename to src/unported/java/appeng/client/render/crafting/LightBakedModel.java diff --git a/src/main/java/appeng/client/render/crafting/MonitorBakedModel.java b/src/unported/java/appeng/client/render/crafting/MonitorBakedModel.java similarity index 100% rename from src/main/java/appeng/client/render/crafting/MonitorBakedModel.java rename to src/unported/java/appeng/client/render/crafting/MonitorBakedModel.java diff --git a/src/main/java/appeng/client/render/crafting/UnitBakedModel.java b/src/unported/java/appeng/client/render/crafting/UnitBakedModel.java similarity index 100% rename from src/main/java/appeng/client/render/crafting/UnitBakedModel.java rename to src/unported/java/appeng/client/render/crafting/UnitBakedModel.java diff --git a/src/main/java/appeng/client/render/model/AEInternalModelData.java b/src/unported/java/appeng/client/render/model/AEInternalModelData.java similarity index 100% rename from src/main/java/appeng/client/render/model/AEInternalModelData.java rename to src/unported/java/appeng/client/render/model/AEInternalModelData.java diff --git a/src/main/java/appeng/client/render/model/AutoRotatingBakedModel.java b/src/unported/java/appeng/client/render/model/AutoRotatingBakedModel.java similarity index 100% rename from src/main/java/appeng/client/render/model/AutoRotatingBakedModel.java rename to src/unported/java/appeng/client/render/model/AutoRotatingBakedModel.java diff --git a/src/main/java/appeng/client/render/model/AutoRotatingCacheKey.java b/src/unported/java/appeng/client/render/model/AutoRotatingCacheKey.java similarity index 100% rename from src/main/java/appeng/client/render/model/AutoRotatingCacheKey.java rename to src/unported/java/appeng/client/render/model/AutoRotatingCacheKey.java diff --git a/src/main/java/appeng/client/render/model/BiometricCardBakedModel.java b/src/unported/java/appeng/client/render/model/BiometricCardBakedModel.java similarity index 100% rename from src/main/java/appeng/client/render/model/BiometricCardBakedModel.java rename to src/unported/java/appeng/client/render/model/BiometricCardBakedModel.java diff --git a/src/main/java/appeng/client/render/model/BiometricCardModel.java b/src/unported/java/appeng/client/render/model/BiometricCardModel.java similarity index 100% rename from src/main/java/appeng/client/render/model/BiometricCardModel.java rename to src/unported/java/appeng/client/render/model/BiometricCardModel.java diff --git a/src/main/java/appeng/client/render/model/ColorApplicatorBakedModel.java b/src/unported/java/appeng/client/render/model/ColorApplicatorBakedModel.java similarity index 100% rename from src/main/java/appeng/client/render/model/ColorApplicatorBakedModel.java rename to src/unported/java/appeng/client/render/model/ColorApplicatorBakedModel.java diff --git a/src/main/java/appeng/client/render/model/ColorApplicatorModel.java b/src/unported/java/appeng/client/render/model/ColorApplicatorModel.java similarity index 100% rename from src/main/java/appeng/client/render/model/ColorApplicatorModel.java rename to src/unported/java/appeng/client/render/model/ColorApplicatorModel.java diff --git a/src/main/java/appeng/client/render/model/DriveBakedModel.java b/src/unported/java/appeng/client/render/model/DriveBakedModel.java similarity index 100% rename from src/main/java/appeng/client/render/model/DriveBakedModel.java rename to src/unported/java/appeng/client/render/model/DriveBakedModel.java diff --git a/src/main/java/appeng/client/render/model/DriveModel.java b/src/unported/java/appeng/client/render/model/DriveModel.java similarity index 100% rename from src/main/java/appeng/client/render/model/DriveModel.java rename to src/unported/java/appeng/client/render/model/DriveModel.java diff --git a/src/main/java/appeng/client/render/model/DriveModelData.java b/src/unported/java/appeng/client/render/model/DriveModelData.java similarity index 100% rename from src/main/java/appeng/client/render/model/DriveModelData.java rename to src/unported/java/appeng/client/render/model/DriveModelData.java diff --git a/src/main/java/appeng/client/render/model/GlassBakedModel.java b/src/unported/java/appeng/client/render/model/GlassBakedModel.java similarity index 100% rename from src/main/java/appeng/client/render/model/GlassBakedModel.java rename to src/unported/java/appeng/client/render/model/GlassBakedModel.java diff --git a/src/main/java/appeng/client/render/model/GlassModel.java b/src/unported/java/appeng/client/render/model/GlassModel.java similarity index 100% rename from src/main/java/appeng/client/render/model/GlassModel.java rename to src/unported/java/appeng/client/render/model/GlassModel.java diff --git a/src/main/java/appeng/client/render/model/MatrixVertexTransformer.java b/src/unported/java/appeng/client/render/model/MatrixVertexTransformer.java similarity index 100% rename from src/main/java/appeng/client/render/model/MatrixVertexTransformer.java rename to src/unported/java/appeng/client/render/model/MatrixVertexTransformer.java diff --git a/src/main/java/appeng/client/render/model/MemoryCardBakedModel.java b/src/unported/java/appeng/client/render/model/MemoryCardBakedModel.java similarity index 100% rename from src/main/java/appeng/client/render/model/MemoryCardBakedModel.java rename to src/unported/java/appeng/client/render/model/MemoryCardBakedModel.java diff --git a/src/main/java/appeng/client/render/model/MemoryCardModel.java b/src/unported/java/appeng/client/render/model/MemoryCardModel.java similarity index 100% rename from src/main/java/appeng/client/render/model/MemoryCardModel.java rename to src/unported/java/appeng/client/render/model/MemoryCardModel.java diff --git a/src/main/java/appeng/client/render/model/RenderHelper.java b/src/unported/java/appeng/client/render/model/RenderHelper.java similarity index 100% rename from src/main/java/appeng/client/render/model/RenderHelper.java rename to src/unported/java/appeng/client/render/model/RenderHelper.java diff --git a/src/main/java/appeng/client/render/model/SkyCompassBakedModel.java b/src/unported/java/appeng/client/render/model/SkyCompassBakedModel.java similarity index 100% rename from src/main/java/appeng/client/render/model/SkyCompassBakedModel.java rename to src/unported/java/appeng/client/render/model/SkyCompassBakedModel.java diff --git a/src/main/java/appeng/client/render/model/SkyCompassModel.java b/src/unported/java/appeng/client/render/model/SkyCompassModel.java similarity index 100% rename from src/main/java/appeng/client/render/model/SkyCompassModel.java rename to src/unported/java/appeng/client/render/model/SkyCompassModel.java diff --git a/src/main/java/appeng/client/render/model/UVLModelLoader.java b/src/unported/java/appeng/client/render/model/UVLModelLoader.java similarity index 100% rename from src/main/java/appeng/client/render/model/UVLModelLoader.java rename to src/unported/java/appeng/client/render/model/UVLModelLoader.java diff --git a/src/main/java/appeng/client/render/renderable/ItemRenderable.java b/src/unported/java/appeng/client/render/renderable/ItemRenderable.java similarity index 100% rename from src/main/java/appeng/client/render/renderable/ItemRenderable.java rename to src/unported/java/appeng/client/render/renderable/ItemRenderable.java diff --git a/src/main/java/appeng/client/render/renderable/Renderable.java b/src/unported/java/appeng/client/render/renderable/Renderable.java similarity index 100% rename from src/main/java/appeng/client/render/renderable/Renderable.java rename to src/unported/java/appeng/client/render/renderable/Renderable.java diff --git a/src/main/java/appeng/client/render/spatial/SpatialPylonBakedModel.java b/src/unported/java/appeng/client/render/spatial/SpatialPylonBakedModel.java similarity index 100% rename from src/main/java/appeng/client/render/spatial/SpatialPylonBakedModel.java rename to src/unported/java/appeng/client/render/spatial/SpatialPylonBakedModel.java diff --git a/src/main/java/appeng/client/render/spatial/SpatialPylonModel.java b/src/unported/java/appeng/client/render/spatial/SpatialPylonModel.java similarity index 100% rename from src/main/java/appeng/client/render/spatial/SpatialPylonModel.java rename to src/unported/java/appeng/client/render/spatial/SpatialPylonModel.java diff --git a/src/main/java/appeng/client/render/spatial/SpatialPylonRendering.java b/src/unported/java/appeng/client/render/spatial/SpatialPylonRendering.java similarity index 100% rename from src/main/java/appeng/client/render/spatial/SpatialPylonRendering.java rename to src/unported/java/appeng/client/render/spatial/SpatialPylonRendering.java diff --git a/src/main/java/appeng/client/render/spatial/SpatialPylonTextureType.java b/src/unported/java/appeng/client/render/spatial/SpatialPylonTextureType.java similarity index 100% rename from src/main/java/appeng/client/render/spatial/SpatialPylonTextureType.java rename to src/unported/java/appeng/client/render/spatial/SpatialPylonTextureType.java diff --git a/src/main/java/appeng/client/render/tesr/CrankTESR.java b/src/unported/java/appeng/client/render/tesr/CrankTESR.java similarity index 100% rename from src/main/java/appeng/client/render/tesr/CrankTESR.java rename to src/unported/java/appeng/client/render/tesr/CrankTESR.java diff --git a/src/main/java/appeng/client/render/tesr/DriveLedTileEntityRenderer.java b/src/unported/java/appeng/client/render/tesr/DriveLedTileEntityRenderer.java similarity index 100% rename from src/main/java/appeng/client/render/tesr/DriveLedTileEntityRenderer.java rename to src/unported/java/appeng/client/render/tesr/DriveLedTileEntityRenderer.java diff --git a/src/main/java/appeng/client/render/tesr/InscriberTESR.java b/src/unported/java/appeng/client/render/tesr/InscriberTESR.java similarity index 100% rename from src/main/java/appeng/client/render/tesr/InscriberTESR.java rename to src/unported/java/appeng/client/render/tesr/InscriberTESR.java diff --git a/src/main/java/appeng/client/render/tesr/ModularTESR.java b/src/unported/java/appeng/client/render/tesr/ModularTESR.java similarity index 100% rename from src/main/java/appeng/client/render/tesr/ModularTESR.java rename to src/unported/java/appeng/client/render/tesr/ModularTESR.java diff --git a/src/main/java/appeng/container/AEBaseContainer.java b/src/unported/java/appeng/container/AEBaseContainer.java similarity index 100% rename from src/main/java/appeng/container/AEBaseContainer.java rename to src/unported/java/appeng/container/AEBaseContainer.java diff --git a/src/main/java/appeng/container/ContainerNull.java b/src/unported/java/appeng/container/ContainerNull.java similarity index 100% rename from src/main/java/appeng/container/ContainerNull.java rename to src/unported/java/appeng/container/ContainerNull.java diff --git a/src/main/java/appeng/container/ContainerOpener.java b/src/unported/java/appeng/container/ContainerOpener.java similarity index 100% rename from src/main/java/appeng/container/ContainerOpener.java rename to src/unported/java/appeng/container/ContainerOpener.java diff --git a/src/main/java/appeng/container/guisync/GuiSync.java b/src/unported/java/appeng/container/guisync/GuiSync.java similarity index 100% rename from src/main/java/appeng/container/guisync/GuiSync.java rename to src/unported/java/appeng/container/guisync/GuiSync.java diff --git a/src/main/java/appeng/container/guisync/SyncData.java b/src/unported/java/appeng/container/guisync/SyncData.java similarity index 100% rename from src/main/java/appeng/container/guisync/SyncData.java rename to src/unported/java/appeng/container/guisync/SyncData.java diff --git a/src/main/java/appeng/container/implementations/CellWorkbenchContainer.java b/src/unported/java/appeng/container/implementations/CellWorkbenchContainer.java similarity index 100% rename from src/main/java/appeng/container/implementations/CellWorkbenchContainer.java rename to src/unported/java/appeng/container/implementations/CellWorkbenchContainer.java diff --git a/src/main/java/appeng/container/implementations/ChestContainer.java b/src/unported/java/appeng/container/implementations/ChestContainer.java similarity index 100% rename from src/main/java/appeng/container/implementations/ChestContainer.java rename to src/unported/java/appeng/container/implementations/ChestContainer.java diff --git a/src/main/java/appeng/container/implementations/CondenserContainer.java b/src/unported/java/appeng/container/implementations/CondenserContainer.java similarity index 100% rename from src/main/java/appeng/container/implementations/CondenserContainer.java rename to src/unported/java/appeng/container/implementations/CondenserContainer.java diff --git a/src/main/java/appeng/container/implementations/ContainerHelper.java b/src/unported/java/appeng/container/implementations/ContainerHelper.java similarity index 100% rename from src/main/java/appeng/container/implementations/ContainerHelper.java rename to src/unported/java/appeng/container/implementations/ContainerHelper.java diff --git a/src/main/java/appeng/container/implementations/CraftAmountContainer.java b/src/unported/java/appeng/container/implementations/CraftAmountContainer.java similarity index 100% rename from src/main/java/appeng/container/implementations/CraftAmountContainer.java rename to src/unported/java/appeng/container/implementations/CraftAmountContainer.java diff --git a/src/main/java/appeng/container/implementations/CraftConfirmContainer.java b/src/unported/java/appeng/container/implementations/CraftConfirmContainer.java similarity index 100% rename from src/main/java/appeng/container/implementations/CraftConfirmContainer.java rename to src/unported/java/appeng/container/implementations/CraftConfirmContainer.java diff --git a/src/main/java/appeng/container/implementations/CraftingCPUContainer.java b/src/unported/java/appeng/container/implementations/CraftingCPUContainer.java similarity index 100% rename from src/main/java/appeng/container/implementations/CraftingCPUContainer.java rename to src/unported/java/appeng/container/implementations/CraftingCPUContainer.java diff --git a/src/main/java/appeng/container/implementations/CraftingCPURecord.java b/src/unported/java/appeng/container/implementations/CraftingCPURecord.java similarity index 100% rename from src/main/java/appeng/container/implementations/CraftingCPURecord.java rename to src/unported/java/appeng/container/implementations/CraftingCPURecord.java diff --git a/src/main/java/appeng/container/implementations/CraftingStatusContainer.java b/src/unported/java/appeng/container/implementations/CraftingStatusContainer.java similarity index 100% rename from src/main/java/appeng/container/implementations/CraftingStatusContainer.java rename to src/unported/java/appeng/container/implementations/CraftingStatusContainer.java diff --git a/src/main/java/appeng/container/implementations/CraftingTermContainer.java b/src/unported/java/appeng/container/implementations/CraftingTermContainer.java similarity index 100% rename from src/main/java/appeng/container/implementations/CraftingTermContainer.java rename to src/unported/java/appeng/container/implementations/CraftingTermContainer.java diff --git a/src/main/java/appeng/container/implementations/DriveContainer.java b/src/unported/java/appeng/container/implementations/DriveContainer.java similarity index 100% rename from src/main/java/appeng/container/implementations/DriveContainer.java rename to src/unported/java/appeng/container/implementations/DriveContainer.java diff --git a/src/main/java/appeng/container/implementations/FormationPlaneContainer.java b/src/unported/java/appeng/container/implementations/FormationPlaneContainer.java similarity index 100% rename from src/main/java/appeng/container/implementations/FormationPlaneContainer.java rename to src/unported/java/appeng/container/implementations/FormationPlaneContainer.java diff --git a/src/main/java/appeng/container/implementations/GrinderContainer.java b/src/unported/java/appeng/container/implementations/GrinderContainer.java similarity index 100% rename from src/main/java/appeng/container/implementations/GrinderContainer.java rename to src/unported/java/appeng/container/implementations/GrinderContainer.java diff --git a/src/main/java/appeng/container/implementations/IOPortContainer.java b/src/unported/java/appeng/container/implementations/IOPortContainer.java similarity index 100% rename from src/main/java/appeng/container/implementations/IOPortContainer.java rename to src/unported/java/appeng/container/implementations/IOPortContainer.java diff --git a/src/main/java/appeng/container/implementations/InscriberContainer.java b/src/unported/java/appeng/container/implementations/InscriberContainer.java similarity index 100% rename from src/main/java/appeng/container/implementations/InscriberContainer.java rename to src/unported/java/appeng/container/implementations/InscriberContainer.java diff --git a/src/main/java/appeng/container/implementations/InterfaceContainer.java b/src/unported/java/appeng/container/implementations/InterfaceContainer.java similarity index 100% rename from src/main/java/appeng/container/implementations/InterfaceContainer.java rename to src/unported/java/appeng/container/implementations/InterfaceContainer.java diff --git a/src/main/java/appeng/container/implementations/InterfaceTerminalContainer.java b/src/unported/java/appeng/container/implementations/InterfaceTerminalContainer.java similarity index 100% rename from src/main/java/appeng/container/implementations/InterfaceTerminalContainer.java rename to src/unported/java/appeng/container/implementations/InterfaceTerminalContainer.java diff --git a/src/main/java/appeng/container/implementations/LevelEmitterContainer.java b/src/unported/java/appeng/container/implementations/LevelEmitterContainer.java similarity index 100% rename from src/main/java/appeng/container/implementations/LevelEmitterContainer.java rename to src/unported/java/appeng/container/implementations/LevelEmitterContainer.java diff --git a/src/main/java/appeng/container/implementations/MEMonitorableContainer.java b/src/unported/java/appeng/container/implementations/MEMonitorableContainer.java similarity index 100% rename from src/main/java/appeng/container/implementations/MEMonitorableContainer.java rename to src/unported/java/appeng/container/implementations/MEMonitorableContainer.java diff --git a/src/main/java/appeng/container/implementations/MEPortableCellContainer.java b/src/unported/java/appeng/container/implementations/MEPortableCellContainer.java similarity index 100% rename from src/main/java/appeng/container/implementations/MEPortableCellContainer.java rename to src/unported/java/appeng/container/implementations/MEPortableCellContainer.java diff --git a/src/main/java/appeng/container/implementations/MolecularAssemblerContainer.java b/src/unported/java/appeng/container/implementations/MolecularAssemblerContainer.java similarity index 100% rename from src/main/java/appeng/container/implementations/MolecularAssemblerContainer.java rename to src/unported/java/appeng/container/implementations/MolecularAssemblerContainer.java diff --git a/src/main/java/appeng/container/implementations/NetworkStatusContainer.java b/src/unported/java/appeng/container/implementations/NetworkStatusContainer.java similarity index 100% rename from src/main/java/appeng/container/implementations/NetworkStatusContainer.java rename to src/unported/java/appeng/container/implementations/NetworkStatusContainer.java diff --git a/src/main/java/appeng/container/implementations/NetworkToolContainer.java b/src/unported/java/appeng/container/implementations/NetworkToolContainer.java similarity index 100% rename from src/main/java/appeng/container/implementations/NetworkToolContainer.java rename to src/unported/java/appeng/container/implementations/NetworkToolContainer.java diff --git a/src/main/java/appeng/container/implementations/PatternTermContainer.java b/src/unported/java/appeng/container/implementations/PatternTermContainer.java similarity index 100% rename from src/main/java/appeng/container/implementations/PatternTermContainer.java rename to src/unported/java/appeng/container/implementations/PatternTermContainer.java diff --git a/src/main/java/appeng/container/implementations/PriorityContainer.java b/src/unported/java/appeng/container/implementations/PriorityContainer.java similarity index 100% rename from src/main/java/appeng/container/implementations/PriorityContainer.java rename to src/unported/java/appeng/container/implementations/PriorityContainer.java diff --git a/src/main/java/appeng/container/implementations/QNBContainer.java b/src/unported/java/appeng/container/implementations/QNBContainer.java similarity index 100% rename from src/main/java/appeng/container/implementations/QNBContainer.java rename to src/unported/java/appeng/container/implementations/QNBContainer.java diff --git a/src/main/java/appeng/container/implementations/QuartzKnifeContainer.java b/src/unported/java/appeng/container/implementations/QuartzKnifeContainer.java similarity index 100% rename from src/main/java/appeng/container/implementations/QuartzKnifeContainer.java rename to src/unported/java/appeng/container/implementations/QuartzKnifeContainer.java diff --git a/src/main/java/appeng/container/implementations/SecurityStationContainer.java b/src/unported/java/appeng/container/implementations/SecurityStationContainer.java similarity index 100% rename from src/main/java/appeng/container/implementations/SecurityStationContainer.java rename to src/unported/java/appeng/container/implementations/SecurityStationContainer.java diff --git a/src/main/java/appeng/container/implementations/SkyChestContainer.java b/src/unported/java/appeng/container/implementations/SkyChestContainer.java similarity index 100% rename from src/main/java/appeng/container/implementations/SkyChestContainer.java rename to src/unported/java/appeng/container/implementations/SkyChestContainer.java diff --git a/src/main/java/appeng/container/implementations/SpatialIOPortContainer.java b/src/unported/java/appeng/container/implementations/SpatialIOPortContainer.java similarity index 100% rename from src/main/java/appeng/container/implementations/SpatialIOPortContainer.java rename to src/unported/java/appeng/container/implementations/SpatialIOPortContainer.java diff --git a/src/main/java/appeng/container/implementations/StorageBusContainer.java b/src/unported/java/appeng/container/implementations/StorageBusContainer.java similarity index 100% rename from src/main/java/appeng/container/implementations/StorageBusContainer.java rename to src/unported/java/appeng/container/implementations/StorageBusContainer.java diff --git a/src/main/java/appeng/container/implementations/UpgradeableContainer.java b/src/unported/java/appeng/container/implementations/UpgradeableContainer.java similarity index 100% rename from src/main/java/appeng/container/implementations/UpgradeableContainer.java rename to src/unported/java/appeng/container/implementations/UpgradeableContainer.java diff --git a/src/main/java/appeng/container/implementations/VibrationChamberContainer.java b/src/unported/java/appeng/container/implementations/VibrationChamberContainer.java similarity index 100% rename from src/main/java/appeng/container/implementations/VibrationChamberContainer.java rename to src/unported/java/appeng/container/implementations/VibrationChamberContainer.java diff --git a/src/main/java/appeng/container/implementations/WirelessContainer.java b/src/unported/java/appeng/container/implementations/WirelessContainer.java similarity index 100% rename from src/main/java/appeng/container/implementations/WirelessContainer.java rename to src/unported/java/appeng/container/implementations/WirelessContainer.java diff --git a/src/main/java/appeng/container/implementations/WirelessTermContainer.java b/src/unported/java/appeng/container/implementations/WirelessTermContainer.java similarity index 100% rename from src/main/java/appeng/container/implementations/WirelessTermContainer.java rename to src/unported/java/appeng/container/implementations/WirelessTermContainer.java diff --git a/src/main/java/appeng/container/interfaces/IProgressProvider.java b/src/unported/java/appeng/container/interfaces/IProgressProvider.java similarity index 100% rename from src/main/java/appeng/container/interfaces/IProgressProvider.java rename to src/unported/java/appeng/container/interfaces/IProgressProvider.java diff --git a/src/main/java/appeng/container/slot/AppEngCraftingSlot.java b/src/unported/java/appeng/container/slot/AppEngCraftingSlot.java similarity index 100% rename from src/main/java/appeng/container/slot/AppEngCraftingSlot.java rename to src/unported/java/appeng/container/slot/AppEngCraftingSlot.java diff --git a/src/main/java/appeng/container/slot/AppEngSlot.java b/src/unported/java/appeng/container/slot/AppEngSlot.java similarity index 100% rename from src/main/java/appeng/container/slot/AppEngSlot.java rename to src/unported/java/appeng/container/slot/AppEngSlot.java diff --git a/src/main/java/appeng/container/slot/CraftingMatrixSlot.java b/src/unported/java/appeng/container/slot/CraftingMatrixSlot.java similarity index 100% rename from src/main/java/appeng/container/slot/CraftingMatrixSlot.java rename to src/unported/java/appeng/container/slot/CraftingMatrixSlot.java diff --git a/src/main/java/appeng/container/slot/CraftingTermSlot.java b/src/unported/java/appeng/container/slot/CraftingTermSlot.java similarity index 100% rename from src/main/java/appeng/container/slot/CraftingTermSlot.java rename to src/unported/java/appeng/container/slot/CraftingTermSlot.java diff --git a/src/main/java/appeng/container/slot/DisabledSlot.java b/src/unported/java/appeng/container/slot/DisabledSlot.java similarity index 100% rename from src/main/java/appeng/container/slot/DisabledSlot.java rename to src/unported/java/appeng/container/slot/DisabledSlot.java diff --git a/src/main/java/appeng/container/slot/FakeBlacklistSlot.java b/src/unported/java/appeng/container/slot/FakeBlacklistSlot.java similarity index 100% rename from src/main/java/appeng/container/slot/FakeBlacklistSlot.java rename to src/unported/java/appeng/container/slot/FakeBlacklistSlot.java diff --git a/src/main/java/appeng/container/slot/FakeCraftingMatrixSlot.java b/src/unported/java/appeng/container/slot/FakeCraftingMatrixSlot.java similarity index 100% rename from src/main/java/appeng/container/slot/FakeCraftingMatrixSlot.java rename to src/unported/java/appeng/container/slot/FakeCraftingMatrixSlot.java diff --git a/src/main/java/appeng/container/slot/FakeSlot.java b/src/unported/java/appeng/container/slot/FakeSlot.java similarity index 100% rename from src/main/java/appeng/container/slot/FakeSlot.java rename to src/unported/java/appeng/container/slot/FakeSlot.java diff --git a/src/main/java/appeng/container/slot/FakeTypeOnlySlot.java b/src/unported/java/appeng/container/slot/FakeTypeOnlySlot.java similarity index 100% rename from src/main/java/appeng/container/slot/FakeTypeOnlySlot.java rename to src/unported/java/appeng/container/slot/FakeTypeOnlySlot.java diff --git a/src/main/java/appeng/container/slot/IOptionalSlot.java b/src/unported/java/appeng/container/slot/IOptionalSlot.java similarity index 100% rename from src/main/java/appeng/container/slot/IOptionalSlot.java rename to src/unported/java/appeng/container/slot/IOptionalSlot.java diff --git a/src/main/java/appeng/container/slot/IOptionalSlotHost.java b/src/unported/java/appeng/container/slot/IOptionalSlotHost.java similarity index 100% rename from src/main/java/appeng/container/slot/IOptionalSlotHost.java rename to src/unported/java/appeng/container/slot/IOptionalSlotHost.java diff --git a/src/main/java/appeng/container/slot/InaccessibleSlot.java b/src/unported/java/appeng/container/slot/InaccessibleSlot.java similarity index 100% rename from src/main/java/appeng/container/slot/InaccessibleSlot.java rename to src/unported/java/appeng/container/slot/InaccessibleSlot.java diff --git a/src/main/java/appeng/container/slot/MolecularAssemblerPatternSlot.java b/src/unported/java/appeng/container/slot/MolecularAssemblerPatternSlot.java similarity index 100% rename from src/main/java/appeng/container/slot/MolecularAssemblerPatternSlot.java rename to src/unported/java/appeng/container/slot/MolecularAssemblerPatternSlot.java diff --git a/src/main/java/appeng/container/slot/NormalSlot.java b/src/unported/java/appeng/container/slot/NormalSlot.java similarity index 100% rename from src/main/java/appeng/container/slot/NormalSlot.java rename to src/unported/java/appeng/container/slot/NormalSlot.java diff --git a/src/main/java/appeng/container/slot/NullSlot.java b/src/unported/java/appeng/container/slot/NullSlot.java similarity index 100% rename from src/main/java/appeng/container/slot/NullSlot.java rename to src/unported/java/appeng/container/slot/NullSlot.java diff --git a/src/main/java/appeng/container/slot/OptionalFakeSlot.java b/src/unported/java/appeng/container/slot/OptionalFakeSlot.java similarity index 100% rename from src/main/java/appeng/container/slot/OptionalFakeSlot.java rename to src/unported/java/appeng/container/slot/OptionalFakeSlot.java diff --git a/src/main/java/appeng/container/slot/OptionalNormalSlot.java b/src/unported/java/appeng/container/slot/OptionalNormalSlot.java similarity index 100% rename from src/main/java/appeng/container/slot/OptionalNormalSlot.java rename to src/unported/java/appeng/container/slot/OptionalNormalSlot.java diff --git a/src/main/java/appeng/container/slot/OptionalRestrictedInputSlot.java b/src/unported/java/appeng/container/slot/OptionalRestrictedInputSlot.java similarity index 100% rename from src/main/java/appeng/container/slot/OptionalRestrictedInputSlot.java rename to src/unported/java/appeng/container/slot/OptionalRestrictedInputSlot.java diff --git a/src/main/java/appeng/container/slot/OptionalTypeOnlyFakeSlot.java b/src/unported/java/appeng/container/slot/OptionalTypeOnlyFakeSlot.java similarity index 100% rename from src/main/java/appeng/container/slot/OptionalTypeOnlyFakeSlot.java rename to src/unported/java/appeng/container/slot/OptionalTypeOnlyFakeSlot.java diff --git a/src/main/java/appeng/container/slot/OutputSlot.java b/src/unported/java/appeng/container/slot/OutputSlot.java similarity index 100% rename from src/main/java/appeng/container/slot/OutputSlot.java rename to src/unported/java/appeng/container/slot/OutputSlot.java diff --git a/src/main/java/appeng/container/slot/PatternOutputsSlot.java b/src/unported/java/appeng/container/slot/PatternOutputsSlot.java similarity index 100% rename from src/main/java/appeng/container/slot/PatternOutputsSlot.java rename to src/unported/java/appeng/container/slot/PatternOutputsSlot.java diff --git a/src/main/java/appeng/container/slot/PatternTermSlot.java b/src/unported/java/appeng/container/slot/PatternTermSlot.java similarity index 100% rename from src/main/java/appeng/container/slot/PatternTermSlot.java rename to src/unported/java/appeng/container/slot/PatternTermSlot.java diff --git a/src/main/java/appeng/container/slot/PlayerHotBarSlot.java b/src/unported/java/appeng/container/slot/PlayerHotBarSlot.java similarity index 100% rename from src/main/java/appeng/container/slot/PlayerHotBarSlot.java rename to src/unported/java/appeng/container/slot/PlayerHotBarSlot.java diff --git a/src/main/java/appeng/container/slot/PlayerInvSlot.java b/src/unported/java/appeng/container/slot/PlayerInvSlot.java similarity index 100% rename from src/main/java/appeng/container/slot/PlayerInvSlot.java rename to src/unported/java/appeng/container/slot/PlayerInvSlot.java diff --git a/src/main/java/appeng/container/slot/RestrictedInputSlot.java b/src/unported/java/appeng/container/slot/RestrictedInputSlot.java similarity index 100% rename from src/main/java/appeng/container/slot/RestrictedInputSlot.java rename to src/unported/java/appeng/container/slot/RestrictedInputSlot.java diff --git a/src/main/java/appeng/core/CommonHelper.java b/src/unported/java/appeng/core/CommonHelper.java similarity index 100% rename from src/main/java/appeng/core/CommonHelper.java rename to src/unported/java/appeng/core/CommonHelper.java diff --git a/src/main/java/appeng/core/FacadeItemGroup.java b/src/unported/java/appeng/core/FacadeItemGroup.java similarity index 100% rename from src/main/java/appeng/core/FacadeItemGroup.java rename to src/unported/java/appeng/core/FacadeItemGroup.java diff --git a/src/main/java/appeng/core/PluginLoader.java b/src/unported/java/appeng/core/PluginLoader.java similarity index 100% rename from src/main/java/appeng/core/PluginLoader.java rename to src/unported/java/appeng/core/PluginLoader.java diff --git a/src/main/java/appeng/core/Registration.java b/src/unported/java/appeng/core/Registration.java similarity index 100% rename from src/main/java/appeng/core/Registration.java rename to src/unported/java/appeng/core/Registration.java diff --git a/src/main/java/appeng/core/api/definitions/PartType.java b/src/unported/java/appeng/core/api/definitions/PartType.java similarity index 100% rename from src/main/java/appeng/core/api/definitions/PartType.java rename to src/unported/java/appeng/core/api/definitions/PartType.java diff --git a/src/main/java/appeng/core/crash/ModCrashEnhancement.java b/src/unported/java/appeng/core/crash/ModCrashEnhancement.java similarity index 100% rename from src/main/java/appeng/core/crash/ModCrashEnhancement.java rename to src/unported/java/appeng/core/crash/ModCrashEnhancement.java diff --git a/src/main/java/appeng/core/sync/packets/AssemblerAnimationPacket.java b/src/unported/java/appeng/core/sync/packets/AssemblerAnimationPacket.java similarity index 100% rename from src/main/java/appeng/core/sync/packets/AssemblerAnimationPacket.java rename to src/unported/java/appeng/core/sync/packets/AssemblerAnimationPacket.java diff --git a/src/main/java/appeng/core/sync/packets/BlockTransitionEffectPacket.java b/src/unported/java/appeng/core/sync/packets/BlockTransitionEffectPacket.java similarity index 100% rename from src/main/java/appeng/core/sync/packets/BlockTransitionEffectPacket.java rename to src/unported/java/appeng/core/sync/packets/BlockTransitionEffectPacket.java diff --git a/src/main/java/appeng/core/sync/packets/ClickPacket.java b/src/unported/java/appeng/core/sync/packets/ClickPacket.java similarity index 100% rename from src/main/java/appeng/core/sync/packets/ClickPacket.java rename to src/unported/java/appeng/core/sync/packets/ClickPacket.java diff --git a/src/main/java/appeng/core/sync/packets/CompressedNBTPacket.java b/src/unported/java/appeng/core/sync/packets/CompressedNBTPacket.java similarity index 100% rename from src/main/java/appeng/core/sync/packets/CompressedNBTPacket.java rename to src/unported/java/appeng/core/sync/packets/CompressedNBTPacket.java diff --git a/src/main/java/appeng/core/sync/packets/ConfigButtonPacket.java b/src/unported/java/appeng/core/sync/packets/ConfigButtonPacket.java similarity index 100% rename from src/main/java/appeng/core/sync/packets/ConfigButtonPacket.java rename to src/unported/java/appeng/core/sync/packets/ConfigButtonPacket.java diff --git a/src/main/java/appeng/core/sync/packets/ConfigValuePacket.java b/src/unported/java/appeng/core/sync/packets/ConfigValuePacket.java similarity index 100% rename from src/main/java/appeng/core/sync/packets/ConfigValuePacket.java rename to src/unported/java/appeng/core/sync/packets/ConfigValuePacket.java diff --git a/src/main/java/appeng/core/sync/packets/CraftRequestPacket.java b/src/unported/java/appeng/core/sync/packets/CraftRequestPacket.java similarity index 100% rename from src/main/java/appeng/core/sync/packets/CraftRequestPacket.java rename to src/unported/java/appeng/core/sync/packets/CraftRequestPacket.java diff --git a/src/main/java/appeng/core/sync/packets/FluidSlotPacket.java b/src/unported/java/appeng/core/sync/packets/FluidSlotPacket.java similarity index 100% rename from src/main/java/appeng/core/sync/packets/FluidSlotPacket.java rename to src/unported/java/appeng/core/sync/packets/FluidSlotPacket.java diff --git a/src/main/java/appeng/core/sync/packets/InventoryActionPacket.java b/src/unported/java/appeng/core/sync/packets/InventoryActionPacket.java similarity index 100% rename from src/main/java/appeng/core/sync/packets/InventoryActionPacket.java rename to src/unported/java/appeng/core/sync/packets/InventoryActionPacket.java diff --git a/src/main/java/appeng/core/sync/packets/ItemTransitionEffectPacket.java b/src/unported/java/appeng/core/sync/packets/ItemTransitionEffectPacket.java similarity index 100% rename from src/main/java/appeng/core/sync/packets/ItemTransitionEffectPacket.java rename to src/unported/java/appeng/core/sync/packets/ItemTransitionEffectPacket.java diff --git a/src/main/java/appeng/core/sync/packets/JEIRecipePacket.java b/src/unported/java/appeng/core/sync/packets/JEIRecipePacket.java similarity index 100% rename from src/main/java/appeng/core/sync/packets/JEIRecipePacket.java rename to src/unported/java/appeng/core/sync/packets/JEIRecipePacket.java diff --git a/src/main/java/appeng/core/sync/packets/LightningPacket.java b/src/unported/java/appeng/core/sync/packets/LightningPacket.java similarity index 100% rename from src/main/java/appeng/core/sync/packets/LightningPacket.java rename to src/unported/java/appeng/core/sync/packets/LightningPacket.java diff --git a/src/main/java/appeng/core/sync/packets/MEFluidInventoryUpdatePacket.java b/src/unported/java/appeng/core/sync/packets/MEFluidInventoryUpdatePacket.java similarity index 100% rename from src/main/java/appeng/core/sync/packets/MEFluidInventoryUpdatePacket.java rename to src/unported/java/appeng/core/sync/packets/MEFluidInventoryUpdatePacket.java diff --git a/src/main/java/appeng/core/sync/packets/MEInventoryUpdatePacket.java b/src/unported/java/appeng/core/sync/packets/MEInventoryUpdatePacket.java similarity index 100% rename from src/main/java/appeng/core/sync/packets/MEInventoryUpdatePacket.java rename to src/unported/java/appeng/core/sync/packets/MEInventoryUpdatePacket.java diff --git a/src/main/java/appeng/core/sync/packets/MatterCannonPacket.java b/src/unported/java/appeng/core/sync/packets/MatterCannonPacket.java similarity index 100% rename from src/main/java/appeng/core/sync/packets/MatterCannonPacket.java rename to src/unported/java/appeng/core/sync/packets/MatterCannonPacket.java diff --git a/src/main/java/appeng/core/sync/packets/PatternSlotPacket.java b/src/unported/java/appeng/core/sync/packets/PatternSlotPacket.java similarity index 100% rename from src/main/java/appeng/core/sync/packets/PatternSlotPacket.java rename to src/unported/java/appeng/core/sync/packets/PatternSlotPacket.java diff --git a/src/main/java/appeng/core/sync/packets/ProgressBarPacket.java b/src/unported/java/appeng/core/sync/packets/ProgressBarPacket.java similarity index 100% rename from src/main/java/appeng/core/sync/packets/ProgressBarPacket.java rename to src/unported/java/appeng/core/sync/packets/ProgressBarPacket.java diff --git a/src/main/java/appeng/core/sync/packets/SwapSlotsPacket.java b/src/unported/java/appeng/core/sync/packets/SwapSlotsPacket.java similarity index 100% rename from src/main/java/appeng/core/sync/packets/SwapSlotsPacket.java rename to src/unported/java/appeng/core/sync/packets/SwapSlotsPacket.java diff --git a/src/main/java/appeng/core/sync/packets/SwitchGuisPacket.java b/src/unported/java/appeng/core/sync/packets/SwitchGuisPacket.java similarity index 100% rename from src/main/java/appeng/core/sync/packets/SwitchGuisPacket.java rename to src/unported/java/appeng/core/sync/packets/SwitchGuisPacket.java diff --git a/src/main/java/appeng/core/sync/packets/TargetFluidStackPacket.java b/src/unported/java/appeng/core/sync/packets/TargetFluidStackPacket.java similarity index 100% rename from src/main/java/appeng/core/sync/packets/TargetFluidStackPacket.java rename to src/unported/java/appeng/core/sync/packets/TargetFluidStackPacket.java diff --git a/src/main/java/appeng/core/sync/packets/TargetItemStackPacket.java b/src/unported/java/appeng/core/sync/packets/TargetItemStackPacket.java similarity index 100% rename from src/main/java/appeng/core/sync/packets/TargetItemStackPacket.java rename to src/unported/java/appeng/core/sync/packets/TargetItemStackPacket.java diff --git a/src/main/java/appeng/crafting/CraftBranchFailure.java b/src/unported/java/appeng/crafting/CraftBranchFailure.java similarity index 100% rename from src/main/java/appeng/crafting/CraftBranchFailure.java rename to src/unported/java/appeng/crafting/CraftBranchFailure.java diff --git a/src/main/java/appeng/crafting/CraftingCalculationFailure.java b/src/unported/java/appeng/crafting/CraftingCalculationFailure.java similarity index 100% rename from src/main/java/appeng/crafting/CraftingCalculationFailure.java rename to src/unported/java/appeng/crafting/CraftingCalculationFailure.java diff --git a/src/unported/java/appeng/crafting/CraftingJob.java b/src/unported/java/appeng/crafting/CraftingJob.java new file mode 100644 index 000000000..45fbf7da9 --- /dev/null +++ b/src/unported/java/appeng/crafting/CraftingJob.java @@ -0,0 +1,345 @@ +/* + * This file is part of Applied Energistics 2. + * Copyright (c) 2013 - 2014, AlgorithmX2, All rights reserved. + * + * Applied Energistics 2 is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Applied Energistics 2 is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Applied Energistics 2. If not, see . + */ + +package appeng.crafting; + +import java.util.HashMap; +import java.util.concurrent.TimeUnit; + +import com.google.common.base.Stopwatch; + +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.world.World; + +import appeng.api.AEApi; +import appeng.api.config.Actionable; +import appeng.api.networking.IGrid; +import appeng.api.networking.IGridHost; +import appeng.api.networking.IGridNode; +import appeng.api.networking.crafting.ICraftingCallback; +import appeng.api.networking.crafting.ICraftingGrid; +import appeng.api.networking.crafting.ICraftingJob; +import appeng.api.networking.crafting.ICraftingPatternDetails; +import appeng.api.networking.security.IActionHost; +import appeng.api.networking.security.IActionSource; +import appeng.api.networking.storage.IStorageGrid; +import appeng.api.storage.channels.IItemStorageChannel; +import appeng.api.storage.data.IAEItemStack; +import appeng.api.storage.data.IItemList; +import appeng.api.util.DimensionalCoord; +import appeng.core.AELog; +import appeng.hooks.TickHandler; + +public class CraftingJob implements Runnable, ICraftingJob { + private static final String LOG_CRAFTING_JOB = "CraftingJob (%s) issued by %s requesting [%s] using %s bytes took %s ms"; + private static final String LOG_MACHINE_SOURCE_DETAILS = "Machine[object=%s, %s]"; + + private final MECraftingInventory original; + private final World world; + private final IItemList crafting = AEApi.instance().storage() + .getStorageChannel(IItemStorageChannel.class).createList(); + private final IItemList missing = AEApi.instance().storage() + .getStorageChannel(IItemStorageChannel.class).createList(); + private final HashMap opsAndMultiplier = new HashMap<>(); + private final Object monitor = new Object(); + private final Stopwatch watch = Stopwatch.createUnstarted(); + private CraftingTreeNode tree; + private final IAEItemStack output; + private boolean simulate = false; + private MECraftingInventory availableCheck; + private long bytes = 0; + private final IActionSource actionSrc; + private final ICraftingCallback callback; + private boolean running = false; + private boolean done = false; + private int time = 5; + private int incTime = Integer.MAX_VALUE; + + private World wrapWorld(final World w) { + return w; + } + + public CraftingJob(final World w, final IGrid grid, final IActionSource actionSrc, final IAEItemStack what, + final ICraftingCallback callback) { + this.world = this.wrapWorld(w); + this.output = what.copy(); + this.actionSrc = actionSrc; + + this.callback = callback; + final ICraftingGrid cc = grid.getCache(ICraftingGrid.class); + final IStorageGrid sg = grid.getCache(IStorageGrid.class); + this.original = new MECraftingInventory( + sg.getInventory(AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class)), actionSrc, + false, false, false); + + this.setTree(this.getCraftingTree(cc, what)); + this.availableCheck = null; + } + + private CraftingTreeNode getCraftingTree(final ICraftingGrid cc, final IAEItemStack what) { + return new CraftingTreeNode(cc, this, what, null, -1, 0); + } + + void refund(final IAEItemStack o) { + this.availableCheck.injectItems(o, Actionable.MODULATE, this.actionSrc); + } + + IAEItemStack checkUse(final IAEItemStack available) { + return this.availableCheck.extractItems(available, Actionable.MODULATE, this.actionSrc); + } + + public void writeToNBT(final CompoundTag out) { + + } + + void addTask(IAEItemStack what, final long crafts, final ICraftingPatternDetails details, final int depth) { + if (crafts > 0) { + what = what.copy(); + what.setStackSize(what.getStackSize() * crafts); + this.crafting.add(what); + } + } + + void addMissing(IAEItemStack what) { + what = what.copy(); + this.missing.add(what); + } + + @Override + public void run() { + try { + try { + TickHandler.INSTANCE.registerCraftingSimulation(this.world, this); + this.handlePausing(); + + final Stopwatch timer = Stopwatch.createStarted(); + + final MECraftingInventory craftingInventory = new MECraftingInventory(this.original, true, false, true); + craftingInventory.ignore(this.output); + + this.availableCheck = new MECraftingInventory(this.original, false, false, false); + this.getTree().request(craftingInventory, this.output.getStackSize(), this.actionSrc); + this.getTree().dive(this); + + for (final String s : this.opsAndMultiplier.keySet()) { + final TwoIntegers ti = this.opsAndMultiplier.get(s); + AELog.crafting(s + " * " + ti.times + " = " + (ti.perOp * ti.times)); + } + + this.logCraftingJob("real", timer); + // if ( mode == Actionable.MODULATE ) + // craftingInventory.moveItemsToStorage( storage ); + } catch (final CraftBranchFailure e) { + this.simulate = true; + + try { + final Stopwatch timer = Stopwatch.createStarted(); + final MECraftingInventory craftingInventory = new MECraftingInventory(this.original, true, false, + true); + craftingInventory.ignore(this.output); + + this.availableCheck = new MECraftingInventory(this.original, false, false, false); + + this.getTree().setSimulate(); + this.getTree().request(craftingInventory, this.output.getStackSize(), this.actionSrc); + this.getTree().dive(this); + + for (final String s : this.opsAndMultiplier.keySet()) { + final TwoIntegers ti = this.opsAndMultiplier.get(s); + AELog.crafting(s + " * " + ti.times + " = " + (ti.perOp * ti.times)); + } + + this.logCraftingJob("simulate", timer); + } catch (final CraftBranchFailure e1) { + AELog.debug(e1); + } catch (final CraftingCalculationFailure f) { + AELog.debug(f); + } catch (final InterruptedException e1) { + AELog.crafting("Crafting calculation canceled."); + this.finish(); + return; + } + } catch (final CraftingCalculationFailure f) { + AELog.debug(f); + } catch (final InterruptedException e1) { + AELog.crafting("Crafting calculation canceled."); + this.finish(); + return; + } + + AELog.craftingDebug("crafting job now done"); + } catch (final Throwable t) { + this.finish(); + throw new IllegalStateException(t); + } + + this.finish(); + } + + void handlePausing() throws InterruptedException { + if (this.incTime > 100) { + this.incTime = 0; + + synchronized (this.monitor) { + if (this.watch.elapsed(TimeUnit.MICROSECONDS) > this.time) { + this.running = false; + this.watch.stop(); + this.monitor.notify(); + } + + if (!this.running) { + AELog.craftingDebug("crafting job will now sleep"); + + while (!this.running) { + this.monitor.wait(); + } + + AELog.craftingDebug("crafting job now active"); + } + } + + if (Thread.interrupted()) { + throw new InterruptedException(); + } + } + this.incTime++; + } + + private void finish() { + if (this.callback != null) { + this.callback.calculationComplete(this); + } + + this.availableCheck = null; + + synchronized (this.monitor) { + this.running = false; + this.done = true; + this.monitor.notify(); + } + } + + @Override + public boolean isSimulation() { + return this.simulate; + } + + @Override + public long getByteTotal() { + return this.bytes; + } + + @Override + public void populatePlan(final IItemList plan) { + if (this.getTree() != null) { + this.getTree().getPlan(plan); + } + } + + @Override + public IAEItemStack getOutput() { + return this.output; + } + + public boolean isDone() { + return this.done; + } + + World getWorld() { + return this.world; + } + + /** + * returns true if this needs more simulation. + * + * @param milli milliseconds of simulation + * + * @return true if this needs more simulation + */ + public boolean simulateFor(final int milli) { + this.time = milli; + + synchronized (this.monitor) { + if (this.done) { + return false; + } + + this.watch.reset(); + this.watch.start(); + this.running = true; + + AELog.craftingDebug("main thread is now going to sleep"); + + this.monitor.notify(); + + while (this.running) { + try { + this.monitor.wait(); + } catch (final InterruptedException ignored) { + } + } + + AELog.craftingDebug("main thread is now active"); + } + + return true; + } + + void addBytes(final long crafts) { + this.bytes += crafts; + } + + public CraftingTreeNode getTree() { + return this.tree; + } + + private void setTree(final CraftingTreeNode tree) { + this.tree = tree; + } + + private void logCraftingJob(String type, Stopwatch timer) { + if (AELog.isCraftingLogEnabled()) { + final String itemToOutput = this.output.toString(); + final long elapsedTime = timer.elapsed(TimeUnit.MILLISECONDS); + final String actionSource; + + if (this.actionSrc.player().isPresent()) { + final PlayerEntity player = this.actionSrc.player().get(); + + actionSource = player.toString(); + } else if (this.actionSrc.machine().isPresent()) { + final IActionHost machineSource = this.actionSrc.machine().get(); + final IGridNode actionableNode = machineSource.getActionableNode(); + final IGridHost machine = actionableNode.getMachine(); + final DimensionalCoord location = actionableNode.getGridBlock().getLocation(); + + actionSource = String.format(LOG_MACHINE_SOURCE_DETAILS, machine, location); + } else { + actionSource = "[unknown source]"; + } + + AELog.crafting(LOG_CRAFTING_JOB, type, actionSource, itemToOutput, this.bytes, elapsedTime); + } + } + + private static class TwoIntegers { + private final long perOp = 0; + private final long times = 0; + } +} diff --git a/src/main/java/appeng/crafting/CraftingLink.java b/src/unported/java/appeng/crafting/CraftingLink.java similarity index 100% rename from src/main/java/appeng/crafting/CraftingLink.java rename to src/unported/java/appeng/crafting/CraftingLink.java diff --git a/src/main/java/appeng/crafting/CraftingLinkNexus.java b/src/unported/java/appeng/crafting/CraftingLinkNexus.java similarity index 100% rename from src/main/java/appeng/crafting/CraftingLinkNexus.java rename to src/unported/java/appeng/crafting/CraftingLinkNexus.java diff --git a/src/main/java/appeng/crafting/CraftingTreeNode.java b/src/unported/java/appeng/crafting/CraftingTreeNode.java similarity index 100% rename from src/main/java/appeng/crafting/CraftingTreeNode.java rename to src/unported/java/appeng/crafting/CraftingTreeNode.java diff --git a/src/main/java/appeng/crafting/CraftingTreeProcess.java b/src/unported/java/appeng/crafting/CraftingTreeProcess.java similarity index 100% rename from src/main/java/appeng/crafting/CraftingTreeProcess.java rename to src/unported/java/appeng/crafting/CraftingTreeProcess.java diff --git a/src/main/java/appeng/crafting/CraftingWatcher.java b/src/unported/java/appeng/crafting/CraftingWatcher.java similarity index 100% rename from src/main/java/appeng/crafting/CraftingWatcher.java rename to src/unported/java/appeng/crafting/CraftingWatcher.java diff --git a/src/main/java/appeng/crafting/MECraftingInventory.java b/src/unported/java/appeng/crafting/MECraftingInventory.java similarity index 100% rename from src/main/java/appeng/crafting/MECraftingInventory.java rename to src/unported/java/appeng/crafting/MECraftingInventory.java diff --git a/src/main/java/appeng/debug/ChunkLoaderBlock.java b/src/unported/java/appeng/debug/ChunkLoaderBlock.java similarity index 100% rename from src/main/java/appeng/debug/ChunkLoaderBlock.java rename to src/unported/java/appeng/debug/ChunkLoaderBlock.java diff --git a/src/main/java/appeng/debug/ChunkLoaderBlockEntity.java b/src/unported/java/appeng/debug/ChunkLoaderBlockEntity.java similarity index 100% rename from src/main/java/appeng/debug/ChunkLoaderBlockEntity.java rename to src/unported/java/appeng/debug/ChunkLoaderBlockEntity.java diff --git a/src/main/java/appeng/debug/CubeGeneratorBlock.java b/src/unported/java/appeng/debug/CubeGeneratorBlock.java similarity index 100% rename from src/main/java/appeng/debug/CubeGeneratorBlock.java rename to src/unported/java/appeng/debug/CubeGeneratorBlock.java diff --git a/src/main/java/appeng/debug/CubeGeneratorBlockEntity.java b/src/unported/java/appeng/debug/CubeGeneratorBlockEntity.java similarity index 100% rename from src/main/java/appeng/debug/CubeGeneratorBlockEntity.java rename to src/unported/java/appeng/debug/CubeGeneratorBlockEntity.java diff --git a/src/main/java/appeng/debug/DebugCardItem.java b/src/unported/java/appeng/debug/DebugCardItem.java similarity index 100% rename from src/main/java/appeng/debug/DebugCardItem.java rename to src/unported/java/appeng/debug/DebugCardItem.java diff --git a/src/main/java/appeng/debug/DebugPartPlacerItem.java b/src/unported/java/appeng/debug/DebugPartPlacerItem.java similarity index 100% rename from src/main/java/appeng/debug/DebugPartPlacerItem.java rename to src/unported/java/appeng/debug/DebugPartPlacerItem.java diff --git a/src/main/java/appeng/debug/EnergyGeneratorBlock.java b/src/unported/java/appeng/debug/EnergyGeneratorBlock.java similarity index 100% rename from src/main/java/appeng/debug/EnergyGeneratorBlock.java rename to src/unported/java/appeng/debug/EnergyGeneratorBlock.java diff --git a/src/main/java/appeng/debug/EnergyGeneratorBlockEntity.java b/src/unported/java/appeng/debug/EnergyGeneratorBlockEntity.java similarity index 100% rename from src/main/java/appeng/debug/EnergyGeneratorBlockEntity.java rename to src/unported/java/appeng/debug/EnergyGeneratorBlockEntity.java diff --git a/src/main/java/appeng/debug/EraserItem.java b/src/unported/java/appeng/debug/EraserItem.java similarity index 100% rename from src/main/java/appeng/debug/EraserItem.java rename to src/unported/java/appeng/debug/EraserItem.java diff --git a/src/main/java/appeng/debug/ItemGenBlock.java b/src/unported/java/appeng/debug/ItemGenBlock.java similarity index 100% rename from src/main/java/appeng/debug/ItemGenBlock.java rename to src/unported/java/appeng/debug/ItemGenBlock.java diff --git a/src/main/java/appeng/debug/ItemGenBlockEntity.java b/src/unported/java/appeng/debug/ItemGenBlockEntity.java similarity index 100% rename from src/main/java/appeng/debug/ItemGenBlockEntity.java rename to src/unported/java/appeng/debug/ItemGenBlockEntity.java diff --git a/src/main/java/appeng/debug/MeteoritePlacerItem.java b/src/unported/java/appeng/debug/MeteoritePlacerItem.java similarity index 100% rename from src/main/java/appeng/debug/MeteoritePlacerItem.java rename to src/unported/java/appeng/debug/MeteoritePlacerItem.java diff --git a/src/main/java/appeng/debug/PhantomNodeBlock.java b/src/unported/java/appeng/debug/PhantomNodeBlock.java similarity index 100% rename from src/main/java/appeng/debug/PhantomNodeBlock.java rename to src/unported/java/appeng/debug/PhantomNodeBlock.java diff --git a/src/main/java/appeng/debug/PhantomNodeBlockEntity.java b/src/unported/java/appeng/debug/PhantomNodeBlockEntity.java similarity index 100% rename from src/main/java/appeng/debug/PhantomNodeBlockEntity.java rename to src/unported/java/appeng/debug/PhantomNodeBlockEntity.java diff --git a/src/main/java/appeng/debug/ReplicatorCardItem.java b/src/unported/java/appeng/debug/ReplicatorCardItem.java similarity index 100% rename from src/main/java/appeng/debug/ReplicatorCardItem.java rename to src/unported/java/appeng/debug/ReplicatorCardItem.java diff --git a/src/main/java/appeng/fluids/block/FluidInterfaceBlock.java b/src/unported/java/appeng/fluids/block/FluidInterfaceBlock.java similarity index 100% rename from src/main/java/appeng/fluids/block/FluidInterfaceBlock.java rename to src/unported/java/appeng/fluids/block/FluidInterfaceBlock.java diff --git a/src/main/java/appeng/fluids/client/gui/FluidFormationPlaneScreen.java b/src/unported/java/appeng/fluids/client/gui/FluidFormationPlaneScreen.java similarity index 100% rename from src/main/java/appeng/fluids/client/gui/FluidFormationPlaneScreen.java rename to src/unported/java/appeng/fluids/client/gui/FluidFormationPlaneScreen.java diff --git a/src/main/java/appeng/fluids/client/gui/FluidIOScreen.java b/src/unported/java/appeng/fluids/client/gui/FluidIOScreen.java similarity index 100% rename from src/main/java/appeng/fluids/client/gui/FluidIOScreen.java rename to src/unported/java/appeng/fluids/client/gui/FluidIOScreen.java diff --git a/src/main/java/appeng/fluids/client/gui/FluidInterfaceScreen.java b/src/unported/java/appeng/fluids/client/gui/FluidInterfaceScreen.java similarity index 100% rename from src/main/java/appeng/fluids/client/gui/FluidInterfaceScreen.java rename to src/unported/java/appeng/fluids/client/gui/FluidInterfaceScreen.java diff --git a/src/main/java/appeng/fluids/client/gui/FluidLevelEmitterScreen.java b/src/unported/java/appeng/fluids/client/gui/FluidLevelEmitterScreen.java similarity index 100% rename from src/main/java/appeng/fluids/client/gui/FluidLevelEmitterScreen.java rename to src/unported/java/appeng/fluids/client/gui/FluidLevelEmitterScreen.java diff --git a/src/main/java/appeng/fluids/client/gui/FluidStorageBusScreen.java b/src/unported/java/appeng/fluids/client/gui/FluidStorageBusScreen.java similarity index 100% rename from src/main/java/appeng/fluids/client/gui/FluidStorageBusScreen.java rename to src/unported/java/appeng/fluids/client/gui/FluidStorageBusScreen.java diff --git a/src/main/java/appeng/fluids/client/gui/FluidTerminalScreen.java b/src/unported/java/appeng/fluids/client/gui/FluidTerminalScreen.java similarity index 100% rename from src/main/java/appeng/fluids/client/gui/FluidTerminalScreen.java rename to src/unported/java/appeng/fluids/client/gui/FluidTerminalScreen.java diff --git a/src/main/java/appeng/fluids/client/gui/widgets/FluidSlotWidget.java b/src/unported/java/appeng/fluids/client/gui/widgets/FluidSlotWidget.java similarity index 100% rename from src/main/java/appeng/fluids/client/gui/widgets/FluidSlotWidget.java rename to src/unported/java/appeng/fluids/client/gui/widgets/FluidSlotWidget.java diff --git a/src/main/java/appeng/fluids/client/gui/widgets/FluidTankWidget.java b/src/unported/java/appeng/fluids/client/gui/widgets/FluidTankWidget.java similarity index 100% rename from src/main/java/appeng/fluids/client/gui/widgets/FluidTankWidget.java rename to src/unported/java/appeng/fluids/client/gui/widgets/FluidTankWidget.java diff --git a/src/main/java/appeng/fluids/client/gui/widgets/OptionalFluidSlotWidget.java b/src/unported/java/appeng/fluids/client/gui/widgets/OptionalFluidSlotWidget.java similarity index 100% rename from src/main/java/appeng/fluids/client/gui/widgets/OptionalFluidSlotWidget.java rename to src/unported/java/appeng/fluids/client/gui/widgets/OptionalFluidSlotWidget.java diff --git a/src/main/java/appeng/fluids/client/render/FluidStackSizeRenderer.java b/src/unported/java/appeng/fluids/client/render/FluidStackSizeRenderer.java similarity index 100% rename from src/main/java/appeng/fluids/client/render/FluidStackSizeRenderer.java rename to src/unported/java/appeng/fluids/client/render/FluidStackSizeRenderer.java diff --git a/src/main/java/appeng/fluids/container/FluidConfigurableContainer.java b/src/unported/java/appeng/fluids/container/FluidConfigurableContainer.java similarity index 100% rename from src/main/java/appeng/fluids/container/FluidConfigurableContainer.java rename to src/unported/java/appeng/fluids/container/FluidConfigurableContainer.java diff --git a/src/main/java/appeng/fluids/container/FluidFormationPlaneContainer.java b/src/unported/java/appeng/fluids/container/FluidFormationPlaneContainer.java similarity index 100% rename from src/main/java/appeng/fluids/container/FluidFormationPlaneContainer.java rename to src/unported/java/appeng/fluids/container/FluidFormationPlaneContainer.java diff --git a/src/main/java/appeng/fluids/container/FluidIOContainer.java b/src/unported/java/appeng/fluids/container/FluidIOContainer.java similarity index 100% rename from src/main/java/appeng/fluids/container/FluidIOContainer.java rename to src/unported/java/appeng/fluids/container/FluidIOContainer.java diff --git a/src/main/java/appeng/fluids/container/FluidInterfaceContainer.java b/src/unported/java/appeng/fluids/container/FluidInterfaceContainer.java similarity index 100% rename from src/main/java/appeng/fluids/container/FluidInterfaceContainer.java rename to src/unported/java/appeng/fluids/container/FluidInterfaceContainer.java diff --git a/src/main/java/appeng/fluids/container/FluidLevelEmitterContainer.java b/src/unported/java/appeng/fluids/container/FluidLevelEmitterContainer.java similarity index 100% rename from src/main/java/appeng/fluids/container/FluidLevelEmitterContainer.java rename to src/unported/java/appeng/fluids/container/FluidLevelEmitterContainer.java diff --git a/src/main/java/appeng/fluids/container/FluidStorageBusContainer.java b/src/unported/java/appeng/fluids/container/FluidStorageBusContainer.java similarity index 100% rename from src/main/java/appeng/fluids/container/FluidStorageBusContainer.java rename to src/unported/java/appeng/fluids/container/FluidStorageBusContainer.java diff --git a/src/main/java/appeng/fluids/container/FluidTerminalContainer.java b/src/unported/java/appeng/fluids/container/FluidTerminalContainer.java similarity index 100% rename from src/main/java/appeng/fluids/container/FluidTerminalContainer.java rename to src/unported/java/appeng/fluids/container/FluidTerminalContainer.java diff --git a/src/main/java/appeng/fluids/container/IFluidSyncContainer.java b/src/unported/java/appeng/fluids/container/IFluidSyncContainer.java similarity index 100% rename from src/main/java/appeng/fluids/container/IFluidSyncContainer.java rename to src/unported/java/appeng/fluids/container/IFluidSyncContainer.java diff --git a/src/main/java/appeng/fluids/container/slots/IMEFluidSlot.java b/src/unported/java/appeng/fluids/container/slots/IMEFluidSlot.java similarity index 100% rename from src/main/java/appeng/fluids/container/slots/IMEFluidSlot.java rename to src/unported/java/appeng/fluids/container/slots/IMEFluidSlot.java diff --git a/src/main/java/appeng/fluids/helper/DualityFluidInterface.java b/src/unported/java/appeng/fluids/helper/DualityFluidInterface.java similarity index 100% rename from src/main/java/appeng/fluids/helper/DualityFluidInterface.java rename to src/unported/java/appeng/fluids/helper/DualityFluidInterface.java diff --git a/src/main/java/appeng/fluids/helper/FluidCellConfig.java b/src/unported/java/appeng/fluids/helper/FluidCellConfig.java similarity index 100% rename from src/main/java/appeng/fluids/helper/FluidCellConfig.java rename to src/unported/java/appeng/fluids/helper/FluidCellConfig.java diff --git a/src/main/java/appeng/fluids/helper/FluidSyncHelper.java b/src/unported/java/appeng/fluids/helper/FluidSyncHelper.java similarity index 100% rename from src/main/java/appeng/fluids/helper/FluidSyncHelper.java rename to src/unported/java/appeng/fluids/helper/FluidSyncHelper.java diff --git a/src/main/java/appeng/fluids/helper/IFluidInterfaceHost.java b/src/unported/java/appeng/fluids/helper/IFluidInterfaceHost.java similarity index 100% rename from src/main/java/appeng/fluids/helper/IFluidInterfaceHost.java rename to src/unported/java/appeng/fluids/helper/IFluidInterfaceHost.java diff --git a/src/main/java/appeng/fluids/items/BasicFluidStorageCell.java b/src/unported/java/appeng/fluids/items/BasicFluidStorageCell.java similarity index 100% rename from src/main/java/appeng/fluids/items/BasicFluidStorageCell.java rename to src/unported/java/appeng/fluids/items/BasicFluidStorageCell.java diff --git a/src/main/java/appeng/fluids/items/FluidDummyItemColor.java b/src/unported/java/appeng/fluids/items/FluidDummyItemColor.java similarity index 100% rename from src/main/java/appeng/fluids/items/FluidDummyItemColor.java rename to src/unported/java/appeng/fluids/items/FluidDummyItemColor.java diff --git a/src/main/java/appeng/fluids/parts/FluidAnnihilationPlanePart.java b/src/unported/java/appeng/fluids/parts/FluidAnnihilationPlanePart.java similarity index 100% rename from src/main/java/appeng/fluids/parts/FluidAnnihilationPlanePart.java rename to src/unported/java/appeng/fluids/parts/FluidAnnihilationPlanePart.java diff --git a/src/main/java/appeng/fluids/parts/FluidExportBusPart.java b/src/unported/java/appeng/fluids/parts/FluidExportBusPart.java similarity index 100% rename from src/main/java/appeng/fluids/parts/FluidExportBusPart.java rename to src/unported/java/appeng/fluids/parts/FluidExportBusPart.java diff --git a/src/main/java/appeng/fluids/parts/FluidFormationPlanePart.java b/src/unported/java/appeng/fluids/parts/FluidFormationPlanePart.java similarity index 100% rename from src/main/java/appeng/fluids/parts/FluidFormationPlanePart.java rename to src/unported/java/appeng/fluids/parts/FluidFormationPlanePart.java diff --git a/src/main/java/appeng/fluids/parts/FluidHandlerAdapter.java b/src/unported/java/appeng/fluids/parts/FluidHandlerAdapter.java similarity index 100% rename from src/main/java/appeng/fluids/parts/FluidHandlerAdapter.java rename to src/unported/java/appeng/fluids/parts/FluidHandlerAdapter.java diff --git a/src/main/java/appeng/fluids/parts/FluidImportBusPart.java b/src/unported/java/appeng/fluids/parts/FluidImportBusPart.java similarity index 100% rename from src/main/java/appeng/fluids/parts/FluidImportBusPart.java rename to src/unported/java/appeng/fluids/parts/FluidImportBusPart.java diff --git a/src/main/java/appeng/fluids/parts/FluidInterfacePart.java b/src/unported/java/appeng/fluids/parts/FluidInterfacePart.java similarity index 100% rename from src/main/java/appeng/fluids/parts/FluidInterfacePart.java rename to src/unported/java/appeng/fluids/parts/FluidInterfacePart.java diff --git a/src/main/java/appeng/fluids/parts/FluidLevelEmitterPart.java b/src/unported/java/appeng/fluids/parts/FluidLevelEmitterPart.java similarity index 100% rename from src/main/java/appeng/fluids/parts/FluidLevelEmitterPart.java rename to src/unported/java/appeng/fluids/parts/FluidLevelEmitterPart.java diff --git a/src/main/java/appeng/fluids/parts/FluidStorageBusPart.java b/src/unported/java/appeng/fluids/parts/FluidStorageBusPart.java similarity index 100% rename from src/main/java/appeng/fluids/parts/FluidStorageBusPart.java rename to src/unported/java/appeng/fluids/parts/FluidStorageBusPart.java diff --git a/src/main/java/appeng/fluids/parts/FluidTerminalPart.java b/src/unported/java/appeng/fluids/parts/FluidTerminalPart.java similarity index 100% rename from src/main/java/appeng/fluids/parts/FluidTerminalPart.java rename to src/unported/java/appeng/fluids/parts/FluidTerminalPart.java diff --git a/src/main/java/appeng/fluids/parts/SharedFluidBusPart.java b/src/unported/java/appeng/fluids/parts/SharedFluidBusPart.java similarity index 100% rename from src/main/java/appeng/fluids/parts/SharedFluidBusPart.java rename to src/unported/java/appeng/fluids/parts/SharedFluidBusPart.java diff --git a/src/main/java/appeng/fluids/registries/BasicFluidCellGuiHandler.java b/src/unported/java/appeng/fluids/registries/BasicFluidCellGuiHandler.java similarity index 100% rename from src/main/java/appeng/fluids/registries/BasicFluidCellGuiHandler.java rename to src/unported/java/appeng/fluids/registries/BasicFluidCellGuiHandler.java diff --git a/src/main/java/appeng/fluids/tile/FluidInterfaceBlockEntity.java b/src/unported/java/appeng/fluids/tile/FluidInterfaceBlockEntity.java similarity index 100% rename from src/main/java/appeng/fluids/tile/FluidInterfaceBlockEntity.java rename to src/unported/java/appeng/fluids/tile/FluidInterfaceBlockEntity.java diff --git a/src/main/java/appeng/fluids/util/AEFluidInventory.java b/src/unported/java/appeng/fluids/util/AEFluidInventory.java similarity index 100% rename from src/main/java/appeng/fluids/util/AEFluidInventory.java rename to src/unported/java/appeng/fluids/util/AEFluidInventory.java diff --git a/src/main/java/appeng/fluids/util/AEFluidTank.java b/src/unported/java/appeng/fluids/util/AEFluidTank.java similarity index 100% rename from src/main/java/appeng/fluids/util/AEFluidTank.java rename to src/unported/java/appeng/fluids/util/AEFluidTank.java diff --git a/src/main/java/appeng/fluids/util/FluidSorters.java b/src/unported/java/appeng/fluids/util/FluidSorters.java similarity index 100% rename from src/main/java/appeng/fluids/util/FluidSorters.java rename to src/unported/java/appeng/fluids/util/FluidSorters.java diff --git a/src/main/java/appeng/fluids/util/IAEFluidInventory.java b/src/unported/java/appeng/fluids/util/IAEFluidInventory.java similarity index 100% rename from src/main/java/appeng/fluids/util/IAEFluidInventory.java rename to src/unported/java/appeng/fluids/util/IAEFluidInventory.java diff --git a/src/main/java/appeng/fluids/util/IAEFluidTank.java b/src/unported/java/appeng/fluids/util/IAEFluidTank.java similarity index 100% rename from src/main/java/appeng/fluids/util/IAEFluidTank.java rename to src/unported/java/appeng/fluids/util/IAEFluidTank.java diff --git a/src/main/java/appeng/forge/data/AE2DataGenerators.java b/src/unported/java/appeng/forge/data/AE2DataGenerators.java similarity index 100% rename from src/main/java/appeng/forge/data/AE2DataGenerators.java rename to src/unported/java/appeng/forge/data/AE2DataGenerators.java diff --git a/src/main/java/appeng/forge/data/providers/IAE2DataProvider.java b/src/unported/java/appeng/forge/data/providers/IAE2DataProvider.java similarity index 100% rename from src/main/java/appeng/forge/data/providers/IAE2DataProvider.java rename to src/unported/java/appeng/forge/data/providers/IAE2DataProvider.java diff --git a/src/main/java/appeng/forge/data/providers/loot/BlockDropProvider.java b/src/unported/java/appeng/forge/data/providers/loot/BlockDropProvider.java similarity index 100% rename from src/main/java/appeng/forge/data/providers/loot/BlockDropProvider.java rename to src/unported/java/appeng/forge/data/providers/loot/BlockDropProvider.java diff --git a/src/main/java/appeng/forge/data/providers/recipes/SlabStairRecipes.java b/src/unported/java/appeng/forge/data/providers/recipes/SlabStairRecipes.java similarity index 100% rename from src/main/java/appeng/forge/data/providers/recipes/SlabStairRecipes.java rename to src/unported/java/appeng/forge/data/providers/recipes/SlabStairRecipes.java diff --git a/src/main/java/appeng/helpers/DualityInterface.java b/src/unported/java/appeng/helpers/DualityInterface.java similarity index 100% rename from src/main/java/appeng/helpers/DualityInterface.java rename to src/unported/java/appeng/helpers/DualityInterface.java diff --git a/src/main/java/appeng/helpers/IContainerCraftingPacket.java b/src/unported/java/appeng/helpers/IContainerCraftingPacket.java similarity index 100% rename from src/main/java/appeng/helpers/IContainerCraftingPacket.java rename to src/unported/java/appeng/helpers/IContainerCraftingPacket.java diff --git a/src/main/java/appeng/helpers/IInterfaceHost.java b/src/unported/java/appeng/helpers/IInterfaceHost.java similarity index 100% rename from src/main/java/appeng/helpers/IInterfaceHost.java rename to src/unported/java/appeng/helpers/IInterfaceHost.java diff --git a/src/main/java/appeng/helpers/IMouseWheelItem.java b/src/unported/java/appeng/helpers/IMouseWheelItem.java similarity index 100% rename from src/main/java/appeng/helpers/IMouseWheelItem.java rename to src/unported/java/appeng/helpers/IMouseWheelItem.java diff --git a/src/main/java/appeng/helpers/InvalidPatternHelper.java b/src/unported/java/appeng/helpers/InvalidPatternHelper.java similarity index 100% rename from src/main/java/appeng/helpers/InvalidPatternHelper.java rename to src/unported/java/appeng/helpers/InvalidPatternHelper.java diff --git a/src/main/java/appeng/helpers/InventoryAction.java b/src/unported/java/appeng/helpers/InventoryAction.java similarity index 100% rename from src/main/java/appeng/helpers/InventoryAction.java rename to src/unported/java/appeng/helpers/InventoryAction.java diff --git a/src/main/java/appeng/helpers/LocationRotation.java b/src/unported/java/appeng/helpers/LocationRotation.java similarity index 100% rename from src/main/java/appeng/helpers/LocationRotation.java rename to src/unported/java/appeng/helpers/LocationRotation.java diff --git a/src/main/java/appeng/helpers/MultiCraftingTracker.java b/src/unported/java/appeng/helpers/MultiCraftingTracker.java similarity index 100% rename from src/main/java/appeng/helpers/MultiCraftingTracker.java rename to src/unported/java/appeng/helpers/MultiCraftingTracker.java diff --git a/src/main/java/appeng/helpers/NonNullArrayIterator.java b/src/unported/java/appeng/helpers/NonNullArrayIterator.java similarity index 100% rename from src/main/java/appeng/helpers/NonNullArrayIterator.java rename to src/unported/java/appeng/helpers/NonNullArrayIterator.java diff --git a/src/main/java/appeng/helpers/NullRotation.java b/src/unported/java/appeng/helpers/NullRotation.java similarity index 100% rename from src/main/java/appeng/helpers/NullRotation.java rename to src/unported/java/appeng/helpers/NullRotation.java diff --git a/src/main/java/appeng/helpers/PatternHelper.java b/src/unported/java/appeng/helpers/PatternHelper.java similarity index 100% rename from src/main/java/appeng/helpers/PatternHelper.java rename to src/unported/java/appeng/helpers/PatternHelper.java diff --git a/src/main/java/appeng/helpers/PlayerSecurityWrapper.java b/src/unported/java/appeng/helpers/PlayerSecurityWrapper.java similarity index 100% rename from src/main/java/appeng/helpers/PlayerSecurityWrapper.java rename to src/unported/java/appeng/helpers/PlayerSecurityWrapper.java diff --git a/src/main/java/appeng/helpers/Reflected.java b/src/unported/java/appeng/helpers/Reflected.java similarity index 100% rename from src/main/java/appeng/helpers/Reflected.java rename to src/unported/java/appeng/helpers/Reflected.java diff --git a/src/main/java/appeng/helpers/Splotch.java b/src/unported/java/appeng/helpers/Splotch.java similarity index 100% rename from src/main/java/appeng/helpers/Splotch.java rename to src/unported/java/appeng/helpers/Splotch.java diff --git a/src/main/java/appeng/helpers/WirelessTerminalGuiObject.java b/src/unported/java/appeng/helpers/WirelessTerminalGuiObject.java similarity index 100% rename from src/main/java/appeng/helpers/WirelessTerminalGuiObject.java rename to src/unported/java/appeng/helpers/WirelessTerminalGuiObject.java diff --git a/src/main/java/appeng/hooks/AETrading.java b/src/unported/java/appeng/hooks/AETrading.java similarity index 100% rename from src/main/java/appeng/hooks/AETrading.java rename to src/unported/java/appeng/hooks/AETrading.java diff --git a/src/main/java/appeng/hooks/BlockToolDispenseItemBehavior.java b/src/unported/java/appeng/hooks/BlockToolDispenseItemBehavior.java similarity index 100% rename from src/main/java/appeng/hooks/BlockToolDispenseItemBehavior.java rename to src/unported/java/appeng/hooks/BlockToolDispenseItemBehavior.java diff --git a/src/main/java/appeng/hooks/IBlockTool.java b/src/unported/java/appeng/hooks/IBlockTool.java similarity index 100% rename from src/main/java/appeng/hooks/IBlockTool.java rename to src/unported/java/appeng/hooks/IBlockTool.java diff --git a/src/main/java/appeng/hooks/MatterCannonDispenseItemBehavior.java b/src/unported/java/appeng/hooks/MatterCannonDispenseItemBehavior.java similarity index 100% rename from src/main/java/appeng/hooks/MatterCannonDispenseItemBehavior.java rename to src/unported/java/appeng/hooks/MatterCannonDispenseItemBehavior.java diff --git a/src/main/java/appeng/integration/IIntegrationModule.java b/src/unported/java/appeng/integration/IIntegrationModule.java similarity index 100% rename from src/main/java/appeng/integration/IIntegrationModule.java rename to src/unported/java/appeng/integration/IIntegrationModule.java diff --git a/src/main/java/appeng/integration/Integrations.java b/src/unported/java/appeng/integration/Integrations.java similarity index 100% rename from src/main/java/appeng/integration/Integrations.java rename to src/unported/java/appeng/integration/Integrations.java diff --git a/src/main/java/appeng/integration/abstraction/IJEI.java b/src/unported/java/appeng/integration/abstraction/IJEI.java similarity index 100% rename from src/main/java/appeng/integration/abstraction/IJEI.java rename to src/unported/java/appeng/integration/abstraction/IJEI.java diff --git a/src/main/java/appeng/integration/abstraction/JEIFacade.java b/src/unported/java/appeng/integration/abstraction/JEIFacade.java similarity index 100% rename from src/main/java/appeng/integration/abstraction/JEIFacade.java rename to src/unported/java/appeng/integration/abstraction/JEIFacade.java diff --git a/src/main/java/appeng/integration/modules/jei/CondenserCategory.java b/src/unported/java/appeng/integration/modules/jei/CondenserCategory.java similarity index 100% rename from src/main/java/appeng/integration/modules/jei/CondenserCategory.java rename to src/unported/java/appeng/integration/modules/jei/CondenserCategory.java diff --git a/src/main/java/appeng/integration/modules/jei/FacadeRegistryPlugin.java b/src/unported/java/appeng/integration/modules/jei/FacadeRegistryPlugin.java similarity index 100% rename from src/main/java/appeng/integration/modules/jei/FacadeRegistryPlugin.java rename to src/unported/java/appeng/integration/modules/jei/FacadeRegistryPlugin.java diff --git a/src/main/java/appeng/integration/modules/jei/GrinderRecipeCategory.java b/src/unported/java/appeng/integration/modules/jei/GrinderRecipeCategory.java similarity index 100% rename from src/main/java/appeng/integration/modules/jei/GrinderRecipeCategory.java rename to src/unported/java/appeng/integration/modules/jei/GrinderRecipeCategory.java diff --git a/src/main/java/appeng/integration/modules/jei/InscriberRecipeCategory.java b/src/unported/java/appeng/integration/modules/jei/InscriberRecipeCategory.java similarity index 100% rename from src/main/java/appeng/integration/modules/jei/InscriberRecipeCategory.java rename to src/unported/java/appeng/integration/modules/jei/InscriberRecipeCategory.java diff --git a/src/main/java/appeng/integration/modules/jei/JEIPlugin.java b/src/unported/java/appeng/integration/modules/jei/JEIPlugin.java similarity index 100% rename from src/main/java/appeng/integration/modules/jei/JEIPlugin.java rename to src/unported/java/appeng/integration/modules/jei/JEIPlugin.java diff --git a/src/main/java/appeng/integration/modules/jei/JeiRuntimeAdapter.java b/src/unported/java/appeng/integration/modules/jei/JeiRuntimeAdapter.java similarity index 100% rename from src/main/java/appeng/integration/modules/jei/JeiRuntimeAdapter.java rename to src/unported/java/appeng/integration/modules/jei/JeiRuntimeAdapter.java diff --git a/src/main/java/appeng/integration/modules/jei/RecipeTransferHandler.java b/src/unported/java/appeng/integration/modules/jei/RecipeTransferHandler.java similarity index 100% rename from src/main/java/appeng/integration/modules/jei/RecipeTransferHandler.java rename to src/unported/java/appeng/integration/modules/jei/RecipeTransferHandler.java diff --git a/src/main/java/appeng/integration/modules/theoneprobe/PartInfoProvider.java b/src/unported/java/appeng/integration/modules/theoneprobe/PartInfoProvider.java similarity index 100% rename from src/main/java/appeng/integration/modules/theoneprobe/PartInfoProvider.java rename to src/unported/java/appeng/integration/modules/theoneprobe/PartInfoProvider.java diff --git a/src/main/java/appeng/integration/modules/theoneprobe/TOP.java b/src/unported/java/appeng/integration/modules/theoneprobe/TOP.java similarity index 100% rename from src/main/java/appeng/integration/modules/theoneprobe/TOP.java rename to src/unported/java/appeng/integration/modules/theoneprobe/TOP.java diff --git a/src/main/java/appeng/integration/modules/theoneprobe/TheOneProbeModule.java b/src/unported/java/appeng/integration/modules/theoneprobe/TheOneProbeModule.java similarity index 100% rename from src/main/java/appeng/integration/modules/theoneprobe/TheOneProbeModule.java rename to src/unported/java/appeng/integration/modules/theoneprobe/TheOneProbeModule.java diff --git a/src/main/java/appeng/integration/modules/theoneprobe/TheOneProbeText.java b/src/unported/java/appeng/integration/modules/theoneprobe/TheOneProbeText.java similarity index 100% rename from src/main/java/appeng/integration/modules/theoneprobe/TheOneProbeText.java rename to src/unported/java/appeng/integration/modules/theoneprobe/TheOneProbeText.java diff --git a/src/main/java/appeng/integration/modules/theoneprobe/TileInfoProvider.java b/src/unported/java/appeng/integration/modules/theoneprobe/TileInfoProvider.java similarity index 100% rename from src/main/java/appeng/integration/modules/theoneprobe/TileInfoProvider.java rename to src/unported/java/appeng/integration/modules/theoneprobe/TileInfoProvider.java diff --git a/src/main/java/appeng/integration/modules/theoneprobe/config/AEConfigProvider.java b/src/unported/java/appeng/integration/modules/theoneprobe/config/AEConfigProvider.java similarity index 100% rename from src/main/java/appeng/integration/modules/theoneprobe/config/AEConfigProvider.java rename to src/unported/java/appeng/integration/modules/theoneprobe/config/AEConfigProvider.java diff --git a/src/main/java/appeng/integration/modules/theoneprobe/part/ChannelInfoProvider.java b/src/unported/java/appeng/integration/modules/theoneprobe/part/ChannelInfoProvider.java similarity index 100% rename from src/main/java/appeng/integration/modules/theoneprobe/part/ChannelInfoProvider.java rename to src/unported/java/appeng/integration/modules/theoneprobe/part/ChannelInfoProvider.java diff --git a/src/main/java/appeng/integration/modules/theoneprobe/part/IPartProbInfoProvider.java b/src/unported/java/appeng/integration/modules/theoneprobe/part/IPartProbInfoProvider.java similarity index 100% rename from src/main/java/appeng/integration/modules/theoneprobe/part/IPartProbInfoProvider.java rename to src/unported/java/appeng/integration/modules/theoneprobe/part/IPartProbInfoProvider.java diff --git a/src/main/java/appeng/integration/modules/theoneprobe/part/P2PStateInfoProvider.java b/src/unported/java/appeng/integration/modules/theoneprobe/part/P2PStateInfoProvider.java similarity index 100% rename from src/main/java/appeng/integration/modules/theoneprobe/part/P2PStateInfoProvider.java rename to src/unported/java/appeng/integration/modules/theoneprobe/part/P2PStateInfoProvider.java diff --git a/src/main/java/appeng/integration/modules/theoneprobe/part/PartAccessor.java b/src/unported/java/appeng/integration/modules/theoneprobe/part/PartAccessor.java similarity index 100% rename from src/main/java/appeng/integration/modules/theoneprobe/part/PartAccessor.java rename to src/unported/java/appeng/integration/modules/theoneprobe/part/PartAccessor.java diff --git a/src/main/java/appeng/integration/modules/theoneprobe/part/PowerStateInfoProvider.java b/src/unported/java/appeng/integration/modules/theoneprobe/part/PowerStateInfoProvider.java similarity index 100% rename from src/main/java/appeng/integration/modules/theoneprobe/part/PowerStateInfoProvider.java rename to src/unported/java/appeng/integration/modules/theoneprobe/part/PowerStateInfoProvider.java diff --git a/src/main/java/appeng/integration/modules/theoneprobe/part/StorageMonitorInfoProvider.java b/src/unported/java/appeng/integration/modules/theoneprobe/part/StorageMonitorInfoProvider.java similarity index 100% rename from src/main/java/appeng/integration/modules/theoneprobe/part/StorageMonitorInfoProvider.java rename to src/unported/java/appeng/integration/modules/theoneprobe/part/StorageMonitorInfoProvider.java diff --git a/src/main/java/appeng/integration/modules/theoneprobe/tile/ChargerInfoProvider.java b/src/unported/java/appeng/integration/modules/theoneprobe/tile/ChargerInfoProvider.java similarity index 100% rename from src/main/java/appeng/integration/modules/theoneprobe/tile/ChargerInfoProvider.java rename to src/unported/java/appeng/integration/modules/theoneprobe/tile/ChargerInfoProvider.java diff --git a/src/main/java/appeng/integration/modules/theoneprobe/tile/CraftingMonitorInfoProvider.java b/src/unported/java/appeng/integration/modules/theoneprobe/tile/CraftingMonitorInfoProvider.java similarity index 100% rename from src/main/java/appeng/integration/modules/theoneprobe/tile/CraftingMonitorInfoProvider.java rename to src/unported/java/appeng/integration/modules/theoneprobe/tile/CraftingMonitorInfoProvider.java diff --git a/src/main/java/appeng/integration/modules/theoneprobe/tile/ITileProbInfoProvider.java b/src/unported/java/appeng/integration/modules/theoneprobe/tile/ITileProbInfoProvider.java similarity index 100% rename from src/main/java/appeng/integration/modules/theoneprobe/tile/ITileProbInfoProvider.java rename to src/unported/java/appeng/integration/modules/theoneprobe/tile/ITileProbInfoProvider.java diff --git a/src/main/java/appeng/integration/modules/theoneprobe/tile/PowerStateInfoProvider.java b/src/unported/java/appeng/integration/modules/theoneprobe/tile/PowerStateInfoProvider.java similarity index 100% rename from src/main/java/appeng/integration/modules/theoneprobe/tile/PowerStateInfoProvider.java rename to src/unported/java/appeng/integration/modules/theoneprobe/tile/PowerStateInfoProvider.java diff --git a/src/main/java/appeng/integration/modules/theoneprobe/tile/PowerStorageInfoProvider.java b/src/unported/java/appeng/integration/modules/theoneprobe/tile/PowerStorageInfoProvider.java similarity index 100% rename from src/main/java/appeng/integration/modules/theoneprobe/tile/PowerStorageInfoProvider.java rename to src/unported/java/appeng/integration/modules/theoneprobe/tile/PowerStorageInfoProvider.java diff --git a/src/main/java/appeng/items/misc/CrystalSeedItem.java b/src/unported/java/appeng/items/misc/CrystalSeedItem.java similarity index 100% rename from src/main/java/appeng/items/misc/CrystalSeedItem.java rename to src/unported/java/appeng/items/misc/CrystalSeedItem.java diff --git a/src/main/java/appeng/items/misc/EncodedPatternItem.java b/src/unported/java/appeng/items/misc/EncodedPatternItem.java similarity index 100% rename from src/main/java/appeng/items/misc/EncodedPatternItem.java rename to src/unported/java/appeng/items/misc/EncodedPatternItem.java diff --git a/src/main/java/appeng/items/misc/PaintBallItem.java b/src/unported/java/appeng/items/misc/PaintBallItem.java similarity index 100% rename from src/main/java/appeng/items/misc/PaintBallItem.java rename to src/unported/java/appeng/items/misc/PaintBallItem.java diff --git a/src/main/java/appeng/items/misc/PaintBallItemRendering.java b/src/unported/java/appeng/items/misc/PaintBallItemRendering.java similarity index 100% rename from src/main/java/appeng/items/misc/PaintBallItemRendering.java rename to src/unported/java/appeng/items/misc/PaintBallItemRendering.java diff --git a/src/main/java/appeng/items/storage/AbstractStorageCell.java b/src/unported/java/appeng/items/storage/AbstractStorageCell.java similarity index 100% rename from src/main/java/appeng/items/storage/AbstractStorageCell.java rename to src/unported/java/appeng/items/storage/AbstractStorageCell.java diff --git a/src/main/java/appeng/items/storage/BasicStorageCellItem.java b/src/unported/java/appeng/items/storage/BasicStorageCellItem.java similarity index 100% rename from src/main/java/appeng/items/storage/BasicStorageCellItem.java rename to src/unported/java/appeng/items/storage/BasicStorageCellItem.java diff --git a/src/main/java/appeng/items/storage/SpatialStorageCellItem.java b/src/unported/java/appeng/items/storage/SpatialStorageCellItem.java similarity index 100% rename from src/main/java/appeng/items/storage/SpatialStorageCellItem.java rename to src/unported/java/appeng/items/storage/SpatialStorageCellItem.java diff --git a/src/main/java/appeng/items/storage/ViewCellItem.java b/src/unported/java/appeng/items/storage/ViewCellItem.java similarity index 100% rename from src/main/java/appeng/items/storage/ViewCellItem.java rename to src/unported/java/appeng/items/storage/ViewCellItem.java diff --git a/src/main/java/appeng/items/tools/BiometricCardItem.java b/src/unported/java/appeng/items/tools/BiometricCardItem.java similarity index 100% rename from src/main/java/appeng/items/tools/BiometricCardItem.java rename to src/unported/java/appeng/items/tools/BiometricCardItem.java diff --git a/src/main/java/appeng/items/tools/MemoryCardItem.java b/src/unported/java/appeng/items/tools/MemoryCardItem.java similarity index 100% rename from src/main/java/appeng/items/tools/MemoryCardItem.java rename to src/unported/java/appeng/items/tools/MemoryCardItem.java diff --git a/src/main/java/appeng/items/tools/NetworkToolItem.java b/src/unported/java/appeng/items/tools/NetworkToolItem.java similarity index 100% rename from src/main/java/appeng/items/tools/NetworkToolItem.java rename to src/unported/java/appeng/items/tools/NetworkToolItem.java diff --git a/src/main/java/appeng/items/tools/powered/BlockRecolorer.java b/src/unported/java/appeng/items/tools/powered/BlockRecolorer.java similarity index 100% rename from src/main/java/appeng/items/tools/powered/BlockRecolorer.java rename to src/unported/java/appeng/items/tools/powered/BlockRecolorer.java diff --git a/src/main/java/appeng/items/tools/powered/ChargedStaffItem.java b/src/unported/java/appeng/items/tools/powered/ChargedStaffItem.java similarity index 100% rename from src/main/java/appeng/items/tools/powered/ChargedStaffItem.java rename to src/unported/java/appeng/items/tools/powered/ChargedStaffItem.java diff --git a/src/main/java/appeng/items/tools/powered/ColorApplicatorItem.java b/src/unported/java/appeng/items/tools/powered/ColorApplicatorItem.java similarity index 100% rename from src/main/java/appeng/items/tools/powered/ColorApplicatorItem.java rename to src/unported/java/appeng/items/tools/powered/ColorApplicatorItem.java diff --git a/src/main/java/appeng/items/tools/powered/ColorApplicatorItemRendering.java b/src/unported/java/appeng/items/tools/powered/ColorApplicatorItemRendering.java similarity index 100% rename from src/main/java/appeng/items/tools/powered/ColorApplicatorItemRendering.java rename to src/unported/java/appeng/items/tools/powered/ColorApplicatorItemRendering.java diff --git a/src/main/java/appeng/items/tools/powered/EntropyManipulatorItem.java b/src/unported/java/appeng/items/tools/powered/EntropyManipulatorItem.java similarity index 100% rename from src/main/java/appeng/items/tools/powered/EntropyManipulatorItem.java rename to src/unported/java/appeng/items/tools/powered/EntropyManipulatorItem.java diff --git a/src/main/java/appeng/items/tools/powered/MatterCannonItem.java b/src/unported/java/appeng/items/tools/powered/MatterCannonItem.java similarity index 100% rename from src/main/java/appeng/items/tools/powered/MatterCannonItem.java rename to src/unported/java/appeng/items/tools/powered/MatterCannonItem.java diff --git a/src/main/java/appeng/items/tools/powered/PortableCellItem.java b/src/unported/java/appeng/items/tools/powered/PortableCellItem.java similarity index 100% rename from src/main/java/appeng/items/tools/powered/PortableCellItem.java rename to src/unported/java/appeng/items/tools/powered/PortableCellItem.java diff --git a/src/main/java/appeng/items/tools/powered/WirelessTerminalItem.java b/src/unported/java/appeng/items/tools/powered/WirelessTerminalItem.java similarity index 100% rename from src/main/java/appeng/items/tools/powered/WirelessTerminalItem.java rename to src/unported/java/appeng/items/tools/powered/WirelessTerminalItem.java diff --git a/src/main/java/appeng/items/tools/powered/powersink/AEBasePoweredItem.java b/src/unported/java/appeng/items/tools/powered/powersink/AEBasePoweredItem.java similarity index 100% rename from src/main/java/appeng/items/tools/powered/powersink/AEBasePoweredItem.java rename to src/unported/java/appeng/items/tools/powered/powersink/AEBasePoweredItem.java diff --git a/src/main/java/appeng/items/tools/powered/powersink/PoweredItemCapabilities.java b/src/unported/java/appeng/items/tools/powered/powersink/PoweredItemCapabilities.java similarity index 100% rename from src/main/java/appeng/items/tools/powered/powersink/PoweredItemCapabilities.java rename to src/unported/java/appeng/items/tools/powered/powersink/PoweredItemCapabilities.java diff --git a/src/main/java/appeng/me/cache/CraftingGridCache.java b/src/unported/java/appeng/me/cache/CraftingGridCache.java similarity index 100% rename from src/main/java/appeng/me/cache/CraftingGridCache.java rename to src/unported/java/appeng/me/cache/CraftingGridCache.java diff --git a/src/unported/java/appeng/me/cache/P2PCache.java b/src/unported/java/appeng/me/cache/P2PCache.java new file mode 100644 index 000000000..100270340 --- /dev/null +++ b/src/unported/java/appeng/me/cache/P2PCache.java @@ -0,0 +1,214 @@ +/* + * This file is part of Applied Energistics 2. + * Copyright (c) 2013 - 2014, AlgorithmX2, All rights reserved. + * + * Applied Energistics 2 is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Applied Energistics 2 is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Applied Energistics 2. If not, see . + */ + +package appeng.me.cache; + +import java.util.HashMap; +import java.util.Random; + +import com.google.common.collect.LinkedHashMultimap; +import com.google.common.collect.Multimap; + +import appeng.api.networking.GridFlags; +import appeng.api.networking.IGrid; +import appeng.api.networking.IGridCache; +import appeng.api.networking.IGridHost; +import appeng.api.networking.IGridNode; +import appeng.api.networking.IGridStorage; +import appeng.api.networking.events.MENetworkBootingStatusChange; +import appeng.api.networking.events.MENetworkEventSubscribe; +import appeng.api.networking.events.MENetworkPowerStatusChange; +import appeng.api.networking.ticking.ITickManager; +import appeng.core.AELog; +import appeng.me.cache.helpers.TunnelCollection; +import appeng.parts.p2p.MEP2PTunnelPart; +import appeng.parts.p2p.P2PTunnelPart; + +public class P2PCache implements IGridCache { + private static final TunnelCollection NULL_COLLECTION = new TunnelCollection(null, + null); + + private final IGrid myGrid; + private final HashMap inputs = new HashMap<>(); + private final Multimap outputs = LinkedHashMultimap.create(); + private final Random frequencyGenerator; + + public P2PCache(final IGrid g) { + this.myGrid = g; + this.frequencyGenerator = new Random(g.hashCode()); + } + + @MENetworkEventSubscribe + public void bootComplete(final MENetworkBootingStatusChange bootStatus) { + final ITickManager tm = this.myGrid.getCache(ITickManager.class); + for (final P2PTunnelPart me : this.inputs.values()) { + if (me instanceof MEP2PTunnelPart) { + tm.wakeDevice(me.getGridNode()); + } + } + } + + @MENetworkEventSubscribe + public void bootComplete(final MENetworkPowerStatusChange power) { + final ITickManager tm = this.myGrid.getCache(ITickManager.class); + for (final P2PTunnelPart me : this.inputs.values()) { + if (me instanceof MEP2PTunnelPart) { + tm.wakeDevice(me.getGridNode()); + } + } + } + + @Override + public void onUpdateTick() { + + } + + @Override + public void removeNode(final IGridNode node, final IGridHost machine) { + if (machine instanceof P2PTunnelPart) { + if (machine instanceof MEP2PTunnelPart) { + if (!node.hasFlag(GridFlags.REQUIRE_CHANNEL)) { + return; + } + } + + final P2PTunnelPart t = (P2PTunnelPart) machine; + // AELog.info( "rmv-" + (t.output ? "output: " : "input: ") + t.freq ); + + if (t.isOutput()) { + this.outputs.remove(t.getFrequency(), t); + } else { + this.inputs.remove(t.getFrequency()); + } + + this.updateTunnel(t.getFrequency(), !t.isOutput(), false); + } + } + + @Override + public void addNode(final IGridNode node, final IGridHost machine) { + if (machine instanceof P2PTunnelPart) { + if (machine instanceof MEP2PTunnelPart) { + if (!node.hasFlag(GridFlags.REQUIRE_CHANNEL)) { + return; + } + } + + final P2PTunnelPart t = (P2PTunnelPart) machine; + // AELog.info( "add-" + (t.output ? "output: " : "input: ") + t.freq ); + + if (t.isOutput()) { + this.outputs.put(t.getFrequency(), t); + } else { + this.inputs.put(t.getFrequency(), t); + } + + this.updateTunnel(t.getFrequency(), !t.isOutput(), false); + } + } + + @Override + public void onSplit(final IGridStorage storageB) { + + } + + @Override + public void onJoin(final IGridStorage storageB) { + + } + + @Override + public void populateGridStorage(final IGridStorage storage) { + + } + + private void updateTunnel(final short freq, final boolean updateOutputs, final boolean configChange) { + for (final P2PTunnelPart p : this.outputs.get(freq)) { + if (configChange) { + p.onTunnelConfigChange(); + } + p.onTunnelNetworkChange(); + } + + final P2PTunnelPart in = this.inputs.get(freq); + if (in != null) { + if (configChange) { + in.onTunnelConfigChange(); + } + in.onTunnelNetworkChange(); + } + } + + public void updateFreq(final P2PTunnelPart t, final short newFrequency) { + if (this.outputs.containsValue(t)) { + this.outputs.remove(t.getFrequency(), t); + } + + if (this.inputs.containsValue(t)) { + this.inputs.remove(t.getFrequency()); + } + + t.setFrequency(newFrequency); + + if (t.isOutput()) { + this.outputs.put(t.getFrequency(), t); + } else { + this.inputs.put(t.getFrequency(), t); + } + + // AELog.info( "update-" + (t.output ? "output: " : "input: ") + t.freq ); + this.updateTunnel(t.getFrequency(), t.isOutput(), true); + this.updateTunnel(t.getFrequency(), !t.isOutput(), true); + } + + public short newFrequency() { + short newFrequency; + int cycles = 0; + + do { + newFrequency = (short) this.frequencyGenerator.nextInt(1 << 16); + cycles++; + } while (newFrequency == 0 || this.inputs.containsKey(newFrequency)); + + if (cycles > 25) { + AELog.debug("Generating a new P2P frequency '%1$d' took %2$d cycles", newFrequency, cycles); + } + + return newFrequency; + } + + public TunnelCollection getOutputs(final short freq, final Class c) { + final P2PTunnelPart in = this.inputs.get(freq); + + if (in == null) { + return NULL_COLLECTION; + } + + final TunnelCollection out = this.inputs.get(freq).getCollection(this.outputs.get(freq), c); + + if (out == null) { + return NULL_COLLECTION; + } + + return out; + } + + public P2PTunnelPart getInput(final short freq) { + return this.inputs.get(freq); + } +} diff --git a/src/main/java/appeng/me/cache/SpatialPylonCache.java b/src/unported/java/appeng/me/cache/SpatialPylonCache.java similarity index 100% rename from src/main/java/appeng/me/cache/SpatialPylonCache.java rename to src/unported/java/appeng/me/cache/SpatialPylonCache.java diff --git a/src/main/java/appeng/me/cache/helpers/ConnectionWrapper.java b/src/unported/java/appeng/me/cache/helpers/ConnectionWrapper.java similarity index 100% rename from src/main/java/appeng/me/cache/helpers/ConnectionWrapper.java rename to src/unported/java/appeng/me/cache/helpers/ConnectionWrapper.java diff --git a/src/main/java/appeng/me/cache/helpers/Connections.java b/src/unported/java/appeng/me/cache/helpers/Connections.java similarity index 100% rename from src/main/java/appeng/me/cache/helpers/Connections.java rename to src/unported/java/appeng/me/cache/helpers/Connections.java diff --git a/src/main/java/appeng/me/cache/helpers/TunnelCollection.java b/src/unported/java/appeng/me/cache/helpers/TunnelCollection.java similarity index 100% rename from src/main/java/appeng/me/cache/helpers/TunnelCollection.java rename to src/unported/java/appeng/me/cache/helpers/TunnelCollection.java diff --git a/src/main/java/appeng/me/cache/helpers/TunnelConnection.java b/src/unported/java/appeng/me/cache/helpers/TunnelConnection.java similarity index 100% rename from src/main/java/appeng/me/cache/helpers/TunnelConnection.java rename to src/unported/java/appeng/me/cache/helpers/TunnelConnection.java diff --git a/src/main/java/appeng/me/cache/helpers/TunnelIterator.java b/src/unported/java/appeng/me/cache/helpers/TunnelIterator.java similarity index 100% rename from src/main/java/appeng/me/cache/helpers/TunnelIterator.java rename to src/unported/java/appeng/me/cache/helpers/TunnelIterator.java diff --git a/src/main/java/appeng/me/cluster/MBCalculator.java b/src/unported/java/appeng/me/cluster/MBCalculator.java similarity index 100% rename from src/main/java/appeng/me/cluster/MBCalculator.java rename to src/unported/java/appeng/me/cluster/MBCalculator.java diff --git a/src/main/java/appeng/me/cluster/implementations/CraftingCPUCalculator.java b/src/unported/java/appeng/me/cluster/implementations/CraftingCPUCalculator.java similarity index 100% rename from src/main/java/appeng/me/cluster/implementations/CraftingCPUCalculator.java rename to src/unported/java/appeng/me/cluster/implementations/CraftingCPUCalculator.java diff --git a/src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java b/src/unported/java/appeng/me/cluster/implementations/CraftingCPUCluster.java similarity index 100% rename from src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java rename to src/unported/java/appeng/me/cluster/implementations/CraftingCPUCluster.java diff --git a/src/main/java/appeng/me/cluster/implementations/QuantumCalculator.java b/src/unported/java/appeng/me/cluster/implementations/QuantumCalculator.java similarity index 100% rename from src/main/java/appeng/me/cluster/implementations/QuantumCalculator.java rename to src/unported/java/appeng/me/cluster/implementations/QuantumCalculator.java diff --git a/src/main/java/appeng/me/cluster/implementations/QuantumCluster.java b/src/unported/java/appeng/me/cluster/implementations/QuantumCluster.java similarity index 100% rename from src/main/java/appeng/me/cluster/implementations/QuantumCluster.java rename to src/unported/java/appeng/me/cluster/implementations/QuantumCluster.java diff --git a/src/main/java/appeng/me/cluster/implementations/SpatialPylonCalculator.java b/src/unported/java/appeng/me/cluster/implementations/SpatialPylonCalculator.java similarity index 100% rename from src/main/java/appeng/me/cluster/implementations/SpatialPylonCalculator.java rename to src/unported/java/appeng/me/cluster/implementations/SpatialPylonCalculator.java diff --git a/src/main/java/appeng/me/cluster/implementations/SpatialPylonCluster.java b/src/unported/java/appeng/me/cluster/implementations/SpatialPylonCluster.java similarity index 100% rename from src/main/java/appeng/me/cluster/implementations/SpatialPylonCluster.java rename to src/unported/java/appeng/me/cluster/implementations/SpatialPylonCluster.java diff --git a/src/main/java/appeng/me/helpers/AENetworkProxyMultiblock.java b/src/unported/java/appeng/me/helpers/AENetworkProxyMultiblock.java similarity index 100% rename from src/main/java/appeng/me/helpers/AENetworkProxyMultiblock.java rename to src/unported/java/appeng/me/helpers/AENetworkProxyMultiblock.java diff --git a/src/main/java/appeng/me/storage/MEMonitorIFluidHandler.java b/src/unported/java/appeng/me/storage/MEMonitorIFluidHandler.java similarity index 100% rename from src/main/java/appeng/me/storage/MEMonitorIFluidHandler.java rename to src/unported/java/appeng/me/storage/MEMonitorIFluidHandler.java diff --git a/src/main/java/appeng/me/storage/SecurityStationInventory.java b/src/unported/java/appeng/me/storage/SecurityStationInventory.java similarity index 100% rename from src/main/java/appeng/me/storage/SecurityStationInventory.java rename to src/unported/java/appeng/me/storage/SecurityStationInventory.java diff --git a/src/main/java/appeng/parts/BasicStatePart.java b/src/unported/java/appeng/parts/BasicStatePart.java similarity index 100% rename from src/main/java/appeng/parts/BasicStatePart.java rename to src/unported/java/appeng/parts/BasicStatePart.java diff --git a/src/main/java/appeng/parts/automation/AbstractFormationPlanePart.java b/src/unported/java/appeng/parts/automation/AbstractFormationPlanePart.java similarity index 100% rename from src/main/java/appeng/parts/automation/AbstractFormationPlanePart.java rename to src/unported/java/appeng/parts/automation/AbstractFormationPlanePart.java diff --git a/src/main/java/appeng/parts/automation/AnnihilationPlanePart.java b/src/unported/java/appeng/parts/automation/AnnihilationPlanePart.java similarity index 100% rename from src/main/java/appeng/parts/automation/AnnihilationPlanePart.java rename to src/unported/java/appeng/parts/automation/AnnihilationPlanePart.java diff --git a/src/main/java/appeng/parts/automation/DefinitionUpgradeInventory.java b/src/unported/java/appeng/parts/automation/DefinitionUpgradeInventory.java similarity index 100% rename from src/main/java/appeng/parts/automation/DefinitionUpgradeInventory.java rename to src/unported/java/appeng/parts/automation/DefinitionUpgradeInventory.java diff --git a/src/main/java/appeng/parts/automation/ExportBusPart.java b/src/unported/java/appeng/parts/automation/ExportBusPart.java similarity index 100% rename from src/main/java/appeng/parts/automation/ExportBusPart.java rename to src/unported/java/appeng/parts/automation/ExportBusPart.java diff --git a/src/main/java/appeng/parts/automation/FormationPlanePart.java b/src/unported/java/appeng/parts/automation/FormationPlanePart.java similarity index 100% rename from src/main/java/appeng/parts/automation/FormationPlanePart.java rename to src/unported/java/appeng/parts/automation/FormationPlanePart.java diff --git a/src/main/java/appeng/parts/automation/IdentityAnnihilationPlanePart.java b/src/unported/java/appeng/parts/automation/IdentityAnnihilationPlanePart.java similarity index 100% rename from src/main/java/appeng/parts/automation/IdentityAnnihilationPlanePart.java rename to src/unported/java/appeng/parts/automation/IdentityAnnihilationPlanePart.java diff --git a/src/main/java/appeng/parts/automation/ImportBusPart.java b/src/unported/java/appeng/parts/automation/ImportBusPart.java similarity index 100% rename from src/main/java/appeng/parts/automation/ImportBusPart.java rename to src/unported/java/appeng/parts/automation/ImportBusPart.java diff --git a/src/main/java/appeng/parts/automation/LevelEmitterPart.java b/src/unported/java/appeng/parts/automation/LevelEmitterPart.java similarity index 100% rename from src/main/java/appeng/parts/automation/LevelEmitterPart.java rename to src/unported/java/appeng/parts/automation/LevelEmitterPart.java diff --git a/src/main/java/appeng/parts/automation/PlaneBakedModel.java b/src/unported/java/appeng/parts/automation/PlaneBakedModel.java similarity index 100% rename from src/main/java/appeng/parts/automation/PlaneBakedModel.java rename to src/unported/java/appeng/parts/automation/PlaneBakedModel.java diff --git a/src/main/java/appeng/parts/automation/PlaneConnections.java b/src/unported/java/appeng/parts/automation/PlaneConnections.java similarity index 100% rename from src/main/java/appeng/parts/automation/PlaneConnections.java rename to src/unported/java/appeng/parts/automation/PlaneConnections.java diff --git a/src/main/java/appeng/parts/automation/PlaneModel.java b/src/unported/java/appeng/parts/automation/PlaneModel.java similarity index 100% rename from src/main/java/appeng/parts/automation/PlaneModel.java rename to src/unported/java/appeng/parts/automation/PlaneModel.java diff --git a/src/main/java/appeng/parts/automation/PlaneModelData.java b/src/unported/java/appeng/parts/automation/PlaneModelData.java similarity index 100% rename from src/main/java/appeng/parts/automation/PlaneModelData.java rename to src/unported/java/appeng/parts/automation/PlaneModelData.java diff --git a/src/main/java/appeng/parts/automation/PlaneModelLoader.java b/src/unported/java/appeng/parts/automation/PlaneModelLoader.java similarity index 100% rename from src/main/java/appeng/parts/automation/PlaneModelLoader.java rename to src/unported/java/appeng/parts/automation/PlaneModelLoader.java diff --git a/src/main/java/appeng/parts/automation/PlaneModels.java b/src/unported/java/appeng/parts/automation/PlaneModels.java similarity index 100% rename from src/main/java/appeng/parts/automation/PlaneModels.java rename to src/unported/java/appeng/parts/automation/PlaneModels.java diff --git a/src/main/java/appeng/parts/automation/SharedItemBusPart.java b/src/unported/java/appeng/parts/automation/SharedItemBusPart.java similarity index 100% rename from src/main/java/appeng/parts/automation/SharedItemBusPart.java rename to src/unported/java/appeng/parts/automation/SharedItemBusPart.java diff --git a/src/main/java/appeng/parts/automation/UpgradeablePart.java b/src/unported/java/appeng/parts/automation/UpgradeablePart.java similarity index 100% rename from src/main/java/appeng/parts/automation/UpgradeablePart.java rename to src/unported/java/appeng/parts/automation/UpgradeablePart.java diff --git a/src/main/java/appeng/parts/misc/InterfacePart.java b/src/unported/java/appeng/parts/misc/InterfacePart.java similarity index 100% rename from src/main/java/appeng/parts/misc/InterfacePart.java rename to src/unported/java/appeng/parts/misc/InterfacePart.java diff --git a/src/main/java/appeng/parts/misc/InvertedToggleBusPart.java b/src/unported/java/appeng/parts/misc/InvertedToggleBusPart.java similarity index 100% rename from src/main/java/appeng/parts/misc/InvertedToggleBusPart.java rename to src/unported/java/appeng/parts/misc/InvertedToggleBusPart.java diff --git a/src/main/java/appeng/parts/misc/ItemHandlerAdapter.java b/src/unported/java/appeng/parts/misc/ItemHandlerAdapter.java similarity index 100% rename from src/main/java/appeng/parts/misc/ItemHandlerAdapter.java rename to src/unported/java/appeng/parts/misc/ItemHandlerAdapter.java diff --git a/src/main/java/appeng/parts/misc/SharedStorageBusPart.java b/src/unported/java/appeng/parts/misc/SharedStorageBusPart.java similarity index 100% rename from src/main/java/appeng/parts/misc/SharedStorageBusPart.java rename to src/unported/java/appeng/parts/misc/SharedStorageBusPart.java diff --git a/src/main/java/appeng/parts/misc/StorageBusPart.java b/src/unported/java/appeng/parts/misc/StorageBusPart.java similarity index 100% rename from src/main/java/appeng/parts/misc/StorageBusPart.java rename to src/unported/java/appeng/parts/misc/StorageBusPart.java diff --git a/src/main/java/appeng/parts/misc/ToggleBusPart.java b/src/unported/java/appeng/parts/misc/ToggleBusPart.java similarity index 100% rename from src/main/java/appeng/parts/misc/ToggleBusPart.java rename to src/unported/java/appeng/parts/misc/ToggleBusPart.java diff --git a/src/main/java/appeng/parts/p2p/FEP2PTunnelPart.java b/src/unported/java/appeng/parts/p2p/FEP2PTunnelPart.java similarity index 100% rename from src/main/java/appeng/parts/p2p/FEP2PTunnelPart.java rename to src/unported/java/appeng/parts/p2p/FEP2PTunnelPart.java diff --git a/src/main/java/appeng/parts/p2p/FluidP2PTunnelPart.java b/src/unported/java/appeng/parts/p2p/FluidP2PTunnelPart.java similarity index 100% rename from src/main/java/appeng/parts/p2p/FluidP2PTunnelPart.java rename to src/unported/java/appeng/parts/p2p/FluidP2PTunnelPart.java diff --git a/src/main/java/appeng/parts/p2p/ItemP2PTunnelPart.java b/src/unported/java/appeng/parts/p2p/ItemP2PTunnelPart.java similarity index 100% rename from src/main/java/appeng/parts/p2p/ItemP2PTunnelPart.java rename to src/unported/java/appeng/parts/p2p/ItemP2PTunnelPart.java diff --git a/src/main/java/appeng/parts/p2p/LightP2PTunnelPart.java b/src/unported/java/appeng/parts/p2p/LightP2PTunnelPart.java similarity index 100% rename from src/main/java/appeng/parts/p2p/LightP2PTunnelPart.java rename to src/unported/java/appeng/parts/p2p/LightP2PTunnelPart.java diff --git a/src/main/java/appeng/parts/p2p/MEP2PTunnelPart.java b/src/unported/java/appeng/parts/p2p/MEP2PTunnelPart.java similarity index 100% rename from src/main/java/appeng/parts/p2p/MEP2PTunnelPart.java rename to src/unported/java/appeng/parts/p2p/MEP2PTunnelPart.java diff --git a/src/main/java/appeng/parts/p2p/P2PModels.java b/src/unported/java/appeng/parts/p2p/P2PModels.java similarity index 100% rename from src/main/java/appeng/parts/p2p/P2PModels.java rename to src/unported/java/appeng/parts/p2p/P2PModels.java diff --git a/src/main/java/appeng/parts/p2p/P2PTunnelPart.java b/src/unported/java/appeng/parts/p2p/P2PTunnelPart.java similarity index 100% rename from src/main/java/appeng/parts/p2p/P2PTunnelPart.java rename to src/unported/java/appeng/parts/p2p/P2PTunnelPart.java diff --git a/src/main/java/appeng/parts/p2p/RedstoneP2PTunnelPart.java b/src/unported/java/appeng/parts/p2p/RedstoneP2PTunnelPart.java similarity index 100% rename from src/main/java/appeng/parts/p2p/RedstoneP2PTunnelPart.java rename to src/unported/java/appeng/parts/p2p/RedstoneP2PTunnelPart.java diff --git a/src/main/java/appeng/parts/reporting/AbstractDisplayPart.java b/src/unported/java/appeng/parts/reporting/AbstractDisplayPart.java similarity index 100% rename from src/main/java/appeng/parts/reporting/AbstractDisplayPart.java rename to src/unported/java/appeng/parts/reporting/AbstractDisplayPart.java diff --git a/src/main/java/appeng/parts/reporting/AbstractMonitorPart.java b/src/unported/java/appeng/parts/reporting/AbstractMonitorPart.java similarity index 100% rename from src/main/java/appeng/parts/reporting/AbstractMonitorPart.java rename to src/unported/java/appeng/parts/reporting/AbstractMonitorPart.java diff --git a/src/main/java/appeng/parts/reporting/AbstractPanelPart.java b/src/unported/java/appeng/parts/reporting/AbstractPanelPart.java similarity index 100% rename from src/main/java/appeng/parts/reporting/AbstractPanelPart.java rename to src/unported/java/appeng/parts/reporting/AbstractPanelPart.java diff --git a/src/main/java/appeng/parts/reporting/AbstractReportingPart.java b/src/unported/java/appeng/parts/reporting/AbstractReportingPart.java similarity index 100% rename from src/main/java/appeng/parts/reporting/AbstractReportingPart.java rename to src/unported/java/appeng/parts/reporting/AbstractReportingPart.java diff --git a/src/main/java/appeng/parts/reporting/AbstractTerminalPart.java b/src/unported/java/appeng/parts/reporting/AbstractTerminalPart.java similarity index 100% rename from src/main/java/appeng/parts/reporting/AbstractTerminalPart.java rename to src/unported/java/appeng/parts/reporting/AbstractTerminalPart.java diff --git a/src/main/java/appeng/parts/reporting/ConversionMonitorPart.java b/src/unported/java/appeng/parts/reporting/ConversionMonitorPart.java similarity index 100% rename from src/main/java/appeng/parts/reporting/ConversionMonitorPart.java rename to src/unported/java/appeng/parts/reporting/ConversionMonitorPart.java diff --git a/src/main/java/appeng/parts/reporting/CraftingTerminalPart.java b/src/unported/java/appeng/parts/reporting/CraftingTerminalPart.java similarity index 100% rename from src/main/java/appeng/parts/reporting/CraftingTerminalPart.java rename to src/unported/java/appeng/parts/reporting/CraftingTerminalPart.java diff --git a/src/main/java/appeng/parts/reporting/DarkPanelPart.java b/src/unported/java/appeng/parts/reporting/DarkPanelPart.java similarity index 100% rename from src/main/java/appeng/parts/reporting/DarkPanelPart.java rename to src/unported/java/appeng/parts/reporting/DarkPanelPart.java diff --git a/src/main/java/appeng/parts/reporting/InterfaceTerminalPart.java b/src/unported/java/appeng/parts/reporting/InterfaceTerminalPart.java similarity index 100% rename from src/main/java/appeng/parts/reporting/InterfaceTerminalPart.java rename to src/unported/java/appeng/parts/reporting/InterfaceTerminalPart.java diff --git a/src/main/java/appeng/parts/reporting/PanelPart.java b/src/unported/java/appeng/parts/reporting/PanelPart.java similarity index 100% rename from src/main/java/appeng/parts/reporting/PanelPart.java rename to src/unported/java/appeng/parts/reporting/PanelPart.java diff --git a/src/main/java/appeng/parts/reporting/PatternTerminalPart.java b/src/unported/java/appeng/parts/reporting/PatternTerminalPart.java similarity index 100% rename from src/main/java/appeng/parts/reporting/PatternTerminalPart.java rename to src/unported/java/appeng/parts/reporting/PatternTerminalPart.java diff --git a/src/main/java/appeng/parts/reporting/SemiDarkPanelPart.java b/src/unported/java/appeng/parts/reporting/SemiDarkPanelPart.java similarity index 100% rename from src/main/java/appeng/parts/reporting/SemiDarkPanelPart.java rename to src/unported/java/appeng/parts/reporting/SemiDarkPanelPart.java diff --git a/src/main/java/appeng/parts/reporting/StorageMonitorPart.java b/src/unported/java/appeng/parts/reporting/StorageMonitorPart.java similarity index 100% rename from src/main/java/appeng/parts/reporting/StorageMonitorPart.java rename to src/unported/java/appeng/parts/reporting/StorageMonitorPart.java diff --git a/src/main/java/appeng/parts/reporting/TerminalPart.java b/src/unported/java/appeng/parts/reporting/TerminalPart.java similarity index 100% rename from src/main/java/appeng/parts/reporting/TerminalPart.java rename to src/unported/java/appeng/parts/reporting/TerminalPart.java diff --git a/src/main/java/appeng/recipes/game/DisassembleRecipe.java b/src/unported/java/appeng/recipes/game/DisassembleRecipe.java similarity index 100% rename from src/main/java/appeng/recipes/game/DisassembleRecipe.java rename to src/unported/java/appeng/recipes/game/DisassembleRecipe.java diff --git a/src/main/java/appeng/recipes/game/FacadeRecipe.java b/src/unported/java/appeng/recipes/game/FacadeRecipe.java similarity index 100% rename from src/main/java/appeng/recipes/game/FacadeRecipe.java rename to src/unported/java/appeng/recipes/game/FacadeRecipe.java diff --git a/src/main/java/appeng/server/AECommand.java b/src/unported/java/appeng/server/AECommand.java similarity index 100% rename from src/main/java/appeng/server/AECommand.java rename to src/unported/java/appeng/server/AECommand.java diff --git a/src/main/java/appeng/server/AccessType.java b/src/unported/java/appeng/server/AccessType.java similarity index 100% rename from src/main/java/appeng/server/AccessType.java rename to src/unported/java/appeng/server/AccessType.java diff --git a/src/main/java/appeng/server/Commands.java b/src/unported/java/appeng/server/Commands.java similarity index 100% rename from src/main/java/appeng/server/Commands.java rename to src/unported/java/appeng/server/Commands.java diff --git a/src/main/java/appeng/server/ISubCommand.java b/src/unported/java/appeng/server/ISubCommand.java similarity index 100% rename from src/main/java/appeng/server/ISubCommand.java rename to src/unported/java/appeng/server/ISubCommand.java diff --git a/src/main/java/appeng/server/ServerHelper.java b/src/unported/java/appeng/server/ServerHelper.java similarity index 100% rename from src/main/java/appeng/server/ServerHelper.java rename to src/unported/java/appeng/server/ServerHelper.java diff --git a/src/main/java/appeng/server/subcommands/ChunkLogger.java b/src/unported/java/appeng/server/subcommands/ChunkLogger.java similarity index 100% rename from src/main/java/appeng/server/subcommands/ChunkLogger.java rename to src/unported/java/appeng/server/subcommands/ChunkLogger.java diff --git a/src/main/java/appeng/server/subcommands/Supporters.java b/src/unported/java/appeng/server/subcommands/Supporters.java similarity index 100% rename from src/main/java/appeng/server/subcommands/Supporters.java rename to src/unported/java/appeng/server/subcommands/Supporters.java diff --git a/src/main/java/appeng/server/subcommands/TestMeteoritesCommand.java b/src/unported/java/appeng/server/subcommands/TestMeteoritesCommand.java similarity index 100% rename from src/main/java/appeng/server/subcommands/TestMeteoritesCommand.java rename to src/unported/java/appeng/server/subcommands/TestMeteoritesCommand.java diff --git a/src/main/java/appeng/server/subcommands/TestOreGenCommand.java b/src/unported/java/appeng/server/subcommands/TestOreGenCommand.java similarity index 100% rename from src/main/java/appeng/server/subcommands/TestOreGenCommand.java rename to src/unported/java/appeng/server/subcommands/TestOreGenCommand.java diff --git a/src/main/java/appeng/spatial/CachedPlane.java b/src/unported/java/appeng/spatial/CachedPlane.java similarity index 100% rename from src/main/java/appeng/spatial/CachedPlane.java rename to src/unported/java/appeng/spatial/CachedPlane.java diff --git a/src/main/java/appeng/spatial/ISpatialVisitor.java b/src/unported/java/appeng/spatial/ISpatialVisitor.java similarity index 100% rename from src/main/java/appeng/spatial/ISpatialVisitor.java rename to src/unported/java/appeng/spatial/ISpatialVisitor.java diff --git a/src/main/java/appeng/spatial/SpatialDimensionExtraData.java b/src/unported/java/appeng/spatial/SpatialDimensionExtraData.java similarity index 100% rename from src/main/java/appeng/spatial/SpatialDimensionExtraData.java rename to src/unported/java/appeng/spatial/SpatialDimensionExtraData.java diff --git a/src/main/java/appeng/spatial/SpatialDimensionManager.java b/src/unported/java/appeng/spatial/SpatialDimensionManager.java similarity index 100% rename from src/main/java/appeng/spatial/SpatialDimensionManager.java rename to src/unported/java/appeng/spatial/SpatialDimensionManager.java diff --git a/src/main/java/appeng/spatial/StorageCellBiome.java b/src/unported/java/appeng/spatial/StorageCellBiome.java similarity index 100% rename from src/main/java/appeng/spatial/StorageCellBiome.java rename to src/unported/java/appeng/spatial/StorageCellBiome.java diff --git a/src/main/java/appeng/spatial/StorageCellDimension.java b/src/unported/java/appeng/spatial/StorageCellDimension.java similarity index 100% rename from src/main/java/appeng/spatial/StorageCellDimension.java rename to src/unported/java/appeng/spatial/StorageCellDimension.java diff --git a/src/main/java/appeng/spatial/StorageCellModDimension.java b/src/unported/java/appeng/spatial/StorageCellModDimension.java similarity index 100% rename from src/main/java/appeng/spatial/StorageCellModDimension.java rename to src/unported/java/appeng/spatial/StorageCellModDimension.java diff --git a/src/main/java/appeng/spatial/StorageChunkGenerator.java b/src/unported/java/appeng/spatial/StorageChunkGenerator.java similarity index 100% rename from src/main/java/appeng/spatial/StorageChunkGenerator.java rename to src/unported/java/appeng/spatial/StorageChunkGenerator.java diff --git a/src/main/java/appeng/spatial/StorageHelper.java b/src/unported/java/appeng/spatial/StorageHelper.java similarity index 100% rename from src/main/java/appeng/spatial/StorageHelper.java rename to src/unported/java/appeng/spatial/StorageHelper.java diff --git a/src/main/java/appeng/thirdparty/codechicken/lib/math/InterpHelper.java b/src/unported/java/appeng/thirdparty/codechicken/lib/math/InterpHelper.java similarity index 100% rename from src/main/java/appeng/thirdparty/codechicken/lib/math/InterpHelper.java rename to src/unported/java/appeng/thirdparty/codechicken/lib/math/InterpHelper.java diff --git a/src/main/java/appeng/thirdparty/codechicken/lib/model/CachedFormat.java b/src/unported/java/appeng/thirdparty/codechicken/lib/model/CachedFormat.java similarity index 100% rename from src/main/java/appeng/thirdparty/codechicken/lib/model/CachedFormat.java rename to src/unported/java/appeng/thirdparty/codechicken/lib/model/CachedFormat.java diff --git a/src/main/java/appeng/thirdparty/codechicken/lib/model/ISmartVertexConsumer.java b/src/unported/java/appeng/thirdparty/codechicken/lib/model/ISmartVertexConsumer.java similarity index 100% rename from src/main/java/appeng/thirdparty/codechicken/lib/model/ISmartVertexConsumer.java rename to src/unported/java/appeng/thirdparty/codechicken/lib/model/ISmartVertexConsumer.java diff --git a/src/main/java/appeng/thirdparty/codechicken/lib/model/Quad.java b/src/unported/java/appeng/thirdparty/codechicken/lib/model/Quad.java similarity index 100% rename from src/main/java/appeng/thirdparty/codechicken/lib/model/Quad.java rename to src/unported/java/appeng/thirdparty/codechicken/lib/model/Quad.java diff --git a/src/main/java/appeng/thirdparty/codechicken/lib/model/pipeline/BakedPipeline.java b/src/unported/java/appeng/thirdparty/codechicken/lib/model/pipeline/BakedPipeline.java similarity index 100% rename from src/main/java/appeng/thirdparty/codechicken/lib/model/pipeline/BakedPipeline.java rename to src/unported/java/appeng/thirdparty/codechicken/lib/model/pipeline/BakedPipeline.java diff --git a/src/main/java/appeng/thirdparty/codechicken/lib/model/pipeline/IPipelineConsumer.java b/src/unported/java/appeng/thirdparty/codechicken/lib/model/pipeline/IPipelineConsumer.java similarity index 100% rename from src/main/java/appeng/thirdparty/codechicken/lib/model/pipeline/IPipelineConsumer.java rename to src/unported/java/appeng/thirdparty/codechicken/lib/model/pipeline/IPipelineConsumer.java diff --git a/src/main/java/appeng/thirdparty/codechicken/lib/model/pipeline/IPipelineElementFactory.java b/src/unported/java/appeng/thirdparty/codechicken/lib/model/pipeline/IPipelineElementFactory.java similarity index 100% rename from src/main/java/appeng/thirdparty/codechicken/lib/model/pipeline/IPipelineElementFactory.java rename to src/unported/java/appeng/thirdparty/codechicken/lib/model/pipeline/IPipelineElementFactory.java diff --git a/src/main/java/appeng/thirdparty/codechicken/lib/model/pipeline/QuadTransformer.java b/src/unported/java/appeng/thirdparty/codechicken/lib/model/pipeline/QuadTransformer.java similarity index 100% rename from src/main/java/appeng/thirdparty/codechicken/lib/model/pipeline/QuadTransformer.java rename to src/unported/java/appeng/thirdparty/codechicken/lib/model/pipeline/QuadTransformer.java diff --git a/src/main/java/appeng/thirdparty/codechicken/lib/model/pipeline/transformers/QuadAlphaOverride.java b/src/unported/java/appeng/thirdparty/codechicken/lib/model/pipeline/transformers/QuadAlphaOverride.java similarity index 100% rename from src/main/java/appeng/thirdparty/codechicken/lib/model/pipeline/transformers/QuadAlphaOverride.java rename to src/unported/java/appeng/thirdparty/codechicken/lib/model/pipeline/transformers/QuadAlphaOverride.java diff --git a/src/main/java/appeng/thirdparty/codechicken/lib/model/pipeline/transformers/QuadClamper.java b/src/unported/java/appeng/thirdparty/codechicken/lib/model/pipeline/transformers/QuadClamper.java similarity index 100% rename from src/main/java/appeng/thirdparty/codechicken/lib/model/pipeline/transformers/QuadClamper.java rename to src/unported/java/appeng/thirdparty/codechicken/lib/model/pipeline/transformers/QuadClamper.java diff --git a/src/main/java/appeng/thirdparty/codechicken/lib/model/pipeline/transformers/QuadCornerKicker.java b/src/unported/java/appeng/thirdparty/codechicken/lib/model/pipeline/transformers/QuadCornerKicker.java similarity index 100% rename from src/main/java/appeng/thirdparty/codechicken/lib/model/pipeline/transformers/QuadCornerKicker.java rename to src/unported/java/appeng/thirdparty/codechicken/lib/model/pipeline/transformers/QuadCornerKicker.java diff --git a/src/main/java/appeng/thirdparty/codechicken/lib/model/pipeline/transformers/QuadFaceStripper.java b/src/unported/java/appeng/thirdparty/codechicken/lib/model/pipeline/transformers/QuadFaceStripper.java similarity index 100% rename from src/main/java/appeng/thirdparty/codechicken/lib/model/pipeline/transformers/QuadFaceStripper.java rename to src/unported/java/appeng/thirdparty/codechicken/lib/model/pipeline/transformers/QuadFaceStripper.java diff --git a/src/main/java/appeng/thirdparty/codechicken/lib/model/pipeline/transformers/QuadMatrixTransformer.java b/src/unported/java/appeng/thirdparty/codechicken/lib/model/pipeline/transformers/QuadMatrixTransformer.java similarity index 100% rename from src/main/java/appeng/thirdparty/codechicken/lib/model/pipeline/transformers/QuadMatrixTransformer.java rename to src/unported/java/appeng/thirdparty/codechicken/lib/model/pipeline/transformers/QuadMatrixTransformer.java diff --git a/src/main/java/appeng/thirdparty/codechicken/lib/model/pipeline/transformers/QuadReInterpolator.java b/src/unported/java/appeng/thirdparty/codechicken/lib/model/pipeline/transformers/QuadReInterpolator.java similarity index 100% rename from src/main/java/appeng/thirdparty/codechicken/lib/model/pipeline/transformers/QuadReInterpolator.java rename to src/unported/java/appeng/thirdparty/codechicken/lib/model/pipeline/transformers/QuadReInterpolator.java diff --git a/src/main/java/appeng/thirdparty/codechicken/lib/model/pipeline/transformers/QuadTinter.java b/src/unported/java/appeng/thirdparty/codechicken/lib/model/pipeline/transformers/QuadTinter.java similarity index 100% rename from src/main/java/appeng/thirdparty/codechicken/lib/model/pipeline/transformers/QuadTinter.java rename to src/unported/java/appeng/thirdparty/codechicken/lib/model/pipeline/transformers/QuadTinter.java diff --git a/src/main/java/appeng/tile/crafting/AssemblerAnimationStatus.java b/src/unported/java/appeng/tile/crafting/AssemblerAnimationStatus.java similarity index 100% rename from src/main/java/appeng/tile/crafting/AssemblerAnimationStatus.java rename to src/unported/java/appeng/tile/crafting/AssemblerAnimationStatus.java diff --git a/src/main/java/appeng/tile/crafting/CraftingBlockEntity.java b/src/unported/java/appeng/tile/crafting/CraftingBlockEntity.java similarity index 100% rename from src/main/java/appeng/tile/crafting/CraftingBlockEntity.java rename to src/unported/java/appeng/tile/crafting/CraftingBlockEntity.java diff --git a/src/main/java/appeng/tile/crafting/CraftingCubeModelData.java b/src/unported/java/appeng/tile/crafting/CraftingCubeModelData.java similarity index 100% rename from src/main/java/appeng/tile/crafting/CraftingCubeModelData.java rename to src/unported/java/appeng/tile/crafting/CraftingCubeModelData.java diff --git a/src/main/java/appeng/tile/crafting/CraftingMonitorBlockEntity.java b/src/unported/java/appeng/tile/crafting/CraftingMonitorBlockEntity.java similarity index 100% rename from src/main/java/appeng/tile/crafting/CraftingMonitorBlockEntity.java rename to src/unported/java/appeng/tile/crafting/CraftingMonitorBlockEntity.java diff --git a/src/main/java/appeng/tile/crafting/CraftingMonitorModelData.java b/src/unported/java/appeng/tile/crafting/CraftingMonitorModelData.java similarity index 100% rename from src/main/java/appeng/tile/crafting/CraftingMonitorModelData.java rename to src/unported/java/appeng/tile/crafting/CraftingMonitorModelData.java diff --git a/src/main/java/appeng/tile/crafting/CraftingStorageBlockEntity.java b/src/unported/java/appeng/tile/crafting/CraftingStorageBlockEntity.java similarity index 100% rename from src/main/java/appeng/tile/crafting/CraftingStorageBlockEntity.java rename to src/unported/java/appeng/tile/crafting/CraftingStorageBlockEntity.java diff --git a/src/main/java/appeng/tile/crafting/MolecularAssemblerBlockEntity.java b/src/unported/java/appeng/tile/crafting/MolecularAssemblerBlockEntity.java similarity index 100% rename from src/main/java/appeng/tile/crafting/MolecularAssemblerBlockEntity.java rename to src/unported/java/appeng/tile/crafting/MolecularAssemblerBlockEntity.java diff --git a/src/main/java/appeng/tile/crafting/MolecularAssemblerRenderer.java b/src/unported/java/appeng/tile/crafting/MolecularAssemblerRenderer.java similarity index 100% rename from src/main/java/appeng/tile/crafting/MolecularAssemblerRenderer.java rename to src/unported/java/appeng/tile/crafting/MolecularAssemblerRenderer.java diff --git a/src/main/java/appeng/tile/grid/AENetworkBlockEntity.java b/src/unported/java/appeng/tile/grid/AENetworkBlockEntity.java similarity index 100% rename from src/main/java/appeng/tile/grid/AENetworkBlockEntity.java rename to src/unported/java/appeng/tile/grid/AENetworkBlockEntity.java diff --git a/src/main/java/appeng/tile/grid/AENetworkInvBlockEntity.java b/src/unported/java/appeng/tile/grid/AENetworkInvBlockEntity.java similarity index 100% rename from src/main/java/appeng/tile/grid/AENetworkInvBlockEntity.java rename to src/unported/java/appeng/tile/grid/AENetworkInvBlockEntity.java diff --git a/src/main/java/appeng/tile/grid/AENetworkPowerBlockEntity.java b/src/unported/java/appeng/tile/grid/AENetworkPowerBlockEntity.java similarity index 100% rename from src/main/java/appeng/tile/grid/AENetworkPowerBlockEntity.java rename to src/unported/java/appeng/tile/grid/AENetworkPowerBlockEntity.java diff --git a/src/main/java/appeng/tile/grindstone/CrankBlockEntity.java b/src/unported/java/appeng/tile/grindstone/CrankBlockEntity.java similarity index 100% rename from src/main/java/appeng/tile/grindstone/CrankBlockEntity.java rename to src/unported/java/appeng/tile/grindstone/CrankBlockEntity.java diff --git a/src/main/java/appeng/tile/grindstone/GrinderBlockEntity.java b/src/unported/java/appeng/tile/grindstone/GrinderBlockEntity.java similarity index 100% rename from src/main/java/appeng/tile/grindstone/GrinderBlockEntity.java rename to src/unported/java/appeng/tile/grindstone/GrinderBlockEntity.java diff --git a/src/main/java/appeng/tile/inventory/AppEngCellInventory.java b/src/unported/java/appeng/tile/inventory/AppEngCellInventory.java similarity index 100% rename from src/main/java/appeng/tile/inventory/AppEngCellInventory.java rename to src/unported/java/appeng/tile/inventory/AppEngCellInventory.java diff --git a/src/main/java/appeng/tile/misc/CellWorkbenchBlockEntity.java b/src/unported/java/appeng/tile/misc/CellWorkbenchBlockEntity.java similarity index 100% rename from src/main/java/appeng/tile/misc/CellWorkbenchBlockEntity.java rename to src/unported/java/appeng/tile/misc/CellWorkbenchBlockEntity.java diff --git a/src/main/java/appeng/tile/misc/ChargerBlockEntity.java b/src/unported/java/appeng/tile/misc/ChargerBlockEntity.java similarity index 100% rename from src/main/java/appeng/tile/misc/ChargerBlockEntity.java rename to src/unported/java/appeng/tile/misc/ChargerBlockEntity.java diff --git a/src/main/java/appeng/tile/misc/CondenserBlockEntity.java b/src/unported/java/appeng/tile/misc/CondenserBlockEntity.java similarity index 100% rename from src/main/java/appeng/tile/misc/CondenserBlockEntity.java rename to src/unported/java/appeng/tile/misc/CondenserBlockEntity.java diff --git a/src/main/java/appeng/tile/misc/CondenserItemInventory.java b/src/unported/java/appeng/tile/misc/CondenserItemInventory.java similarity index 100% rename from src/main/java/appeng/tile/misc/CondenserItemInventory.java rename to src/unported/java/appeng/tile/misc/CondenserItemInventory.java diff --git a/src/main/java/appeng/tile/misc/CondenserVoidInventory.java b/src/unported/java/appeng/tile/misc/CondenserVoidInventory.java similarity index 100% rename from src/main/java/appeng/tile/misc/CondenserVoidInventory.java rename to src/unported/java/appeng/tile/misc/CondenserVoidInventory.java diff --git a/src/main/java/appeng/tile/misc/InscriberBlockEntity.java b/src/unported/java/appeng/tile/misc/InscriberBlockEntity.java similarity index 100% rename from src/main/java/appeng/tile/misc/InscriberBlockEntity.java rename to src/unported/java/appeng/tile/misc/InscriberBlockEntity.java diff --git a/src/main/java/appeng/tile/misc/InscriberRecipes.java b/src/unported/java/appeng/tile/misc/InscriberRecipes.java similarity index 100% rename from src/main/java/appeng/tile/misc/InscriberRecipes.java rename to src/unported/java/appeng/tile/misc/InscriberRecipes.java diff --git a/src/main/java/appeng/tile/misc/InterfaceBlockEntity.java b/src/unported/java/appeng/tile/misc/InterfaceBlockEntity.java similarity index 100% rename from src/main/java/appeng/tile/misc/InterfaceBlockEntity.java rename to src/unported/java/appeng/tile/misc/InterfaceBlockEntity.java diff --git a/src/main/java/appeng/tile/misc/PaintSplotchesBlockEntity.java b/src/unported/java/appeng/tile/misc/PaintSplotchesBlockEntity.java similarity index 100% rename from src/main/java/appeng/tile/misc/PaintSplotchesBlockEntity.java rename to src/unported/java/appeng/tile/misc/PaintSplotchesBlockEntity.java diff --git a/src/main/java/appeng/tile/misc/QuartzGrowthAcceleratorBlockEntity.java b/src/unported/java/appeng/tile/misc/QuartzGrowthAcceleratorBlockEntity.java similarity index 100% rename from src/main/java/appeng/tile/misc/QuartzGrowthAcceleratorBlockEntity.java rename to src/unported/java/appeng/tile/misc/QuartzGrowthAcceleratorBlockEntity.java diff --git a/src/main/java/appeng/tile/misc/SecurityStationBlockEntity.java b/src/unported/java/appeng/tile/misc/SecurityStationBlockEntity.java similarity index 100% rename from src/main/java/appeng/tile/misc/SecurityStationBlockEntity.java rename to src/unported/java/appeng/tile/misc/SecurityStationBlockEntity.java diff --git a/src/main/java/appeng/tile/misc/VibrationChamberBlockEntity.java b/src/unported/java/appeng/tile/misc/VibrationChamberBlockEntity.java similarity index 100% rename from src/main/java/appeng/tile/misc/VibrationChamberBlockEntity.java rename to src/unported/java/appeng/tile/misc/VibrationChamberBlockEntity.java diff --git a/src/unported/java/appeng/tile/networking/ControllerBlockEntity.java b/src/unported/java/appeng/tile/networking/ControllerBlockEntity.java new file mode 100644 index 000000000..8edb3c29d --- /dev/null +++ b/src/unported/java/appeng/tile/networking/ControllerBlockEntity.java @@ -0,0 +1,192 @@ +/* + * This file is part of Applied Energistics 2. + * Copyright (c) 2013 - 2015, AlgorithmX2, All rights reserved. + * + * Applied Energistics 2 is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Applied Energistics 2 is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Applied Energistics 2. If not, see . + */ + +package appeng.tile.networking; + +import java.util.EnumSet; + +import net.minecraft.item.ItemStack; +import net.minecraft.block.entity.BlockEntityType; +import net.minecraft.util.math.Direction; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.ChunkPos; +import alexiil.mc.lib.attributes.item.FixedItemInv; +import alexiil.mc.lib.attributes.item.impl.EmptyFixedItemInv; + +import appeng.api.config.Actionable; +import appeng.api.networking.GridFlags; +import appeng.api.networking.energy.IEnergyGrid; +import appeng.api.networking.events.MENetworkControllerChange; +import appeng.api.networking.events.MENetworkEventSubscribe; +import appeng.api.networking.events.MENetworkPowerStatusChange; +import appeng.api.networking.events.MENetworkPowerStorage; +import appeng.api.networking.events.MENetworkPowerStorage.PowerEventType; +import appeng.api.networking.pathing.ControllerState; +import appeng.api.util.AECableType; +import appeng.api.util.AEPartLocation; +import appeng.block.networking.ControllerBlock; +import appeng.block.networking.ControllerBlock.ControllerBlockState; +import appeng.me.GridAccessException; +import appeng.tile.grid.AENetworkPowerBlockEntity; +import appeng.util.inv.InvOperation; + +public class ControllerBlockEntity extends AENetworkPowerBlockEntity { + private boolean isValid = false; + + public ControllerBlockEntity(BlockEntityType tileEntityTypeIn) { + super(tileEntityTypeIn); + this.setInternalMaxPower(8000); + this.setInternalPublicPowerStorage(true); + this.getProxy().setIdlePowerUsage(3); + this.getProxy().setFlags(GridFlags.CANNOT_CARRY, GridFlags.DENSE_CAPACITY); + } + + @Override + public AECableType getCableConnectionType(final AEPartLocation dir) { + return AECableType.DENSE_SMART; + } + + @Override + public void onReady() { + this.onNeighborChange(true); + super.onReady(); + } + + public void onNeighborChange(final boolean force) { + final boolean xx = this.checkController(this.pos.offset(Direction.EAST)) + && this.checkController(this.pos.offset(Direction.WEST)); + final boolean yy = this.checkController(this.pos.offset(Direction.UP)) + && this.checkController(this.pos.offset(Direction.DOWN)); + final boolean zz = this.checkController(this.pos.offset(Direction.NORTH)) + && this.checkController(this.pos.offset(Direction.SOUTH)); + + // int meta = world.getBlockMetadata( xCoord, yCoord, zCoord ); + // boolean hasPower = meta > 0; + // boolean isConflict = meta == 2; + + final boolean oldValid = this.isValid; + + this.isValid = (xx && !yy && !zz) || (!xx && yy && !zz) || (!xx && !yy && zz) + || ((xx ? 1 : 0) + (yy ? 1 : 0) + (zz ? 1 : 0) <= 1); + + if (oldValid != this.isValid || force) { + if (this.isValid) { + this.getProxy().setValidSides(EnumSet.allOf(Direction.class)); + } else { + this.getProxy().setValidSides(EnumSet.noneOf(Direction.class)); + } + + this.updateMeta(); + } + + } + + private void updateMeta() { + if (!this.getProxy().isReady()) { + return; + } + + ControllerBlockState metaState = ControllerBlockState.offline; + + try { + if (this.getProxy().getEnergy().isNetworkPowered()) { + metaState = ControllerBlockState.online; + + if (this.getProxy().getPath().getControllerState() == ControllerState.CONTROLLER_CONFLICT) { + metaState = ControllerBlockState.conflicted; + } + } + } catch (final GridAccessException e) { + metaState = ControllerBlockState.offline; + } + + if (this.checkController(this.pos) + && this.world.getBlockState(this.pos).get(ControllerBlock.CONTROLLER_STATE) != metaState) { + this.world.setBlockState(this.pos, + this.world.getBlockState(this.pos).with(ControllerBlock.CONTROLLER_STATE, metaState)); + } + + } + + @Override + protected double getFunnelPowerDemand(final double maxReceived) { + try { + final IEnergyGrid grid = this.getProxy().getEnergy(); + + return grid.getEnergyDemand(maxReceived); + } catch (final GridAccessException e) { + // no grid? use local... + return super.getFunnelPowerDemand(maxReceived); + } + } + + @Override + protected double funnelPowerIntoStorage(final double power, final Actionable mode) { + try { + final IEnergyGrid grid = this.getProxy().getEnergy(); + final double leftOver = grid.injectPower(power, mode); + + return leftOver; + } catch (final GridAccessException e) { + // no grid? use local... + return super.funnelPowerIntoStorage(power, mode); + } + } + + @Override + protected void PowerEvent(final PowerEventType x) { + try { + this.getProxy().getGrid().postEvent(new MENetworkPowerStorage(this, x)); + } catch (final GridAccessException e) { + // not ready! + } + } + + @MENetworkEventSubscribe + public void onControllerChange(final MENetworkControllerChange status) { + this.updateMeta(); + } + + @MENetworkEventSubscribe + public void onPowerChange(final MENetworkPowerStatusChange status) { + this.updateMeta(); + } + + @Override + public FixedItemInv getInternalInventory() { + return EmptyFixedItemInv.INSTANCE; + } + + @Override + public void onChangeInventory(final FixedItemInv inv, final int slot, final InvOperation mc, + final ItemStack removed, final ItemStack added) { + } + + /** + * Check for a controller at this coordinates as well as is it loaded. + * + * @return true if there is a loaded controller + */ + private boolean checkController(final BlockPos pos) { + if (this.world.getChunkManager().isChunkLoaded(new ChunkPos(pos.getX() >> 4, pos.getZ() >> 4))) { + return this.world.getBlockEntity(pos) instanceof ControllerBlockEntity; + } + + return false; + } +} diff --git a/src/main/java/appeng/tile/networking/CreativeEnergyCellBlockEntity.java b/src/unported/java/appeng/tile/networking/CreativeEnergyCellBlockEntity.java similarity index 100% rename from src/main/java/appeng/tile/networking/CreativeEnergyCellBlockEntity.java rename to src/unported/java/appeng/tile/networking/CreativeEnergyCellBlockEntity.java diff --git a/src/main/java/appeng/tile/networking/DenseEnergyCellBlockEntity.java b/src/unported/java/appeng/tile/networking/DenseEnergyCellBlockEntity.java similarity index 100% rename from src/main/java/appeng/tile/networking/DenseEnergyCellBlockEntity.java rename to src/unported/java/appeng/tile/networking/DenseEnergyCellBlockEntity.java diff --git a/src/main/java/appeng/tile/networking/EnergyAcceptorBlockEntity.java b/src/unported/java/appeng/tile/networking/EnergyAcceptorBlockEntity.java similarity index 100% rename from src/main/java/appeng/tile/networking/EnergyAcceptorBlockEntity.java rename to src/unported/java/appeng/tile/networking/EnergyAcceptorBlockEntity.java diff --git a/src/main/java/appeng/tile/networking/EnergyCellBlockEntity.java b/src/unported/java/appeng/tile/networking/EnergyCellBlockEntity.java similarity index 100% rename from src/main/java/appeng/tile/networking/EnergyCellBlockEntity.java rename to src/unported/java/appeng/tile/networking/EnergyCellBlockEntity.java diff --git a/src/main/java/appeng/tile/networking/WirelessBlockEntity.java b/src/unported/java/appeng/tile/networking/WirelessBlockEntity.java similarity index 100% rename from src/main/java/appeng/tile/networking/WirelessBlockEntity.java rename to src/unported/java/appeng/tile/networking/WirelessBlockEntity.java diff --git a/src/main/java/appeng/tile/powersink/AEBasePoweredBlockEntity.java b/src/unported/java/appeng/tile/powersink/AEBasePoweredBlockEntity.java similarity index 100% rename from src/main/java/appeng/tile/powersink/AEBasePoweredBlockEntity.java rename to src/unported/java/appeng/tile/powersink/AEBasePoweredBlockEntity.java diff --git a/src/main/java/appeng/tile/powersink/ForgeEnergyAdapter.java b/src/unported/java/appeng/tile/powersink/ForgeEnergyAdapter.java similarity index 100% rename from src/main/java/appeng/tile/powersink/ForgeEnergyAdapter.java rename to src/unported/java/appeng/tile/powersink/ForgeEnergyAdapter.java diff --git a/src/main/java/appeng/tile/powersink/IExternalPowerSink.java b/src/unported/java/appeng/tile/powersink/IExternalPowerSink.java similarity index 100% rename from src/main/java/appeng/tile/powersink/IExternalPowerSink.java rename to src/unported/java/appeng/tile/powersink/IExternalPowerSink.java diff --git a/src/main/java/appeng/tile/qnb/QuantumBridgeBlockEntity.java b/src/unported/java/appeng/tile/qnb/QuantumBridgeBlockEntity.java similarity index 100% rename from src/main/java/appeng/tile/qnb/QuantumBridgeBlockEntity.java rename to src/unported/java/appeng/tile/qnb/QuantumBridgeBlockEntity.java diff --git a/src/main/java/appeng/tile/spatial/SpatialIOPortBlockEntity.java b/src/unported/java/appeng/tile/spatial/SpatialIOPortBlockEntity.java similarity index 100% rename from src/main/java/appeng/tile/spatial/SpatialIOPortBlockEntity.java rename to src/unported/java/appeng/tile/spatial/SpatialIOPortBlockEntity.java diff --git a/src/main/java/appeng/tile/spatial/SpatialPylonBlockEntity.java b/src/unported/java/appeng/tile/spatial/SpatialPylonBlockEntity.java similarity index 100% rename from src/main/java/appeng/tile/spatial/SpatialPylonBlockEntity.java rename to src/unported/java/appeng/tile/spatial/SpatialPylonBlockEntity.java diff --git a/src/main/java/appeng/tile/storage/ChestBlockEntity.java b/src/unported/java/appeng/tile/storage/ChestBlockEntity.java similarity index 100% rename from src/main/java/appeng/tile/storage/ChestBlockEntity.java rename to src/unported/java/appeng/tile/storage/ChestBlockEntity.java diff --git a/src/main/java/appeng/tile/storage/DriveBlockEntity.java b/src/unported/java/appeng/tile/storage/DriveBlockEntity.java similarity index 100% rename from src/main/java/appeng/tile/storage/DriveBlockEntity.java rename to src/unported/java/appeng/tile/storage/DriveBlockEntity.java diff --git a/src/main/java/appeng/tile/storage/IOPortBlockEntity.java b/src/unported/java/appeng/tile/storage/IOPortBlockEntity.java similarity index 100% rename from src/main/java/appeng/tile/storage/IOPortBlockEntity.java rename to src/unported/java/appeng/tile/storage/IOPortBlockEntity.java diff --git a/src/main/java/appeng/worldgen/ChargedQuartzOreConfig.java b/src/unported/java/appeng/worldgen/ChargedQuartzOreConfig.java similarity index 100% rename from src/main/java/appeng/worldgen/ChargedQuartzOreConfig.java rename to src/unported/java/appeng/worldgen/ChargedQuartzOreConfig.java diff --git a/src/main/java/appeng/worldgen/ChargedQuartzOreFeature.java b/src/unported/java/appeng/worldgen/ChargedQuartzOreFeature.java similarity index 100% rename from src/main/java/appeng/worldgen/ChargedQuartzOreFeature.java rename to src/unported/java/appeng/worldgen/ChargedQuartzOreFeature.java diff --git a/src/main/java/appeng/worldgen/meteorite/Constants.java b/src/unported/java/appeng/worldgen/meteorite/Constants.java similarity index 100% rename from src/main/java/appeng/worldgen/meteorite/Constants.java rename to src/unported/java/appeng/worldgen/meteorite/Constants.java diff --git a/src/main/java/appeng/worldgen/meteorite/CraterType.java b/src/unported/java/appeng/worldgen/meteorite/CraterType.java similarity index 100% rename from src/main/java/appeng/worldgen/meteorite/CraterType.java rename to src/unported/java/appeng/worldgen/meteorite/CraterType.java diff --git a/src/main/java/appeng/worldgen/meteorite/MeteoriteBlockPutter.java b/src/unported/java/appeng/worldgen/meteorite/MeteoriteBlockPutter.java similarity index 100% rename from src/main/java/appeng/worldgen/meteorite/MeteoriteBlockPutter.java rename to src/unported/java/appeng/worldgen/meteorite/MeteoriteBlockPutter.java diff --git a/src/main/java/appeng/worldgen/meteorite/MeteoritePlacer.java b/src/unported/java/appeng/worldgen/meteorite/MeteoritePlacer.java similarity index 100% rename from src/main/java/appeng/worldgen/meteorite/MeteoritePlacer.java rename to src/unported/java/appeng/worldgen/meteorite/MeteoritePlacer.java diff --git a/src/main/java/appeng/worldgen/meteorite/MeteoriteSpawnData.java b/src/unported/java/appeng/worldgen/meteorite/MeteoriteSpawnData.java similarity index 100% rename from src/main/java/appeng/worldgen/meteorite/MeteoriteSpawnData.java rename to src/unported/java/appeng/worldgen/meteorite/MeteoriteSpawnData.java diff --git a/src/main/java/appeng/worldgen/meteorite/MeteoriteStructure.java b/src/unported/java/appeng/worldgen/meteorite/MeteoriteStructure.java similarity index 100% rename from src/main/java/appeng/worldgen/meteorite/MeteoriteStructure.java rename to src/unported/java/appeng/worldgen/meteorite/MeteoriteStructure.java diff --git a/src/main/java/appeng/worldgen/meteorite/MeteoriteStructurePiece.java b/src/unported/java/appeng/worldgen/meteorite/MeteoriteStructurePiece.java similarity index 100% rename from src/main/java/appeng/worldgen/meteorite/MeteoriteStructurePiece.java rename to src/unported/java/appeng/worldgen/meteorite/MeteoriteStructurePiece.java diff --git a/src/main/java/appeng/worldgen/meteorite/MeteoriteStructureStart.java b/src/unported/java/appeng/worldgen/meteorite/MeteoriteStructureStart.java similarity index 100% rename from src/main/java/appeng/worldgen/meteorite/MeteoriteStructureStart.java rename to src/unported/java/appeng/worldgen/meteorite/MeteoriteStructureStart.java diff --git a/src/main/java/appeng/worldgen/meteorite/PlacedMeteoriteSettings.java b/src/unported/java/appeng/worldgen/meteorite/PlacedMeteoriteSettings.java similarity index 100% rename from src/main/java/appeng/worldgen/meteorite/PlacedMeteoriteSettings.java rename to src/unported/java/appeng/worldgen/meteorite/PlacedMeteoriteSettings.java diff --git a/src/main/java/appeng/worldgen/meteorite/debug/MeteoriteSpawner.java b/src/unported/java/appeng/worldgen/meteorite/debug/MeteoriteSpawner.java similarity index 100% rename from src/main/java/appeng/worldgen/meteorite/debug/MeteoriteSpawner.java rename to src/unported/java/appeng/worldgen/meteorite/debug/MeteoriteSpawner.java diff --git a/src/main/java/appeng/worldgen/meteorite/fallout/Fallout.java b/src/unported/java/appeng/worldgen/meteorite/fallout/Fallout.java similarity index 100% rename from src/main/java/appeng/worldgen/meteorite/fallout/Fallout.java rename to src/unported/java/appeng/worldgen/meteorite/fallout/Fallout.java diff --git a/src/main/java/appeng/worldgen/meteorite/fallout/FalloutCopy.java b/src/unported/java/appeng/worldgen/meteorite/fallout/FalloutCopy.java similarity index 100% rename from src/main/java/appeng/worldgen/meteorite/fallout/FalloutCopy.java rename to src/unported/java/appeng/worldgen/meteorite/fallout/FalloutCopy.java diff --git a/src/main/java/appeng/worldgen/meteorite/fallout/FalloutMode.java b/src/unported/java/appeng/worldgen/meteorite/fallout/FalloutMode.java similarity index 100% rename from src/main/java/appeng/worldgen/meteorite/fallout/FalloutMode.java rename to src/unported/java/appeng/worldgen/meteorite/fallout/FalloutMode.java diff --git a/src/main/java/appeng/worldgen/meteorite/fallout/FalloutSand.java b/src/unported/java/appeng/worldgen/meteorite/fallout/FalloutSand.java similarity index 100% rename from src/main/java/appeng/worldgen/meteorite/fallout/FalloutSand.java rename to src/unported/java/appeng/worldgen/meteorite/fallout/FalloutSand.java diff --git a/src/main/java/appeng/worldgen/meteorite/fallout/FalloutSnow.java b/src/unported/java/appeng/worldgen/meteorite/fallout/FalloutSnow.java similarity index 100% rename from src/main/java/appeng/worldgen/meteorite/fallout/FalloutSnow.java rename to src/unported/java/appeng/worldgen/meteorite/fallout/FalloutSnow.java diff --git a/src/main/resources/META-INF/accesstransformer.cfg b/src/unported/resources/META-INF/accesstransformer.cfg similarity index 100% rename from src/main/resources/META-INF/accesstransformer.cfg rename to src/unported/resources/META-INF/accesstransformer.cfg diff --git a/src/main/resources/META-INF/mods.toml b/src/unported/resources/META-INF/mods.toml similarity index 100% rename from src/main/resources/META-INF/mods.toml rename to src/unported/resources/META-INF/mods.toml diff --git a/src/main/resources/assets/appliedenergistics2/models/block/drive/drive_cell.json b/src/unported/resources/assets/appliedenergistics2/models/block/drive/drive_cell.json similarity index 100% rename from src/main/resources/assets/appliedenergistics2/models/block/drive/drive_cell.json rename to src/unported/resources/assets/appliedenergistics2/models/block/drive/drive_cell.json diff --git a/src/main/resources/assets/appliedenergistics2/models/item/dummy_fluid_item.json b/src/unported/resources/assets/appliedenergistics2/models/item/dummy_fluid_item.json similarity index 100% rename from src/main/resources/assets/appliedenergistics2/models/item/dummy_fluid_item.json rename to src/unported/resources/assets/appliedenergistics2/models/item/dummy_fluid_item.json diff --git a/src/main/resources/pack.mcmeta b/src/unported/resources/pack.mcmeta similarity index 100% rename from src/main/resources/pack.mcmeta rename to src/unported/resources/pack.mcmeta