From 2e185e65069f36988a80de6f1af106893d8f3882 Mon Sep 17 00:00:00 2001 From: Tombenpotter Date: Sun, 26 Oct 2014 09:49:38 +0100 Subject: [PATCH] Un-messified the code. --- Changelog.txt | 7 +++ .../emt/client/gui/GuiEtherealMacerator.java | 2 +- .../gui/GuiIndustrialWandRecharger.java | 2 +- .../container/ContainerEtheralMacerator.java | 2 +- .../ContainerIndustrialWandRecharge.java | 2 +- .../base}/blocks/BlockPortableNode.java | 2 +- .../ic2/blocks/BlockEMT.java | 4 +- .../ic2/blocks/BlockEMTMachines.java | 6 +-- .../ic2/blocks/BlockEMTSolars.java | 34 +++++++------- .../ic2/blocks/BlockEMTSolars2.java | 12 ++--- .../ic2/blocks/BlockEssentiaGenerator.java | 4 +- .../ic2/blocks/BlockEssentiaGenerators.java | 4 +- .../ic2/blocks/BlockShield.java | 2 +- .../modules/ic2/blocks/IC2BlockRegistry.java | 4 +- .../modules/ic2/items/IC2ItemRegistry.java | 43 +++++++++-------- .../ic2/items/ItemElectricScribingTools.java | 2 +- .../boots/ItemElectricBootsTraveller.java | 2 +- .../armor/boots/ItemNanoBootsTraveller.java | 2 +- .../boots/ItemQuantumBootsTraveller.java | 2 +- .../armor/goggles/ItemElectricGoggles.java | 2 +- .../items/armor/goggles/ItemNanoGoggles.java | 2 +- .../armor/goggles/ItemQuantumGoggles.java | 2 +- .../goggles/ItemSolarHelmetRevealing.java | 2 +- .../ic2/items/armor/wings/ItemNanoWing.java | 2 +- .../items/armor/wings/ItemQuantumWing.java | 2 +- .../items/blocks/ItemBlockEMTMachines.java | 2 +- .../ic2/items/blocks/ItemBlockEMTSolars.java | 2 +- .../ic2/items/blocks/ItemBlockEMTSolars2.java | 2 +- .../blocks/ItemBlockEssentiaGenerator.java | 2 +- .../blocks/ItemBlockEssentiaGenerators.java | 2 +- .../ic2/items/foci/ItemChargeFocus.java | 2 +- .../ic2/items/foci/ItemWandChargingFocus.java | 2 +- .../items/tools/ItemElectricHoeGrowth.java | 2 +- .../items/tools/ItemElectricThorHammer.java | 2 +- .../tools/chainsaws/ItemDiamondChainsaw.java | 2 +- .../tools/chainsaws/ItemStreamChainsaw.java | 2 +- .../tools/chainsaws/ItemThaumiumChainsaw.java | 2 +- .../tools/drills/ItemRockbreakerDrill.java | 2 +- .../items/tools/drills/ItemThaumiumDrill.java | 2 +- .../tools/omnitools/ItemOmnitoolDiamond.java | 2 +- .../tools/omnitools/ItemOmnitoolIron.java | 2 +- .../tools/omnitools/ItemOmnitoolThaumium.java | 2 +- .../modules/ic2/tile/IC2TileRegistry.java | 46 +++++++++---------- .../ic2/tile/TileEntityEMT.java | 2 +- .../ic2/tile/TileEntityEtherealMacerator.java | 2 +- .../TileEntityIndustrialWandRecharge.java | 2 +- .../generators/TileEntityAerGenerator.java | 2 +- .../generators/TileEntityArborGenerator.java | 2 +- .../generators/TileEntityAuramGenerator.java | 2 +- .../generators/TileEntityBaseGenerator.java | 4 +- .../TileEntityEssentiaGenerator.java | 4 +- .../generators/TileEntityIgnisGenerator.java | 2 +- .../TileEntityPotentiaGenerator.java | 2 +- .../ic2/tile/solars/TileEntitySolarBase.java | 4 +- .../tile/solars/air/TileEntityAirSolar.java | 4 +- .../solars/air/TileEntityDoubleAirSolar.java | 2 +- .../solars/air/TileEntityTripleAirSolar.java | 2 +- .../compressed/TileEntityCompressedSolar.java | 4 +- .../TileEntityDoubleCompressedSolar.java | 4 +- .../TileEntityTripleCompressedSolar.java | 4 +- .../tile/solars/dark/TileEntityDarkSolar.java | 4 +- .../dark/TileEntityDoubleDarkSolar.java | 2 +- .../dark/TileEntityTripleDarkSolar.java | 2 +- .../earth/TileEntityDoubleEarthSolar.java | 2 +- .../solars/earth/TileEntityEarthSolar.java | 4 +- .../earth/TileEntityTripleEarthSolar.java | 2 +- .../fire/TileEntityDoubleFireSolar.java | 2 +- .../tile/solars/fire/TileEntityFireSolar.java | 4 +- .../fire/TileEntityTripleFireSolar.java | 2 +- .../order/TileEntityDoubleOrderSolar.java | 2 +- .../solars/order/TileEntityOrderSolar.java | 4 +- .../order/TileEntityTripleOrderSolar.java | 2 +- .../water/TileEntityDoubleWaterSolar.java | 2 +- .../water/TileEntityTripleWaterSolar.java | 2 +- .../solars/water/TileEntityWaterSolar.java | 4 +- .../tombenpotter/emt/proxies/CommonProxy.java | 4 +- .../assets/electromagictools/lang/en_US.lang | 2 +- 77 files changed, 164 insertions(+), 160 deletions(-) rename src/main/java/tombenpotter/emt/common/{module/ic2 => modules/base}/blocks/BlockPortableNode.java (98%) rename src/main/java/tombenpotter/emt/common/{module => modules}/ic2/blocks/BlockEMT.java (95%) rename src/main/java/tombenpotter/emt/common/{module => modules}/ic2/blocks/BlockEMTMachines.java (96%) rename src/main/java/tombenpotter/emt/common/{module => modules}/ic2/blocks/BlockEMTSolars.java (86%) rename src/main/java/tombenpotter/emt/common/{module => modules}/ic2/blocks/BlockEMTSolars2.java (90%) rename src/main/java/tombenpotter/emt/common/{module => modules}/ic2/blocks/BlockEssentiaGenerator.java (95%) rename src/main/java/tombenpotter/emt/common/{module => modules}/ic2/blocks/BlockEssentiaGenerators.java (97%) rename src/main/java/tombenpotter/emt/common/{module => modules}/ic2/blocks/BlockShield.java (98%) rename src/main/java/tombenpotter/emt/common/{module => modules}/ic2/items/ItemElectricScribingTools.java (98%) rename src/main/java/tombenpotter/emt/common/{module => modules}/ic2/items/armor/boots/ItemElectricBootsTraveller.java (99%) rename src/main/java/tombenpotter/emt/common/{module => modules}/ic2/items/armor/boots/ItemNanoBootsTraveller.java (97%) rename src/main/java/tombenpotter/emt/common/{module => modules}/ic2/items/armor/boots/ItemQuantumBootsTraveller.java (97%) rename src/main/java/tombenpotter/emt/common/{module => modules}/ic2/items/armor/goggles/ItemElectricGoggles.java (99%) rename src/main/java/tombenpotter/emt/common/{module => modules}/ic2/items/armor/goggles/ItemNanoGoggles.java (97%) rename src/main/java/tombenpotter/emt/common/{module => modules}/ic2/items/armor/goggles/ItemQuantumGoggles.java (98%) rename src/main/java/tombenpotter/emt/common/{module => modules}/ic2/items/armor/goggles/ItemSolarHelmetRevealing.java (99%) rename src/main/java/tombenpotter/emt/common/{module => modules}/ic2/items/armor/wings/ItemNanoWing.java (98%) rename src/main/java/tombenpotter/emt/common/{module => modules}/ic2/items/armor/wings/ItemQuantumWing.java (97%) rename src/main/java/tombenpotter/emt/common/{module => modules}/ic2/items/blocks/ItemBlockEMTMachines.java (96%) rename src/main/java/tombenpotter/emt/common/{module => modules}/ic2/items/blocks/ItemBlockEMTSolars.java (99%) rename src/main/java/tombenpotter/emt/common/{module => modules}/ic2/items/blocks/ItemBlockEMTSolars2.java (98%) rename src/main/java/tombenpotter/emt/common/{module => modules}/ic2/items/blocks/ItemBlockEssentiaGenerator.java (88%) rename src/main/java/tombenpotter/emt/common/{module => modules}/ic2/items/blocks/ItemBlockEssentiaGenerators.java (97%) rename src/main/java/tombenpotter/emt/common/{module => modules}/ic2/items/foci/ItemChargeFocus.java (98%) rename src/main/java/tombenpotter/emt/common/{module => modules}/ic2/items/foci/ItemWandChargingFocus.java (97%) rename src/main/java/tombenpotter/emt/common/{module => modules}/ic2/items/tools/ItemElectricHoeGrowth.java (98%) rename src/main/java/tombenpotter/emt/common/{module => modules}/ic2/items/tools/ItemElectricThorHammer.java (99%) rename src/main/java/tombenpotter/emt/common/{module => modules}/ic2/items/tools/chainsaws/ItemDiamondChainsaw.java (98%) rename src/main/java/tombenpotter/emt/common/{module => modules}/ic2/items/tools/chainsaws/ItemStreamChainsaw.java (98%) rename src/main/java/tombenpotter/emt/common/{module => modules}/ic2/items/tools/chainsaws/ItemThaumiumChainsaw.java (97%) rename src/main/java/tombenpotter/emt/common/{module => modules}/ic2/items/tools/drills/ItemRockbreakerDrill.java (99%) rename src/main/java/tombenpotter/emt/common/{module => modules}/ic2/items/tools/drills/ItemThaumiumDrill.java (98%) rename src/main/java/tombenpotter/emt/common/{module => modules}/ic2/items/tools/omnitools/ItemOmnitoolDiamond.java (97%) rename src/main/java/tombenpotter/emt/common/{module => modules}/ic2/items/tools/omnitools/ItemOmnitoolIron.java (99%) rename src/main/java/tombenpotter/emt/common/{module => modules}/ic2/items/tools/omnitools/ItemOmnitoolThaumium.java (97%) rename src/main/java/tombenpotter/emt/common/{module => modules}/ic2/tile/TileEntityEMT.java (96%) rename src/main/java/tombenpotter/emt/common/{module => modules}/ic2/tile/TileEntityEtherealMacerator.java (99%) rename src/main/java/tombenpotter/emt/common/{module => modules}/ic2/tile/TileEntityIndustrialWandRecharge.java (99%) rename src/main/java/tombenpotter/emt/common/{module => modules}/ic2/tile/generators/TileEntityAerGenerator.java (82%) rename src/main/java/tombenpotter/emt/common/{module => modules}/ic2/tile/generators/TileEntityArborGenerator.java (94%) rename src/main/java/tombenpotter/emt/common/{module => modules}/ic2/tile/generators/TileEntityAuramGenerator.java (94%) rename src/main/java/tombenpotter/emt/common/{module => modules}/ic2/tile/generators/TileEntityBaseGenerator.java (92%) rename src/main/java/tombenpotter/emt/common/{module => modules}/ic2/tile/generators/TileEntityEssentiaGenerator.java (94%) rename src/main/java/tombenpotter/emt/common/{module => modules}/ic2/tile/generators/TileEntityIgnisGenerator.java (94%) rename src/main/java/tombenpotter/emt/common/{module => modules}/ic2/tile/generators/TileEntityPotentiaGenerator.java (94%) rename src/main/java/tombenpotter/emt/common/{module => modules}/ic2/tile/solars/TileEntitySolarBase.java (95%) rename src/main/java/tombenpotter/emt/common/{module => modules}/ic2/tile/solars/air/TileEntityAirSolar.java (91%) rename src/main/java/tombenpotter/emt/common/{module => modules}/ic2/tile/solars/air/TileEntityDoubleAirSolar.java (95%) rename src/main/java/tombenpotter/emt/common/{module => modules}/ic2/tile/solars/air/TileEntityTripleAirSolar.java (95%) rename src/main/java/tombenpotter/emt/common/{module => modules}/ic2/tile/solars/compressed/TileEntityCompressedSolar.java (89%) rename src/main/java/tombenpotter/emt/common/{module => modules}/ic2/tile/solars/compressed/TileEntityDoubleCompressedSolar.java (89%) rename src/main/java/tombenpotter/emt/common/{module => modules}/ic2/tile/solars/compressed/TileEntityTripleCompressedSolar.java (89%) rename src/main/java/tombenpotter/emt/common/{module => modules}/ic2/tile/solars/dark/TileEntityDarkSolar.java (91%) rename src/main/java/tombenpotter/emt/common/{module => modules}/ic2/tile/solars/dark/TileEntityDoubleDarkSolar.java (95%) rename src/main/java/tombenpotter/emt/common/{module => modules}/ic2/tile/solars/dark/TileEntityTripleDarkSolar.java (95%) rename src/main/java/tombenpotter/emt/common/{module => modules}/ic2/tile/solars/earth/TileEntityDoubleEarthSolar.java (95%) rename src/main/java/tombenpotter/emt/common/{module => modules}/ic2/tile/solars/earth/TileEntityEarthSolar.java (91%) rename src/main/java/tombenpotter/emt/common/{module => modules}/ic2/tile/solars/earth/TileEntityTripleEarthSolar.java (95%) rename src/main/java/tombenpotter/emt/common/{module => modules}/ic2/tile/solars/fire/TileEntityDoubleFireSolar.java (95%) rename src/main/java/tombenpotter/emt/common/{module => modules}/ic2/tile/solars/fire/TileEntityFireSolar.java (92%) rename src/main/java/tombenpotter/emt/common/{module => modules}/ic2/tile/solars/fire/TileEntityTripleFireSolar.java (95%) rename src/main/java/tombenpotter/emt/common/{module => modules}/ic2/tile/solars/order/TileEntityDoubleOrderSolar.java (95%) rename src/main/java/tombenpotter/emt/common/{module => modules}/ic2/tile/solars/order/TileEntityOrderSolar.java (90%) rename src/main/java/tombenpotter/emt/common/{module => modules}/ic2/tile/solars/order/TileEntityTripleOrderSolar.java (95%) rename src/main/java/tombenpotter/emt/common/{module => modules}/ic2/tile/solars/water/TileEntityDoubleWaterSolar.java (95%) rename src/main/java/tombenpotter/emt/common/{module => modules}/ic2/tile/solars/water/TileEntityTripleWaterSolar.java (95%) rename src/main/java/tombenpotter/emt/common/{module => modules}/ic2/tile/solars/water/TileEntityWaterSolar.java (91%) diff --git a/Changelog.txt b/Changelog.txt index 7532e1b..0e95f43 100644 --- a/Changelog.txt +++ b/Changelog.txt @@ -1,6 +1,13 @@ Changelog of the mod : Electric Magic Tools, a Thaumcraft 4/Industrial-Craft 2 addon -------------------------------------------------------------------------------------------------------------------------------------------------------- +Version 2.0.0Alpha-Build 29: +Hopefully no more duplicate packages or stuff. I hope. + +Version 2.0.0Alpha-Build 28: +Started updating changelog again. Oops :p +Fixed the TileEntities not getting registered. + Version 2.0.0Alpa5: Wild Material Shards have appeared! They are used in the tools' crafting recipes :D. And here come the carvers! diff --git a/src/main/java/tombenpotter/emt/client/gui/GuiEtherealMacerator.java b/src/main/java/tombenpotter/emt/client/gui/GuiEtherealMacerator.java index 0c1f87e..f52a5d6 100644 --- a/src/main/java/tombenpotter/emt/client/gui/GuiEtherealMacerator.java +++ b/src/main/java/tombenpotter/emt/client/gui/GuiEtherealMacerator.java @@ -19,7 +19,7 @@ import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; import tombenpotter.emt.ModInformation; import tombenpotter.emt.client.gui.container.ContainerEtheralMacerator; -import tombenpotter.emt.common.module.ic2.tile.TileEntityEtherealMacerator; +import tombenpotter.emt.common.modules.ic2.tile.TileEntityEtherealMacerator; import tombenpotter.emt.common.util.TextHelper; public class GuiEtherealMacerator extends GuiContainer { diff --git a/src/main/java/tombenpotter/emt/client/gui/GuiIndustrialWandRecharger.java b/src/main/java/tombenpotter/emt/client/gui/GuiIndustrialWandRecharger.java index bc87c48..ffa4a2b 100644 --- a/src/main/java/tombenpotter/emt/client/gui/GuiIndustrialWandRecharger.java +++ b/src/main/java/tombenpotter/emt/client/gui/GuiIndustrialWandRecharger.java @@ -19,7 +19,7 @@ import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; import tombenpotter.emt.ModInformation; import tombenpotter.emt.client.gui.container.ContainerIndustrialWandRecharge; -import tombenpotter.emt.common.module.ic2.tile.TileEntityIndustrialWandRecharge; +import tombenpotter.emt.common.modules.ic2.tile.TileEntityIndustrialWandRecharge; import tombenpotter.emt.common.util.TextHelper; public class GuiIndustrialWandRecharger extends GuiContainer { diff --git a/src/main/java/tombenpotter/emt/client/gui/container/ContainerEtheralMacerator.java b/src/main/java/tombenpotter/emt/client/gui/container/ContainerEtheralMacerator.java index 305e1f5..c785052 100644 --- a/src/main/java/tombenpotter/emt/client/gui/container/ContainerEtheralMacerator.java +++ b/src/main/java/tombenpotter/emt/client/gui/container/ContainerEtheralMacerator.java @@ -20,7 +20,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.FurnaceRecipes; import net.minecraft.tileentity.TileEntity; import thaumcraft.common.container.SlotOutput; -import tombenpotter.emt.common.module.ic2.tile.TileEntityEtherealMacerator; +import tombenpotter.emt.common.modules.ic2.tile.TileEntityEtherealMacerator; public class ContainerEtheralMacerator extends Container { diff --git a/src/main/java/tombenpotter/emt/client/gui/container/ContainerIndustrialWandRecharge.java b/src/main/java/tombenpotter/emt/client/gui/container/ContainerIndustrialWandRecharge.java index 025ad59..0e34acb 100644 --- a/src/main/java/tombenpotter/emt/client/gui/container/ContainerIndustrialWandRecharge.java +++ b/src/main/java/tombenpotter/emt/client/gui/container/ContainerIndustrialWandRecharge.java @@ -18,7 +18,7 @@ import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.FurnaceRecipes; -import tombenpotter.emt.common.module.ic2.tile.TileEntityIndustrialWandRecharge; +import tombenpotter.emt.common.modules.ic2.tile.TileEntityIndustrialWandRecharge; public class ContainerIndustrialWandRecharge extends Container { diff --git a/src/main/java/tombenpotter/emt/common/module/ic2/blocks/BlockPortableNode.java b/src/main/java/tombenpotter/emt/common/modules/base/blocks/BlockPortableNode.java similarity index 98% rename from src/main/java/tombenpotter/emt/common/module/ic2/blocks/BlockPortableNode.java rename to src/main/java/tombenpotter/emt/common/modules/base/blocks/BlockPortableNode.java index 9d70e00..62f5062 100644 --- a/src/main/java/tombenpotter/emt/common/module/ic2/blocks/BlockPortableNode.java +++ b/src/main/java/tombenpotter/emt/common/modules/base/blocks/BlockPortableNode.java @@ -10,7 +10,7 @@ * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ -package tombenpotter.emt.common.module.ic2.blocks; +package tombenpotter.emt.common.modules.base.blocks; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/tombenpotter/emt/common/module/ic2/blocks/BlockEMT.java b/src/main/java/tombenpotter/emt/common/modules/ic2/blocks/BlockEMT.java similarity index 95% rename from src/main/java/tombenpotter/emt/common/module/ic2/blocks/BlockEMT.java rename to src/main/java/tombenpotter/emt/common/modules/ic2/blocks/BlockEMT.java index 86a1fe3..6e2f5bd 100644 --- a/src/main/java/tombenpotter/emt/common/module/ic2/blocks/BlockEMT.java +++ b/src/main/java/tombenpotter/emt/common/modules/ic2/blocks/BlockEMT.java @@ -1,4 +1,4 @@ -package tombenpotter.emt.common.module.ic2.blocks; +package tombenpotter.emt.common.modules.ic2.blocks; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -11,7 +11,7 @@ import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import tombenpotter.emt.common.module.ic2.tile.TileEntityEMT; +import tombenpotter.emt.common.modules.ic2.tile.TileEntityEMT; public abstract class BlockEMT extends BlockContainer { diff --git a/src/main/java/tombenpotter/emt/common/module/ic2/blocks/BlockEMTMachines.java b/src/main/java/tombenpotter/emt/common/modules/ic2/blocks/BlockEMTMachines.java similarity index 96% rename from src/main/java/tombenpotter/emt/common/module/ic2/blocks/BlockEMTMachines.java rename to src/main/java/tombenpotter/emt/common/modules/ic2/blocks/BlockEMTMachines.java index 18423c2..f921029 100644 --- a/src/main/java/tombenpotter/emt/common/module/ic2/blocks/BlockEMTMachines.java +++ b/src/main/java/tombenpotter/emt/common/modules/ic2/blocks/BlockEMTMachines.java @@ -10,7 +10,7 @@ * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ -package tombenpotter.emt.common.module.ic2.blocks; +package tombenpotter.emt.common.modules.ic2.blocks; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -28,8 +28,8 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import tombenpotter.emt.ElectroMagicTools; import tombenpotter.emt.ModInformation; -import tombenpotter.emt.common.module.ic2.tile.TileEntityEtherealMacerator; -import tombenpotter.emt.common.module.ic2.tile.TileEntityIndustrialWandRecharge; +import tombenpotter.emt.common.modules.ic2.tile.TileEntityEtherealMacerator; +import tombenpotter.emt.common.modules.ic2.tile.TileEntityIndustrialWandRecharge; import java.util.List; import java.util.Random; diff --git a/src/main/java/tombenpotter/emt/common/module/ic2/blocks/BlockEMTSolars.java b/src/main/java/tombenpotter/emt/common/modules/ic2/blocks/BlockEMTSolars.java similarity index 86% rename from src/main/java/tombenpotter/emt/common/module/ic2/blocks/BlockEMTSolars.java rename to src/main/java/tombenpotter/emt/common/modules/ic2/blocks/BlockEMTSolars.java index 18cc69e..0939333 100644 --- a/src/main/java/tombenpotter/emt/common/module/ic2/blocks/BlockEMTSolars.java +++ b/src/main/java/tombenpotter/emt/common/modules/ic2/blocks/BlockEMTSolars.java @@ -10,7 +10,7 @@ * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ -package tombenpotter.emt.common.module.ic2.blocks; +package tombenpotter.emt.common.modules.ic2.blocks; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -24,22 +24,22 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import tombenpotter.emt.ElectroMagicTools; import tombenpotter.emt.ModInformation; -import tombenpotter.emt.common.module.ic2.tile.solars.air.TileEntityAirSolar; -import tombenpotter.emt.common.module.ic2.tile.solars.compressed.TileEntityCompressedSolar; -import tombenpotter.emt.common.module.ic2.tile.solars.compressed.TileEntityDoubleCompressedSolar; -import tombenpotter.emt.common.module.ic2.tile.solars.compressed.TileEntityTripleCompressedSolar; -import tombenpotter.emt.common.module.ic2.tile.solars.dark.TileEntityDarkSolar; -import tombenpotter.emt.common.module.ic2.tile.solars.dark.TileEntityDoubleDarkSolar; -import tombenpotter.emt.common.module.ic2.tile.solars.dark.TileEntityTripleDarkSolar; -import tombenpotter.emt.common.module.ic2.tile.solars.fire.TileEntityDoubleFireSolar; -import tombenpotter.emt.common.module.ic2.tile.solars.fire.TileEntityFireSolar; -import tombenpotter.emt.common.module.ic2.tile.solars.fire.TileEntityTripleFireSolar; -import tombenpotter.emt.common.module.ic2.tile.solars.order.TileEntityDoubleOrderSolar; -import tombenpotter.emt.common.module.ic2.tile.solars.order.TileEntityOrderSolar; -import tombenpotter.emt.common.module.ic2.tile.solars.order.TileEntityTripleOrderSolar; -import tombenpotter.emt.common.module.ic2.tile.solars.water.TileEntityDoubleWaterSolar; -import tombenpotter.emt.common.module.ic2.tile.solars.water.TileEntityTripleWaterSolar; -import tombenpotter.emt.common.module.ic2.tile.solars.water.TileEntityWaterSolar; +import tombenpotter.emt.common.modules.ic2.tile.solars.air.TileEntityAirSolar; +import tombenpotter.emt.common.modules.ic2.tile.solars.compressed.TileEntityCompressedSolar; +import tombenpotter.emt.common.modules.ic2.tile.solars.compressed.TileEntityDoubleCompressedSolar; +import tombenpotter.emt.common.modules.ic2.tile.solars.compressed.TileEntityTripleCompressedSolar; +import tombenpotter.emt.common.modules.ic2.tile.solars.dark.TileEntityDarkSolar; +import tombenpotter.emt.common.modules.ic2.tile.solars.dark.TileEntityDoubleDarkSolar; +import tombenpotter.emt.common.modules.ic2.tile.solars.dark.TileEntityTripleDarkSolar; +import tombenpotter.emt.common.modules.ic2.tile.solars.fire.TileEntityDoubleFireSolar; +import tombenpotter.emt.common.modules.ic2.tile.solars.fire.TileEntityFireSolar; +import tombenpotter.emt.common.modules.ic2.tile.solars.fire.TileEntityTripleFireSolar; +import tombenpotter.emt.common.modules.ic2.tile.solars.order.TileEntityDoubleOrderSolar; +import tombenpotter.emt.common.modules.ic2.tile.solars.order.TileEntityOrderSolar; +import tombenpotter.emt.common.modules.ic2.tile.solars.order.TileEntityTripleOrderSolar; +import tombenpotter.emt.common.modules.ic2.tile.solars.water.TileEntityDoubleWaterSolar; +import tombenpotter.emt.common.modules.ic2.tile.solars.water.TileEntityTripleWaterSolar; +import tombenpotter.emt.common.modules.ic2.tile.solars.water.TileEntityWaterSolar; import java.util.List; diff --git a/src/main/java/tombenpotter/emt/common/module/ic2/blocks/BlockEMTSolars2.java b/src/main/java/tombenpotter/emt/common/modules/ic2/blocks/BlockEMTSolars2.java similarity index 90% rename from src/main/java/tombenpotter/emt/common/module/ic2/blocks/BlockEMTSolars2.java rename to src/main/java/tombenpotter/emt/common/modules/ic2/blocks/BlockEMTSolars2.java index c0f6d0d..7f33b9d 100644 --- a/src/main/java/tombenpotter/emt/common/module/ic2/blocks/BlockEMTSolars2.java +++ b/src/main/java/tombenpotter/emt/common/modules/ic2/blocks/BlockEMTSolars2.java @@ -10,7 +10,7 @@ * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ -package tombenpotter.emt.common.module.ic2.blocks; +package tombenpotter.emt.common.modules.ic2.blocks; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -24,11 +24,11 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import tombenpotter.emt.ElectroMagicTools; import tombenpotter.emt.ModInformation; -import tombenpotter.emt.common.module.ic2.tile.solars.air.TileEntityDoubleAirSolar; -import tombenpotter.emt.common.module.ic2.tile.solars.air.TileEntityTripleAirSolar; -import tombenpotter.emt.common.module.ic2.tile.solars.earth.TileEntityDoubleEarthSolar; -import tombenpotter.emt.common.module.ic2.tile.solars.earth.TileEntityEarthSolar; -import tombenpotter.emt.common.module.ic2.tile.solars.earth.TileEntityTripleEarthSolar; +import tombenpotter.emt.common.modules.ic2.tile.solars.air.TileEntityDoubleAirSolar; +import tombenpotter.emt.common.modules.ic2.tile.solars.air.TileEntityTripleAirSolar; +import tombenpotter.emt.common.modules.ic2.tile.solars.earth.TileEntityDoubleEarthSolar; +import tombenpotter.emt.common.modules.ic2.tile.solars.earth.TileEntityEarthSolar; +import tombenpotter.emt.common.modules.ic2.tile.solars.earth.TileEntityTripleEarthSolar; import java.util.List; diff --git a/src/main/java/tombenpotter/emt/common/module/ic2/blocks/BlockEssentiaGenerator.java b/src/main/java/tombenpotter/emt/common/modules/ic2/blocks/BlockEssentiaGenerator.java similarity index 95% rename from src/main/java/tombenpotter/emt/common/module/ic2/blocks/BlockEssentiaGenerator.java rename to src/main/java/tombenpotter/emt/common/modules/ic2/blocks/BlockEssentiaGenerator.java index b81f0c4..af1f924 100644 --- a/src/main/java/tombenpotter/emt/common/module/ic2/blocks/BlockEssentiaGenerator.java +++ b/src/main/java/tombenpotter/emt/common/modules/ic2/blocks/BlockEssentiaGenerator.java @@ -1,4 +1,4 @@ -package tombenpotter.emt.common.module.ic2.blocks; +package tombenpotter.emt.common.modules.ic2.blocks; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -11,7 +11,7 @@ import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.IEssentiaContainerItem; import tombenpotter.emt.ElectroMagicTools; import tombenpotter.emt.ModInformation; -import tombenpotter.emt.common.module.ic2.tile.generators.TileEntityEssentiaGenerator; +import tombenpotter.emt.common.modules.ic2.tile.generators.TileEntityEssentiaGenerator; public class BlockEssentiaGenerator extends BlockEMT { diff --git a/src/main/java/tombenpotter/emt/common/module/ic2/blocks/BlockEssentiaGenerators.java b/src/main/java/tombenpotter/emt/common/modules/ic2/blocks/BlockEssentiaGenerators.java similarity index 97% rename from src/main/java/tombenpotter/emt/common/module/ic2/blocks/BlockEssentiaGenerators.java rename to src/main/java/tombenpotter/emt/common/modules/ic2/blocks/BlockEssentiaGenerators.java index 0f650d0..dc9b317 100644 --- a/src/main/java/tombenpotter/emt/common/module/ic2/blocks/BlockEssentiaGenerators.java +++ b/src/main/java/tombenpotter/emt/common/modules/ic2/blocks/BlockEssentiaGenerators.java @@ -10,7 +10,7 @@ * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ -package tombenpotter.emt.common.module.ic2.blocks; +package tombenpotter.emt.common.modules.ic2.blocks; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -23,7 +23,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import tombenpotter.emt.ElectroMagicTools; import tombenpotter.emt.ModInformation; -import tombenpotter.emt.common.module.ic2.tile.generators.*; +import tombenpotter.emt.common.modules.ic2.tile.generators.*; import java.util.List; import java.util.Random; diff --git a/src/main/java/tombenpotter/emt/common/module/ic2/blocks/BlockShield.java b/src/main/java/tombenpotter/emt/common/modules/ic2/blocks/BlockShield.java similarity index 98% rename from src/main/java/tombenpotter/emt/common/module/ic2/blocks/BlockShield.java rename to src/main/java/tombenpotter/emt/common/modules/ic2/blocks/BlockShield.java index a56c594..ef14454 100644 --- a/src/main/java/tombenpotter/emt/common/module/ic2/blocks/BlockShield.java +++ b/src/main/java/tombenpotter/emt/common/modules/ic2/blocks/BlockShield.java @@ -10,7 +10,7 @@ * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ -package tombenpotter.emt.common.module.ic2.blocks; +package tombenpotter.emt.common.modules.ic2.blocks; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/tombenpotter/emt/common/modules/ic2/blocks/IC2BlockRegistry.java b/src/main/java/tombenpotter/emt/common/modules/ic2/blocks/IC2BlockRegistry.java index 0dff523..42fd011 100644 --- a/src/main/java/tombenpotter/emt/common/modules/ic2/blocks/IC2BlockRegistry.java +++ b/src/main/java/tombenpotter/emt/common/modules/ic2/blocks/IC2BlockRegistry.java @@ -15,8 +15,8 @@ package tombenpotter.emt.common.modules.ic2.blocks; import cpw.mods.fml.common.registry.GameRegistry; import net.minecraft.block.Block; import tombenpotter.emt.ModInformation; -import tombenpotter.emt.common.module.ic2.blocks.*; -import tombenpotter.emt.common.module.ic2.items.blocks.*; +import tombenpotter.emt.common.modules.ic2.items.blocks.*; +import tombenpotter.emt.common.modules.base.blocks.BlockPortableNode; public class IC2BlockRegistry { diff --git a/src/main/java/tombenpotter/emt/common/modules/ic2/items/IC2ItemRegistry.java b/src/main/java/tombenpotter/emt/common/modules/ic2/items/IC2ItemRegistry.java index 0c4502a..e671786 100644 --- a/src/main/java/tombenpotter/emt/common/modules/ic2/items/IC2ItemRegistry.java +++ b/src/main/java/tombenpotter/emt/common/modules/ic2/items/IC2ItemRegistry.java @@ -18,28 +18,27 @@ import net.minecraft.item.ItemArmor; import net.minecraftforge.common.util.EnumHelper; import thaumcraft.api.ThaumcraftApi; import tombenpotter.emt.ModInformation; -import tombenpotter.emt.common.module.ic2.items.ItemElectricScribingTools; -import tombenpotter.emt.common.module.ic2.items.armor.boots.ItemElectricBootsTraveller; -import tombenpotter.emt.common.module.ic2.items.armor.boots.ItemNanoBootsTraveller; -import tombenpotter.emt.common.module.ic2.items.armor.boots.ItemQuantumBootsTraveller; -import tombenpotter.emt.common.module.ic2.items.armor.goggles.ItemElectricGoggles; -import tombenpotter.emt.common.module.ic2.items.armor.goggles.ItemNanoGoggles; -import tombenpotter.emt.common.module.ic2.items.armor.goggles.ItemQuantumGoggles; -import tombenpotter.emt.common.module.ic2.items.armor.goggles.ItemSolarHelmetRevealing; -import tombenpotter.emt.common.module.ic2.items.armor.wings.ItemNanoWing; -import tombenpotter.emt.common.module.ic2.items.armor.wings.ItemQuantumWing; -import tombenpotter.emt.common.module.ic2.items.foci.ItemChargeFocus; -import tombenpotter.emt.common.module.ic2.items.foci.ItemWandChargingFocus; -import tombenpotter.emt.common.module.ic2.items.tools.ItemElectricHoeGrowth; -import tombenpotter.emt.common.module.ic2.items.tools.ItemElectricThorHammer; -import tombenpotter.emt.common.module.ic2.items.tools.chainsaws.ItemDiamondChainsaw; -import tombenpotter.emt.common.module.ic2.items.tools.chainsaws.ItemStreamChainsaw; -import tombenpotter.emt.common.module.ic2.items.tools.chainsaws.ItemThaumiumChainsaw; -import tombenpotter.emt.common.module.ic2.items.tools.drills.ItemRockbreakerDrill; -import tombenpotter.emt.common.module.ic2.items.tools.drills.ItemThaumiumDrill; -import tombenpotter.emt.common.module.ic2.items.tools.omnitools.ItemOmnitoolDiamond; -import tombenpotter.emt.common.module.ic2.items.tools.omnitools.ItemOmnitoolIron; -import tombenpotter.emt.common.module.ic2.items.tools.omnitools.ItemOmnitoolThaumium; +import tombenpotter.emt.common.modules.ic2.items.armor.boots.ItemElectricBootsTraveller; +import tombenpotter.emt.common.modules.ic2.items.armor.boots.ItemNanoBootsTraveller; +import tombenpotter.emt.common.modules.ic2.items.armor.boots.ItemQuantumBootsTraveller; +import tombenpotter.emt.common.modules.ic2.items.armor.goggles.ItemElectricGoggles; +import tombenpotter.emt.common.modules.ic2.items.armor.goggles.ItemNanoGoggles; +import tombenpotter.emt.common.modules.ic2.items.armor.goggles.ItemQuantumGoggles; +import tombenpotter.emt.common.modules.ic2.items.armor.goggles.ItemSolarHelmetRevealing; +import tombenpotter.emt.common.modules.ic2.items.armor.wings.ItemNanoWing; +import tombenpotter.emt.common.modules.ic2.items.armor.wings.ItemQuantumWing; +import tombenpotter.emt.common.modules.ic2.items.foci.ItemChargeFocus; +import tombenpotter.emt.common.modules.ic2.items.foci.ItemWandChargingFocus; +import tombenpotter.emt.common.modules.ic2.items.tools.ItemElectricHoeGrowth; +import tombenpotter.emt.common.modules.ic2.items.tools.ItemElectricThorHammer; +import tombenpotter.emt.common.modules.ic2.items.tools.chainsaws.ItemDiamondChainsaw; +import tombenpotter.emt.common.modules.ic2.items.tools.chainsaws.ItemStreamChainsaw; +import tombenpotter.emt.common.modules.ic2.items.tools.chainsaws.ItemThaumiumChainsaw; +import tombenpotter.emt.common.modules.ic2.items.tools.drills.ItemRockbreakerDrill; +import tombenpotter.emt.common.modules.ic2.items.tools.drills.ItemThaumiumDrill; +import tombenpotter.emt.common.modules.ic2.items.tools.omnitools.ItemOmnitoolDiamond; +import tombenpotter.emt.common.modules.ic2.items.tools.omnitools.ItemOmnitoolIron; +import tombenpotter.emt.common.modules.ic2.items.tools.omnitools.ItemOmnitoolThaumium; import tombenpotter.emt.common.modules.base.items.ItemMaterials; import tombenpotter.emt.common.modules.base.items.armor.ItemFeatherWing; import tombenpotter.emt.common.modules.base.items.armor.ItemThaumiumReinforcedWing; diff --git a/src/main/java/tombenpotter/emt/common/module/ic2/items/ItemElectricScribingTools.java b/src/main/java/tombenpotter/emt/common/modules/ic2/items/ItemElectricScribingTools.java similarity index 98% rename from src/main/java/tombenpotter/emt/common/module/ic2/items/ItemElectricScribingTools.java rename to src/main/java/tombenpotter/emt/common/modules/ic2/items/ItemElectricScribingTools.java index 44b84c5..002679f 100644 --- a/src/main/java/tombenpotter/emt/common/module/ic2/items/ItemElectricScribingTools.java +++ b/src/main/java/tombenpotter/emt/common/modules/ic2/items/ItemElectricScribingTools.java @@ -10,7 +10,7 @@ * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ -package tombenpotter.emt.common.module.ic2.items; +package tombenpotter.emt.common.modules.ic2.items; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/tombenpotter/emt/common/module/ic2/items/armor/boots/ItemElectricBootsTraveller.java b/src/main/java/tombenpotter/emt/common/modules/ic2/items/armor/boots/ItemElectricBootsTraveller.java similarity index 99% rename from src/main/java/tombenpotter/emt/common/module/ic2/items/armor/boots/ItemElectricBootsTraveller.java rename to src/main/java/tombenpotter/emt/common/modules/ic2/items/armor/boots/ItemElectricBootsTraveller.java index 59ff845..abde72f 100644 --- a/src/main/java/tombenpotter/emt/common/module/ic2/items/armor/boots/ItemElectricBootsTraveller.java +++ b/src/main/java/tombenpotter/emt/common/modules/ic2/items/armor/boots/ItemElectricBootsTraveller.java @@ -19,7 +19,7 @@ * http://www.minecraftforum.net/topic/1813058- ******************************************************************************/ -package tombenpotter.emt.common.module.ic2.items.armor.boots; +package tombenpotter.emt.common.modules.ic2.items.armor.boots; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/tombenpotter/emt/common/module/ic2/items/armor/boots/ItemNanoBootsTraveller.java b/src/main/java/tombenpotter/emt/common/modules/ic2/items/armor/boots/ItemNanoBootsTraveller.java similarity index 97% rename from src/main/java/tombenpotter/emt/common/module/ic2/items/armor/boots/ItemNanoBootsTraveller.java rename to src/main/java/tombenpotter/emt/common/modules/ic2/items/armor/boots/ItemNanoBootsTraveller.java index 365214f..de9e478 100644 --- a/src/main/java/tombenpotter/emt/common/module/ic2/items/armor/boots/ItemNanoBootsTraveller.java +++ b/src/main/java/tombenpotter/emt/common/modules/ic2/items/armor/boots/ItemNanoBootsTraveller.java @@ -19,7 +19,7 @@ * http://www.minecraftforum.net/topic/1813058- ******************************************************************************/ -package tombenpotter.emt.common.module.ic2.items.armor.boots; +package tombenpotter.emt.common.modules.ic2.items.armor.boots; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/tombenpotter/emt/common/module/ic2/items/armor/boots/ItemQuantumBootsTraveller.java b/src/main/java/tombenpotter/emt/common/modules/ic2/items/armor/boots/ItemQuantumBootsTraveller.java similarity index 97% rename from src/main/java/tombenpotter/emt/common/module/ic2/items/armor/boots/ItemQuantumBootsTraveller.java rename to src/main/java/tombenpotter/emt/common/modules/ic2/items/armor/boots/ItemQuantumBootsTraveller.java index 99c26f9..a9740c3 100644 --- a/src/main/java/tombenpotter/emt/common/module/ic2/items/armor/boots/ItemQuantumBootsTraveller.java +++ b/src/main/java/tombenpotter/emt/common/modules/ic2/items/armor/boots/ItemQuantumBootsTraveller.java @@ -19,7 +19,7 @@ * http://www.minecraftforum.net/topic/1813058- ******************************************************************************/ -package tombenpotter.emt.common.module.ic2.items.armor.boots; +package tombenpotter.emt.common.modules.ic2.items.armor.boots; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/tombenpotter/emt/common/module/ic2/items/armor/goggles/ItemElectricGoggles.java b/src/main/java/tombenpotter/emt/common/modules/ic2/items/armor/goggles/ItemElectricGoggles.java similarity index 99% rename from src/main/java/tombenpotter/emt/common/module/ic2/items/armor/goggles/ItemElectricGoggles.java rename to src/main/java/tombenpotter/emt/common/modules/ic2/items/armor/goggles/ItemElectricGoggles.java index cf8d50f..368cf00 100644 --- a/src/main/java/tombenpotter/emt/common/module/ic2/items/armor/goggles/ItemElectricGoggles.java +++ b/src/main/java/tombenpotter/emt/common/modules/ic2/items/armor/goggles/ItemElectricGoggles.java @@ -10,7 +10,7 @@ * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ -package tombenpotter.emt.common.module.ic2.items.armor.goggles; +package tombenpotter.emt.common.modules.ic2.items.armor.goggles; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/tombenpotter/emt/common/module/ic2/items/armor/goggles/ItemNanoGoggles.java b/src/main/java/tombenpotter/emt/common/modules/ic2/items/armor/goggles/ItemNanoGoggles.java similarity index 97% rename from src/main/java/tombenpotter/emt/common/module/ic2/items/armor/goggles/ItemNanoGoggles.java rename to src/main/java/tombenpotter/emt/common/modules/ic2/items/armor/goggles/ItemNanoGoggles.java index b972ad7..fe7eaa0 100644 --- a/src/main/java/tombenpotter/emt/common/module/ic2/items/armor/goggles/ItemNanoGoggles.java +++ b/src/main/java/tombenpotter/emt/common/modules/ic2/items/armor/goggles/ItemNanoGoggles.java @@ -10,7 +10,7 @@ * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ -package tombenpotter.emt.common.module.ic2.items.armor.goggles; +package tombenpotter.emt.common.modules.ic2.items.armor.goggles; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/tombenpotter/emt/common/module/ic2/items/armor/goggles/ItemQuantumGoggles.java b/src/main/java/tombenpotter/emt/common/modules/ic2/items/armor/goggles/ItemQuantumGoggles.java similarity index 98% rename from src/main/java/tombenpotter/emt/common/module/ic2/items/armor/goggles/ItemQuantumGoggles.java rename to src/main/java/tombenpotter/emt/common/modules/ic2/items/armor/goggles/ItemQuantumGoggles.java index 16b212e..473e66c 100644 --- a/src/main/java/tombenpotter/emt/common/module/ic2/items/armor/goggles/ItemQuantumGoggles.java +++ b/src/main/java/tombenpotter/emt/common/modules/ic2/items/armor/goggles/ItemQuantumGoggles.java @@ -10,7 +10,7 @@ * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ -package tombenpotter.emt.common.module.ic2.items.armor.goggles; +package tombenpotter.emt.common.modules.ic2.items.armor.goggles; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/tombenpotter/emt/common/module/ic2/items/armor/goggles/ItemSolarHelmetRevealing.java b/src/main/java/tombenpotter/emt/common/modules/ic2/items/armor/goggles/ItemSolarHelmetRevealing.java similarity index 99% rename from src/main/java/tombenpotter/emt/common/module/ic2/items/armor/goggles/ItemSolarHelmetRevealing.java rename to src/main/java/tombenpotter/emt/common/modules/ic2/items/armor/goggles/ItemSolarHelmetRevealing.java index 83cb0fe..fcc3cf1 100644 --- a/src/main/java/tombenpotter/emt/common/module/ic2/items/armor/goggles/ItemSolarHelmetRevealing.java +++ b/src/main/java/tombenpotter/emt/common/modules/ic2/items/armor/goggles/ItemSolarHelmetRevealing.java @@ -10,7 +10,7 @@ * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ -package tombenpotter.emt.common.module.ic2.items.armor.goggles; +package tombenpotter.emt.common.modules.ic2.items.armor.goggles; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/tombenpotter/emt/common/module/ic2/items/armor/wings/ItemNanoWing.java b/src/main/java/tombenpotter/emt/common/modules/ic2/items/armor/wings/ItemNanoWing.java similarity index 98% rename from src/main/java/tombenpotter/emt/common/module/ic2/items/armor/wings/ItemNanoWing.java rename to src/main/java/tombenpotter/emt/common/modules/ic2/items/armor/wings/ItemNanoWing.java index f5618f7..69f75f5 100644 --- a/src/main/java/tombenpotter/emt/common/module/ic2/items/armor/wings/ItemNanoWing.java +++ b/src/main/java/tombenpotter/emt/common/modules/ic2/items/armor/wings/ItemNanoWing.java @@ -1,4 +1,4 @@ -package tombenpotter.emt.common.module.ic2.items.armor.wings; +package tombenpotter.emt.common.modules.ic2.items.armor.wings; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/tombenpotter/emt/common/module/ic2/items/armor/wings/ItemQuantumWing.java b/src/main/java/tombenpotter/emt/common/modules/ic2/items/armor/wings/ItemQuantumWing.java similarity index 97% rename from src/main/java/tombenpotter/emt/common/module/ic2/items/armor/wings/ItemQuantumWing.java rename to src/main/java/tombenpotter/emt/common/modules/ic2/items/armor/wings/ItemQuantumWing.java index 37549a2..b74126b 100644 --- a/src/main/java/tombenpotter/emt/common/module/ic2/items/armor/wings/ItemQuantumWing.java +++ b/src/main/java/tombenpotter/emt/common/modules/ic2/items/armor/wings/ItemQuantumWing.java @@ -1,4 +1,4 @@ -package tombenpotter.emt.common.module.ic2.items.armor.wings; +package tombenpotter.emt.common.modules.ic2.items.armor.wings; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/tombenpotter/emt/common/module/ic2/items/blocks/ItemBlockEMTMachines.java b/src/main/java/tombenpotter/emt/common/modules/ic2/items/blocks/ItemBlockEMTMachines.java similarity index 96% rename from src/main/java/tombenpotter/emt/common/module/ic2/items/blocks/ItemBlockEMTMachines.java rename to src/main/java/tombenpotter/emt/common/modules/ic2/items/blocks/ItemBlockEMTMachines.java index a48af3d..245b8c1 100644 --- a/src/main/java/tombenpotter/emt/common/module/ic2/items/blocks/ItemBlockEMTMachines.java +++ b/src/main/java/tombenpotter/emt/common/modules/ic2/items/blocks/ItemBlockEMTMachines.java @@ -10,7 +10,7 @@ * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ -package tombenpotter.emt.common.module.ic2.items.blocks; +package tombenpotter.emt.common.modules.ic2.items.blocks; import net.minecraft.block.Block; import net.minecraft.item.ItemBlock; diff --git a/src/main/java/tombenpotter/emt/common/module/ic2/items/blocks/ItemBlockEMTSolars.java b/src/main/java/tombenpotter/emt/common/modules/ic2/items/blocks/ItemBlockEMTSolars.java similarity index 99% rename from src/main/java/tombenpotter/emt/common/module/ic2/items/blocks/ItemBlockEMTSolars.java rename to src/main/java/tombenpotter/emt/common/modules/ic2/items/blocks/ItemBlockEMTSolars.java index 7fcfa2c..3c8d5a6 100644 --- a/src/main/java/tombenpotter/emt/common/module/ic2/items/blocks/ItemBlockEMTSolars.java +++ b/src/main/java/tombenpotter/emt/common/modules/ic2/items/blocks/ItemBlockEMTSolars.java @@ -10,7 +10,7 @@ * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ -package tombenpotter.emt.common.module.ic2.items.blocks; +package tombenpotter.emt.common.modules.ic2.items.blocks; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/tombenpotter/emt/common/module/ic2/items/blocks/ItemBlockEMTSolars2.java b/src/main/java/tombenpotter/emt/common/modules/ic2/items/blocks/ItemBlockEMTSolars2.java similarity index 98% rename from src/main/java/tombenpotter/emt/common/module/ic2/items/blocks/ItemBlockEMTSolars2.java rename to src/main/java/tombenpotter/emt/common/modules/ic2/items/blocks/ItemBlockEMTSolars2.java index ddc4c4e..c7b9335 100644 --- a/src/main/java/tombenpotter/emt/common/module/ic2/items/blocks/ItemBlockEMTSolars2.java +++ b/src/main/java/tombenpotter/emt/common/modules/ic2/items/blocks/ItemBlockEMTSolars2.java @@ -10,7 +10,7 @@ * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ -package tombenpotter.emt.common.module.ic2.items.blocks; +package tombenpotter.emt.common.modules.ic2.items.blocks; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/tombenpotter/emt/common/module/ic2/items/blocks/ItemBlockEssentiaGenerator.java b/src/main/java/tombenpotter/emt/common/modules/ic2/items/blocks/ItemBlockEssentiaGenerator.java similarity index 88% rename from src/main/java/tombenpotter/emt/common/module/ic2/items/blocks/ItemBlockEssentiaGenerator.java rename to src/main/java/tombenpotter/emt/common/modules/ic2/items/blocks/ItemBlockEssentiaGenerator.java index 5bf0ea8..ef2d217 100644 --- a/src/main/java/tombenpotter/emt/common/module/ic2/items/blocks/ItemBlockEssentiaGenerator.java +++ b/src/main/java/tombenpotter/emt/common/modules/ic2/items/blocks/ItemBlockEssentiaGenerator.java @@ -1,4 +1,4 @@ -package tombenpotter.emt.common.module.ic2.items.blocks; +package tombenpotter.emt.common.modules.ic2.items.blocks; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/tombenpotter/emt/common/module/ic2/items/blocks/ItemBlockEssentiaGenerators.java b/src/main/java/tombenpotter/emt/common/modules/ic2/items/blocks/ItemBlockEssentiaGenerators.java similarity index 97% rename from src/main/java/tombenpotter/emt/common/module/ic2/items/blocks/ItemBlockEssentiaGenerators.java rename to src/main/java/tombenpotter/emt/common/modules/ic2/items/blocks/ItemBlockEssentiaGenerators.java index f789b95..fae6e6f 100644 --- a/src/main/java/tombenpotter/emt/common/module/ic2/items/blocks/ItemBlockEssentiaGenerators.java +++ b/src/main/java/tombenpotter/emt/common/modules/ic2/items/blocks/ItemBlockEssentiaGenerators.java @@ -10,7 +10,7 @@ * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ -package tombenpotter.emt.common.module.ic2.items.blocks; +package tombenpotter.emt.common.modules.ic2.items.blocks; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/tombenpotter/emt/common/module/ic2/items/foci/ItemChargeFocus.java b/src/main/java/tombenpotter/emt/common/modules/ic2/items/foci/ItemChargeFocus.java similarity index 98% rename from src/main/java/tombenpotter/emt/common/module/ic2/items/foci/ItemChargeFocus.java rename to src/main/java/tombenpotter/emt/common/modules/ic2/items/foci/ItemChargeFocus.java index 4ad0d5b..64a38bd 100644 --- a/src/main/java/tombenpotter/emt/common/module/ic2/items/foci/ItemChargeFocus.java +++ b/src/main/java/tombenpotter/emt/common/modules/ic2/items/foci/ItemChargeFocus.java @@ -10,7 +10,7 @@ * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ -package tombenpotter.emt.common.module.ic2.items.foci; +package tombenpotter.emt.common.modules.ic2.items.foci; import ic2.api.item.ElectricItem; import ic2.api.item.IElectricItem; diff --git a/src/main/java/tombenpotter/emt/common/module/ic2/items/foci/ItemWandChargingFocus.java b/src/main/java/tombenpotter/emt/common/modules/ic2/items/foci/ItemWandChargingFocus.java similarity index 97% rename from src/main/java/tombenpotter/emt/common/module/ic2/items/foci/ItemWandChargingFocus.java rename to src/main/java/tombenpotter/emt/common/modules/ic2/items/foci/ItemWandChargingFocus.java index d66cd15..2d6ef8c 100644 --- a/src/main/java/tombenpotter/emt/common/module/ic2/items/foci/ItemWandChargingFocus.java +++ b/src/main/java/tombenpotter/emt/common/modules/ic2/items/foci/ItemWandChargingFocus.java @@ -1,4 +1,4 @@ -package tombenpotter.emt.common.module.ic2.items.foci; +package tombenpotter.emt.common.modules.ic2.items.foci; import ic2.api.item.ElectricItem; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/tombenpotter/emt/common/module/ic2/items/tools/ItemElectricHoeGrowth.java b/src/main/java/tombenpotter/emt/common/modules/ic2/items/tools/ItemElectricHoeGrowth.java similarity index 98% rename from src/main/java/tombenpotter/emt/common/module/ic2/items/tools/ItemElectricHoeGrowth.java rename to src/main/java/tombenpotter/emt/common/modules/ic2/items/tools/ItemElectricHoeGrowth.java index 28910e8..b4dcf5b 100644 --- a/src/main/java/tombenpotter/emt/common/module/ic2/items/tools/ItemElectricHoeGrowth.java +++ b/src/main/java/tombenpotter/emt/common/modules/ic2/items/tools/ItemElectricHoeGrowth.java @@ -10,7 +10,7 @@ * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ -package tombenpotter.emt.common.module.ic2.items.tools; +package tombenpotter.emt.common.modules.ic2.items.tools; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/tombenpotter/emt/common/module/ic2/items/tools/ItemElectricThorHammer.java b/src/main/java/tombenpotter/emt/common/modules/ic2/items/tools/ItemElectricThorHammer.java similarity index 99% rename from src/main/java/tombenpotter/emt/common/module/ic2/items/tools/ItemElectricThorHammer.java rename to src/main/java/tombenpotter/emt/common/modules/ic2/items/tools/ItemElectricThorHammer.java index 558d021..53308d6 100644 --- a/src/main/java/tombenpotter/emt/common/module/ic2/items/tools/ItemElectricThorHammer.java +++ b/src/main/java/tombenpotter/emt/common/modules/ic2/items/tools/ItemElectricThorHammer.java @@ -10,7 +10,7 @@ * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ -package tombenpotter.emt.common.module.ic2.items.tools; +package tombenpotter.emt.common.modules.ic2.items.tools; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/tombenpotter/emt/common/module/ic2/items/tools/chainsaws/ItemDiamondChainsaw.java b/src/main/java/tombenpotter/emt/common/modules/ic2/items/tools/chainsaws/ItemDiamondChainsaw.java similarity index 98% rename from src/main/java/tombenpotter/emt/common/module/ic2/items/tools/chainsaws/ItemDiamondChainsaw.java rename to src/main/java/tombenpotter/emt/common/modules/ic2/items/tools/chainsaws/ItemDiamondChainsaw.java index bf2ba7b..fa76762 100644 --- a/src/main/java/tombenpotter/emt/common/module/ic2/items/tools/chainsaws/ItemDiamondChainsaw.java +++ b/src/main/java/tombenpotter/emt/common/modules/ic2/items/tools/chainsaws/ItemDiamondChainsaw.java @@ -10,7 +10,7 @@ * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ -package tombenpotter.emt.common.module.ic2.items.tools.chainsaws; +package tombenpotter.emt.common.modules.ic2.items.tools.chainsaws; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/tombenpotter/emt/common/module/ic2/items/tools/chainsaws/ItemStreamChainsaw.java b/src/main/java/tombenpotter/emt/common/modules/ic2/items/tools/chainsaws/ItemStreamChainsaw.java similarity index 98% rename from src/main/java/tombenpotter/emt/common/module/ic2/items/tools/chainsaws/ItemStreamChainsaw.java rename to src/main/java/tombenpotter/emt/common/modules/ic2/items/tools/chainsaws/ItemStreamChainsaw.java index 54b053d..03d4dcd 100644 --- a/src/main/java/tombenpotter/emt/common/module/ic2/items/tools/chainsaws/ItemStreamChainsaw.java +++ b/src/main/java/tombenpotter/emt/common/modules/ic2/items/tools/chainsaws/ItemStreamChainsaw.java @@ -12,7 +12,7 @@ * This class originally belongs to Azanor, but with his permission I took it, and modified it to make it work as I wanted to. ******************************************************************************/ -package tombenpotter.emt.common.module.ic2.items.tools.chainsaws; +package tombenpotter.emt.common.modules.ic2.items.tools.chainsaws; import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/tombenpotter/emt/common/module/ic2/items/tools/chainsaws/ItemThaumiumChainsaw.java b/src/main/java/tombenpotter/emt/common/modules/ic2/items/tools/chainsaws/ItemThaumiumChainsaw.java similarity index 97% rename from src/main/java/tombenpotter/emt/common/module/ic2/items/tools/chainsaws/ItemThaumiumChainsaw.java rename to src/main/java/tombenpotter/emt/common/modules/ic2/items/tools/chainsaws/ItemThaumiumChainsaw.java index 7a8e710..db78b90 100644 --- a/src/main/java/tombenpotter/emt/common/module/ic2/items/tools/chainsaws/ItemThaumiumChainsaw.java +++ b/src/main/java/tombenpotter/emt/common/modules/ic2/items/tools/chainsaws/ItemThaumiumChainsaw.java @@ -10,7 +10,7 @@ * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ -package tombenpotter.emt.common.module.ic2.items.tools.chainsaws; +package tombenpotter.emt.common.modules.ic2.items.tools.chainsaws; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/tombenpotter/emt/common/module/ic2/items/tools/drills/ItemRockbreakerDrill.java b/src/main/java/tombenpotter/emt/common/modules/ic2/items/tools/drills/ItemRockbreakerDrill.java similarity index 99% rename from src/main/java/tombenpotter/emt/common/module/ic2/items/tools/drills/ItemRockbreakerDrill.java rename to src/main/java/tombenpotter/emt/common/modules/ic2/items/tools/drills/ItemRockbreakerDrill.java index 358d0fb..7e41656 100644 --- a/src/main/java/tombenpotter/emt/common/module/ic2/items/tools/drills/ItemRockbreakerDrill.java +++ b/src/main/java/tombenpotter/emt/common/modules/ic2/items/tools/drills/ItemRockbreakerDrill.java @@ -12,7 +12,7 @@ * This class originally belongs to Azanor, but with his permission I took it, and modified it to make it work as I wanted to. ******************************************************************************/ -package tombenpotter.emt.common.module.ic2.items.tools.drills; +package tombenpotter.emt.common.modules.ic2.items.tools.drills; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/tombenpotter/emt/common/module/ic2/items/tools/drills/ItemThaumiumDrill.java b/src/main/java/tombenpotter/emt/common/modules/ic2/items/tools/drills/ItemThaumiumDrill.java similarity index 98% rename from src/main/java/tombenpotter/emt/common/module/ic2/items/tools/drills/ItemThaumiumDrill.java rename to src/main/java/tombenpotter/emt/common/modules/ic2/items/tools/drills/ItemThaumiumDrill.java index c04d4c7..201d846 100644 --- a/src/main/java/tombenpotter/emt/common/module/ic2/items/tools/drills/ItemThaumiumDrill.java +++ b/src/main/java/tombenpotter/emt/common/modules/ic2/items/tools/drills/ItemThaumiumDrill.java @@ -10,7 +10,7 @@ * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ -package tombenpotter.emt.common.module.ic2.items.tools.drills; +package tombenpotter.emt.common.modules.ic2.items.tools.drills; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/tombenpotter/emt/common/module/ic2/items/tools/omnitools/ItemOmnitoolDiamond.java b/src/main/java/tombenpotter/emt/common/modules/ic2/items/tools/omnitools/ItemOmnitoolDiamond.java similarity index 97% rename from src/main/java/tombenpotter/emt/common/module/ic2/items/tools/omnitools/ItemOmnitoolDiamond.java rename to src/main/java/tombenpotter/emt/common/modules/ic2/items/tools/omnitools/ItemOmnitoolDiamond.java index 095a441..a786189 100644 --- a/src/main/java/tombenpotter/emt/common/module/ic2/items/tools/omnitools/ItemOmnitoolDiamond.java +++ b/src/main/java/tombenpotter/emt/common/modules/ic2/items/tools/omnitools/ItemOmnitoolDiamond.java @@ -10,7 +10,7 @@ * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ -package tombenpotter.emt.common.module.ic2.items.tools.omnitools; +package tombenpotter.emt.common.modules.ic2.items.tools.omnitools; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/tombenpotter/emt/common/module/ic2/items/tools/omnitools/ItemOmnitoolIron.java b/src/main/java/tombenpotter/emt/common/modules/ic2/items/tools/omnitools/ItemOmnitoolIron.java similarity index 99% rename from src/main/java/tombenpotter/emt/common/module/ic2/items/tools/omnitools/ItemOmnitoolIron.java rename to src/main/java/tombenpotter/emt/common/modules/ic2/items/tools/omnitools/ItemOmnitoolIron.java index 8edf1e6..aa4f3df 100644 --- a/src/main/java/tombenpotter/emt/common/module/ic2/items/tools/omnitools/ItemOmnitoolIron.java +++ b/src/main/java/tombenpotter/emt/common/modules/ic2/items/tools/omnitools/ItemOmnitoolIron.java @@ -10,7 +10,7 @@ * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ -package tombenpotter.emt.common.module.ic2.items.tools.omnitools; +package tombenpotter.emt.common.modules.ic2.items.tools.omnitools; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/tombenpotter/emt/common/module/ic2/items/tools/omnitools/ItemOmnitoolThaumium.java b/src/main/java/tombenpotter/emt/common/modules/ic2/items/tools/omnitools/ItemOmnitoolThaumium.java similarity index 97% rename from src/main/java/tombenpotter/emt/common/module/ic2/items/tools/omnitools/ItemOmnitoolThaumium.java rename to src/main/java/tombenpotter/emt/common/modules/ic2/items/tools/omnitools/ItemOmnitoolThaumium.java index 545597c..e043df0 100644 --- a/src/main/java/tombenpotter/emt/common/module/ic2/items/tools/omnitools/ItemOmnitoolThaumium.java +++ b/src/main/java/tombenpotter/emt/common/modules/ic2/items/tools/omnitools/ItemOmnitoolThaumium.java @@ -10,7 +10,7 @@ * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ -package tombenpotter.emt.common.module.ic2.items.tools.omnitools; +package tombenpotter.emt.common.modules.ic2.items.tools.omnitools; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/tombenpotter/emt/common/modules/ic2/tile/IC2TileRegistry.java b/src/main/java/tombenpotter/emt/common/modules/ic2/tile/IC2TileRegistry.java index 068cd28..51a6e8d 100644 --- a/src/main/java/tombenpotter/emt/common/modules/ic2/tile/IC2TileRegistry.java +++ b/src/main/java/tombenpotter/emt/common/modules/ic2/tile/IC2TileRegistry.java @@ -14,30 +14,28 @@ package tombenpotter.emt.common.modules.ic2.tile; import cpw.mods.fml.common.registry.GameRegistry; import tombenpotter.emt.common.modules.base.tile.TileEntityPortableNode; -import tombenpotter.emt.common.module.ic2.tile.TileEntityEtherealMacerator; -import tombenpotter.emt.common.module.ic2.tile.TileEntityIndustrialWandRecharge; -import tombenpotter.emt.common.module.ic2.tile.generators.*; -import tombenpotter.emt.common.module.ic2.tile.solars.air.TileEntityAirSolar; -import tombenpotter.emt.common.module.ic2.tile.solars.air.TileEntityDoubleAirSolar; -import tombenpotter.emt.common.module.ic2.tile.solars.air.TileEntityTripleAirSolar; -import tombenpotter.emt.common.module.ic2.tile.solars.compressed.TileEntityCompressedSolar; -import tombenpotter.emt.common.module.ic2.tile.solars.compressed.TileEntityDoubleCompressedSolar; -import tombenpotter.emt.common.module.ic2.tile.solars.compressed.TileEntityTripleCompressedSolar; -import tombenpotter.emt.common.module.ic2.tile.solars.dark.TileEntityDarkSolar; -import tombenpotter.emt.common.module.ic2.tile.solars.dark.TileEntityDoubleDarkSolar; -import tombenpotter.emt.common.module.ic2.tile.solars.dark.TileEntityTripleDarkSolar; -import tombenpotter.emt.common.module.ic2.tile.solars.earth.TileEntityDoubleEarthSolar; -import tombenpotter.emt.common.module.ic2.tile.solars.earth.TileEntityEarthSolar; -import tombenpotter.emt.common.module.ic2.tile.solars.earth.TileEntityTripleEarthSolar; -import tombenpotter.emt.common.module.ic2.tile.solars.fire.TileEntityDoubleFireSolar; -import tombenpotter.emt.common.module.ic2.tile.solars.fire.TileEntityFireSolar; -import tombenpotter.emt.common.module.ic2.tile.solars.fire.TileEntityTripleFireSolar; -import tombenpotter.emt.common.module.ic2.tile.solars.order.TileEntityDoubleOrderSolar; -import tombenpotter.emt.common.module.ic2.tile.solars.order.TileEntityOrderSolar; -import tombenpotter.emt.common.module.ic2.tile.solars.order.TileEntityTripleOrderSolar; -import tombenpotter.emt.common.module.ic2.tile.solars.water.TileEntityDoubleWaterSolar; -import tombenpotter.emt.common.module.ic2.tile.solars.water.TileEntityTripleWaterSolar; -import tombenpotter.emt.common.module.ic2.tile.solars.water.TileEntityWaterSolar; +import tombenpotter.emt.common.modules.ic2.tile.generators.*; +import tombenpotter.emt.common.modules.ic2.tile.solars.air.TileEntityAirSolar; +import tombenpotter.emt.common.modules.ic2.tile.solars.air.TileEntityDoubleAirSolar; +import tombenpotter.emt.common.modules.ic2.tile.solars.air.TileEntityTripleAirSolar; +import tombenpotter.emt.common.modules.ic2.tile.solars.compressed.TileEntityCompressedSolar; +import tombenpotter.emt.common.modules.ic2.tile.solars.compressed.TileEntityDoubleCompressedSolar; +import tombenpotter.emt.common.modules.ic2.tile.solars.compressed.TileEntityTripleCompressedSolar; +import tombenpotter.emt.common.modules.ic2.tile.solars.dark.TileEntityDarkSolar; +import tombenpotter.emt.common.modules.ic2.tile.solars.dark.TileEntityDoubleDarkSolar; +import tombenpotter.emt.common.modules.ic2.tile.solars.dark.TileEntityTripleDarkSolar; +import tombenpotter.emt.common.modules.ic2.tile.solars.earth.TileEntityDoubleEarthSolar; +import tombenpotter.emt.common.modules.ic2.tile.solars.earth.TileEntityEarthSolar; +import tombenpotter.emt.common.modules.ic2.tile.solars.earth.TileEntityTripleEarthSolar; +import tombenpotter.emt.common.modules.ic2.tile.solars.fire.TileEntityDoubleFireSolar; +import tombenpotter.emt.common.modules.ic2.tile.solars.fire.TileEntityFireSolar; +import tombenpotter.emt.common.modules.ic2.tile.solars.fire.TileEntityTripleFireSolar; +import tombenpotter.emt.common.modules.ic2.tile.solars.order.TileEntityDoubleOrderSolar; +import tombenpotter.emt.common.modules.ic2.tile.solars.order.TileEntityOrderSolar; +import tombenpotter.emt.common.modules.ic2.tile.solars.order.TileEntityTripleOrderSolar; +import tombenpotter.emt.common.modules.ic2.tile.solars.water.TileEntityDoubleWaterSolar; +import tombenpotter.emt.common.modules.ic2.tile.solars.water.TileEntityTripleWaterSolar; +import tombenpotter.emt.common.modules.ic2.tile.solars.water.TileEntityWaterSolar; public class IC2TileRegistry { diff --git a/src/main/java/tombenpotter/emt/common/module/ic2/tile/TileEntityEMT.java b/src/main/java/tombenpotter/emt/common/modules/ic2/tile/TileEntityEMT.java similarity index 96% rename from src/main/java/tombenpotter/emt/common/module/ic2/tile/TileEntityEMT.java rename to src/main/java/tombenpotter/emt/common/modules/ic2/tile/TileEntityEMT.java index d49230d..62b5a4d 100644 --- a/src/main/java/tombenpotter/emt/common/module/ic2/tile/TileEntityEMT.java +++ b/src/main/java/tombenpotter/emt/common/modules/ic2/tile/TileEntityEMT.java @@ -1,4 +1,4 @@ -package tombenpotter.emt.common.module.ic2.tile; +package tombenpotter.emt.common.modules.ic2.tile; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.NetworkManager; diff --git a/src/main/java/tombenpotter/emt/common/module/ic2/tile/TileEntityEtherealMacerator.java b/src/main/java/tombenpotter/emt/common/modules/ic2/tile/TileEntityEtherealMacerator.java similarity index 99% rename from src/main/java/tombenpotter/emt/common/module/ic2/tile/TileEntityEtherealMacerator.java rename to src/main/java/tombenpotter/emt/common/modules/ic2/tile/TileEntityEtherealMacerator.java index 4ca3deb..ca79530 100644 --- a/src/main/java/tombenpotter/emt/common/module/ic2/tile/TileEntityEtherealMacerator.java +++ b/src/main/java/tombenpotter/emt/common/modules/ic2/tile/TileEntityEtherealMacerator.java @@ -10,7 +10,7 @@ * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ -package tombenpotter.emt.common.module.ic2.tile; +package tombenpotter.emt.common.modules.ic2.tile; import ic2.api.item.IC2Items; import ic2.api.tile.IWrenchable; diff --git a/src/main/java/tombenpotter/emt/common/module/ic2/tile/TileEntityIndustrialWandRecharge.java b/src/main/java/tombenpotter/emt/common/modules/ic2/tile/TileEntityIndustrialWandRecharge.java similarity index 99% rename from src/main/java/tombenpotter/emt/common/module/ic2/tile/TileEntityIndustrialWandRecharge.java rename to src/main/java/tombenpotter/emt/common/modules/ic2/tile/TileEntityIndustrialWandRecharge.java index 4d0b0e9..a16e501 100644 --- a/src/main/java/tombenpotter/emt/common/module/ic2/tile/TileEntityIndustrialWandRecharge.java +++ b/src/main/java/tombenpotter/emt/common/modules/ic2/tile/TileEntityIndustrialWandRecharge.java @@ -10,7 +10,7 @@ * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ -package tombenpotter.emt.common.module.ic2.tile; +package tombenpotter.emt.common.modules.ic2.tile; import ic2.api.energy.prefab.BasicSink; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/tombenpotter/emt/common/module/ic2/tile/generators/TileEntityAerGenerator.java b/src/main/java/tombenpotter/emt/common/modules/ic2/tile/generators/TileEntityAerGenerator.java similarity index 82% rename from src/main/java/tombenpotter/emt/common/module/ic2/tile/generators/TileEntityAerGenerator.java rename to src/main/java/tombenpotter/emt/common/modules/ic2/tile/generators/TileEntityAerGenerator.java index 0adf134..e6f9231 100644 --- a/src/main/java/tombenpotter/emt/common/module/ic2/tile/generators/TileEntityAerGenerator.java +++ b/src/main/java/tombenpotter/emt/common/modules/ic2/tile/generators/TileEntityAerGenerator.java @@ -1,4 +1,4 @@ -package tombenpotter.emt.common.module.ic2.tile.generators; +package tombenpotter.emt.common.modules.ic2.tile.generators; import thaumcraft.api.aspects.Aspect; import tombenpotter.emt.common.util.EssentiasOutputs; diff --git a/src/main/java/tombenpotter/emt/common/module/ic2/tile/generators/TileEntityArborGenerator.java b/src/main/java/tombenpotter/emt/common/modules/ic2/tile/generators/TileEntityArborGenerator.java similarity index 94% rename from src/main/java/tombenpotter/emt/common/module/ic2/tile/generators/TileEntityArborGenerator.java rename to src/main/java/tombenpotter/emt/common/modules/ic2/tile/generators/TileEntityArborGenerator.java index cf7956b..ce3d023 100644 --- a/src/main/java/tombenpotter/emt/common/module/ic2/tile/generators/TileEntityArborGenerator.java +++ b/src/main/java/tombenpotter/emt/common/modules/ic2/tile/generators/TileEntityArborGenerator.java @@ -10,7 +10,7 @@ * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ -package tombenpotter.emt.common.module.ic2.tile.generators; +package tombenpotter.emt.common.modules.ic2.tile.generators; import thaumcraft.api.aspects.Aspect; import tombenpotter.emt.common.util.EssentiasOutputs; diff --git a/src/main/java/tombenpotter/emt/common/module/ic2/tile/generators/TileEntityAuramGenerator.java b/src/main/java/tombenpotter/emt/common/modules/ic2/tile/generators/TileEntityAuramGenerator.java similarity index 94% rename from src/main/java/tombenpotter/emt/common/module/ic2/tile/generators/TileEntityAuramGenerator.java rename to src/main/java/tombenpotter/emt/common/modules/ic2/tile/generators/TileEntityAuramGenerator.java index 833dadb..34de2e9 100644 --- a/src/main/java/tombenpotter/emt/common/module/ic2/tile/generators/TileEntityAuramGenerator.java +++ b/src/main/java/tombenpotter/emt/common/modules/ic2/tile/generators/TileEntityAuramGenerator.java @@ -10,7 +10,7 @@ * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ -package tombenpotter.emt.common.module.ic2.tile.generators; +package tombenpotter.emt.common.modules.ic2.tile.generators; import thaumcraft.api.aspects.Aspect; import tombenpotter.emt.common.util.EssentiasOutputs; diff --git a/src/main/java/tombenpotter/emt/common/module/ic2/tile/generators/TileEntityBaseGenerator.java b/src/main/java/tombenpotter/emt/common/modules/ic2/tile/generators/TileEntityBaseGenerator.java similarity index 92% rename from src/main/java/tombenpotter/emt/common/module/ic2/tile/generators/TileEntityBaseGenerator.java rename to src/main/java/tombenpotter/emt/common/modules/ic2/tile/generators/TileEntityBaseGenerator.java index eed32f6..840d546 100644 --- a/src/main/java/tombenpotter/emt/common/module/ic2/tile/generators/TileEntityBaseGenerator.java +++ b/src/main/java/tombenpotter/emt/common/modules/ic2/tile/generators/TileEntityBaseGenerator.java @@ -1,11 +1,11 @@ -package tombenpotter.emt.common.module.ic2.tile.generators; +package tombenpotter.emt.common.modules.ic2.tile.generators; import ic2.api.energy.prefab.BasicSource; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.util.ForgeDirection; import thaumcraft.api.aspects.Aspect; import thaumcraft.common.lib.events.EssentiaHandler; -import tombenpotter.emt.common.module.ic2.tile.TileEntityEMT; +import tombenpotter.emt.common.modules.ic2.tile.TileEntityEMT; import tombenpotter.emt.common.util.ConfigHandler; public abstract class TileEntityBaseGenerator extends TileEntityEMT { diff --git a/src/main/java/tombenpotter/emt/common/module/ic2/tile/generators/TileEntityEssentiaGenerator.java b/src/main/java/tombenpotter/emt/common/modules/ic2/tile/generators/TileEntityEssentiaGenerator.java similarity index 94% rename from src/main/java/tombenpotter/emt/common/module/ic2/tile/generators/TileEntityEssentiaGenerator.java rename to src/main/java/tombenpotter/emt/common/modules/ic2/tile/generators/TileEntityEssentiaGenerator.java index efe7916..9adb4cd 100644 --- a/src/main/java/tombenpotter/emt/common/module/ic2/tile/generators/TileEntityEssentiaGenerator.java +++ b/src/main/java/tombenpotter/emt/common/modules/ic2/tile/generators/TileEntityEssentiaGenerator.java @@ -1,11 +1,11 @@ -package tombenpotter.emt.common.module.ic2.tile.generators; +package tombenpotter.emt.common.modules.ic2.tile.generators; import ic2.api.energy.prefab.BasicSource; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.util.ForgeDirection; import thaumcraft.api.aspects.Aspect; import thaumcraft.common.lib.events.EssentiaHandler; -import tombenpotter.emt.common.module.ic2.tile.TileEntityEMT; +import tombenpotter.emt.common.modules.ic2.tile.TileEntityEMT; import tombenpotter.emt.common.util.ConfigHandler; import tombenpotter.emt.common.util.EssentiasOutputs; diff --git a/src/main/java/tombenpotter/emt/common/module/ic2/tile/generators/TileEntityIgnisGenerator.java b/src/main/java/tombenpotter/emt/common/modules/ic2/tile/generators/TileEntityIgnisGenerator.java similarity index 94% rename from src/main/java/tombenpotter/emt/common/module/ic2/tile/generators/TileEntityIgnisGenerator.java rename to src/main/java/tombenpotter/emt/common/modules/ic2/tile/generators/TileEntityIgnisGenerator.java index 9f1c9e4..bbd52c8 100644 --- a/src/main/java/tombenpotter/emt/common/module/ic2/tile/generators/TileEntityIgnisGenerator.java +++ b/src/main/java/tombenpotter/emt/common/modules/ic2/tile/generators/TileEntityIgnisGenerator.java @@ -10,7 +10,7 @@ * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ -package tombenpotter.emt.common.module.ic2.tile.generators; +package tombenpotter.emt.common.modules.ic2.tile.generators; import thaumcraft.api.aspects.Aspect; import tombenpotter.emt.common.util.EssentiasOutputs; diff --git a/src/main/java/tombenpotter/emt/common/module/ic2/tile/generators/TileEntityPotentiaGenerator.java b/src/main/java/tombenpotter/emt/common/modules/ic2/tile/generators/TileEntityPotentiaGenerator.java similarity index 94% rename from src/main/java/tombenpotter/emt/common/module/ic2/tile/generators/TileEntityPotentiaGenerator.java rename to src/main/java/tombenpotter/emt/common/modules/ic2/tile/generators/TileEntityPotentiaGenerator.java index 7c2b275..a047324 100644 --- a/src/main/java/tombenpotter/emt/common/module/ic2/tile/generators/TileEntityPotentiaGenerator.java +++ b/src/main/java/tombenpotter/emt/common/modules/ic2/tile/generators/TileEntityPotentiaGenerator.java @@ -10,7 +10,7 @@ * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ -package tombenpotter.emt.common.module.ic2.tile.generators; +package tombenpotter.emt.common.modules.ic2.tile.generators; import thaumcraft.api.aspects.Aspect; import tombenpotter.emt.common.util.EssentiasOutputs; diff --git a/src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/TileEntitySolarBase.java b/src/main/java/tombenpotter/emt/common/modules/ic2/tile/solars/TileEntitySolarBase.java similarity index 95% rename from src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/TileEntitySolarBase.java rename to src/main/java/tombenpotter/emt/common/modules/ic2/tile/solars/TileEntitySolarBase.java index c87c8a0..2254951 100644 --- a/src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/TileEntitySolarBase.java +++ b/src/main/java/tombenpotter/emt/common/modules/ic2/tile/solars/TileEntitySolarBase.java @@ -1,10 +1,10 @@ -package tombenpotter.emt.common.module.ic2.tile.solars; +package tombenpotter.emt.common.modules.ic2.tile.solars; import ic2.api.energy.prefab.BasicSource; import ic2.api.tile.IWrenchable; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; -import tombenpotter.emt.common.module.ic2.tile.TileEntityEMT; +import tombenpotter.emt.common.modules.ic2.tile.TileEntityEMT; import java.util.Random; diff --git a/src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/air/TileEntityAirSolar.java b/src/main/java/tombenpotter/emt/common/modules/ic2/tile/solars/air/TileEntityAirSolar.java similarity index 91% rename from src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/air/TileEntityAirSolar.java rename to src/main/java/tombenpotter/emt/common/modules/ic2/tile/solars/air/TileEntityAirSolar.java index 717d82b..db2a7f1 100644 --- a/src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/air/TileEntityAirSolar.java +++ b/src/main/java/tombenpotter/emt/common/modules/ic2/tile/solars/air/TileEntityAirSolar.java @@ -10,12 +10,12 @@ * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ -package tombenpotter.emt.common.module.ic2.tile.solars.air; +package tombenpotter.emt.common.modules.ic2.tile.solars.air; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import tombenpotter.emt.common.modules.ic2.blocks.IC2BlockRegistry; -import tombenpotter.emt.common.module.ic2.tile.solars.TileEntitySolarBase; +import tombenpotter.emt.common.modules.ic2.tile.solars.TileEntitySolarBase; import tombenpotter.emt.common.util.ConfigHandler; public class TileEntityAirSolar extends TileEntitySolarBase { diff --git a/src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/air/TileEntityDoubleAirSolar.java b/src/main/java/tombenpotter/emt/common/modules/ic2/tile/solars/air/TileEntityDoubleAirSolar.java similarity index 95% rename from src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/air/TileEntityDoubleAirSolar.java rename to src/main/java/tombenpotter/emt/common/modules/ic2/tile/solars/air/TileEntityDoubleAirSolar.java index 193f6a3..e251c65 100644 --- a/src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/air/TileEntityDoubleAirSolar.java +++ b/src/main/java/tombenpotter/emt/common/modules/ic2/tile/solars/air/TileEntityDoubleAirSolar.java @@ -10,7 +10,7 @@ * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ -package tombenpotter.emt.common.module.ic2.tile.solars.air; +package tombenpotter.emt.common.modules.ic2.tile.solars.air; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; diff --git a/src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/air/TileEntityTripleAirSolar.java b/src/main/java/tombenpotter/emt/common/modules/ic2/tile/solars/air/TileEntityTripleAirSolar.java similarity index 95% rename from src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/air/TileEntityTripleAirSolar.java rename to src/main/java/tombenpotter/emt/common/modules/ic2/tile/solars/air/TileEntityTripleAirSolar.java index 8749197..e055998 100644 --- a/src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/air/TileEntityTripleAirSolar.java +++ b/src/main/java/tombenpotter/emt/common/modules/ic2/tile/solars/air/TileEntityTripleAirSolar.java @@ -10,7 +10,7 @@ * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ -package tombenpotter.emt.common.module.ic2.tile.solars.air; +package tombenpotter.emt.common.modules.ic2.tile.solars.air; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; diff --git a/src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/compressed/TileEntityCompressedSolar.java b/src/main/java/tombenpotter/emt/common/modules/ic2/tile/solars/compressed/TileEntityCompressedSolar.java similarity index 89% rename from src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/compressed/TileEntityCompressedSolar.java rename to src/main/java/tombenpotter/emt/common/modules/ic2/tile/solars/compressed/TileEntityCompressedSolar.java index cc4fd99..abac9f1 100644 --- a/src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/compressed/TileEntityCompressedSolar.java +++ b/src/main/java/tombenpotter/emt/common/modules/ic2/tile/solars/compressed/TileEntityCompressedSolar.java @@ -10,12 +10,12 @@ * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ -package tombenpotter.emt.common.module.ic2.tile.solars.compressed; +package tombenpotter.emt.common.modules.ic2.tile.solars.compressed; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import tombenpotter.emt.common.modules.ic2.blocks.IC2BlockRegistry; -import tombenpotter.emt.common.module.ic2.tile.solars.TileEntitySolarBase; +import tombenpotter.emt.common.modules.ic2.tile.solars.TileEntitySolarBase; import tombenpotter.emt.common.util.ConfigHandler; public class TileEntityCompressedSolar extends TileEntitySolarBase { diff --git a/src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/compressed/TileEntityDoubleCompressedSolar.java b/src/main/java/tombenpotter/emt/common/modules/ic2/tile/solars/compressed/TileEntityDoubleCompressedSolar.java similarity index 89% rename from src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/compressed/TileEntityDoubleCompressedSolar.java rename to src/main/java/tombenpotter/emt/common/modules/ic2/tile/solars/compressed/TileEntityDoubleCompressedSolar.java index e2c1d0d..667dc0a 100644 --- a/src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/compressed/TileEntityDoubleCompressedSolar.java +++ b/src/main/java/tombenpotter/emt/common/modules/ic2/tile/solars/compressed/TileEntityDoubleCompressedSolar.java @@ -10,12 +10,12 @@ * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ -package tombenpotter.emt.common.module.ic2.tile.solars.compressed; +package tombenpotter.emt.common.modules.ic2.tile.solars.compressed; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import tombenpotter.emt.common.modules.ic2.blocks.IC2BlockRegistry; -import tombenpotter.emt.common.module.ic2.tile.solars.TileEntitySolarBase; +import tombenpotter.emt.common.modules.ic2.tile.solars.TileEntitySolarBase; import tombenpotter.emt.common.util.ConfigHandler; public class TileEntityDoubleCompressedSolar extends TileEntitySolarBase { diff --git a/src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/compressed/TileEntityTripleCompressedSolar.java b/src/main/java/tombenpotter/emt/common/modules/ic2/tile/solars/compressed/TileEntityTripleCompressedSolar.java similarity index 89% rename from src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/compressed/TileEntityTripleCompressedSolar.java rename to src/main/java/tombenpotter/emt/common/modules/ic2/tile/solars/compressed/TileEntityTripleCompressedSolar.java index b1dca48..6951560 100644 --- a/src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/compressed/TileEntityTripleCompressedSolar.java +++ b/src/main/java/tombenpotter/emt/common/modules/ic2/tile/solars/compressed/TileEntityTripleCompressedSolar.java @@ -10,12 +10,12 @@ * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ -package tombenpotter.emt.common.module.ic2.tile.solars.compressed; +package tombenpotter.emt.common.modules.ic2.tile.solars.compressed; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import tombenpotter.emt.common.modules.ic2.blocks.IC2BlockRegistry; -import tombenpotter.emt.common.module.ic2.tile.solars.TileEntitySolarBase; +import tombenpotter.emt.common.modules.ic2.tile.solars.TileEntitySolarBase; import tombenpotter.emt.common.util.ConfigHandler; public class TileEntityTripleCompressedSolar extends TileEntitySolarBase { diff --git a/src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/dark/TileEntityDarkSolar.java b/src/main/java/tombenpotter/emt/common/modules/ic2/tile/solars/dark/TileEntityDarkSolar.java similarity index 91% rename from src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/dark/TileEntityDarkSolar.java rename to src/main/java/tombenpotter/emt/common/modules/ic2/tile/solars/dark/TileEntityDarkSolar.java index 7582c7a..d0f7e87 100644 --- a/src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/dark/TileEntityDarkSolar.java +++ b/src/main/java/tombenpotter/emt/common/modules/ic2/tile/solars/dark/TileEntityDarkSolar.java @@ -10,12 +10,12 @@ * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ -package tombenpotter.emt.common.module.ic2.tile.solars.dark; +package tombenpotter.emt.common.modules.ic2.tile.solars.dark; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import tombenpotter.emt.common.modules.ic2.blocks.IC2BlockRegistry; -import tombenpotter.emt.common.module.ic2.tile.solars.TileEntitySolarBase; +import tombenpotter.emt.common.modules.ic2.tile.solars.TileEntitySolarBase; import tombenpotter.emt.common.util.ConfigHandler; public class TileEntityDarkSolar extends TileEntitySolarBase { diff --git a/src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/dark/TileEntityDoubleDarkSolar.java b/src/main/java/tombenpotter/emt/common/modules/ic2/tile/solars/dark/TileEntityDoubleDarkSolar.java similarity index 95% rename from src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/dark/TileEntityDoubleDarkSolar.java rename to src/main/java/tombenpotter/emt/common/modules/ic2/tile/solars/dark/TileEntityDoubleDarkSolar.java index c2fcf39..71da59d 100644 --- a/src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/dark/TileEntityDoubleDarkSolar.java +++ b/src/main/java/tombenpotter/emt/common/modules/ic2/tile/solars/dark/TileEntityDoubleDarkSolar.java @@ -10,7 +10,7 @@ * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ -package tombenpotter.emt.common.module.ic2.tile.solars.dark; +package tombenpotter.emt.common.modules.ic2.tile.solars.dark; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; diff --git a/src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/dark/TileEntityTripleDarkSolar.java b/src/main/java/tombenpotter/emt/common/modules/ic2/tile/solars/dark/TileEntityTripleDarkSolar.java similarity index 95% rename from src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/dark/TileEntityTripleDarkSolar.java rename to src/main/java/tombenpotter/emt/common/modules/ic2/tile/solars/dark/TileEntityTripleDarkSolar.java index 436363b..c3d0953 100644 --- a/src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/dark/TileEntityTripleDarkSolar.java +++ b/src/main/java/tombenpotter/emt/common/modules/ic2/tile/solars/dark/TileEntityTripleDarkSolar.java @@ -10,7 +10,7 @@ * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ -package tombenpotter.emt.common.module.ic2.tile.solars.dark; +package tombenpotter.emt.common.modules.ic2.tile.solars.dark; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; diff --git a/src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/earth/TileEntityDoubleEarthSolar.java b/src/main/java/tombenpotter/emt/common/modules/ic2/tile/solars/earth/TileEntityDoubleEarthSolar.java similarity index 95% rename from src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/earth/TileEntityDoubleEarthSolar.java rename to src/main/java/tombenpotter/emt/common/modules/ic2/tile/solars/earth/TileEntityDoubleEarthSolar.java index ff2abe0..5a30c3d 100644 --- a/src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/earth/TileEntityDoubleEarthSolar.java +++ b/src/main/java/tombenpotter/emt/common/modules/ic2/tile/solars/earth/TileEntityDoubleEarthSolar.java @@ -10,7 +10,7 @@ * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ -package tombenpotter.emt.common.module.ic2.tile.solars.earth; +package tombenpotter.emt.common.modules.ic2.tile.solars.earth; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; diff --git a/src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/earth/TileEntityEarthSolar.java b/src/main/java/tombenpotter/emt/common/modules/ic2/tile/solars/earth/TileEntityEarthSolar.java similarity index 91% rename from src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/earth/TileEntityEarthSolar.java rename to src/main/java/tombenpotter/emt/common/modules/ic2/tile/solars/earth/TileEntityEarthSolar.java index 7de4495..c266aeb 100644 --- a/src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/earth/TileEntityEarthSolar.java +++ b/src/main/java/tombenpotter/emt/common/modules/ic2/tile/solars/earth/TileEntityEarthSolar.java @@ -10,12 +10,12 @@ * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ -package tombenpotter.emt.common.module.ic2.tile.solars.earth; +package tombenpotter.emt.common.modules.ic2.tile.solars.earth; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import tombenpotter.emt.common.modules.ic2.blocks.IC2BlockRegistry; -import tombenpotter.emt.common.module.ic2.tile.solars.TileEntitySolarBase; +import tombenpotter.emt.common.modules.ic2.tile.solars.TileEntitySolarBase; import tombenpotter.emt.common.util.ConfigHandler; public class TileEntityEarthSolar extends TileEntitySolarBase { diff --git a/src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/earth/TileEntityTripleEarthSolar.java b/src/main/java/tombenpotter/emt/common/modules/ic2/tile/solars/earth/TileEntityTripleEarthSolar.java similarity index 95% rename from src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/earth/TileEntityTripleEarthSolar.java rename to src/main/java/tombenpotter/emt/common/modules/ic2/tile/solars/earth/TileEntityTripleEarthSolar.java index 4c281dc..bf7993e 100644 --- a/src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/earth/TileEntityTripleEarthSolar.java +++ b/src/main/java/tombenpotter/emt/common/modules/ic2/tile/solars/earth/TileEntityTripleEarthSolar.java @@ -10,7 +10,7 @@ * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ -package tombenpotter.emt.common.module.ic2.tile.solars.earth; +package tombenpotter.emt.common.modules.ic2.tile.solars.earth; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; diff --git a/src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/fire/TileEntityDoubleFireSolar.java b/src/main/java/tombenpotter/emt/common/modules/ic2/tile/solars/fire/TileEntityDoubleFireSolar.java similarity index 95% rename from src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/fire/TileEntityDoubleFireSolar.java rename to src/main/java/tombenpotter/emt/common/modules/ic2/tile/solars/fire/TileEntityDoubleFireSolar.java index 6cc6d12..f6e57dd 100644 --- a/src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/fire/TileEntityDoubleFireSolar.java +++ b/src/main/java/tombenpotter/emt/common/modules/ic2/tile/solars/fire/TileEntityDoubleFireSolar.java @@ -10,7 +10,7 @@ * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ -package tombenpotter.emt.common.module.ic2.tile.solars.fire; +package tombenpotter.emt.common.modules.ic2.tile.solars.fire; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; diff --git a/src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/fire/TileEntityFireSolar.java b/src/main/java/tombenpotter/emt/common/modules/ic2/tile/solars/fire/TileEntityFireSolar.java similarity index 92% rename from src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/fire/TileEntityFireSolar.java rename to src/main/java/tombenpotter/emt/common/modules/ic2/tile/solars/fire/TileEntityFireSolar.java index 906e983..47ec993 100644 --- a/src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/fire/TileEntityFireSolar.java +++ b/src/main/java/tombenpotter/emt/common/modules/ic2/tile/solars/fire/TileEntityFireSolar.java @@ -10,12 +10,12 @@ * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ -package tombenpotter.emt.common.module.ic2.tile.solars.fire; +package tombenpotter.emt.common.modules.ic2.tile.solars.fire; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import tombenpotter.emt.common.modules.ic2.blocks.IC2BlockRegistry; -import tombenpotter.emt.common.module.ic2.tile.solars.TileEntitySolarBase; +import tombenpotter.emt.common.modules.ic2.tile.solars.TileEntitySolarBase; import tombenpotter.emt.common.util.ConfigHandler; public class TileEntityFireSolar extends TileEntitySolarBase { diff --git a/src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/fire/TileEntityTripleFireSolar.java b/src/main/java/tombenpotter/emt/common/modules/ic2/tile/solars/fire/TileEntityTripleFireSolar.java similarity index 95% rename from src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/fire/TileEntityTripleFireSolar.java rename to src/main/java/tombenpotter/emt/common/modules/ic2/tile/solars/fire/TileEntityTripleFireSolar.java index 9e75486..5646d1d 100644 --- a/src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/fire/TileEntityTripleFireSolar.java +++ b/src/main/java/tombenpotter/emt/common/modules/ic2/tile/solars/fire/TileEntityTripleFireSolar.java @@ -10,7 +10,7 @@ * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ -package tombenpotter.emt.common.module.ic2.tile.solars.fire; +package tombenpotter.emt.common.modules.ic2.tile.solars.fire; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; diff --git a/src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/order/TileEntityDoubleOrderSolar.java b/src/main/java/tombenpotter/emt/common/modules/ic2/tile/solars/order/TileEntityDoubleOrderSolar.java similarity index 95% rename from src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/order/TileEntityDoubleOrderSolar.java rename to src/main/java/tombenpotter/emt/common/modules/ic2/tile/solars/order/TileEntityDoubleOrderSolar.java index 6eff7ce..50a8f77 100644 --- a/src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/order/TileEntityDoubleOrderSolar.java +++ b/src/main/java/tombenpotter/emt/common/modules/ic2/tile/solars/order/TileEntityDoubleOrderSolar.java @@ -10,7 +10,7 @@ * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ -package tombenpotter.emt.common.module.ic2.tile.solars.order; +package tombenpotter.emt.common.modules.ic2.tile.solars.order; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; diff --git a/src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/order/TileEntityOrderSolar.java b/src/main/java/tombenpotter/emt/common/modules/ic2/tile/solars/order/TileEntityOrderSolar.java similarity index 90% rename from src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/order/TileEntityOrderSolar.java rename to src/main/java/tombenpotter/emt/common/modules/ic2/tile/solars/order/TileEntityOrderSolar.java index 0c8270d..7e28118 100644 --- a/src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/order/TileEntityOrderSolar.java +++ b/src/main/java/tombenpotter/emt/common/modules/ic2/tile/solars/order/TileEntityOrderSolar.java @@ -10,12 +10,12 @@ * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ -package tombenpotter.emt.common.module.ic2.tile.solars.order; +package tombenpotter.emt.common.modules.ic2.tile.solars.order; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import tombenpotter.emt.common.modules.ic2.blocks.IC2BlockRegistry; -import tombenpotter.emt.common.module.ic2.tile.solars.TileEntitySolarBase; +import tombenpotter.emt.common.modules.ic2.tile.solars.TileEntitySolarBase; import tombenpotter.emt.common.util.ConfigHandler; public class TileEntityOrderSolar extends TileEntitySolarBase { diff --git a/src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/order/TileEntityTripleOrderSolar.java b/src/main/java/tombenpotter/emt/common/modules/ic2/tile/solars/order/TileEntityTripleOrderSolar.java similarity index 95% rename from src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/order/TileEntityTripleOrderSolar.java rename to src/main/java/tombenpotter/emt/common/modules/ic2/tile/solars/order/TileEntityTripleOrderSolar.java index 6045bae..8fa8405 100644 --- a/src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/order/TileEntityTripleOrderSolar.java +++ b/src/main/java/tombenpotter/emt/common/modules/ic2/tile/solars/order/TileEntityTripleOrderSolar.java @@ -10,7 +10,7 @@ * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ -package tombenpotter.emt.common.module.ic2.tile.solars.order; +package tombenpotter.emt.common.modules.ic2.tile.solars.order; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; diff --git a/src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/water/TileEntityDoubleWaterSolar.java b/src/main/java/tombenpotter/emt/common/modules/ic2/tile/solars/water/TileEntityDoubleWaterSolar.java similarity index 95% rename from src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/water/TileEntityDoubleWaterSolar.java rename to src/main/java/tombenpotter/emt/common/modules/ic2/tile/solars/water/TileEntityDoubleWaterSolar.java index 4b4b1f4..a31427c 100644 --- a/src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/water/TileEntityDoubleWaterSolar.java +++ b/src/main/java/tombenpotter/emt/common/modules/ic2/tile/solars/water/TileEntityDoubleWaterSolar.java @@ -10,7 +10,7 @@ * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ -package tombenpotter.emt.common.module.ic2.tile.solars.water; +package tombenpotter.emt.common.modules.ic2.tile.solars.water; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; diff --git a/src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/water/TileEntityTripleWaterSolar.java b/src/main/java/tombenpotter/emt/common/modules/ic2/tile/solars/water/TileEntityTripleWaterSolar.java similarity index 95% rename from src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/water/TileEntityTripleWaterSolar.java rename to src/main/java/tombenpotter/emt/common/modules/ic2/tile/solars/water/TileEntityTripleWaterSolar.java index 2b17429..47e9cf2 100644 --- a/src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/water/TileEntityTripleWaterSolar.java +++ b/src/main/java/tombenpotter/emt/common/modules/ic2/tile/solars/water/TileEntityTripleWaterSolar.java @@ -10,7 +10,7 @@ * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ -package tombenpotter.emt.common.module.ic2.tile.solars.water; +package tombenpotter.emt.common.modules.ic2.tile.solars.water; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; diff --git a/src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/water/TileEntityWaterSolar.java b/src/main/java/tombenpotter/emt/common/modules/ic2/tile/solars/water/TileEntityWaterSolar.java similarity index 91% rename from src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/water/TileEntityWaterSolar.java rename to src/main/java/tombenpotter/emt/common/modules/ic2/tile/solars/water/TileEntityWaterSolar.java index 24e56dc..25f2ff3 100644 --- a/src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/water/TileEntityWaterSolar.java +++ b/src/main/java/tombenpotter/emt/common/modules/ic2/tile/solars/water/TileEntityWaterSolar.java @@ -10,12 +10,12 @@ * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ -package tombenpotter.emt.common.module.ic2.tile.solars.water; +package tombenpotter.emt.common.modules.ic2.tile.solars.water; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import tombenpotter.emt.common.modules.ic2.blocks.IC2BlockRegistry; -import tombenpotter.emt.common.module.ic2.tile.solars.TileEntitySolarBase; +import tombenpotter.emt.common.modules.ic2.tile.solars.TileEntitySolarBase; import tombenpotter.emt.common.util.ConfigHandler; public class TileEntityWaterSolar extends TileEntitySolarBase { diff --git a/src/main/java/tombenpotter/emt/proxies/CommonProxy.java b/src/main/java/tombenpotter/emt/proxies/CommonProxy.java index 6532869..ebc0d98 100644 --- a/src/main/java/tombenpotter/emt/proxies/CommonProxy.java +++ b/src/main/java/tombenpotter/emt/proxies/CommonProxy.java @@ -20,8 +20,8 @@ import tombenpotter.emt.client.gui.GuiEtherealMacerator; import tombenpotter.emt.client.gui.GuiIndustrialWandRecharger; import tombenpotter.emt.client.gui.container.ContainerEtheralMacerator; import tombenpotter.emt.client.gui.container.ContainerIndustrialWandRecharge; -import tombenpotter.emt.common.module.ic2.tile.TileEntityEtherealMacerator; -import tombenpotter.emt.common.module.ic2.tile.TileEntityIndustrialWandRecharge; +import tombenpotter.emt.common.modules.ic2.tile.TileEntityEtherealMacerator; +import tombenpotter.emt.common.modules.ic2.tile.TileEntityIndustrialWandRecharge; public class CommonProxy implements IGuiHandler { diff --git a/src/main/resources/assets/electromagictools/lang/en_US.lang b/src/main/resources/assets/electromagictools/lang/en_US.lang index e445ef9..e4a9b74 100644 --- a/src/main/resources/assets/electromagictools/lang/en_US.lang +++ b/src/main/resources/assets/electromagictools/lang/en_US.lang @@ -186,7 +186,7 @@ tile.EMT.emtsolars.compressed.name=Compressed Solar Panel tile.EMT.emtsolars.doublecompressed.name=Double Compressed Solar Panel tile.EMT.emtsolars.triplecompressed.name=Triple Compressed Solar Panel tile.EMT.emtsolars.water.name=Water Infused Compressed Solar Panel -tile.EMT.emtsolars.doublewater.name=Water Infused DoubleCompressed Solar Panel +tile.EMT.emtsolars.doublewater.name=Water Infused Double Compressed Solar Panel tile.EMT.emtsolars.triplewater.name=Water Infused Triple Compressed Solar Panel tile.EMT.emtsolars.dark.name=Entropy Infused Compressed Solar Panel tile.EMT.emtsolars.doubledark.name=Entropy Double Infused Compressed Solar Panel