diff --git a/.gitattributes b/.gitattributes index 008515e4..c72b8773 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1 +1,20 @@ -build.properties text \ No newline at end of file +# text stuff +* text=auto +*.java text eol=lf +*.groovy text eol=lf +*.scala text eol=lf +*.sh text eol=lf +*.bat text eol=crlf +*.md text +*.properties text + +#binary +*.dat binary +*.bin binary +*.png binary +*.exe binary +*.dll binary +*.zip binary +*.jar binary +*.7z binary +*.db binary diff --git a/.gitignore b/.gitignore index e0dde055..c6c56bf2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,18 @@ +## gradle +/.gradle +/build + +## ForgeGradle +/run + +## eclipse +/.settings +/.metadata +/.classpath +/.project /bin -.classpath -.project -private.properties -environment.properties -/eclipse \ No newline at end of file + +## intellij +/out +/.idea +/*.iml \ No newline at end of file diff --git a/common/com/pahimar/ee3/EquivalentExchange3.java b/src/main/java/com/pahimar/ee3/EquivalentExchange3.java similarity index 100% rename from common/com/pahimar/ee3/EquivalentExchange3.java rename to src/main/java/com/pahimar/ee3/EquivalentExchange3.java diff --git a/common/com/pahimar/ee3/api/RecipeMapping.java b/src/main/java/com/pahimar/ee3/api/RecipeMapping.java similarity index 100% rename from common/com/pahimar/ee3/api/RecipeMapping.java rename to src/main/java/com/pahimar/ee3/api/RecipeMapping.java diff --git a/common/com/pahimar/ee3/api/StackValueMapping.java b/src/main/java/com/pahimar/ee3/api/StackValueMapping.java similarity index 100% rename from common/com/pahimar/ee3/api/StackValueMapping.java rename to src/main/java/com/pahimar/ee3/api/StackValueMapping.java diff --git a/common/com/pahimar/ee3/block/BlockAlchemicalChest.java b/src/main/java/com/pahimar/ee3/block/BlockAlchemicalChest.java similarity index 100% rename from common/com/pahimar/ee3/block/BlockAlchemicalChest.java rename to src/main/java/com/pahimar/ee3/block/BlockAlchemicalChest.java diff --git a/common/com/pahimar/ee3/block/BlockAludelBase.java b/src/main/java/com/pahimar/ee3/block/BlockAludelBase.java similarity index 100% rename from common/com/pahimar/ee3/block/BlockAludelBase.java rename to src/main/java/com/pahimar/ee3/block/BlockAludelBase.java diff --git a/common/com/pahimar/ee3/block/BlockCalcinator.java b/src/main/java/com/pahimar/ee3/block/BlockCalcinator.java similarity index 100% rename from common/com/pahimar/ee3/block/BlockCalcinator.java rename to src/main/java/com/pahimar/ee3/block/BlockCalcinator.java diff --git a/common/com/pahimar/ee3/block/BlockEE.java b/src/main/java/com/pahimar/ee3/block/BlockEE.java similarity index 100% rename from common/com/pahimar/ee3/block/BlockEE.java rename to src/main/java/com/pahimar/ee3/block/BlockEE.java diff --git a/common/com/pahimar/ee3/block/BlockGlassBell.java b/src/main/java/com/pahimar/ee3/block/BlockGlassBell.java similarity index 100% rename from common/com/pahimar/ee3/block/BlockGlassBell.java rename to src/main/java/com/pahimar/ee3/block/BlockGlassBell.java diff --git a/common/com/pahimar/ee3/block/ModBlocks.java b/src/main/java/com/pahimar/ee3/block/ModBlocks.java similarity index 100% rename from common/com/pahimar/ee3/block/ModBlocks.java rename to src/main/java/com/pahimar/ee3/block/ModBlocks.java diff --git a/common/com/pahimar/ee3/client/audio/SoundHandler.java b/src/main/java/com/pahimar/ee3/client/audio/SoundHandler.java similarity index 100% rename from common/com/pahimar/ee3/client/audio/SoundHandler.java rename to src/main/java/com/pahimar/ee3/client/audio/SoundHandler.java diff --git a/common/com/pahimar/ee3/client/gui/inventory/GuiAlchemicalBag.java b/src/main/java/com/pahimar/ee3/client/gui/inventory/GuiAlchemicalBag.java similarity index 100% rename from common/com/pahimar/ee3/client/gui/inventory/GuiAlchemicalBag.java rename to src/main/java/com/pahimar/ee3/client/gui/inventory/GuiAlchemicalBag.java diff --git a/common/com/pahimar/ee3/client/gui/inventory/GuiAlchemicalChest.java b/src/main/java/com/pahimar/ee3/client/gui/inventory/GuiAlchemicalChest.java similarity index 100% rename from common/com/pahimar/ee3/client/gui/inventory/GuiAlchemicalChest.java rename to src/main/java/com/pahimar/ee3/client/gui/inventory/GuiAlchemicalChest.java diff --git a/common/com/pahimar/ee3/client/gui/inventory/GuiAludel.java b/src/main/java/com/pahimar/ee3/client/gui/inventory/GuiAludel.java similarity index 100% rename from common/com/pahimar/ee3/client/gui/inventory/GuiAludel.java rename to src/main/java/com/pahimar/ee3/client/gui/inventory/GuiAludel.java diff --git a/common/com/pahimar/ee3/client/gui/inventory/GuiCalcinator.java b/src/main/java/com/pahimar/ee3/client/gui/inventory/GuiCalcinator.java similarity index 100% rename from common/com/pahimar/ee3/client/gui/inventory/GuiCalcinator.java rename to src/main/java/com/pahimar/ee3/client/gui/inventory/GuiCalcinator.java diff --git a/common/com/pahimar/ee3/client/gui/inventory/GuiGlassBell.java b/src/main/java/com/pahimar/ee3/client/gui/inventory/GuiGlassBell.java similarity index 100% rename from common/com/pahimar/ee3/client/gui/inventory/GuiGlassBell.java rename to src/main/java/com/pahimar/ee3/client/gui/inventory/GuiGlassBell.java diff --git a/common/com/pahimar/ee3/client/gui/inventory/GuiPortableCrafting.java b/src/main/java/com/pahimar/ee3/client/gui/inventory/GuiPortableCrafting.java similarity index 100% rename from common/com/pahimar/ee3/client/gui/inventory/GuiPortableCrafting.java rename to src/main/java/com/pahimar/ee3/client/gui/inventory/GuiPortableCrafting.java diff --git a/common/com/pahimar/ee3/client/gui/inventory/GuiPortableTransmutation.java b/src/main/java/com/pahimar/ee3/client/gui/inventory/GuiPortableTransmutation.java similarity index 100% rename from common/com/pahimar/ee3/client/gui/inventory/GuiPortableTransmutation.java rename to src/main/java/com/pahimar/ee3/client/gui/inventory/GuiPortableTransmutation.java diff --git a/common/com/pahimar/ee3/client/model/ModelAludel.java b/src/main/java/com/pahimar/ee3/client/model/ModelAludel.java similarity index 100% rename from common/com/pahimar/ee3/client/model/ModelAludel.java rename to src/main/java/com/pahimar/ee3/client/model/ModelAludel.java diff --git a/common/com/pahimar/ee3/client/model/ModelCalcinator.java b/src/main/java/com/pahimar/ee3/client/model/ModelCalcinator.java similarity index 100% rename from common/com/pahimar/ee3/client/model/ModelCalcinator.java rename to src/main/java/com/pahimar/ee3/client/model/ModelCalcinator.java diff --git a/common/com/pahimar/ee3/client/model/ModelGlassBell.java b/src/main/java/com/pahimar/ee3/client/model/ModelGlassBell.java similarity index 100% rename from common/com/pahimar/ee3/client/model/ModelGlassBell.java rename to src/main/java/com/pahimar/ee3/client/model/ModelGlassBell.java diff --git a/common/com/pahimar/ee3/client/renderer/RenderUtils.java b/src/main/java/com/pahimar/ee3/client/renderer/RenderUtils.java similarity index 100% rename from common/com/pahimar/ee3/client/renderer/RenderUtils.java rename to src/main/java/com/pahimar/ee3/client/renderer/RenderUtils.java diff --git a/common/com/pahimar/ee3/client/renderer/item/ItemAlchemicalChestRenderer.java b/src/main/java/com/pahimar/ee3/client/renderer/item/ItemAlchemicalChestRenderer.java similarity index 100% rename from common/com/pahimar/ee3/client/renderer/item/ItemAlchemicalChestRenderer.java rename to src/main/java/com/pahimar/ee3/client/renderer/item/ItemAlchemicalChestRenderer.java diff --git a/common/com/pahimar/ee3/client/renderer/item/ItemAludelRenderer.java b/src/main/java/com/pahimar/ee3/client/renderer/item/ItemAludelRenderer.java similarity index 100% rename from common/com/pahimar/ee3/client/renderer/item/ItemAludelRenderer.java rename to src/main/java/com/pahimar/ee3/client/renderer/item/ItemAludelRenderer.java diff --git a/common/com/pahimar/ee3/client/renderer/item/ItemCalcinatorRenderer.java b/src/main/java/com/pahimar/ee3/client/renderer/item/ItemCalcinatorRenderer.java similarity index 100% rename from common/com/pahimar/ee3/client/renderer/item/ItemCalcinatorRenderer.java rename to src/main/java/com/pahimar/ee3/client/renderer/item/ItemCalcinatorRenderer.java diff --git a/common/com/pahimar/ee3/client/renderer/item/ItemGlassBellRenderer.java b/src/main/java/com/pahimar/ee3/client/renderer/item/ItemGlassBellRenderer.java similarity index 100% rename from common/com/pahimar/ee3/client/renderer/item/ItemGlassBellRenderer.java rename to src/main/java/com/pahimar/ee3/client/renderer/item/ItemGlassBellRenderer.java diff --git a/common/com/pahimar/ee3/client/renderer/tileentity/TileEntityAlchemicalChestRenderer.java b/src/main/java/com/pahimar/ee3/client/renderer/tileentity/TileEntityAlchemicalChestRenderer.java similarity index 100% rename from common/com/pahimar/ee3/client/renderer/tileentity/TileEntityAlchemicalChestRenderer.java rename to src/main/java/com/pahimar/ee3/client/renderer/tileentity/TileEntityAlchemicalChestRenderer.java diff --git a/common/com/pahimar/ee3/client/renderer/tileentity/TileEntityAludelRenderer.java b/src/main/java/com/pahimar/ee3/client/renderer/tileentity/TileEntityAludelRenderer.java similarity index 100% rename from common/com/pahimar/ee3/client/renderer/tileentity/TileEntityAludelRenderer.java rename to src/main/java/com/pahimar/ee3/client/renderer/tileentity/TileEntityAludelRenderer.java diff --git a/common/com/pahimar/ee3/client/renderer/tileentity/TileEntityCalcinatorRenderer.java b/src/main/java/com/pahimar/ee3/client/renderer/tileentity/TileEntityCalcinatorRenderer.java similarity index 100% rename from common/com/pahimar/ee3/client/renderer/tileentity/TileEntityCalcinatorRenderer.java rename to src/main/java/com/pahimar/ee3/client/renderer/tileentity/TileEntityCalcinatorRenderer.java diff --git a/common/com/pahimar/ee3/client/renderer/tileentity/TileEntityGlassBellRenderer.java b/src/main/java/com/pahimar/ee3/client/renderer/tileentity/TileEntityGlassBellRenderer.java similarity index 100% rename from common/com/pahimar/ee3/client/renderer/tileentity/TileEntityGlassBellRenderer.java rename to src/main/java/com/pahimar/ee3/client/renderer/tileentity/TileEntityGlassBellRenderer.java diff --git a/common/com/pahimar/ee3/command/CommandEE.java b/src/main/java/com/pahimar/ee3/command/CommandEE.java similarity index 100% rename from common/com/pahimar/ee3/command/CommandEE.java rename to src/main/java/com/pahimar/ee3/command/CommandEE.java diff --git a/common/com/pahimar/ee3/command/CommandHandler.java b/src/main/java/com/pahimar/ee3/command/CommandHandler.java similarity index 100% rename from common/com/pahimar/ee3/command/CommandHandler.java rename to src/main/java/com/pahimar/ee3/command/CommandHandler.java diff --git a/common/com/pahimar/ee3/command/CommandOverlay.java b/src/main/java/com/pahimar/ee3/command/CommandOverlay.java similarity index 100% rename from common/com/pahimar/ee3/command/CommandOverlay.java rename to src/main/java/com/pahimar/ee3/command/CommandOverlay.java diff --git a/common/com/pahimar/ee3/command/CommandParticles.java b/src/main/java/com/pahimar/ee3/command/CommandParticles.java similarity index 100% rename from common/com/pahimar/ee3/command/CommandParticles.java rename to src/main/java/com/pahimar/ee3/command/CommandParticles.java diff --git a/common/com/pahimar/ee3/command/CommandSounds.java b/src/main/java/com/pahimar/ee3/command/CommandSounds.java similarity index 100% rename from common/com/pahimar/ee3/command/CommandSounds.java rename to src/main/java/com/pahimar/ee3/command/CommandSounds.java diff --git a/common/com/pahimar/ee3/command/CommandVersion.java b/src/main/java/com/pahimar/ee3/command/CommandVersion.java similarity index 100% rename from common/com/pahimar/ee3/command/CommandVersion.java rename to src/main/java/com/pahimar/ee3/command/CommandVersion.java diff --git a/common/com/pahimar/ee3/configuration/BlockConfiguration.java b/src/main/java/com/pahimar/ee3/configuration/BlockConfiguration.java similarity index 100% rename from common/com/pahimar/ee3/configuration/BlockConfiguration.java rename to src/main/java/com/pahimar/ee3/configuration/BlockConfiguration.java diff --git a/common/com/pahimar/ee3/configuration/ConfigurationHandler.java b/src/main/java/com/pahimar/ee3/configuration/ConfigurationHandler.java similarity index 100% rename from common/com/pahimar/ee3/configuration/ConfigurationHandler.java rename to src/main/java/com/pahimar/ee3/configuration/ConfigurationHandler.java diff --git a/common/com/pahimar/ee3/configuration/ConfigurationSettings.java b/src/main/java/com/pahimar/ee3/configuration/ConfigurationSettings.java similarity index 100% rename from common/com/pahimar/ee3/configuration/ConfigurationSettings.java rename to src/main/java/com/pahimar/ee3/configuration/ConfigurationSettings.java diff --git a/common/com/pahimar/ee3/configuration/GeneralConfiguration.java b/src/main/java/com/pahimar/ee3/configuration/GeneralConfiguration.java similarity index 100% rename from common/com/pahimar/ee3/configuration/GeneralConfiguration.java rename to src/main/java/com/pahimar/ee3/configuration/GeneralConfiguration.java diff --git a/common/com/pahimar/ee3/configuration/ItemConfiguration.java b/src/main/java/com/pahimar/ee3/configuration/ItemConfiguration.java similarity index 100% rename from common/com/pahimar/ee3/configuration/ItemConfiguration.java rename to src/main/java/com/pahimar/ee3/configuration/ItemConfiguration.java diff --git a/common/com/pahimar/ee3/configuration/TransmutationConfiguration.java b/src/main/java/com/pahimar/ee3/configuration/TransmutationConfiguration.java similarity index 100% rename from common/com/pahimar/ee3/configuration/TransmutationConfiguration.java rename to src/main/java/com/pahimar/ee3/configuration/TransmutationConfiguration.java diff --git a/common/com/pahimar/ee3/core/handler/ActionRequestHandler.java b/src/main/java/com/pahimar/ee3/core/handler/ActionRequestHandler.java similarity index 100% rename from common/com/pahimar/ee3/core/handler/ActionRequestHandler.java rename to src/main/java/com/pahimar/ee3/core/handler/ActionRequestHandler.java diff --git a/common/com/pahimar/ee3/core/handler/CraftingHandler.java b/src/main/java/com/pahimar/ee3/core/handler/CraftingHandler.java similarity index 100% rename from common/com/pahimar/ee3/core/handler/CraftingHandler.java rename to src/main/java/com/pahimar/ee3/core/handler/CraftingHandler.java diff --git a/common/com/pahimar/ee3/core/handler/DrawBlockHighlightHandler.java b/src/main/java/com/pahimar/ee3/core/handler/DrawBlockHighlightHandler.java similarity index 100% rename from common/com/pahimar/ee3/core/handler/DrawBlockHighlightHandler.java rename to src/main/java/com/pahimar/ee3/core/handler/DrawBlockHighlightHandler.java diff --git a/common/com/pahimar/ee3/core/handler/EntityLivingHandler.java b/src/main/java/com/pahimar/ee3/core/handler/EntityLivingHandler.java similarity index 100% rename from common/com/pahimar/ee3/core/handler/EntityLivingHandler.java rename to src/main/java/com/pahimar/ee3/core/handler/EntityLivingHandler.java diff --git a/common/com/pahimar/ee3/core/handler/EquivalencyHandler.java b/src/main/java/com/pahimar/ee3/core/handler/EquivalencyHandler.java similarity index 100% rename from common/com/pahimar/ee3/core/handler/EquivalencyHandler.java rename to src/main/java/com/pahimar/ee3/core/handler/EquivalencyHandler.java diff --git a/common/com/pahimar/ee3/core/handler/ItemEventHandler.java b/src/main/java/com/pahimar/ee3/core/handler/ItemEventHandler.java similarity index 100% rename from common/com/pahimar/ee3/core/handler/ItemEventHandler.java rename to src/main/java/com/pahimar/ee3/core/handler/ItemEventHandler.java diff --git a/common/com/pahimar/ee3/core/handler/ItemTooltipEventHandler.java b/src/main/java/com/pahimar/ee3/core/handler/ItemTooltipEventHandler.java similarity index 100% rename from common/com/pahimar/ee3/core/handler/ItemTooltipEventHandler.java rename to src/main/java/com/pahimar/ee3/core/handler/ItemTooltipEventHandler.java diff --git a/common/com/pahimar/ee3/core/handler/KeyBindingHandler.java b/src/main/java/com/pahimar/ee3/core/handler/KeyBindingHandler.java similarity index 100% rename from common/com/pahimar/ee3/core/handler/KeyBindingHandler.java rename to src/main/java/com/pahimar/ee3/core/handler/KeyBindingHandler.java diff --git a/common/com/pahimar/ee3/core/handler/PlayerDestroyItemHandler.java b/src/main/java/com/pahimar/ee3/core/handler/PlayerDestroyItemHandler.java similarity index 100% rename from common/com/pahimar/ee3/core/handler/PlayerDestroyItemHandler.java rename to src/main/java/com/pahimar/ee3/core/handler/PlayerDestroyItemHandler.java diff --git a/common/com/pahimar/ee3/core/handler/TransmutationTargetOverlayHandler.java b/src/main/java/com/pahimar/ee3/core/handler/TransmutationTargetOverlayHandler.java similarity index 100% rename from common/com/pahimar/ee3/core/handler/TransmutationTargetOverlayHandler.java rename to src/main/java/com/pahimar/ee3/core/handler/TransmutationTargetOverlayHandler.java diff --git a/common/com/pahimar/ee3/core/handler/VersionCheckTickHandler.java b/src/main/java/com/pahimar/ee3/core/handler/VersionCheckTickHandler.java similarity index 100% rename from common/com/pahimar/ee3/core/handler/VersionCheckTickHandler.java rename to src/main/java/com/pahimar/ee3/core/handler/VersionCheckTickHandler.java diff --git a/common/com/pahimar/ee3/core/handler/WorldTransmutationHandler.java b/src/main/java/com/pahimar/ee3/core/handler/WorldTransmutationHandler.java similarity index 100% rename from common/com/pahimar/ee3/core/handler/WorldTransmutationHandler.java rename to src/main/java/com/pahimar/ee3/core/handler/WorldTransmutationHandler.java diff --git a/common/com/pahimar/ee3/core/handler/addon/AddonEmcValues.java b/src/main/java/com/pahimar/ee3/core/handler/addon/AddonEmcValues.java similarity index 100% rename from common/com/pahimar/ee3/core/handler/addon/AddonEmcValues.java rename to src/main/java/com/pahimar/ee3/core/handler/addon/AddonEmcValues.java diff --git a/common/com/pahimar/ee3/core/handler/addon/AddonIMCHandler.java b/src/main/java/com/pahimar/ee3/core/handler/addon/AddonIMCHandler.java similarity index 100% rename from common/com/pahimar/ee3/core/handler/addon/AddonIMCHandler.java rename to src/main/java/com/pahimar/ee3/core/handler/addon/AddonIMCHandler.java diff --git a/common/com/pahimar/ee3/core/handler/addon/AddonRecipes.java b/src/main/java/com/pahimar/ee3/core/handler/addon/AddonRecipes.java similarity index 100% rename from common/com/pahimar/ee3/core/handler/addon/AddonRecipes.java rename to src/main/java/com/pahimar/ee3/core/handler/addon/AddonRecipes.java diff --git a/common/com/pahimar/ee3/core/helper/EmcHelper.java b/src/main/java/com/pahimar/ee3/core/helper/EmcHelper.java similarity index 100% rename from common/com/pahimar/ee3/core/helper/EmcHelper.java rename to src/main/java/com/pahimar/ee3/core/helper/EmcHelper.java diff --git a/common/com/pahimar/ee3/core/helper/FluidHelper.java b/src/main/java/com/pahimar/ee3/core/helper/FluidHelper.java similarity index 100% rename from common/com/pahimar/ee3/core/helper/FluidHelper.java rename to src/main/java/com/pahimar/ee3/core/helper/FluidHelper.java diff --git a/common/com/pahimar/ee3/core/helper/GeneralHelper.java b/src/main/java/com/pahimar/ee3/core/helper/GeneralHelper.java similarity index 100% rename from common/com/pahimar/ee3/core/helper/GeneralHelper.java rename to src/main/java/com/pahimar/ee3/core/helper/GeneralHelper.java diff --git a/common/com/pahimar/ee3/core/helper/ItemHelper.java b/src/main/java/com/pahimar/ee3/core/helper/ItemHelper.java similarity index 100% rename from common/com/pahimar/ee3/core/helper/ItemHelper.java rename to src/main/java/com/pahimar/ee3/core/helper/ItemHelper.java diff --git a/common/com/pahimar/ee3/core/helper/ItemStackNBTHelper.java b/src/main/java/com/pahimar/ee3/core/helper/ItemStackNBTHelper.java similarity index 100% rename from common/com/pahimar/ee3/core/helper/ItemStackNBTHelper.java rename to src/main/java/com/pahimar/ee3/core/helper/ItemStackNBTHelper.java diff --git a/common/com/pahimar/ee3/core/helper/KeyBindingHelper.java b/src/main/java/com/pahimar/ee3/core/helper/KeyBindingHelper.java similarity index 100% rename from common/com/pahimar/ee3/core/helper/KeyBindingHelper.java rename to src/main/java/com/pahimar/ee3/core/helper/KeyBindingHelper.java diff --git a/common/com/pahimar/ee3/core/helper/LogHelper.java b/src/main/java/com/pahimar/ee3/core/helper/LogHelper.java similarity index 100% rename from common/com/pahimar/ee3/core/helper/LogHelper.java rename to src/main/java/com/pahimar/ee3/core/helper/LogHelper.java diff --git a/common/com/pahimar/ee3/core/helper/QualityHelper.java b/src/main/java/com/pahimar/ee3/core/helper/QualityHelper.java similarity index 100% rename from common/com/pahimar/ee3/core/helper/QualityHelper.java rename to src/main/java/com/pahimar/ee3/core/helper/QualityHelper.java diff --git a/common/com/pahimar/ee3/core/helper/RecipeHelper.java b/src/main/java/com/pahimar/ee3/core/helper/RecipeHelper.java similarity index 100% rename from common/com/pahimar/ee3/core/helper/RecipeHelper.java rename to src/main/java/com/pahimar/ee3/core/helper/RecipeHelper.java diff --git a/common/com/pahimar/ee3/core/helper/ResourceLocationHelper.java b/src/main/java/com/pahimar/ee3/core/helper/ResourceLocationHelper.java similarity index 100% rename from common/com/pahimar/ee3/core/helper/ResourceLocationHelper.java rename to src/main/java/com/pahimar/ee3/core/helper/ResourceLocationHelper.java diff --git a/common/com/pahimar/ee3/core/helper/TransmutationHelper.java b/src/main/java/com/pahimar/ee3/core/helper/TransmutationHelper.java similarity index 100% rename from common/com/pahimar/ee3/core/helper/TransmutationHelper.java rename to src/main/java/com/pahimar/ee3/core/helper/TransmutationHelper.java diff --git a/common/com/pahimar/ee3/core/helper/VersionHelper.java b/src/main/java/com/pahimar/ee3/core/helper/VersionHelper.java similarity index 100% rename from common/com/pahimar/ee3/core/helper/VersionHelper.java rename to src/main/java/com/pahimar/ee3/core/helper/VersionHelper.java diff --git a/common/com/pahimar/ee3/core/proxy/ClientProxy.java b/src/main/java/com/pahimar/ee3/core/proxy/ClientProxy.java similarity index 100% rename from common/com/pahimar/ee3/core/proxy/ClientProxy.java rename to src/main/java/com/pahimar/ee3/core/proxy/ClientProxy.java diff --git a/common/com/pahimar/ee3/core/proxy/CommonProxy.java b/src/main/java/com/pahimar/ee3/core/proxy/CommonProxy.java similarity index 100% rename from common/com/pahimar/ee3/core/proxy/CommonProxy.java rename to src/main/java/com/pahimar/ee3/core/proxy/CommonProxy.java diff --git a/common/com/pahimar/ee3/creativetab/CreativeTabEE3.java b/src/main/java/com/pahimar/ee3/creativetab/CreativeTabEE3.java similarity index 100% rename from common/com/pahimar/ee3/creativetab/CreativeTabEE3.java rename to src/main/java/com/pahimar/ee3/creativetab/CreativeTabEE3.java diff --git a/common/com/pahimar/ee3/emc/EmcComponent.java b/src/main/java/com/pahimar/ee3/emc/EmcComponent.java similarity index 100% rename from common/com/pahimar/ee3/emc/EmcComponent.java rename to src/main/java/com/pahimar/ee3/emc/EmcComponent.java diff --git a/common/com/pahimar/ee3/emc/EmcRegistry.java b/src/main/java/com/pahimar/ee3/emc/EmcRegistry.java similarity index 100% rename from common/com/pahimar/ee3/emc/EmcRegistry.java rename to src/main/java/com/pahimar/ee3/emc/EmcRegistry.java diff --git a/common/com/pahimar/ee3/emc/EmcType.java b/src/main/java/com/pahimar/ee3/emc/EmcType.java similarity index 100% rename from common/com/pahimar/ee3/emc/EmcType.java rename to src/main/java/com/pahimar/ee3/emc/EmcType.java diff --git a/common/com/pahimar/ee3/emc/EmcValue.java b/src/main/java/com/pahimar/ee3/emc/EmcValue.java similarity index 100% rename from common/com/pahimar/ee3/emc/EmcValue.java rename to src/main/java/com/pahimar/ee3/emc/EmcValue.java diff --git a/common/com/pahimar/ee3/emc/EmcValuesDefault.java b/src/main/java/com/pahimar/ee3/emc/EmcValuesDefault.java similarity index 100% rename from common/com/pahimar/ee3/emc/EmcValuesDefault.java rename to src/main/java/com/pahimar/ee3/emc/EmcValuesDefault.java diff --git a/common/com/pahimar/ee3/emc/EmcValuesIMC.java b/src/main/java/com/pahimar/ee3/emc/EmcValuesIMC.java similarity index 100% rename from common/com/pahimar/ee3/emc/EmcValuesIMC.java rename to src/main/java/com/pahimar/ee3/emc/EmcValuesIMC.java diff --git a/common/com/pahimar/ee3/event/ActionEvent.java b/src/main/java/com/pahimar/ee3/event/ActionEvent.java similarity index 100% rename from common/com/pahimar/ee3/event/ActionEvent.java rename to src/main/java/com/pahimar/ee3/event/ActionEvent.java diff --git a/common/com/pahimar/ee3/event/ActionRequestEvent.java b/src/main/java/com/pahimar/ee3/event/ActionRequestEvent.java similarity index 100% rename from common/com/pahimar/ee3/event/ActionRequestEvent.java rename to src/main/java/com/pahimar/ee3/event/ActionRequestEvent.java diff --git a/common/com/pahimar/ee3/event/WorldTransmutationEvent.java b/src/main/java/com/pahimar/ee3/event/WorldTransmutationEvent.java similarity index 100% rename from common/com/pahimar/ee3/event/WorldTransmutationEvent.java rename to src/main/java/com/pahimar/ee3/event/WorldTransmutationEvent.java diff --git a/common/com/pahimar/ee3/imc/InterModCommsHandler.java b/src/main/java/com/pahimar/ee3/imc/InterModCommsHandler.java similarity index 100% rename from common/com/pahimar/ee3/imc/InterModCommsHandler.java rename to src/main/java/com/pahimar/ee3/imc/InterModCommsHandler.java diff --git a/common/com/pahimar/ee3/imc/InterModCommsOperations.java b/src/main/java/com/pahimar/ee3/imc/InterModCommsOperations.java similarity index 100% rename from common/com/pahimar/ee3/imc/InterModCommsOperations.java rename to src/main/java/com/pahimar/ee3/imc/InterModCommsOperations.java diff --git a/common/com/pahimar/ee3/inventory/ContainerAlchemicalBag.java b/src/main/java/com/pahimar/ee3/inventory/ContainerAlchemicalBag.java similarity index 100% rename from common/com/pahimar/ee3/inventory/ContainerAlchemicalBag.java rename to src/main/java/com/pahimar/ee3/inventory/ContainerAlchemicalBag.java diff --git a/common/com/pahimar/ee3/inventory/ContainerAlchemicalChest.java b/src/main/java/com/pahimar/ee3/inventory/ContainerAlchemicalChest.java similarity index 100% rename from common/com/pahimar/ee3/inventory/ContainerAlchemicalChest.java rename to src/main/java/com/pahimar/ee3/inventory/ContainerAlchemicalChest.java diff --git a/common/com/pahimar/ee3/inventory/ContainerAludel.java b/src/main/java/com/pahimar/ee3/inventory/ContainerAludel.java similarity index 100% rename from common/com/pahimar/ee3/inventory/ContainerAludel.java rename to src/main/java/com/pahimar/ee3/inventory/ContainerAludel.java diff --git a/common/com/pahimar/ee3/inventory/ContainerCalcinator.java b/src/main/java/com/pahimar/ee3/inventory/ContainerCalcinator.java similarity index 100% rename from common/com/pahimar/ee3/inventory/ContainerCalcinator.java rename to src/main/java/com/pahimar/ee3/inventory/ContainerCalcinator.java diff --git a/common/com/pahimar/ee3/inventory/ContainerGlassBell.java b/src/main/java/com/pahimar/ee3/inventory/ContainerGlassBell.java similarity index 100% rename from common/com/pahimar/ee3/inventory/ContainerGlassBell.java rename to src/main/java/com/pahimar/ee3/inventory/ContainerGlassBell.java diff --git a/common/com/pahimar/ee3/inventory/ContainerPortableCrafting.java b/src/main/java/com/pahimar/ee3/inventory/ContainerPortableCrafting.java similarity index 100% rename from common/com/pahimar/ee3/inventory/ContainerPortableCrafting.java rename to src/main/java/com/pahimar/ee3/inventory/ContainerPortableCrafting.java diff --git a/common/com/pahimar/ee3/inventory/ContainerPortableTransmutation.java b/src/main/java/com/pahimar/ee3/inventory/ContainerPortableTransmutation.java similarity index 100% rename from common/com/pahimar/ee3/inventory/ContainerPortableTransmutation.java rename to src/main/java/com/pahimar/ee3/inventory/ContainerPortableTransmutation.java diff --git a/common/com/pahimar/ee3/inventory/SlotCalcinator.java b/src/main/java/com/pahimar/ee3/inventory/SlotCalcinator.java similarity index 100% rename from common/com/pahimar/ee3/inventory/SlotCalcinator.java rename to src/main/java/com/pahimar/ee3/inventory/SlotCalcinator.java diff --git a/common/com/pahimar/ee3/item/EnergyStack.java b/src/main/java/com/pahimar/ee3/item/EnergyStack.java similarity index 100% rename from common/com/pahimar/ee3/item/EnergyStack.java rename to src/main/java/com/pahimar/ee3/item/EnergyStack.java diff --git a/common/com/pahimar/ee3/item/IChargeable.java b/src/main/java/com/pahimar/ee3/item/IChargeable.java similarity index 100% rename from common/com/pahimar/ee3/item/IChargeable.java rename to src/main/java/com/pahimar/ee3/item/IChargeable.java diff --git a/common/com/pahimar/ee3/item/IKeyBound.java b/src/main/java/com/pahimar/ee3/item/IKeyBound.java similarity index 100% rename from common/com/pahimar/ee3/item/IKeyBound.java rename to src/main/java/com/pahimar/ee3/item/IKeyBound.java diff --git a/common/com/pahimar/ee3/item/ITransmutationStone.java b/src/main/java/com/pahimar/ee3/item/ITransmutationStone.java similarity index 100% rename from common/com/pahimar/ee3/item/ITransmutationStone.java rename to src/main/java/com/pahimar/ee3/item/ITransmutationStone.java diff --git a/common/com/pahimar/ee3/item/ItemAlchemicalBag.java b/src/main/java/com/pahimar/ee3/item/ItemAlchemicalBag.java similarity index 100% rename from common/com/pahimar/ee3/item/ItemAlchemicalBag.java rename to src/main/java/com/pahimar/ee3/item/ItemAlchemicalBag.java diff --git a/common/com/pahimar/ee3/item/ItemAlchemicalChalk.java b/src/main/java/com/pahimar/ee3/item/ItemAlchemicalChalk.java similarity index 100% rename from common/com/pahimar/ee3/item/ItemAlchemicalChalk.java rename to src/main/java/com/pahimar/ee3/item/ItemAlchemicalChalk.java diff --git a/common/com/pahimar/ee3/item/ItemAlchemicalDust.java b/src/main/java/com/pahimar/ee3/item/ItemAlchemicalDust.java similarity index 100% rename from common/com/pahimar/ee3/item/ItemAlchemicalDust.java rename to src/main/java/com/pahimar/ee3/item/ItemAlchemicalDust.java diff --git a/common/com/pahimar/ee3/item/ItemEE.java b/src/main/java/com/pahimar/ee3/item/ItemEE.java similarity index 100% rename from common/com/pahimar/ee3/item/ItemEE.java rename to src/main/java/com/pahimar/ee3/item/ItemEE.java diff --git a/common/com/pahimar/ee3/item/ItemInertStone.java b/src/main/java/com/pahimar/ee3/item/ItemInertStone.java similarity index 100% rename from common/com/pahimar/ee3/item/ItemInertStone.java rename to src/main/java/com/pahimar/ee3/item/ItemInertStone.java diff --git a/common/com/pahimar/ee3/item/ItemMiniumShard.java b/src/main/java/com/pahimar/ee3/item/ItemMiniumShard.java similarity index 100% rename from common/com/pahimar/ee3/item/ItemMiniumShard.java rename to src/main/java/com/pahimar/ee3/item/ItemMiniumShard.java diff --git a/common/com/pahimar/ee3/item/ItemMiniumStone.java b/src/main/java/com/pahimar/ee3/item/ItemMiniumStone.java similarity index 100% rename from common/com/pahimar/ee3/item/ItemMiniumStone.java rename to src/main/java/com/pahimar/ee3/item/ItemMiniumStone.java diff --git a/common/com/pahimar/ee3/item/ItemPhilosophersStone.java b/src/main/java/com/pahimar/ee3/item/ItemPhilosophersStone.java similarity index 100% rename from common/com/pahimar/ee3/item/ItemPhilosophersStone.java rename to src/main/java/com/pahimar/ee3/item/ItemPhilosophersStone.java diff --git a/common/com/pahimar/ee3/item/ModItems.java b/src/main/java/com/pahimar/ee3/item/ModItems.java similarity index 100% rename from common/com/pahimar/ee3/item/ModItems.java rename to src/main/java/com/pahimar/ee3/item/ModItems.java diff --git a/common/com/pahimar/ee3/item/OreStack.java b/src/main/java/com/pahimar/ee3/item/OreStack.java similarity index 100% rename from common/com/pahimar/ee3/item/OreStack.java rename to src/main/java/com/pahimar/ee3/item/OreStack.java diff --git a/common/com/pahimar/ee3/item/WrappedStack.java b/src/main/java/com/pahimar/ee3/item/WrappedStack.java similarity index 100% rename from common/com/pahimar/ee3/item/WrappedStack.java rename to src/main/java/com/pahimar/ee3/item/WrappedStack.java diff --git a/common/com/pahimar/ee3/item/crafting/CalcinationManager.java b/src/main/java/com/pahimar/ee3/item/crafting/CalcinationManager.java similarity index 100% rename from common/com/pahimar/ee3/item/crafting/CalcinationManager.java rename to src/main/java/com/pahimar/ee3/item/crafting/CalcinationManager.java diff --git a/common/com/pahimar/ee3/item/crafting/CustomWrappedRecipe.java b/src/main/java/com/pahimar/ee3/item/crafting/CustomWrappedRecipe.java similarity index 100% rename from common/com/pahimar/ee3/item/crafting/CustomWrappedRecipe.java rename to src/main/java/com/pahimar/ee3/item/crafting/CustomWrappedRecipe.java diff --git a/common/com/pahimar/ee3/item/crafting/RecipeRegistry.java b/src/main/java/com/pahimar/ee3/item/crafting/RecipeRegistry.java similarity index 100% rename from common/com/pahimar/ee3/item/crafting/RecipeRegistry.java rename to src/main/java/com/pahimar/ee3/item/crafting/RecipeRegistry.java diff --git a/common/com/pahimar/ee3/item/crafting/RecipesAlchemicalBagDyes.java b/src/main/java/com/pahimar/ee3/item/crafting/RecipesAlchemicalBagDyes.java similarity index 100% rename from common/com/pahimar/ee3/item/crafting/RecipesAlchemicalBagDyes.java rename to src/main/java/com/pahimar/ee3/item/crafting/RecipesAlchemicalBagDyes.java diff --git a/common/com/pahimar/ee3/item/crafting/RecipesFluidContainers.java b/src/main/java/com/pahimar/ee3/item/crafting/RecipesFluidContainers.java similarity index 100% rename from common/com/pahimar/ee3/item/crafting/RecipesFluidContainers.java rename to src/main/java/com/pahimar/ee3/item/crafting/RecipesFluidContainers.java diff --git a/common/com/pahimar/ee3/item/crafting/RecipesIMC.java b/src/main/java/com/pahimar/ee3/item/crafting/RecipesIMC.java similarity index 100% rename from common/com/pahimar/ee3/item/crafting/RecipesIMC.java rename to src/main/java/com/pahimar/ee3/item/crafting/RecipesIMC.java diff --git a/common/com/pahimar/ee3/item/crafting/RecipesPotions.java b/src/main/java/com/pahimar/ee3/item/crafting/RecipesPotions.java similarity index 100% rename from common/com/pahimar/ee3/item/crafting/RecipesPotions.java rename to src/main/java/com/pahimar/ee3/item/crafting/RecipesPotions.java diff --git a/common/com/pahimar/ee3/item/crafting/RecipesVanilla.java b/src/main/java/com/pahimar/ee3/item/crafting/RecipesVanilla.java similarity index 100% rename from common/com/pahimar/ee3/item/crafting/RecipesVanilla.java rename to src/main/java/com/pahimar/ee3/item/crafting/RecipesVanilla.java diff --git a/common/com/pahimar/ee3/item/crafting/TransmutationManager.java b/src/main/java/com/pahimar/ee3/item/crafting/TransmutationManager.java similarity index 100% rename from common/com/pahimar/ee3/item/crafting/TransmutationManager.java rename to src/main/java/com/pahimar/ee3/item/crafting/TransmutationManager.java diff --git a/common/com/pahimar/ee3/lib/ActionTypes.java b/src/main/java/com/pahimar/ee3/lib/ActionTypes.java similarity index 100% rename from common/com/pahimar/ee3/lib/ActionTypes.java rename to src/main/java/com/pahimar/ee3/lib/ActionTypes.java diff --git a/common/com/pahimar/ee3/lib/BlockIds.java b/src/main/java/com/pahimar/ee3/lib/BlockIds.java similarity index 100% rename from common/com/pahimar/ee3/lib/BlockIds.java rename to src/main/java/com/pahimar/ee3/lib/BlockIds.java diff --git a/common/com/pahimar/ee3/lib/Colours.java b/src/main/java/com/pahimar/ee3/lib/Colours.java similarity index 100% rename from common/com/pahimar/ee3/lib/Colours.java rename to src/main/java/com/pahimar/ee3/lib/Colours.java diff --git a/common/com/pahimar/ee3/lib/Commands.java b/src/main/java/com/pahimar/ee3/lib/Commands.java similarity index 100% rename from common/com/pahimar/ee3/lib/Commands.java rename to src/main/java/com/pahimar/ee3/lib/Commands.java diff --git a/common/com/pahimar/ee3/lib/Compare.java b/src/main/java/com/pahimar/ee3/lib/Compare.java similarity index 100% rename from common/com/pahimar/ee3/lib/Compare.java rename to src/main/java/com/pahimar/ee3/lib/Compare.java diff --git a/common/com/pahimar/ee3/lib/GuiIds.java b/src/main/java/com/pahimar/ee3/lib/GuiIds.java similarity index 100% rename from common/com/pahimar/ee3/lib/GuiIds.java rename to src/main/java/com/pahimar/ee3/lib/GuiIds.java diff --git a/common/com/pahimar/ee3/lib/ItemIds.java b/src/main/java/com/pahimar/ee3/lib/ItemIds.java similarity index 100% rename from common/com/pahimar/ee3/lib/ItemIds.java rename to src/main/java/com/pahimar/ee3/lib/ItemIds.java diff --git a/common/com/pahimar/ee3/lib/ItemUpdateTypes.java b/src/main/java/com/pahimar/ee3/lib/ItemUpdateTypes.java similarity index 100% rename from common/com/pahimar/ee3/lib/ItemUpdateTypes.java rename to src/main/java/com/pahimar/ee3/lib/ItemUpdateTypes.java diff --git a/common/com/pahimar/ee3/lib/Models.java b/src/main/java/com/pahimar/ee3/lib/Models.java similarity index 100% rename from common/com/pahimar/ee3/lib/Models.java rename to src/main/java/com/pahimar/ee3/lib/Models.java diff --git a/common/com/pahimar/ee3/lib/Particles.java b/src/main/java/com/pahimar/ee3/lib/Particles.java similarity index 100% rename from common/com/pahimar/ee3/lib/Particles.java rename to src/main/java/com/pahimar/ee3/lib/Particles.java diff --git a/common/com/pahimar/ee3/lib/Reference.java b/src/main/java/com/pahimar/ee3/lib/Reference.java similarity index 100% rename from common/com/pahimar/ee3/lib/Reference.java rename to src/main/java/com/pahimar/ee3/lib/Reference.java diff --git a/common/com/pahimar/ee3/lib/RenderIds.java b/src/main/java/com/pahimar/ee3/lib/RenderIds.java similarity index 100% rename from common/com/pahimar/ee3/lib/RenderIds.java rename to src/main/java/com/pahimar/ee3/lib/RenderIds.java diff --git a/common/com/pahimar/ee3/lib/Sounds.java b/src/main/java/com/pahimar/ee3/lib/Sounds.java similarity index 100% rename from common/com/pahimar/ee3/lib/Sounds.java rename to src/main/java/com/pahimar/ee3/lib/Sounds.java diff --git a/common/com/pahimar/ee3/lib/Strings.java b/src/main/java/com/pahimar/ee3/lib/Strings.java similarity index 100% rename from common/com/pahimar/ee3/lib/Strings.java rename to src/main/java/com/pahimar/ee3/lib/Strings.java diff --git a/common/com/pahimar/ee3/lib/Textures.java b/src/main/java/com/pahimar/ee3/lib/Textures.java similarity index 100% rename from common/com/pahimar/ee3/lib/Textures.java rename to src/main/java/com/pahimar/ee3/lib/Textures.java diff --git a/common/com/pahimar/ee3/network/PacketHandler.java b/src/main/java/com/pahimar/ee3/network/PacketHandler.java similarity index 100% rename from common/com/pahimar/ee3/network/PacketHandler.java rename to src/main/java/com/pahimar/ee3/network/PacketHandler.java diff --git a/common/com/pahimar/ee3/network/PacketTypeHandler.java b/src/main/java/com/pahimar/ee3/network/PacketTypeHandler.java similarity index 100% rename from common/com/pahimar/ee3/network/PacketTypeHandler.java rename to src/main/java/com/pahimar/ee3/network/PacketTypeHandler.java diff --git a/common/com/pahimar/ee3/network/packet/PacketEE.java b/src/main/java/com/pahimar/ee3/network/packet/PacketEE.java similarity index 100% rename from common/com/pahimar/ee3/network/packet/PacketEE.java rename to src/main/java/com/pahimar/ee3/network/packet/PacketEE.java diff --git a/common/com/pahimar/ee3/network/packet/PacketItemUpdate.java b/src/main/java/com/pahimar/ee3/network/packet/PacketItemUpdate.java similarity index 100% rename from common/com/pahimar/ee3/network/packet/PacketItemUpdate.java rename to src/main/java/com/pahimar/ee3/network/packet/PacketItemUpdate.java diff --git a/common/com/pahimar/ee3/network/packet/PacketKeyPressed.java b/src/main/java/com/pahimar/ee3/network/packet/PacketKeyPressed.java similarity index 100% rename from common/com/pahimar/ee3/network/packet/PacketKeyPressed.java rename to src/main/java/com/pahimar/ee3/network/packet/PacketKeyPressed.java diff --git a/common/com/pahimar/ee3/network/packet/PacketRequestEvent.java b/src/main/java/com/pahimar/ee3/network/packet/PacketRequestEvent.java similarity index 100% rename from common/com/pahimar/ee3/network/packet/PacketRequestEvent.java rename to src/main/java/com/pahimar/ee3/network/packet/PacketRequestEvent.java diff --git a/common/com/pahimar/ee3/network/packet/PacketSoundEvent.java b/src/main/java/com/pahimar/ee3/network/packet/PacketSoundEvent.java similarity index 100% rename from common/com/pahimar/ee3/network/packet/PacketSoundEvent.java rename to src/main/java/com/pahimar/ee3/network/packet/PacketSoundEvent.java diff --git a/common/com/pahimar/ee3/network/packet/PacketSpawnParticle.java b/src/main/java/com/pahimar/ee3/network/packet/PacketSpawnParticle.java similarity index 100% rename from common/com/pahimar/ee3/network/packet/PacketSpawnParticle.java rename to src/main/java/com/pahimar/ee3/network/packet/PacketSpawnParticle.java diff --git a/common/com/pahimar/ee3/network/packet/PacketTileUpdate.java b/src/main/java/com/pahimar/ee3/network/packet/PacketTileUpdate.java similarity index 100% rename from common/com/pahimar/ee3/network/packet/PacketTileUpdate.java rename to src/main/java/com/pahimar/ee3/network/packet/PacketTileUpdate.java diff --git a/common/com/pahimar/ee3/network/packet/PacketTileWithItemUpdate.java b/src/main/java/com/pahimar/ee3/network/packet/PacketTileWithItemUpdate.java similarity index 100% rename from common/com/pahimar/ee3/network/packet/PacketTileWithItemUpdate.java rename to src/main/java/com/pahimar/ee3/network/packet/PacketTileWithItemUpdate.java diff --git a/common/com/pahimar/ee3/recipe/RecipesCalcinator.java b/src/main/java/com/pahimar/ee3/recipe/RecipesCalcinator.java similarity index 100% rename from common/com/pahimar/ee3/recipe/RecipesCalcinator.java rename to src/main/java/com/pahimar/ee3/recipe/RecipesCalcinator.java diff --git a/common/com/pahimar/ee3/tileentity/TileAlchemicalChest.java b/src/main/java/com/pahimar/ee3/tileentity/TileAlchemicalChest.java similarity index 100% rename from common/com/pahimar/ee3/tileentity/TileAlchemicalChest.java rename to src/main/java/com/pahimar/ee3/tileentity/TileAlchemicalChest.java diff --git a/common/com/pahimar/ee3/tileentity/TileAludel.java b/src/main/java/com/pahimar/ee3/tileentity/TileAludel.java similarity index 100% rename from common/com/pahimar/ee3/tileentity/TileAludel.java rename to src/main/java/com/pahimar/ee3/tileentity/TileAludel.java diff --git a/common/com/pahimar/ee3/tileentity/TileCalcinator.java b/src/main/java/com/pahimar/ee3/tileentity/TileCalcinator.java similarity index 100% rename from common/com/pahimar/ee3/tileentity/TileCalcinator.java rename to src/main/java/com/pahimar/ee3/tileentity/TileCalcinator.java diff --git a/common/com/pahimar/ee3/tileentity/TileEE.java b/src/main/java/com/pahimar/ee3/tileentity/TileEE.java similarity index 100% rename from common/com/pahimar/ee3/tileentity/TileEE.java rename to src/main/java/com/pahimar/ee3/tileentity/TileEE.java diff --git a/common/com/pahimar/ee3/tileentity/TileGlassBell.java b/src/main/java/com/pahimar/ee3/tileentity/TileGlassBell.java similarity index 100% rename from common/com/pahimar/ee3/tileentity/TileGlassBell.java rename to src/main/java/com/pahimar/ee3/tileentity/TileGlassBell.java diff --git a/resources/assets/ee3/lang/cs_CZ.lang b/src/main/resources/assets/ee3/lang/cs_CZ.lang similarity index 100% rename from resources/assets/ee3/lang/cs_CZ.lang rename to src/main/resources/assets/ee3/lang/cs_CZ.lang diff --git a/resources/assets/ee3/lang/de_DE.lang b/src/main/resources/assets/ee3/lang/de_DE.lang similarity index 100% rename from resources/assets/ee3/lang/de_DE.lang rename to src/main/resources/assets/ee3/lang/de_DE.lang diff --git a/resources/assets/ee3/lang/el_GR.lang b/src/main/resources/assets/ee3/lang/el_GR.lang similarity index 100% rename from resources/assets/ee3/lang/el_GR.lang rename to src/main/resources/assets/ee3/lang/el_GR.lang diff --git a/resources/assets/ee3/lang/en_US.lang b/src/main/resources/assets/ee3/lang/en_US.lang similarity index 100% rename from resources/assets/ee3/lang/en_US.lang rename to src/main/resources/assets/ee3/lang/en_US.lang diff --git a/resources/assets/ee3/lang/es_ES.lang b/src/main/resources/assets/ee3/lang/es_ES.lang similarity index 100% rename from resources/assets/ee3/lang/es_ES.lang rename to src/main/resources/assets/ee3/lang/es_ES.lang diff --git a/resources/assets/ee3/lang/fi_FI.lang b/src/main/resources/assets/ee3/lang/fi_FI.lang similarity index 100% rename from resources/assets/ee3/lang/fi_FI.lang rename to src/main/resources/assets/ee3/lang/fi_FI.lang diff --git a/resources/assets/ee3/lang/it_IT.lang b/src/main/resources/assets/ee3/lang/it_IT.lang similarity index 100% rename from resources/assets/ee3/lang/it_IT.lang rename to src/main/resources/assets/ee3/lang/it_IT.lang diff --git a/resources/assets/ee3/lang/nb_NO.lang b/src/main/resources/assets/ee3/lang/nb_NO.lang similarity index 100% rename from resources/assets/ee3/lang/nb_NO.lang rename to src/main/resources/assets/ee3/lang/nb_NO.lang diff --git a/resources/assets/ee3/lang/nl_NL.lang b/src/main/resources/assets/ee3/lang/nl_NL.lang similarity index 100% rename from resources/assets/ee3/lang/nl_NL.lang rename to src/main/resources/assets/ee3/lang/nl_NL.lang diff --git a/resources/assets/ee3/lang/pt_PT.lang b/src/main/resources/assets/ee3/lang/pt_PT.lang similarity index 100% rename from resources/assets/ee3/lang/pt_PT.lang rename to src/main/resources/assets/ee3/lang/pt_PT.lang diff --git a/resources/assets/ee3/lang/ru_RU.lang b/src/main/resources/assets/ee3/lang/ru_RU.lang similarity index 100% rename from resources/assets/ee3/lang/ru_RU.lang rename to src/main/resources/assets/ee3/lang/ru_RU.lang diff --git a/resources/assets/ee3/lang/sl_SI.lang b/src/main/resources/assets/ee3/lang/sl_SI.lang similarity index 100% rename from resources/assets/ee3/lang/sl_SI.lang rename to src/main/resources/assets/ee3/lang/sl_SI.lang diff --git a/resources/assets/ee3/lang/sv_SE.lang b/src/main/resources/assets/ee3/lang/sv_SE.lang similarity index 100% rename from resources/assets/ee3/lang/sv_SE.lang rename to src/main/resources/assets/ee3/lang/sv_SE.lang diff --git a/resources/assets/ee3/lang/zh_CN.lang b/src/main/resources/assets/ee3/lang/zh_CN.lang similarity index 100% rename from resources/assets/ee3/lang/zh_CN.lang rename to src/main/resources/assets/ee3/lang/zh_CN.lang diff --git a/resources/assets/ee3/lang/zh_TW.lang b/src/main/resources/assets/ee3/lang/zh_TW.lang similarity index 100% rename from resources/assets/ee3/lang/zh_TW.lang rename to src/main/resources/assets/ee3/lang/zh_TW.lang diff --git a/resources/assets/ee3/models/aludel.obj b/src/main/resources/assets/ee3/models/aludel.obj similarity index 100% rename from resources/assets/ee3/models/aludel.obj rename to src/main/resources/assets/ee3/models/aludel.obj diff --git a/resources/assets/ee3/models/calcinator.obj b/src/main/resources/assets/ee3/models/calcinator.obj similarity index 100% rename from resources/assets/ee3/models/calcinator.obj rename to src/main/resources/assets/ee3/models/calcinator.obj diff --git a/resources/assets/ee3/sound/chargeDown.ogg b/src/main/resources/assets/ee3/sound/chargeDown.ogg similarity index 100% rename from resources/assets/ee3/sound/chargeDown.ogg rename to src/main/resources/assets/ee3/sound/chargeDown.ogg diff --git a/resources/assets/ee3/sound/chargeUp.ogg b/src/main/resources/assets/ee3/sound/chargeUp.ogg similarity index 100% rename from resources/assets/ee3/sound/chargeUp.ogg rename to src/main/resources/assets/ee3/sound/chargeUp.ogg diff --git a/resources/assets/ee3/sound/destruct.ogg b/src/main/resources/assets/ee3/sound/destruct.ogg similarity index 100% rename from resources/assets/ee3/sound/destruct.ogg rename to src/main/resources/assets/ee3/sound/destruct.ogg diff --git a/resources/assets/ee3/sound/fail.ogg b/src/main/resources/assets/ee3/sound/fail.ogg similarity index 100% rename from resources/assets/ee3/sound/fail.ogg rename to src/main/resources/assets/ee3/sound/fail.ogg diff --git a/resources/assets/ee3/sound/gust.ogg b/src/main/resources/assets/ee3/sound/gust.ogg similarity index 100% rename from resources/assets/ee3/sound/gust.ogg rename to src/main/resources/assets/ee3/sound/gust.ogg diff --git a/resources/assets/ee3/sound/heal.ogg b/src/main/resources/assets/ee3/sound/heal.ogg similarity index 100% rename from resources/assets/ee3/sound/heal.ogg rename to src/main/resources/assets/ee3/sound/heal.ogg diff --git a/resources/assets/ee3/sound/kinesis.ogg b/src/main/resources/assets/ee3/sound/kinesis.ogg similarity index 100% rename from resources/assets/ee3/sound/kinesis.ogg rename to src/main/resources/assets/ee3/sound/kinesis.ogg diff --git a/resources/assets/ee3/sound/launch.ogg b/src/main/resources/assets/ee3/sound/launch.ogg similarity index 100% rename from resources/assets/ee3/sound/launch.ogg rename to src/main/resources/assets/ee3/sound/launch.ogg diff --git a/resources/assets/ee3/sound/nova.ogg b/src/main/resources/assets/ee3/sound/nova.ogg similarity index 100% rename from resources/assets/ee3/sound/nova.ogg rename to src/main/resources/assets/ee3/sound/nova.ogg diff --git a/resources/assets/ee3/sound/ocarina/1_D2.ogg b/src/main/resources/assets/ee3/sound/ocarina/1_D2.ogg similarity index 100% rename from resources/assets/ee3/sound/ocarina/1_D2.ogg rename to src/main/resources/assets/ee3/sound/ocarina/1_D2.ogg diff --git a/resources/assets/ee3/sound/ocarina/2_E2.ogg b/src/main/resources/assets/ee3/sound/ocarina/2_E2.ogg similarity index 100% rename from resources/assets/ee3/sound/ocarina/2_E2.ogg rename to src/main/resources/assets/ee3/sound/ocarina/2_E2.ogg diff --git a/resources/assets/ee3/sound/ocarina/3_F2Sharp.ogg b/src/main/resources/assets/ee3/sound/ocarina/3_F2Sharp.ogg similarity index 100% rename from resources/assets/ee3/sound/ocarina/3_F2Sharp.ogg rename to src/main/resources/assets/ee3/sound/ocarina/3_F2Sharp.ogg diff --git a/resources/assets/ee3/sound/ocarina/4_G2.ogg b/src/main/resources/assets/ee3/sound/ocarina/4_G2.ogg similarity index 100% rename from resources/assets/ee3/sound/ocarina/4_G2.ogg rename to src/main/resources/assets/ee3/sound/ocarina/4_G2.ogg diff --git a/resources/assets/ee3/sound/ocarina/5_A2.ogg b/src/main/resources/assets/ee3/sound/ocarina/5_A2.ogg similarity index 100% rename from resources/assets/ee3/sound/ocarina/5_A2.ogg rename to src/main/resources/assets/ee3/sound/ocarina/5_A2.ogg diff --git a/resources/assets/ee3/sound/ocarina/6_B2.ogg b/src/main/resources/assets/ee3/sound/ocarina/6_B2.ogg similarity index 100% rename from resources/assets/ee3/sound/ocarina/6_B2.ogg rename to src/main/resources/assets/ee3/sound/ocarina/6_B2.ogg diff --git a/resources/assets/ee3/sound/ocarina/7_C3Sharp.ogg b/src/main/resources/assets/ee3/sound/ocarina/7_C3Sharp.ogg similarity index 100% rename from resources/assets/ee3/sound/ocarina/7_C3Sharp.ogg rename to src/main/resources/assets/ee3/sound/ocarina/7_C3Sharp.ogg diff --git a/resources/assets/ee3/sound/ocarina/8_D3.ogg b/src/main/resources/assets/ee3/sound/ocarina/8_D3.ogg similarity index 100% rename from resources/assets/ee3/sound/ocarina/8_D3.ogg rename to src/main/resources/assets/ee3/sound/ocarina/8_D3.ogg diff --git a/resources/assets/ee3/sound/philball.ogg b/src/main/resources/assets/ee3/sound/philball.ogg similarity index 100% rename from resources/assets/ee3/sound/philball.ogg rename to src/main/resources/assets/ee3/sound/philball.ogg diff --git a/resources/assets/ee3/sound/tock.ogg b/src/main/resources/assets/ee3/sound/tock.ogg similarity index 100% rename from resources/assets/ee3/sound/tock.ogg rename to src/main/resources/assets/ee3/sound/tock.ogg diff --git a/resources/assets/ee3/sound/transmute.ogg b/src/main/resources/assets/ee3/sound/transmute.ogg similarity index 100% rename from resources/assets/ee3/sound/transmute.ogg rename to src/main/resources/assets/ee3/sound/transmute.ogg diff --git a/resources/assets/ee3/sound/wall.ogg b/src/main/resources/assets/ee3/sound/wall.ogg similarity index 100% rename from resources/assets/ee3/sound/wall.ogg rename to src/main/resources/assets/ee3/sound/wall.ogg diff --git a/resources/assets/ee3/sound/waterball.ogg b/src/main/resources/assets/ee3/sound/waterball.ogg similarity index 100% rename from resources/assets/ee3/sound/waterball.ogg rename to src/main/resources/assets/ee3/sound/waterball.ogg diff --git a/resources/assets/ee3/sound/wind.ogg b/src/main/resources/assets/ee3/sound/wind.ogg similarity index 100% rename from resources/assets/ee3/sound/wind.ogg rename to src/main/resources/assets/ee3/sound/wind.ogg diff --git a/resources/assets/ee3/textures/blocks/alchemicalChest.png b/src/main/resources/assets/ee3/textures/blocks/alchemicalChest.png similarity index 100% rename from resources/assets/ee3/textures/blocks/alchemicalChest.png rename to src/main/resources/assets/ee3/textures/blocks/alchemicalChest.png diff --git a/resources/assets/ee3/textures/blocks/aludel.png b/src/main/resources/assets/ee3/textures/blocks/aludel.png similarity index 100% rename from resources/assets/ee3/textures/blocks/aludel.png rename to src/main/resources/assets/ee3/textures/blocks/aludel.png diff --git a/resources/assets/ee3/textures/blocks/calcinator.png b/src/main/resources/assets/ee3/textures/blocks/calcinator.png similarity index 100% rename from resources/assets/ee3/textures/blocks/calcinator.png rename to src/main/resources/assets/ee3/textures/blocks/calcinator.png diff --git a/resources/assets/ee3/textures/blocks/glassBell.png b/src/main/resources/assets/ee3/textures/blocks/glassBell.png similarity index 100% rename from resources/assets/ee3/textures/blocks/glassBell.png rename to src/main/resources/assets/ee3/textures/blocks/glassBell.png diff --git a/resources/assets/ee3/textures/effects/noise.png b/src/main/resources/assets/ee3/textures/effects/noise.png similarity index 100% rename from resources/assets/ee3/textures/effects/noise.png rename to src/main/resources/assets/ee3/textures/effects/noise.png diff --git a/resources/assets/ee3/textures/gui/alchemicalStorage.png b/src/main/resources/assets/ee3/textures/gui/alchemicalStorage.png similarity index 100% rename from resources/assets/ee3/textures/gui/alchemicalStorage.png rename to src/main/resources/assets/ee3/textures/gui/alchemicalStorage.png diff --git a/resources/assets/ee3/textures/gui/aludel.png b/src/main/resources/assets/ee3/textures/gui/aludel.png similarity index 100% rename from resources/assets/ee3/textures/gui/aludel.png rename to src/main/resources/assets/ee3/textures/gui/aludel.png diff --git a/resources/assets/ee3/textures/gui/calcinator.png b/src/main/resources/assets/ee3/textures/gui/calcinator.png similarity index 100% rename from resources/assets/ee3/textures/gui/calcinator.png rename to src/main/resources/assets/ee3/textures/gui/calcinator.png diff --git a/resources/assets/ee3/textures/gui/glassBell.png b/src/main/resources/assets/ee3/textures/gui/glassBell.png similarity index 100% rename from resources/assets/ee3/textures/gui/glassBell.png rename to src/main/resources/assets/ee3/textures/gui/glassBell.png diff --git a/resources/assets/ee3/textures/gui/ocarina.png b/src/main/resources/assets/ee3/textures/gui/ocarina.png similarity index 100% rename from resources/assets/ee3/textures/gui/ocarina.png rename to src/main/resources/assets/ee3/textures/gui/ocarina.png diff --git a/resources/assets/ee3/textures/gui/portableTransmutation.png b/src/main/resources/assets/ee3/textures/gui/portableTransmutation.png similarity index 100% rename from resources/assets/ee3/textures/gui/portableTransmutation.png rename to src/main/resources/assets/ee3/textures/gui/portableTransmutation.png diff --git a/resources/assets/ee3/textures/gui/sharedAlchemicalStorage.png b/src/main/resources/assets/ee3/textures/gui/sharedAlchemicalStorage.png similarity index 100% rename from resources/assets/ee3/textures/gui/sharedAlchemicalStorage.png rename to src/main/resources/assets/ee3/textures/gui/sharedAlchemicalStorage.png diff --git a/resources/assets/ee3/textures/icons/amorphous.png b/src/main/resources/assets/ee3/textures/icons/amorphous.png similarity index 100% rename from resources/assets/ee3/textures/icons/amorphous.png rename to src/main/resources/assets/ee3/textures/icons/amorphous.png diff --git a/resources/assets/ee3/textures/icons/corporeal.png b/src/main/resources/assets/ee3/textures/icons/corporeal.png similarity index 100% rename from resources/assets/ee3/textures/icons/corporeal.png rename to src/main/resources/assets/ee3/textures/icons/corporeal.png diff --git a/resources/assets/ee3/textures/icons/essentia.png b/src/main/resources/assets/ee3/textures/icons/essentia.png similarity index 100% rename from resources/assets/ee3/textures/icons/essentia.png rename to src/main/resources/assets/ee3/textures/icons/essentia.png diff --git a/resources/assets/ee3/textures/icons/kinetic.png b/src/main/resources/assets/ee3/textures/icons/kinetic.png similarity index 100% rename from resources/assets/ee3/textures/icons/kinetic.png rename to src/main/resources/assets/ee3/textures/icons/kinetic.png diff --git a/resources/assets/ee3/textures/icons/license.txt b/src/main/resources/assets/ee3/textures/icons/license.txt similarity index 100% rename from resources/assets/ee3/textures/icons/license.txt rename to src/main/resources/assets/ee3/textures/icons/license.txt diff --git a/resources/assets/ee3/textures/icons/omni.png b/src/main/resources/assets/ee3/textures/icons/omni.png similarity index 100% rename from resources/assets/ee3/textures/icons/omni.png rename to src/main/resources/assets/ee3/textures/icons/omni.png diff --git a/resources/assets/ee3/textures/icons/temporal.png b/src/main/resources/assets/ee3/textures/icons/temporal.png similarity index 100% rename from resources/assets/ee3/textures/icons/temporal.png rename to src/main/resources/assets/ee3/textures/icons/temporal.png diff --git a/resources/assets/ee3/textures/icons/void.png b/src/main/resources/assets/ee3/textures/icons/void.png similarity index 100% rename from resources/assets/ee3/textures/icons/void.png rename to src/main/resources/assets/ee3/textures/icons/void.png diff --git a/resources/assets/ee3/textures/items/alchemicalBagClosed.png b/src/main/resources/assets/ee3/textures/items/alchemicalBagClosed.png similarity index 100% rename from resources/assets/ee3/textures/items/alchemicalBagClosed.png rename to src/main/resources/assets/ee3/textures/items/alchemicalBagClosed.png diff --git a/resources/assets/ee3/textures/items/alchemicalBagClosedDrawString.png b/src/main/resources/assets/ee3/textures/items/alchemicalBagClosedDrawString.png similarity index 100% rename from resources/assets/ee3/textures/items/alchemicalBagClosedDrawString.png rename to src/main/resources/assets/ee3/textures/items/alchemicalBagClosedDrawString.png diff --git a/resources/assets/ee3/textures/items/alchemicalBagOpen.png b/src/main/resources/assets/ee3/textures/items/alchemicalBagOpen.png similarity index 100% rename from resources/assets/ee3/textures/items/alchemicalBagOpen.png rename to src/main/resources/assets/ee3/textures/items/alchemicalBagOpen.png diff --git a/resources/assets/ee3/textures/items/alchemicalBagOpenDrawString.png b/src/main/resources/assets/ee3/textures/items/alchemicalBagOpenDrawString.png similarity index 100% rename from resources/assets/ee3/textures/items/alchemicalBagOpenDrawString.png rename to src/main/resources/assets/ee3/textures/items/alchemicalBagOpenDrawString.png diff --git a/resources/assets/ee3/textures/items/alchemicalChalk.png b/src/main/resources/assets/ee3/textures/items/alchemicalChalk.png similarity index 100% rename from resources/assets/ee3/textures/items/alchemicalChalk.png rename to src/main/resources/assets/ee3/textures/items/alchemicalChalk.png diff --git a/resources/assets/ee3/textures/items/alchemicalDustAmaranthine.png b/src/main/resources/assets/ee3/textures/items/alchemicalDustAmaranthine.png similarity index 100% rename from resources/assets/ee3/textures/items/alchemicalDustAmaranthine.png rename to src/main/resources/assets/ee3/textures/items/alchemicalDustAmaranthine.png diff --git a/resources/assets/ee3/textures/items/alchemicalDustAsh.png b/src/main/resources/assets/ee3/textures/items/alchemicalDustAsh.png similarity index 100% rename from resources/assets/ee3/textures/items/alchemicalDustAsh.png rename to src/main/resources/assets/ee3/textures/items/alchemicalDustAsh.png diff --git a/resources/assets/ee3/textures/items/alchemicalDustAzure.png b/src/main/resources/assets/ee3/textures/items/alchemicalDustAzure.png similarity index 100% rename from resources/assets/ee3/textures/items/alchemicalDustAzure.png rename to src/main/resources/assets/ee3/textures/items/alchemicalDustAzure.png diff --git a/resources/assets/ee3/textures/items/alchemicalDustIridescent.png b/src/main/resources/assets/ee3/textures/items/alchemicalDustIridescent.png similarity index 100% rename from resources/assets/ee3/textures/items/alchemicalDustIridescent.png rename to src/main/resources/assets/ee3/textures/items/alchemicalDustIridescent.png diff --git a/resources/assets/ee3/textures/items/alchemicalDustMinium.png b/src/main/resources/assets/ee3/textures/items/alchemicalDustMinium.png similarity index 100% rename from resources/assets/ee3/textures/items/alchemicalDustMinium.png rename to src/main/resources/assets/ee3/textures/items/alchemicalDustMinium.png diff --git a/resources/assets/ee3/textures/items/alchemicalDustVerdant.png b/src/main/resources/assets/ee3/textures/items/alchemicalDustVerdant.png similarity index 100% rename from resources/assets/ee3/textures/items/alchemicalDustVerdant.png rename to src/main/resources/assets/ee3/textures/items/alchemicalDustVerdant.png diff --git a/resources/assets/ee3/textures/items/algotGeneric.png b/src/main/resources/assets/ee3/textures/items/algotGeneric.png similarity index 100% rename from resources/assets/ee3/textures/items/algotGeneric.png rename to src/main/resources/assets/ee3/textures/items/algotGeneric.png diff --git a/resources/assets/ee3/textures/items/diviningRod.png b/src/main/resources/assets/ee3/textures/items/diviningRod.png similarity index 100% rename from resources/assets/ee3/textures/items/diviningRod.png rename to src/main/resources/assets/ee3/textures/items/diviningRod.png diff --git a/resources/assets/ee3/textures/items/diviningRodEffectGlow.png b/src/main/resources/assets/ee3/textures/items/diviningRodEffectGlow.png similarity index 100% rename from resources/assets/ee3/textures/items/diviningRodEffectGlow.png rename to src/main/resources/assets/ee3/textures/items/diviningRodEffectGlow.png diff --git a/resources/assets/ee3/textures/items/eggShell.png b/src/main/resources/assets/ee3/textures/items/eggShell.png similarity index 100% rename from resources/assets/ee3/textures/items/eggShell.png rename to src/main/resources/assets/ee3/textures/items/eggShell.png diff --git a/resources/assets/ee3/textures/items/kunai.png b/src/main/resources/assets/ee3/textures/items/kunai.png similarity index 100% rename from resources/assets/ee3/textures/items/kunai.png rename to src/main/resources/assets/ee3/textures/items/kunai.png diff --git a/resources/assets/ee3/textures/items/ocarina.png b/src/main/resources/assets/ee3/textures/items/ocarina.png similarity index 100% rename from resources/assets/ee3/textures/items/ocarina.png rename to src/main/resources/assets/ee3/textures/items/ocarina.png diff --git a/resources/assets/ee3/textures/items/shardMinium.png b/src/main/resources/assets/ee3/textures/items/shardMinium.png similarity index 100% rename from resources/assets/ee3/textures/items/shardMinium.png rename to src/main/resources/assets/ee3/textures/items/shardMinium.png diff --git a/resources/assets/ee3/textures/items/spear1.png b/src/main/resources/assets/ee3/textures/items/spear1.png similarity index 100% rename from resources/assets/ee3/textures/items/spear1.png rename to src/main/resources/assets/ee3/textures/items/spear1.png diff --git a/resources/assets/ee3/textures/items/spear2.png b/src/main/resources/assets/ee3/textures/items/spear2.png similarity index 100% rename from resources/assets/ee3/textures/items/spear2.png rename to src/main/resources/assets/ee3/textures/items/spear2.png diff --git a/resources/assets/ee3/textures/items/spear3.png b/src/main/resources/assets/ee3/textures/items/spear3.png similarity index 100% rename from resources/assets/ee3/textures/items/spear3.png rename to src/main/resources/assets/ee3/textures/items/spear3.png diff --git a/resources/assets/ee3/textures/items/spear4.png b/src/main/resources/assets/ee3/textures/items/spear4.png similarity index 100% rename from resources/assets/ee3/textures/items/spear4.png rename to src/main/resources/assets/ee3/textures/items/spear4.png diff --git a/resources/assets/ee3/textures/items/staff1.png b/src/main/resources/assets/ee3/textures/items/staff1.png similarity index 100% rename from resources/assets/ee3/textures/items/staff1.png rename to src/main/resources/assets/ee3/textures/items/staff1.png diff --git a/resources/assets/ee3/textures/items/staff2.png b/src/main/resources/assets/ee3/textures/items/staff2.png similarity index 100% rename from resources/assets/ee3/textures/items/staff2.png rename to src/main/resources/assets/ee3/textures/items/staff2.png diff --git a/resources/assets/ee3/textures/items/staff3.png b/src/main/resources/assets/ee3/textures/items/staff3.png similarity index 100% rename from resources/assets/ee3/textures/items/staff3.png rename to src/main/resources/assets/ee3/textures/items/staff3.png diff --git a/resources/assets/ee3/textures/items/staff4.png b/src/main/resources/assets/ee3/textures/items/staff4.png similarity index 100% rename from resources/assets/ee3/textures/items/staff4.png rename to src/main/resources/assets/ee3/textures/items/staff4.png diff --git a/resources/assets/ee3/textures/items/staff5.png b/src/main/resources/assets/ee3/textures/items/staff5.png similarity index 100% rename from resources/assets/ee3/textures/items/staff5.png rename to src/main/resources/assets/ee3/textures/items/staff5.png diff --git a/resources/assets/ee3/textures/items/staff6.png b/src/main/resources/assets/ee3/textures/items/staff6.png similarity index 100% rename from resources/assets/ee3/textures/items/staff6.png rename to src/main/resources/assets/ee3/textures/items/staff6.png diff --git a/resources/assets/ee3/textures/items/stoneEffectFlame.png b/src/main/resources/assets/ee3/textures/items/stoneEffectFlame.png similarity index 100% rename from resources/assets/ee3/textures/items/stoneEffectFlame.png rename to src/main/resources/assets/ee3/textures/items/stoneEffectFlame.png diff --git a/resources/assets/ee3/textures/items/stoneInert.png b/src/main/resources/assets/ee3/textures/items/stoneInert.png similarity index 100% rename from resources/assets/ee3/textures/items/stoneInert.png rename to src/main/resources/assets/ee3/textures/items/stoneInert.png diff --git a/resources/assets/ee3/textures/items/stoneMinium.png b/src/main/resources/assets/ee3/textures/items/stoneMinium.png similarity index 100% rename from resources/assets/ee3/textures/items/stoneMinium.png rename to src/main/resources/assets/ee3/textures/items/stoneMinium.png diff --git a/resources/assets/ee3/textures/items/stonePhilosophers.png b/src/main/resources/assets/ee3/textures/items/stonePhilosophers.png similarity index 100% rename from resources/assets/ee3/textures/items/stonePhilosophers.png rename to src/main/resources/assets/ee3/textures/items/stonePhilosophers.png diff --git a/resources/assets/ee3/textures/logo/logo.png b/src/main/resources/assets/ee3/textures/logo/logo.png similarity index 100% rename from resources/assets/ee3/textures/logo/logo.png rename to src/main/resources/assets/ee3/textures/logo/logo.png diff --git a/resources/assets/ee3/textures/models/alchemicalChest.png b/src/main/resources/assets/ee3/textures/models/alchemicalChest.png similarity index 100% rename from resources/assets/ee3/textures/models/alchemicalChest.png rename to src/main/resources/assets/ee3/textures/models/alchemicalChest.png diff --git a/resources/assets/ee3/textures/models/aludel.png b/src/main/resources/assets/ee3/textures/models/aludel.png similarity index 100% rename from resources/assets/ee3/textures/models/aludel.png rename to src/main/resources/assets/ee3/textures/models/aludel.png diff --git a/resources/assets/ee3/textures/models/calcinator.png b/src/main/resources/assets/ee3/textures/models/calcinator.png similarity index 100% rename from resources/assets/ee3/textures/models/calcinator.png rename to src/main/resources/assets/ee3/textures/models/calcinator.png diff --git a/resources/assets/ee3/textures/svg/icons/amorphous.svg b/src/main/resources/assets/ee3/textures/svg/icons/amorphous.svg similarity index 100% rename from resources/assets/ee3/textures/svg/icons/amorphous.svg rename to src/main/resources/assets/ee3/textures/svg/icons/amorphous.svg diff --git a/resources/assets/ee3/textures/svg/icons/corporeal.svg b/src/main/resources/assets/ee3/textures/svg/icons/corporeal.svg similarity index 100% rename from resources/assets/ee3/textures/svg/icons/corporeal.svg rename to src/main/resources/assets/ee3/textures/svg/icons/corporeal.svg diff --git a/resources/assets/ee3/textures/svg/icons/essentia.svg b/src/main/resources/assets/ee3/textures/svg/icons/essentia.svg similarity index 100% rename from resources/assets/ee3/textures/svg/icons/essentia.svg rename to src/main/resources/assets/ee3/textures/svg/icons/essentia.svg diff --git a/resources/assets/ee3/textures/svg/icons/kinetic.svg b/src/main/resources/assets/ee3/textures/svg/icons/kinetic.svg similarity index 100% rename from resources/assets/ee3/textures/svg/icons/kinetic.svg rename to src/main/resources/assets/ee3/textures/svg/icons/kinetic.svg diff --git a/resources/assets/ee3/textures/svg/icons/license.txt b/src/main/resources/assets/ee3/textures/svg/icons/license.txt similarity index 100% rename from resources/assets/ee3/textures/svg/icons/license.txt rename to src/main/resources/assets/ee3/textures/svg/icons/license.txt diff --git a/resources/assets/ee3/textures/svg/icons/omni.svg b/src/main/resources/assets/ee3/textures/svg/icons/omni.svg similarity index 100% rename from resources/assets/ee3/textures/svg/icons/omni.svg rename to src/main/resources/assets/ee3/textures/svg/icons/omni.svg diff --git a/resources/assets/ee3/textures/svg/icons/temporal.svg b/src/main/resources/assets/ee3/textures/svg/icons/temporal.svg similarity index 100% rename from resources/assets/ee3/textures/svg/icons/temporal.svg rename to src/main/resources/assets/ee3/textures/svg/icons/temporal.svg diff --git a/resources/assets/ee3/textures/svg/icons/void.svg b/src/main/resources/assets/ee3/textures/svg/icons/void.svg similarity index 100% rename from resources/assets/ee3/textures/svg/icons/void.svg rename to src/main/resources/assets/ee3/textures/svg/icons/void.svg diff --git a/resources/assets/ee3/textures/xcf/blocks/alchemicalChest.xcf b/src/main/resources/assets/ee3/textures/xcf/blocks/alchemicalChest.xcf similarity index 100% rename from resources/assets/ee3/textures/xcf/blocks/alchemicalChest.xcf rename to src/main/resources/assets/ee3/textures/xcf/blocks/alchemicalChest.xcf diff --git a/resources/assets/ee3/textures/xcf/blocks/aludel.xcf b/src/main/resources/assets/ee3/textures/xcf/blocks/aludel.xcf similarity index 100% rename from resources/assets/ee3/textures/xcf/blocks/aludel.xcf rename to src/main/resources/assets/ee3/textures/xcf/blocks/aludel.xcf diff --git a/resources/assets/ee3/textures/xcf/blocks/calcinator.xcf b/src/main/resources/assets/ee3/textures/xcf/blocks/calcinator.xcf similarity index 100% rename from resources/assets/ee3/textures/xcf/blocks/calcinator.xcf rename to src/main/resources/assets/ee3/textures/xcf/blocks/calcinator.xcf diff --git a/resources/assets/ee3/textures/xcf/blocks/glassBell.xcf b/src/main/resources/assets/ee3/textures/xcf/blocks/glassBell.xcf similarity index 100% rename from resources/assets/ee3/textures/xcf/blocks/glassBell.xcf rename to src/main/resources/assets/ee3/textures/xcf/blocks/glassBell.xcf diff --git a/resources/assets/ee3/textures/xcf/effects/noise.xcf b/src/main/resources/assets/ee3/textures/xcf/effects/noise.xcf similarity index 100% rename from resources/assets/ee3/textures/xcf/effects/noise.xcf rename to src/main/resources/assets/ee3/textures/xcf/effects/noise.xcf diff --git a/resources/assets/ee3/textures/xcf/gui/alchemicalStorage.xcf b/src/main/resources/assets/ee3/textures/xcf/gui/alchemicalStorage.xcf similarity index 100% rename from resources/assets/ee3/textures/xcf/gui/alchemicalStorage.xcf rename to src/main/resources/assets/ee3/textures/xcf/gui/alchemicalStorage.xcf diff --git a/resources/assets/ee3/textures/xcf/gui/aludel.xcf b/src/main/resources/assets/ee3/textures/xcf/gui/aludel.xcf similarity index 100% rename from resources/assets/ee3/textures/xcf/gui/aludel.xcf rename to src/main/resources/assets/ee3/textures/xcf/gui/aludel.xcf diff --git a/resources/assets/ee3/textures/xcf/gui/base_gui.xcf b/src/main/resources/assets/ee3/textures/xcf/gui/base_gui.xcf similarity index 100% rename from resources/assets/ee3/textures/xcf/gui/base_gui.xcf rename to src/main/resources/assets/ee3/textures/xcf/gui/base_gui.xcf diff --git a/resources/assets/ee3/textures/xcf/gui/calcinator.xcf b/src/main/resources/assets/ee3/textures/xcf/gui/calcinator.xcf similarity index 100% rename from resources/assets/ee3/textures/xcf/gui/calcinator.xcf rename to src/main/resources/assets/ee3/textures/xcf/gui/calcinator.xcf diff --git a/resources/assets/ee3/textures/xcf/gui/glassBell.xcf b/src/main/resources/assets/ee3/textures/xcf/gui/glassBell.xcf similarity index 100% rename from resources/assets/ee3/textures/xcf/gui/glassBell.xcf rename to src/main/resources/assets/ee3/textures/xcf/gui/glassBell.xcf diff --git a/resources/assets/ee3/textures/xcf/gui/ocarina.xcf b/src/main/resources/assets/ee3/textures/xcf/gui/ocarina.xcf similarity index 100% rename from resources/assets/ee3/textures/xcf/gui/ocarina.xcf rename to src/main/resources/assets/ee3/textures/xcf/gui/ocarina.xcf diff --git a/resources/assets/ee3/textures/xcf/gui/portableTransmutation.xcf b/src/main/resources/assets/ee3/textures/xcf/gui/portableTransmutation.xcf similarity index 100% rename from resources/assets/ee3/textures/xcf/gui/portableTransmutation.xcf rename to src/main/resources/assets/ee3/textures/xcf/gui/portableTransmutation.xcf diff --git a/resources/assets/ee3/textures/xcf/gui/sharedAlchemicalStorage.xcf b/src/main/resources/assets/ee3/textures/xcf/gui/sharedAlchemicalStorage.xcf similarity index 100% rename from resources/assets/ee3/textures/xcf/gui/sharedAlchemicalStorage.xcf rename to src/main/resources/assets/ee3/textures/xcf/gui/sharedAlchemicalStorage.xcf diff --git a/resources/assets/ee3/textures/xcf/items/alchemicalBagClosed.xcf b/src/main/resources/assets/ee3/textures/xcf/items/alchemicalBagClosed.xcf similarity index 100% rename from resources/assets/ee3/textures/xcf/items/alchemicalBagClosed.xcf rename to src/main/resources/assets/ee3/textures/xcf/items/alchemicalBagClosed.xcf diff --git a/resources/assets/ee3/textures/xcf/items/alchemicalBagClosedDrawString.xcf b/src/main/resources/assets/ee3/textures/xcf/items/alchemicalBagClosedDrawString.xcf similarity index 100% rename from resources/assets/ee3/textures/xcf/items/alchemicalBagClosedDrawString.xcf rename to src/main/resources/assets/ee3/textures/xcf/items/alchemicalBagClosedDrawString.xcf diff --git a/resources/assets/ee3/textures/xcf/items/alchemicalBagOpen.xcf b/src/main/resources/assets/ee3/textures/xcf/items/alchemicalBagOpen.xcf similarity index 100% rename from resources/assets/ee3/textures/xcf/items/alchemicalBagOpen.xcf rename to src/main/resources/assets/ee3/textures/xcf/items/alchemicalBagOpen.xcf diff --git a/resources/assets/ee3/textures/xcf/items/alchemicalBagOpenDrawString.xcf b/src/main/resources/assets/ee3/textures/xcf/items/alchemicalBagOpenDrawString.xcf similarity index 100% rename from resources/assets/ee3/textures/xcf/items/alchemicalBagOpenDrawString.xcf rename to src/main/resources/assets/ee3/textures/xcf/items/alchemicalBagOpenDrawString.xcf diff --git a/resources/assets/ee3/textures/xcf/items/alchemicalChalk.xcf b/src/main/resources/assets/ee3/textures/xcf/items/alchemicalChalk.xcf similarity index 100% rename from resources/assets/ee3/textures/xcf/items/alchemicalChalk.xcf rename to src/main/resources/assets/ee3/textures/xcf/items/alchemicalChalk.xcf diff --git a/resources/assets/ee3/textures/xcf/items/algotGeneric.xcf b/src/main/resources/assets/ee3/textures/xcf/items/algotGeneric.xcf similarity index 100% rename from resources/assets/ee3/textures/xcf/items/algotGeneric.xcf rename to src/main/resources/assets/ee3/textures/xcf/items/algotGeneric.xcf diff --git a/resources/assets/ee3/textures/xcf/items/diviningRod.xcf b/src/main/resources/assets/ee3/textures/xcf/items/diviningRod.xcf similarity index 100% rename from resources/assets/ee3/textures/xcf/items/diviningRod.xcf rename to src/main/resources/assets/ee3/textures/xcf/items/diviningRod.xcf diff --git a/resources/assets/ee3/textures/xcf/items/diviningRodEffectGlow.xcf b/src/main/resources/assets/ee3/textures/xcf/items/diviningRodEffectGlow.xcf similarity index 100% rename from resources/assets/ee3/textures/xcf/items/diviningRodEffectGlow.xcf rename to src/main/resources/assets/ee3/textures/xcf/items/diviningRodEffectGlow.xcf diff --git a/resources/assets/ee3/textures/xcf/items/dustAlchemicalAmaranthine.xcf b/src/main/resources/assets/ee3/textures/xcf/items/dustAlchemicalAmaranthine.xcf similarity index 100% rename from resources/assets/ee3/textures/xcf/items/dustAlchemicalAmaranthine.xcf rename to src/main/resources/assets/ee3/textures/xcf/items/dustAlchemicalAmaranthine.xcf diff --git a/resources/assets/ee3/textures/xcf/items/dustAlchemicalAsh.xcf b/src/main/resources/assets/ee3/textures/xcf/items/dustAlchemicalAsh.xcf similarity index 100% rename from resources/assets/ee3/textures/xcf/items/dustAlchemicalAsh.xcf rename to src/main/resources/assets/ee3/textures/xcf/items/dustAlchemicalAsh.xcf diff --git a/resources/assets/ee3/textures/xcf/items/dustAlchemicalAzure.xcf b/src/main/resources/assets/ee3/textures/xcf/items/dustAlchemicalAzure.xcf similarity index 100% rename from resources/assets/ee3/textures/xcf/items/dustAlchemicalAzure.xcf rename to src/main/resources/assets/ee3/textures/xcf/items/dustAlchemicalAzure.xcf diff --git a/resources/assets/ee3/textures/xcf/items/dustAlchemicalIridescent.xcf b/src/main/resources/assets/ee3/textures/xcf/items/dustAlchemicalIridescent.xcf similarity index 100% rename from resources/assets/ee3/textures/xcf/items/dustAlchemicalIridescent.xcf rename to src/main/resources/assets/ee3/textures/xcf/items/dustAlchemicalIridescent.xcf diff --git a/resources/assets/ee3/textures/xcf/items/dustAlchemicalMinium.xcf b/src/main/resources/assets/ee3/textures/xcf/items/dustAlchemicalMinium.xcf similarity index 100% rename from resources/assets/ee3/textures/xcf/items/dustAlchemicalMinium.xcf rename to src/main/resources/assets/ee3/textures/xcf/items/dustAlchemicalMinium.xcf diff --git a/resources/assets/ee3/textures/xcf/items/dustAlchemicalVerdant.xcf b/src/main/resources/assets/ee3/textures/xcf/items/dustAlchemicalVerdant.xcf similarity index 100% rename from resources/assets/ee3/textures/xcf/items/dustAlchemicalVerdant.xcf rename to src/main/resources/assets/ee3/textures/xcf/items/dustAlchemicalVerdant.xcf diff --git a/resources/assets/ee3/textures/xcf/items/kunai.xcf b/src/main/resources/assets/ee3/textures/xcf/items/kunai.xcf similarity index 100% rename from resources/assets/ee3/textures/xcf/items/kunai.xcf rename to src/main/resources/assets/ee3/textures/xcf/items/kunai.xcf diff --git a/resources/assets/ee3/textures/xcf/items/ocarina.xcf b/src/main/resources/assets/ee3/textures/xcf/items/ocarina.xcf similarity index 100% rename from resources/assets/ee3/textures/xcf/items/ocarina.xcf rename to src/main/resources/assets/ee3/textures/xcf/items/ocarina.xcf diff --git a/resources/assets/ee3/textures/xcf/items/shardMinium.xcf b/src/main/resources/assets/ee3/textures/xcf/items/shardMinium.xcf similarity index 100% rename from resources/assets/ee3/textures/xcf/items/shardMinium.xcf rename to src/main/resources/assets/ee3/textures/xcf/items/shardMinium.xcf diff --git a/resources/assets/ee3/textures/xcf/items/spear1.xcf b/src/main/resources/assets/ee3/textures/xcf/items/spear1.xcf similarity index 100% rename from resources/assets/ee3/textures/xcf/items/spear1.xcf rename to src/main/resources/assets/ee3/textures/xcf/items/spear1.xcf diff --git a/resources/assets/ee3/textures/xcf/items/spear2.xcf b/src/main/resources/assets/ee3/textures/xcf/items/spear2.xcf similarity index 100% rename from resources/assets/ee3/textures/xcf/items/spear2.xcf rename to src/main/resources/assets/ee3/textures/xcf/items/spear2.xcf diff --git a/resources/assets/ee3/textures/xcf/items/spear3.xcf b/src/main/resources/assets/ee3/textures/xcf/items/spear3.xcf similarity index 100% rename from resources/assets/ee3/textures/xcf/items/spear3.xcf rename to src/main/resources/assets/ee3/textures/xcf/items/spear3.xcf diff --git a/resources/assets/ee3/textures/xcf/items/spear4.xcf b/src/main/resources/assets/ee3/textures/xcf/items/spear4.xcf similarity index 100% rename from resources/assets/ee3/textures/xcf/items/spear4.xcf rename to src/main/resources/assets/ee3/textures/xcf/items/spear4.xcf diff --git a/resources/assets/ee3/textures/xcf/items/staff1.xcf b/src/main/resources/assets/ee3/textures/xcf/items/staff1.xcf similarity index 100% rename from resources/assets/ee3/textures/xcf/items/staff1.xcf rename to src/main/resources/assets/ee3/textures/xcf/items/staff1.xcf diff --git a/resources/assets/ee3/textures/xcf/items/staff2.xcf b/src/main/resources/assets/ee3/textures/xcf/items/staff2.xcf similarity index 100% rename from resources/assets/ee3/textures/xcf/items/staff2.xcf rename to src/main/resources/assets/ee3/textures/xcf/items/staff2.xcf diff --git a/resources/assets/ee3/textures/xcf/items/staff3.xcf b/src/main/resources/assets/ee3/textures/xcf/items/staff3.xcf similarity index 100% rename from resources/assets/ee3/textures/xcf/items/staff3.xcf rename to src/main/resources/assets/ee3/textures/xcf/items/staff3.xcf diff --git a/resources/assets/ee3/textures/xcf/items/staff4.xcf b/src/main/resources/assets/ee3/textures/xcf/items/staff4.xcf similarity index 100% rename from resources/assets/ee3/textures/xcf/items/staff4.xcf rename to src/main/resources/assets/ee3/textures/xcf/items/staff4.xcf diff --git a/resources/assets/ee3/textures/xcf/items/staff5.xcf b/src/main/resources/assets/ee3/textures/xcf/items/staff5.xcf similarity index 100% rename from resources/assets/ee3/textures/xcf/items/staff5.xcf rename to src/main/resources/assets/ee3/textures/xcf/items/staff5.xcf diff --git a/resources/assets/ee3/textures/xcf/items/staff6.xcf b/src/main/resources/assets/ee3/textures/xcf/items/staff6.xcf similarity index 100% rename from resources/assets/ee3/textures/xcf/items/staff6.xcf rename to src/main/resources/assets/ee3/textures/xcf/items/staff6.xcf diff --git a/resources/assets/ee3/textures/xcf/items/stoneEffectFlame.xcf b/src/main/resources/assets/ee3/textures/xcf/items/stoneEffectFlame.xcf similarity index 100% rename from resources/assets/ee3/textures/xcf/items/stoneEffectFlame.xcf rename to src/main/resources/assets/ee3/textures/xcf/items/stoneEffectFlame.xcf diff --git a/resources/assets/ee3/textures/xcf/items/stoneInert.xcf b/src/main/resources/assets/ee3/textures/xcf/items/stoneInert.xcf similarity index 100% rename from resources/assets/ee3/textures/xcf/items/stoneInert.xcf rename to src/main/resources/assets/ee3/textures/xcf/items/stoneInert.xcf diff --git a/resources/assets/ee3/textures/xcf/items/stoneMinium.xcf b/src/main/resources/assets/ee3/textures/xcf/items/stoneMinium.xcf similarity index 100% rename from resources/assets/ee3/textures/xcf/items/stoneMinium.xcf rename to src/main/resources/assets/ee3/textures/xcf/items/stoneMinium.xcf diff --git a/resources/assets/ee3/textures/xcf/items/stonePhilosophers.xcf b/src/main/resources/assets/ee3/textures/xcf/items/stonePhilosophers.xcf similarity index 100% rename from resources/assets/ee3/textures/xcf/items/stonePhilosophers.xcf rename to src/main/resources/assets/ee3/textures/xcf/items/stonePhilosophers.xcf diff --git a/resources/assets/ee3/textures/xcf/logo/logo.xcf b/src/main/resources/assets/ee3/textures/xcf/logo/logo.xcf similarity index 100% rename from resources/assets/ee3/textures/xcf/logo/logo.xcf rename to src/main/resources/assets/ee3/textures/xcf/logo/logo.xcf diff --git a/resources/assets/ee3/textures/xcf/models/alchemicalChest.xcf b/src/main/resources/assets/ee3/textures/xcf/models/alchemicalChest.xcf similarity index 100% rename from resources/assets/ee3/textures/xcf/models/alchemicalChest.xcf rename to src/main/resources/assets/ee3/textures/xcf/models/alchemicalChest.xcf diff --git a/resources/assets/ee3/textures/xcf/models/aludel.xcf b/src/main/resources/assets/ee3/textures/xcf/models/aludel.xcf similarity index 100% rename from resources/assets/ee3/textures/xcf/models/aludel.xcf rename to src/main/resources/assets/ee3/textures/xcf/models/aludel.xcf diff --git a/resources/assets/ee3/textures/xcf/models/calcinator.xcf b/src/main/resources/assets/ee3/textures/xcf/models/calcinator.xcf similarity index 100% rename from resources/assets/ee3/textures/xcf/models/calcinator.xcf rename to src/main/resources/assets/ee3/textures/xcf/models/calcinator.xcf diff --git a/common/mcmod.info b/src/main/resources/mcmod.info similarity index 100% rename from common/mcmod.info rename to src/main/resources/mcmod.info diff --git a/common/pack.mcmeta b/src/main/resources/pack.mcmeta similarity index 100% rename from common/pack.mcmeta rename to src/main/resources/pack.mcmeta