From 3badd4a9661f0ac699e67951652b109ce17f148a Mon Sep 17 00:00:00 2001 From: Calclavia Date: Wed, 8 Jan 2014 20:03:25 +0800 Subject: [PATCH] Separated into modules --- .../java/resonantinduction/ClientProxy.java | 16 +++---- .../java/resonantinduction/CommonProxy.java | 4 +- .../java/resonantinduction/MultipartRI.java | 12 +++--- .../resonantinduction/ResonantInduction.java | 42 +++++++++---------- .../multimeter/ContainerMultimeter.java | 2 +- .../multimeter/ItemMultimeter.java | 4 +- .../multimeter/PartMultimeter.java | 2 +- .../multimeter/RenderMultimeter.java | 4 +- .../core/render/BlockRenderingHandler.java | 8 ++-- .../core/render/RenderRIItem.java | 8 ++-- .../{transport => energy}/ILinkable.java | 2 +- .../{transport => energy}/LinkEvent.java | 2 +- .../battery/BatteryStructure.java | 2 +- .../battery/BlockBattery.java | 2 +- .../battery/ItemBlockBattery.java | 2 +- .../battery/RenderBattery.java | 2 +- .../battery/TileBattery.java | 2 +- .../fx/FXElectricBolt.java | 2 +- .../gui/GuiMultimeter.java | 6 +-- .../model/ModelBattery.java | 2 +- .../model/ModelEMContractor.java | 2 +- .../model/ModelInsulation.java | 2 +- .../model/ModelMultimeter.java | 2 +- .../model/ModelTeslaBottom.java | 2 +- .../model/ModelTeslaMiddle.java | 2 +- .../model/ModelTeslaTop.java | 2 +- .../model/ModelWire.java | 2 +- .../tesla/BlockTesla.java | 2 +- .../tesla/RenderTesla.java | 8 ++-- .../tesla/TeslaGrid.java | 2 +- .../tesla/TileTesla.java | 4 +- .../transformer/ItemTransformer.java | 4 +- .../transformer/ModelTransformer.java | 2 +- .../transformer/PartTransformer.java | 2 +- .../transformer/RenderTransformer.java | 2 +- .../wire/EnumWireMaterial.java | 2 +- .../{transport => energy}/wire/ItemWire.java | 10 ++--- .../wire/PartAdvancedWire.java | 2 +- .../wire/PartConductor.java | 2 +- .../wire/flat/PartFlatSwitchWire.java | 2 +- .../wire/flat/PartFlatWire.java | 6 +-- .../wire/flat/RenderFlatWire.java | 2 +- .../wire/framed/PartFramedSwitchWire.java | 2 +- .../wire/framed/PartFramedWire.java | 6 +-- .../wire/framed/RenderPartWire.java | 2 +- .../wire/trait/TraitConductor.java | 2 +- .../wire/trait/TraitEnergyHandler.java | 4 +- .../wire/trait/TraitEnergySink.java | 2 +- .../BlockMachinePart.java | 2 +- .../furnace/BlockAdvancedFurnace.java | 2 +- .../furnace/TileAdvancedFurnace.java | 2 +- .../grinder/BlockGrinderWheel.java | 2 +- .../grinder/TileGrinderWheel.java | 2 +- .../grinder/TilePurifier.java | 4 +- .../{machine => mechanics}/item/ItemDust.java | 2 +- .../liquid/BlockFluidMixture.java | 2 +- .../liquid/TileFluidMixture.java | 2 +- .../purifier/BlockPurifier.java | 4 +- .../transport/levitator/RenderLevitator.java | 2 +- .../transport/levitator/TileEMLevitator.java | 4 +- 60 files changed, 119 insertions(+), 121 deletions(-) rename src/main/java/resonantinduction/{utility => core}/multimeter/ContainerMultimeter.java (96%) rename src/main/java/resonantinduction/{utility => core}/multimeter/ItemMultimeter.java (96%) rename src/main/java/resonantinduction/{utility => core}/multimeter/PartMultimeter.java (99%) rename src/main/java/resonantinduction/{utility => core}/multimeter/RenderMultimeter.java (97%) rename src/main/java/resonantinduction/{transport => energy}/ILinkable.java (89%) rename src/main/java/resonantinduction/{transport => energy}/LinkEvent.java (98%) rename src/main/java/resonantinduction/{transport => energy}/battery/BatteryStructure.java (96%) rename src/main/java/resonantinduction/{transport => energy}/battery/BlockBattery.java (98%) rename src/main/java/resonantinduction/{transport => energy}/battery/ItemBlockBattery.java (99%) rename src/main/java/resonantinduction/{transport => energy}/battery/RenderBattery.java (96%) rename src/main/java/resonantinduction/{transport => energy}/battery/TileBattery.java (99%) rename src/main/java/resonantinduction/{transport => energy}/fx/FXElectricBolt.java (99%) rename src/main/java/resonantinduction/{transport => energy}/gui/GuiMultimeter.java (95%) rename src/main/java/resonantinduction/{transport => energy}/model/ModelBattery.java (99%) rename src/main/java/resonantinduction/{transport => energy}/model/ModelEMContractor.java (99%) rename src/main/java/resonantinduction/{transport => energy}/model/ModelInsulation.java (99%) rename src/main/java/resonantinduction/{transport => energy}/model/ModelMultimeter.java (97%) rename src/main/java/resonantinduction/{transport => energy}/model/ModelTeslaBottom.java (99%) rename src/main/java/resonantinduction/{transport => energy}/model/ModelTeslaMiddle.java (99%) rename src/main/java/resonantinduction/{transport => energy}/model/ModelTeslaTop.java (99%) rename src/main/java/resonantinduction/{transport => energy}/model/ModelWire.java (98%) rename src/main/java/resonantinduction/{transport => energy}/tesla/BlockTesla.java (98%) rename src/main/java/resonantinduction/{transport => energy}/tesla/RenderTesla.java (88%) rename src/main/java/resonantinduction/{transport => energy}/tesla/TeslaGrid.java (96%) rename src/main/java/resonantinduction/{transport => energy}/tesla/TileTesla.java (99%) rename src/main/java/resonantinduction/{transport => energy}/transformer/ItemTransformer.java (89%) rename src/main/java/resonantinduction/{transport => energy}/transformer/ModelTransformer.java (98%) rename src/main/java/resonantinduction/{transport => energy}/transformer/PartTransformer.java (99%) rename src/main/java/resonantinduction/{transport => energy}/transformer/RenderTransformer.java (99%) rename src/main/java/resonantinduction/{transport => energy}/wire/EnumWireMaterial.java (97%) rename src/main/java/resonantinduction/{transport => energy}/wire/ItemWire.java (94%) rename src/main/java/resonantinduction/{transport => energy}/wire/PartAdvancedWire.java (99%) rename src/main/java/resonantinduction/{transport => energy}/wire/PartConductor.java (98%) rename src/main/java/resonantinduction/{transport => energy}/wire/flat/PartFlatSwitchWire.java (97%) rename src/main/java/resonantinduction/{transport => energy}/wire/flat/PartFlatWire.java (99%) rename src/main/java/resonantinduction/{transport => energy}/wire/flat/RenderFlatWire.java (99%) rename src/main/java/resonantinduction/{transport => energy}/wire/framed/PartFramedSwitchWire.java (98%) rename src/main/java/resonantinduction/{transport => energy}/wire/framed/PartFramedWire.java (98%) rename src/main/java/resonantinduction/{transport => energy}/wire/framed/RenderPartWire.java (99%) rename src/main/java/resonantinduction/{transport => energy}/wire/trait/TraitConductor.java (98%) rename src/main/java/resonantinduction/{transport => energy}/wire/trait/TraitEnergyHandler.java (97%) rename src/main/java/resonantinduction/{transport => energy}/wire/trait/TraitEnergySink.java (98%) rename src/main/java/resonantinduction/{machine => mechanics}/BlockMachinePart.java (88%) rename src/main/java/resonantinduction/{machine => mechanics}/furnace/BlockAdvancedFurnace.java (98%) rename src/main/java/resonantinduction/{machine => mechanics}/furnace/TileAdvancedFurnace.java (99%) rename src/main/java/resonantinduction/{machine => mechanics}/grinder/BlockGrinderWheel.java (98%) rename src/main/java/resonantinduction/{machine => mechanics}/grinder/TileGrinderWheel.java (98%) rename src/main/java/resonantinduction/{machine => mechanics}/grinder/TilePurifier.java (97%) rename src/main/java/resonantinduction/{machine => mechanics}/item/ItemDust.java (99%) rename src/main/java/resonantinduction/{machine => mechanics}/liquid/BlockFluidMixture.java (97%) rename src/main/java/resonantinduction/{machine => mechanics}/liquid/TileFluidMixture.java (97%) rename src/main/java/resonantinduction/{machine => mechanics}/purifier/BlockPurifier.java (94%) diff --git a/src/main/java/resonantinduction/ClientProxy.java b/src/main/java/resonantinduction/ClientProxy.java index cb34716f..68d63e68 100644 --- a/src/main/java/resonantinduction/ClientProxy.java +++ b/src/main/java/resonantinduction/ClientProxy.java @@ -6,18 +6,18 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.client.MinecraftForgeClient; import net.minecraftforge.common.MinecraftForge; +import resonantinduction.core.multimeter.PartMultimeter; import resonantinduction.core.render.BlockRenderingHandler; import resonantinduction.core.render.RenderRIItem; -import resonantinduction.machine.item.ItemDust; -import resonantinduction.transport.battery.RenderBattery; -import resonantinduction.transport.battery.TileBattery; -import resonantinduction.transport.fx.FXElectricBolt; -import resonantinduction.transport.gui.GuiMultimeter; +import resonantinduction.energy.battery.RenderBattery; +import resonantinduction.energy.battery.TileBattery; +import resonantinduction.energy.fx.FXElectricBolt; +import resonantinduction.energy.gui.GuiMultimeter; +import resonantinduction.energy.tesla.RenderTesla; +import resonantinduction.energy.tesla.TileTesla; +import resonantinduction.mechanics.item.ItemDust; import resonantinduction.transport.levitator.RenderLevitator; import resonantinduction.transport.levitator.TileEMLevitator; -import resonantinduction.transport.tesla.RenderTesla; -import resonantinduction.transport.tesla.TileTesla; -import resonantinduction.utility.multimeter.PartMultimeter; import universalelectricity.api.vector.Vector3; import codechicken.multipart.TMultiPart; import codechicken.multipart.TileMultipart; diff --git a/src/main/java/resonantinduction/CommonProxy.java b/src/main/java/resonantinduction/CommonProxy.java index b468df6c..3d227079 100644 --- a/src/main/java/resonantinduction/CommonProxy.java +++ b/src/main/java/resonantinduction/CommonProxy.java @@ -6,8 +6,8 @@ package resonantinduction; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import resonantinduction.utility.multimeter.ContainerMultimeter; -import resonantinduction.utility.multimeter.PartMultimeter; +import resonantinduction.core.multimeter.ContainerMultimeter; +import resonantinduction.core.multimeter.PartMultimeter; import universalelectricity.api.vector.Vector3; import codechicken.lib.colour.ColourRGBA; import codechicken.multipart.TMultiPart; diff --git a/src/main/java/resonantinduction/MultipartRI.java b/src/main/java/resonantinduction/MultipartRI.java index 32127be3..cf7e3d6b 100644 --- a/src/main/java/resonantinduction/MultipartRI.java +++ b/src/main/java/resonantinduction/MultipartRI.java @@ -1,11 +1,11 @@ package resonantinduction; -import resonantinduction.transport.transformer.PartTransformer; -import resonantinduction.transport.wire.flat.PartFlatSwitchWire; -import resonantinduction.transport.wire.flat.PartFlatWire; -import resonantinduction.transport.wire.framed.PartFramedSwitchWire; -import resonantinduction.transport.wire.framed.PartFramedWire; -import resonantinduction.utility.multimeter.PartMultimeter; +import resonantinduction.core.multimeter.PartMultimeter; +import resonantinduction.energy.transformer.PartTransformer; +import resonantinduction.energy.wire.flat.PartFlatSwitchWire; +import resonantinduction.energy.wire.flat.PartFlatWire; +import resonantinduction.energy.wire.framed.PartFramedSwitchWire; +import resonantinduction.energy.wire.framed.PartFramedWire; import codechicken.multipart.MultiPartRegistry; import codechicken.multipart.MultiPartRegistry.IPartFactory; import codechicken.multipart.MultipartGenerator; diff --git a/src/main/java/resonantinduction/ResonantInduction.java b/src/main/java/resonantinduction/ResonantInduction.java index 4f836e9d..265bb1bb 100644 --- a/src/main/java/resonantinduction/ResonantInduction.java +++ b/src/main/java/resonantinduction/ResonantInduction.java @@ -26,29 +26,29 @@ import net.minecraftforge.oredict.ShapelessOreRecipe; import org.modstats.ModstatInfo; import org.modstats.Modstats; -import resonantinduction.machine.BlockMachinePart; -import resonantinduction.machine.furnace.BlockAdvancedFurnace; -import resonantinduction.machine.furnace.TileAdvancedFurnace; -import resonantinduction.machine.grinder.BlockGrinderWheel; -import resonantinduction.machine.grinder.TileGrinderWheel; -import resonantinduction.machine.grinder.TilePurifier; -import resonantinduction.machine.item.ItemDust; -import resonantinduction.machine.liquid.BlockFluidMixture; -import resonantinduction.machine.liquid.TileFluidMixture; -import resonantinduction.machine.purifier.BlockPurifier; -import resonantinduction.transport.LinkEvent; -import resonantinduction.transport.battery.BlockBattery; -import resonantinduction.transport.battery.ItemBlockBattery; -import resonantinduction.transport.battery.TileBattery; +import resonantinduction.core.multimeter.ItemMultimeter; +import resonantinduction.energy.LinkEvent; +import resonantinduction.energy.battery.BlockBattery; +import resonantinduction.energy.battery.ItemBlockBattery; +import resonantinduction.energy.battery.TileBattery; +import resonantinduction.energy.tesla.BlockTesla; +import resonantinduction.energy.tesla.TileTesla; +import resonantinduction.energy.transformer.ItemTransformer; +import resonantinduction.energy.wire.EnumWireMaterial; +import resonantinduction.energy.wire.ItemWire; +import resonantinduction.mechanics.BlockMachinePart; +import resonantinduction.mechanics.furnace.BlockAdvancedFurnace; +import resonantinduction.mechanics.furnace.TileAdvancedFurnace; +import resonantinduction.mechanics.grinder.BlockGrinderWheel; +import resonantinduction.mechanics.grinder.TileGrinderWheel; +import resonantinduction.mechanics.grinder.TilePurifier; +import resonantinduction.mechanics.item.ItemDust; +import resonantinduction.mechanics.liquid.BlockFluidMixture; +import resonantinduction.mechanics.liquid.TileFluidMixture; +import resonantinduction.mechanics.purifier.BlockPurifier; import resonantinduction.transport.levitator.BlockLevitator; import resonantinduction.transport.levitator.ItemBlockContractor; import resonantinduction.transport.levitator.TileEMLevitator; -import resonantinduction.transport.tesla.BlockTesla; -import resonantinduction.transport.tesla.TileTesla; -import resonantinduction.transport.transformer.ItemTransformer; -import resonantinduction.transport.wire.EnumWireMaterial; -import resonantinduction.transport.wire.ItemWire; -import resonantinduction.utility.multimeter.ItemMultimeter; import calclavia.lib.network.PacketHandler; import calclavia.lib.network.PacketTile; import calclavia.lib.recipe.UniversalRecipe; @@ -278,8 +278,6 @@ public class ResonantInduction metadata.autogenerated = false; MultipartRI.INSTANCE = new MultipartRI(); - - UniversalRecipe.init(); } @EventHandler diff --git a/src/main/java/resonantinduction/utility/multimeter/ContainerMultimeter.java b/src/main/java/resonantinduction/core/multimeter/ContainerMultimeter.java similarity index 96% rename from src/main/java/resonantinduction/utility/multimeter/ContainerMultimeter.java rename to src/main/java/resonantinduction/core/multimeter/ContainerMultimeter.java index 57c437f5..b82981eb 100644 --- a/src/main/java/resonantinduction/utility/multimeter/ContainerMultimeter.java +++ b/src/main/java/resonantinduction/core/multimeter/ContainerMultimeter.java @@ -1,7 +1,7 @@ /** * */ -package resonantinduction.utility.multimeter; +package resonantinduction.core.multimeter; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; diff --git a/src/main/java/resonantinduction/utility/multimeter/ItemMultimeter.java b/src/main/java/resonantinduction/core/multimeter/ItemMultimeter.java similarity index 96% rename from src/main/java/resonantinduction/utility/multimeter/ItemMultimeter.java rename to src/main/java/resonantinduction/core/multimeter/ItemMultimeter.java index 797fad22..b0469c90 100644 --- a/src/main/java/resonantinduction/utility/multimeter/ItemMultimeter.java +++ b/src/main/java/resonantinduction/core/multimeter/ItemMultimeter.java @@ -1,4 +1,4 @@ -package resonantinduction.utility.multimeter; +package resonantinduction.core.multimeter; import java.util.List; @@ -10,7 +10,7 @@ import net.minecraft.util.Icon; import net.minecraft.world.World; import net.minecraftforge.common.ForgeDirection; import resonantinduction.core.base.ItemMultipartBase; -import resonantinduction.transport.wire.EnumWireMaterial; +import resonantinduction.energy.wire.EnumWireMaterial; import codechicken.lib.vec.BlockCoord; import codechicken.lib.vec.Vector3; import codechicken.multipart.MultiPartRegistry; diff --git a/src/main/java/resonantinduction/utility/multimeter/PartMultimeter.java b/src/main/java/resonantinduction/core/multimeter/PartMultimeter.java similarity index 99% rename from src/main/java/resonantinduction/utility/multimeter/PartMultimeter.java rename to src/main/java/resonantinduction/core/multimeter/PartMultimeter.java index adcef89a..4f038fbe 100644 --- a/src/main/java/resonantinduction/utility/multimeter/PartMultimeter.java +++ b/src/main/java/resonantinduction/core/multimeter/PartMultimeter.java @@ -1,7 +1,7 @@ /** * */ -package resonantinduction.utility.multimeter; +package resonantinduction.core.multimeter; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/main/java/resonantinduction/utility/multimeter/RenderMultimeter.java b/src/main/java/resonantinduction/core/multimeter/RenderMultimeter.java similarity index 97% rename from src/main/java/resonantinduction/utility/multimeter/RenderMultimeter.java rename to src/main/java/resonantinduction/core/multimeter/RenderMultimeter.java index f13d118e..390db452 100644 --- a/src/main/java/resonantinduction/utility/multimeter/RenderMultimeter.java +++ b/src/main/java/resonantinduction/core/multimeter/RenderMultimeter.java @@ -1,4 +1,4 @@ -package resonantinduction.utility.multimeter; +package resonantinduction.core.multimeter; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; @@ -8,7 +8,7 @@ import net.minecraftforge.common.ForgeDirection; import org.lwjgl.opengl.GL11; import resonantinduction.ResonantInduction; -import resonantinduction.transport.model.ModelMultimeter; +import resonantinduction.energy.model.ModelMultimeter; import universalelectricity.api.energy.UnitDisplay; import universalelectricity.api.energy.UnitDisplay.Unit; import cpw.mods.fml.client.FMLClientHandler; diff --git a/src/main/java/resonantinduction/core/render/BlockRenderingHandler.java b/src/main/java/resonantinduction/core/render/BlockRenderingHandler.java index 367ab74e..ba4b93bc 100644 --- a/src/main/java/resonantinduction/core/render/BlockRenderingHandler.java +++ b/src/main/java/resonantinduction/core/render/BlockRenderingHandler.java @@ -6,12 +6,12 @@ package resonantinduction.core.render; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.world.IBlockAccess; -import resonantinduction.transport.battery.BlockBattery; -import resonantinduction.transport.battery.RenderBattery; +import resonantinduction.energy.battery.BlockBattery; +import resonantinduction.energy.battery.RenderBattery; +import resonantinduction.energy.tesla.BlockTesla; +import resonantinduction.energy.tesla.RenderTesla; import resonantinduction.transport.levitator.BlockLevitator; import resonantinduction.transport.levitator.RenderLevitator; -import resonantinduction.transport.tesla.BlockTesla; -import resonantinduction.transport.tesla.RenderTesla; import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.client.registry.RenderingRegistry; diff --git a/src/main/java/resonantinduction/core/render/RenderRIItem.java b/src/main/java/resonantinduction/core/render/RenderRIItem.java index ce086744..9b8e2d56 100644 --- a/src/main/java/resonantinduction/core/render/RenderRIItem.java +++ b/src/main/java/resonantinduction/core/render/RenderRIItem.java @@ -5,10 +5,10 @@ import net.minecraftforge.client.IItemRenderer; import org.lwjgl.opengl.GL11; -import resonantinduction.transport.transformer.ItemTransformer; -import resonantinduction.transport.transformer.RenderTransformer; -import resonantinduction.utility.multimeter.ItemMultimeter; -import resonantinduction.utility.multimeter.RenderMultimeter; +import resonantinduction.core.multimeter.ItemMultimeter; +import resonantinduction.core.multimeter.RenderMultimeter; +import resonantinduction.energy.transformer.ItemTransformer; +import resonantinduction.energy.transformer.RenderTransformer; import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/resonantinduction/transport/ILinkable.java b/src/main/java/resonantinduction/energy/ILinkable.java similarity index 89% rename from src/main/java/resonantinduction/transport/ILinkable.java rename to src/main/java/resonantinduction/energy/ILinkable.java index 45eac1ed..adb6e095 100644 --- a/src/main/java/resonantinduction/transport/ILinkable.java +++ b/src/main/java/resonantinduction/energy/ILinkable.java @@ -1,4 +1,4 @@ -package resonantinduction.transport; +package resonantinduction.energy; import net.minecraft.entity.player.EntityPlayer; import universalelectricity.api.vector.VectorWorld; diff --git a/src/main/java/resonantinduction/transport/LinkEvent.java b/src/main/java/resonantinduction/energy/LinkEvent.java similarity index 98% rename from src/main/java/resonantinduction/transport/LinkEvent.java rename to src/main/java/resonantinduction/energy/LinkEvent.java index 54691e21..74d3e233 100644 --- a/src/main/java/resonantinduction/transport/LinkEvent.java +++ b/src/main/java/resonantinduction/energy/LinkEvent.java @@ -1,7 +1,7 @@ /** * */ -package resonantinduction.transport; +package resonantinduction.energy; import codechicken.multipart.ControlKeyModifer; import net.minecraft.item.ItemStack; diff --git a/src/main/java/resonantinduction/transport/battery/BatteryStructure.java b/src/main/java/resonantinduction/energy/battery/BatteryStructure.java similarity index 96% rename from src/main/java/resonantinduction/transport/battery/BatteryStructure.java rename to src/main/java/resonantinduction/energy/battery/BatteryStructure.java index 3fba1917..d44d587c 100644 --- a/src/main/java/resonantinduction/transport/battery/BatteryStructure.java +++ b/src/main/java/resonantinduction/energy/battery/BatteryStructure.java @@ -1,4 +1,4 @@ -package resonantinduction.transport.battery; +package resonantinduction.energy.battery; import java.util.Arrays; diff --git a/src/main/java/resonantinduction/transport/battery/BlockBattery.java b/src/main/java/resonantinduction/energy/battery/BlockBattery.java similarity index 98% rename from src/main/java/resonantinduction/transport/battery/BlockBattery.java rename to src/main/java/resonantinduction/energy/battery/BlockBattery.java index 5341d207..6de7adf7 100644 --- a/src/main/java/resonantinduction/transport/battery/BlockBattery.java +++ b/src/main/java/resonantinduction/energy/battery/BlockBattery.java @@ -1,7 +1,7 @@ /** * */ -package resonantinduction.transport.battery; +package resonantinduction.energy.battery; import net.minecraft.block.ITileEntityProvider; import net.minecraft.entity.EntityLivingBase; diff --git a/src/main/java/resonantinduction/transport/battery/ItemBlockBattery.java b/src/main/java/resonantinduction/energy/battery/ItemBlockBattery.java similarity index 99% rename from src/main/java/resonantinduction/transport/battery/ItemBlockBattery.java rename to src/main/java/resonantinduction/energy/battery/ItemBlockBattery.java index e5d2b593..72d827f2 100644 --- a/src/main/java/resonantinduction/transport/battery/ItemBlockBattery.java +++ b/src/main/java/resonantinduction/energy/battery/ItemBlockBattery.java @@ -1,4 +1,4 @@ -package resonantinduction.transport.battery; +package resonantinduction.energy.battery; import java.util.List; diff --git a/src/main/java/resonantinduction/transport/battery/RenderBattery.java b/src/main/java/resonantinduction/energy/battery/RenderBattery.java similarity index 96% rename from src/main/java/resonantinduction/transport/battery/RenderBattery.java rename to src/main/java/resonantinduction/energy/battery/RenderBattery.java index f41e94ad..c8981a65 100644 --- a/src/main/java/resonantinduction/transport/battery/RenderBattery.java +++ b/src/main/java/resonantinduction/energy/battery/RenderBattery.java @@ -1,7 +1,7 @@ /** * */ -package resonantinduction.transport.battery; +package resonantinduction.energy.battery; import static org.lwjgl.opengl.GL11.glPopMatrix; import static org.lwjgl.opengl.GL11.glPushMatrix; diff --git a/src/main/java/resonantinduction/transport/battery/TileBattery.java b/src/main/java/resonantinduction/energy/battery/TileBattery.java similarity index 99% rename from src/main/java/resonantinduction/transport/battery/TileBattery.java rename to src/main/java/resonantinduction/energy/battery/TileBattery.java index 4a38ba8d..655e4cc7 100644 --- a/src/main/java/resonantinduction/transport/battery/TileBattery.java +++ b/src/main/java/resonantinduction/energy/battery/TileBattery.java @@ -1,4 +1,4 @@ -package resonantinduction.transport.battery; +package resonantinduction.energy.battery; import java.util.ArrayList; import java.util.EnumSet; diff --git a/src/main/java/resonantinduction/transport/fx/FXElectricBolt.java b/src/main/java/resonantinduction/energy/fx/FXElectricBolt.java similarity index 99% rename from src/main/java/resonantinduction/transport/fx/FXElectricBolt.java rename to src/main/java/resonantinduction/energy/fx/FXElectricBolt.java index 44023ebb..0344921c 100644 --- a/src/main/java/resonantinduction/transport/fx/FXElectricBolt.java +++ b/src/main/java/resonantinduction/energy/fx/FXElectricBolt.java @@ -1,4 +1,4 @@ -package resonantinduction.transport.fx; +package resonantinduction.energy.fx; import static org.lwjgl.opengl.GL11.GL_BLEND; import static org.lwjgl.opengl.GL11.GL_ONE_MINUS_SRC_ALPHA; diff --git a/src/main/java/resonantinduction/transport/gui/GuiMultimeter.java b/src/main/java/resonantinduction/energy/gui/GuiMultimeter.java similarity index 95% rename from src/main/java/resonantinduction/transport/gui/GuiMultimeter.java rename to src/main/java/resonantinduction/energy/gui/GuiMultimeter.java index 5642fc72..ac6c36ad 100644 --- a/src/main/java/resonantinduction/transport/gui/GuiMultimeter.java +++ b/src/main/java/resonantinduction/energy/gui/GuiMultimeter.java @@ -1,15 +1,15 @@ /** * */ -package resonantinduction.transport.gui; +package resonantinduction.energy.gui; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiTextField; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; import resonantinduction.ResonantInduction; -import resonantinduction.utility.multimeter.ContainerMultimeter; -import resonantinduction.utility.multimeter.PartMultimeter; +import resonantinduction.core.multimeter.ContainerMultimeter; +import resonantinduction.core.multimeter.PartMultimeter; import universalelectricity.api.energy.UnitDisplay.Unit; import calclavia.lib.gui.GuiContainerBase; import calclavia.lib.render.EnumColor; diff --git a/src/main/java/resonantinduction/transport/model/ModelBattery.java b/src/main/java/resonantinduction/energy/model/ModelBattery.java similarity index 99% rename from src/main/java/resonantinduction/transport/model/ModelBattery.java rename to src/main/java/resonantinduction/energy/model/ModelBattery.java index 7d5068a0..cccee2a3 100644 --- a/src/main/java/resonantinduction/transport/model/ModelBattery.java +++ b/src/main/java/resonantinduction/energy/model/ModelBattery.java @@ -1,4 +1,4 @@ -package resonantinduction.transport.model; +package resonantinduction.energy.model; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; diff --git a/src/main/java/resonantinduction/transport/model/ModelEMContractor.java b/src/main/java/resonantinduction/energy/model/ModelEMContractor.java similarity index 99% rename from src/main/java/resonantinduction/transport/model/ModelEMContractor.java rename to src/main/java/resonantinduction/energy/model/ModelEMContractor.java index 784427da..3165560f 100644 --- a/src/main/java/resonantinduction/transport/model/ModelEMContractor.java +++ b/src/main/java/resonantinduction/energy/model/ModelEMContractor.java @@ -1,4 +1,4 @@ -package resonantinduction.transport.model; +package resonantinduction.energy.model; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; diff --git a/src/main/java/resonantinduction/transport/model/ModelInsulation.java b/src/main/java/resonantinduction/energy/model/ModelInsulation.java similarity index 99% rename from src/main/java/resonantinduction/transport/model/ModelInsulation.java rename to src/main/java/resonantinduction/energy/model/ModelInsulation.java index 6d2bdde2..b48fd5cc 100644 --- a/src/main/java/resonantinduction/transport/model/ModelInsulation.java +++ b/src/main/java/resonantinduction/energy/model/ModelInsulation.java @@ -1,4 +1,4 @@ -package resonantinduction.transport.model; +package resonantinduction.energy.model; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; diff --git a/src/main/java/resonantinduction/transport/model/ModelMultimeter.java b/src/main/java/resonantinduction/energy/model/ModelMultimeter.java similarity index 97% rename from src/main/java/resonantinduction/transport/model/ModelMultimeter.java rename to src/main/java/resonantinduction/energy/model/ModelMultimeter.java index 1881df0e..db07c2a2 100644 --- a/src/main/java/resonantinduction/transport/model/ModelMultimeter.java +++ b/src/main/java/resonantinduction/energy/model/ModelMultimeter.java @@ -1,4 +1,4 @@ -package resonantinduction.transport.model; +package resonantinduction.energy.model; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; diff --git a/src/main/java/resonantinduction/transport/model/ModelTeslaBottom.java b/src/main/java/resonantinduction/energy/model/ModelTeslaBottom.java similarity index 99% rename from src/main/java/resonantinduction/transport/model/ModelTeslaBottom.java rename to src/main/java/resonantinduction/energy/model/ModelTeslaBottom.java index c16d3a1d..c27efae7 100644 --- a/src/main/java/resonantinduction/transport/model/ModelTeslaBottom.java +++ b/src/main/java/resonantinduction/energy/model/ModelTeslaBottom.java @@ -1,4 +1,4 @@ -package resonantinduction.transport.model; +package resonantinduction.energy.model; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; diff --git a/src/main/java/resonantinduction/transport/model/ModelTeslaMiddle.java b/src/main/java/resonantinduction/energy/model/ModelTeslaMiddle.java similarity index 99% rename from src/main/java/resonantinduction/transport/model/ModelTeslaMiddle.java rename to src/main/java/resonantinduction/energy/model/ModelTeslaMiddle.java index a3e95196..0712bcd6 100644 --- a/src/main/java/resonantinduction/transport/model/ModelTeslaMiddle.java +++ b/src/main/java/resonantinduction/energy/model/ModelTeslaMiddle.java @@ -1,4 +1,4 @@ -package resonantinduction.transport.model; +package resonantinduction.energy.model; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; diff --git a/src/main/java/resonantinduction/transport/model/ModelTeslaTop.java b/src/main/java/resonantinduction/energy/model/ModelTeslaTop.java similarity index 99% rename from src/main/java/resonantinduction/transport/model/ModelTeslaTop.java rename to src/main/java/resonantinduction/energy/model/ModelTeslaTop.java index 3f6cbc3a..7e3db1d2 100644 --- a/src/main/java/resonantinduction/transport/model/ModelTeslaTop.java +++ b/src/main/java/resonantinduction/energy/model/ModelTeslaTop.java @@ -1,4 +1,4 @@ -package resonantinduction.transport.model; +package resonantinduction.energy.model; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; diff --git a/src/main/java/resonantinduction/transport/model/ModelWire.java b/src/main/java/resonantinduction/energy/model/ModelWire.java similarity index 98% rename from src/main/java/resonantinduction/transport/model/ModelWire.java rename to src/main/java/resonantinduction/energy/model/ModelWire.java index dc5d6fb0..178a493a 100644 --- a/src/main/java/resonantinduction/transport/model/ModelWire.java +++ b/src/main/java/resonantinduction/energy/model/ModelWire.java @@ -1,4 +1,4 @@ -package resonantinduction.transport.model; +package resonantinduction.energy.model; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; diff --git a/src/main/java/resonantinduction/transport/tesla/BlockTesla.java b/src/main/java/resonantinduction/energy/tesla/BlockTesla.java similarity index 98% rename from src/main/java/resonantinduction/transport/tesla/BlockTesla.java rename to src/main/java/resonantinduction/energy/tesla/BlockTesla.java index 3536e993..c30879db 100644 --- a/src/main/java/resonantinduction/transport/tesla/BlockTesla.java +++ b/src/main/java/resonantinduction/energy/tesla/BlockTesla.java @@ -1,7 +1,7 @@ /** * */ -package resonantinduction.transport.tesla; +package resonantinduction.energy.tesla; import net.minecraft.block.ITileEntityProvider; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/resonantinduction/transport/tesla/RenderTesla.java b/src/main/java/resonantinduction/energy/tesla/RenderTesla.java similarity index 88% rename from src/main/java/resonantinduction/transport/tesla/RenderTesla.java rename to src/main/java/resonantinduction/energy/tesla/RenderTesla.java index ba435dfd..02a70e6f 100644 --- a/src/main/java/resonantinduction/transport/tesla/RenderTesla.java +++ b/src/main/java/resonantinduction/energy/tesla/RenderTesla.java @@ -1,7 +1,7 @@ /** * */ -package resonantinduction.transport.tesla; +package resonantinduction.energy.tesla; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; @@ -10,9 +10,9 @@ import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; import resonantinduction.ResonantInduction; -import resonantinduction.transport.model.ModelTeslaBottom; -import resonantinduction.transport.model.ModelTeslaMiddle; -import resonantinduction.transport.model.ModelTeslaTop; +import resonantinduction.energy.model.ModelTeslaBottom; +import resonantinduction.energy.model.ModelTeslaMiddle; +import resonantinduction.energy.model.ModelTeslaTop; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/resonantinduction/transport/tesla/TeslaGrid.java b/src/main/java/resonantinduction/energy/tesla/TeslaGrid.java similarity index 96% rename from src/main/java/resonantinduction/transport/tesla/TeslaGrid.java rename to src/main/java/resonantinduction/energy/tesla/TeslaGrid.java index a80b277f..96361042 100644 --- a/src/main/java/resonantinduction/transport/tesla/TeslaGrid.java +++ b/src/main/java/resonantinduction/energy/tesla/TeslaGrid.java @@ -1,7 +1,7 @@ /** * */ -package resonantinduction.transport.tesla; +package resonantinduction.energy.tesla; import java.util.HashSet; import java.util.Iterator; diff --git a/src/main/java/resonantinduction/transport/tesla/TileTesla.java b/src/main/java/resonantinduction/energy/tesla/TileTesla.java similarity index 99% rename from src/main/java/resonantinduction/transport/tesla/TileTesla.java rename to src/main/java/resonantinduction/energy/tesla/TileTesla.java index 317b5c00..c10f9e0b 100644 --- a/src/main/java/resonantinduction/transport/tesla/TileTesla.java +++ b/src/main/java/resonantinduction/energy/tesla/TileTesla.java @@ -1,7 +1,7 @@ /** * */ -package resonantinduction.transport.tesla; +package resonantinduction.energy.tesla; import java.util.ArrayList; import java.util.Collections; @@ -21,7 +21,7 @@ import net.minecraft.world.World; import net.minecraftforge.common.ForgeDirection; import resonantinduction.ResonantInduction; import resonantinduction.api.ITesla; -import resonantinduction.transport.ILinkable; +import resonantinduction.energy.ILinkable; import universalelectricity.api.energy.EnergyStorageHandler; import universalelectricity.api.vector.Vector3; import universalelectricity.api.vector.VectorWorld; diff --git a/src/main/java/resonantinduction/transport/transformer/ItemTransformer.java b/src/main/java/resonantinduction/energy/transformer/ItemTransformer.java similarity index 89% rename from src/main/java/resonantinduction/transport/transformer/ItemTransformer.java rename to src/main/java/resonantinduction/energy/transformer/ItemTransformer.java index 6bc5ec17..0fb90706 100644 --- a/src/main/java/resonantinduction/transport/transformer/ItemTransformer.java +++ b/src/main/java/resonantinduction/energy/transformer/ItemTransformer.java @@ -1,11 +1,11 @@ -package resonantinduction.transport.transformer; +package resonantinduction.energy.transformer; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.Icon; import net.minecraft.world.World; import resonantinduction.core.base.ItemMultipartBase; -import resonantinduction.transport.wire.EnumWireMaterial; +import resonantinduction.energy.wire.EnumWireMaterial; import codechicken.lib.vec.BlockCoord; import codechicken.lib.vec.Vector3; import codechicken.multipart.MultiPartRegistry; diff --git a/src/main/java/resonantinduction/transport/transformer/ModelTransformer.java b/src/main/java/resonantinduction/energy/transformer/ModelTransformer.java similarity index 98% rename from src/main/java/resonantinduction/transport/transformer/ModelTransformer.java rename to src/main/java/resonantinduction/energy/transformer/ModelTransformer.java index 98b79061..b1729a95 100644 --- a/src/main/java/resonantinduction/transport/transformer/ModelTransformer.java +++ b/src/main/java/resonantinduction/energy/transformer/ModelTransformer.java @@ -1,4 +1,4 @@ -package resonantinduction.transport.transformer; +package resonantinduction.energy.transformer; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; diff --git a/src/main/java/resonantinduction/transport/transformer/PartTransformer.java b/src/main/java/resonantinduction/energy/transformer/PartTransformer.java similarity index 99% rename from src/main/java/resonantinduction/transport/transformer/PartTransformer.java rename to src/main/java/resonantinduction/energy/transformer/PartTransformer.java index 7d146196..3bb7b297 100644 --- a/src/main/java/resonantinduction/transport/transformer/PartTransformer.java +++ b/src/main/java/resonantinduction/energy/transformer/PartTransformer.java @@ -1,4 +1,4 @@ -package resonantinduction.transport.transformer; +package resonantinduction.energy.transformer; import java.lang.reflect.Method; import java.util.ArrayList; diff --git a/src/main/java/resonantinduction/transport/transformer/RenderTransformer.java b/src/main/java/resonantinduction/energy/transformer/RenderTransformer.java similarity index 99% rename from src/main/java/resonantinduction/transport/transformer/RenderTransformer.java rename to src/main/java/resonantinduction/energy/transformer/RenderTransformer.java index c924e72d..ba8b0fca 100644 --- a/src/main/java/resonantinduction/transport/transformer/RenderTransformer.java +++ b/src/main/java/resonantinduction/energy/transformer/RenderTransformer.java @@ -1,4 +1,4 @@ -package resonantinduction.transport.transformer; +package resonantinduction.energy.transformer; import net.minecraft.client.Minecraft; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/resonantinduction/transport/wire/EnumWireMaterial.java b/src/main/java/resonantinduction/energy/wire/EnumWireMaterial.java similarity index 97% rename from src/main/java/resonantinduction/transport/wire/EnumWireMaterial.java rename to src/main/java/resonantinduction/energy/wire/EnumWireMaterial.java index 4ba5ad5c..cc696914 100644 --- a/src/main/java/resonantinduction/transport/wire/EnumWireMaterial.java +++ b/src/main/java/resonantinduction/energy/wire/EnumWireMaterial.java @@ -1,4 +1,4 @@ -package resonantinduction.transport.wire; +package resonantinduction.energy.wire; import net.minecraft.block.Block; import net.minecraft.item.Item; diff --git a/src/main/java/resonantinduction/transport/wire/ItemWire.java b/src/main/java/resonantinduction/energy/wire/ItemWire.java similarity index 94% rename from src/main/java/resonantinduction/transport/wire/ItemWire.java rename to src/main/java/resonantinduction/energy/wire/ItemWire.java index 56977ee3..b3a7f6d4 100644 --- a/src/main/java/resonantinduction/transport/wire/ItemWire.java +++ b/src/main/java/resonantinduction/energy/wire/ItemWire.java @@ -1,4 +1,4 @@ -package resonantinduction.transport.wire; +package resonantinduction.energy.wire; import java.util.List; @@ -16,10 +16,10 @@ import org.lwjgl.input.Keyboard; import resonantinduction.ResonantInduction; import resonantinduction.TabRI; import resonantinduction.Utility; -import resonantinduction.transport.wire.flat.PartFlatWire; -import resonantinduction.transport.wire.flat.RenderFlatWire; -import resonantinduction.transport.wire.framed.PartFramedWire; -import resonantinduction.transport.wire.framed.RenderPartWire; +import resonantinduction.energy.wire.flat.PartFlatWire; +import resonantinduction.energy.wire.flat.RenderFlatWire; +import resonantinduction.energy.wire.framed.PartFramedWire; +import resonantinduction.energy.wire.framed.RenderPartWire; import universalelectricity.api.energy.UnitDisplay; import universalelectricity.api.energy.UnitDisplay.Unit; import calclavia.lib.render.EnumColor; diff --git a/src/main/java/resonantinduction/transport/wire/PartAdvancedWire.java b/src/main/java/resonantinduction/energy/wire/PartAdvancedWire.java similarity index 99% rename from src/main/java/resonantinduction/transport/wire/PartAdvancedWire.java rename to src/main/java/resonantinduction/energy/wire/PartAdvancedWire.java index 57630b01..96fc3652 100644 --- a/src/main/java/resonantinduction/transport/wire/PartAdvancedWire.java +++ b/src/main/java/resonantinduction/energy/wire/PartAdvancedWire.java @@ -1,4 +1,4 @@ -package resonantinduction.transport.wire; +package resonantinduction.energy.wire; import java.util.ArrayList; import java.util.Collections; diff --git a/src/main/java/resonantinduction/transport/wire/PartConductor.java b/src/main/java/resonantinduction/energy/wire/PartConductor.java similarity index 98% rename from src/main/java/resonantinduction/transport/wire/PartConductor.java rename to src/main/java/resonantinduction/energy/wire/PartConductor.java index 36aa7112..27ca8340 100644 --- a/src/main/java/resonantinduction/transport/wire/PartConductor.java +++ b/src/main/java/resonantinduction/energy/wire/PartConductor.java @@ -1,4 +1,4 @@ -package resonantinduction.transport.wire; +package resonantinduction.energy.wire; import ic2.api.energy.event.EnergyTileLoadEvent; import ic2.api.energy.event.EnergyTileUnloadEvent; diff --git a/src/main/java/resonantinduction/transport/wire/flat/PartFlatSwitchWire.java b/src/main/java/resonantinduction/energy/wire/flat/PartFlatSwitchWire.java similarity index 97% rename from src/main/java/resonantinduction/transport/wire/flat/PartFlatSwitchWire.java rename to src/main/java/resonantinduction/energy/wire/flat/PartFlatSwitchWire.java index 44107166..f3f335e0 100644 --- a/src/main/java/resonantinduction/transport/wire/flat/PartFlatSwitchWire.java +++ b/src/main/java/resonantinduction/energy/wire/flat/PartFlatSwitchWire.java @@ -1,4 +1,4 @@ -package resonantinduction.transport.wire.flat; +package resonantinduction.energy.wire.flat; import java.util.Collections; import java.util.List; diff --git a/src/main/java/resonantinduction/transport/wire/flat/PartFlatWire.java b/src/main/java/resonantinduction/energy/wire/flat/PartFlatWire.java similarity index 99% rename from src/main/java/resonantinduction/transport/wire/flat/PartFlatWire.java rename to src/main/java/resonantinduction/energy/wire/flat/PartFlatWire.java index 1aa5248b..4702c52c 100644 --- a/src/main/java/resonantinduction/transport/wire/flat/PartFlatWire.java +++ b/src/main/java/resonantinduction/energy/wire/flat/PartFlatWire.java @@ -1,4 +1,4 @@ -package resonantinduction.transport.wire.flat; +package resonantinduction.energy.wire.flat; import java.util.Arrays; @@ -17,8 +17,8 @@ import org.lwjgl.opengl.GL11; import resonantinduction.ResonantInduction; import resonantinduction.Utility; -import resonantinduction.transport.wire.EnumWireMaterial; -import resonantinduction.transport.wire.PartAdvancedWire; +import resonantinduction.energy.wire.EnumWireMaterial; +import resonantinduction.energy.wire.PartAdvancedWire; import codechicken.lib.colour.Colour; import codechicken.lib.data.MCDataInput; import codechicken.lib.data.MCDataOutput; diff --git a/src/main/java/resonantinduction/transport/wire/flat/RenderFlatWire.java b/src/main/java/resonantinduction/energy/wire/flat/RenderFlatWire.java similarity index 99% rename from src/main/java/resonantinduction/transport/wire/flat/RenderFlatWire.java rename to src/main/java/resonantinduction/energy/wire/flat/RenderFlatWire.java index 7d87f26a..0bc58292 100644 --- a/src/main/java/resonantinduction/transport/wire/flat/RenderFlatWire.java +++ b/src/main/java/resonantinduction/energy/wire/flat/RenderFlatWire.java @@ -1,4 +1,4 @@ -package resonantinduction.transport.wire.flat; +package resonantinduction.energy.wire.flat; import java.util.Arrays; import java.util.LinkedList; diff --git a/src/main/java/resonantinduction/transport/wire/framed/PartFramedSwitchWire.java b/src/main/java/resonantinduction/energy/wire/framed/PartFramedSwitchWire.java similarity index 98% rename from src/main/java/resonantinduction/transport/wire/framed/PartFramedSwitchWire.java rename to src/main/java/resonantinduction/energy/wire/framed/PartFramedSwitchWire.java index 8db790f6..b91bfc77 100644 --- a/src/main/java/resonantinduction/transport/wire/framed/PartFramedSwitchWire.java +++ b/src/main/java/resonantinduction/energy/wire/framed/PartFramedSwitchWire.java @@ -1,4 +1,4 @@ -package resonantinduction.transport.wire.framed; +package resonantinduction.energy.wire.framed; import java.util.Collections; import java.util.List; diff --git a/src/main/java/resonantinduction/transport/wire/framed/PartFramedWire.java b/src/main/java/resonantinduction/energy/wire/framed/PartFramedWire.java similarity index 98% rename from src/main/java/resonantinduction/transport/wire/framed/PartFramedWire.java rename to src/main/java/resonantinduction/energy/wire/framed/PartFramedWire.java index af52cb86..cce0b092 100644 --- a/src/main/java/resonantinduction/transport/wire/framed/PartFramedWire.java +++ b/src/main/java/resonantinduction/energy/wire/framed/PartFramedWire.java @@ -1,4 +1,4 @@ -package resonantinduction.transport.wire.framed; +package resonantinduction.energy.wire.framed; import java.util.Collection; import java.util.HashSet; @@ -14,8 +14,8 @@ import net.minecraft.util.Icon; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; import net.minecraftforge.common.ForgeDirection; -import resonantinduction.transport.wire.EnumWireMaterial; -import resonantinduction.transport.wire.PartAdvancedWire; +import resonantinduction.energy.wire.EnumWireMaterial; +import resonantinduction.energy.wire.PartAdvancedWire; import universalelectricity.api.CompatibilityModule; import universalelectricity.api.energy.IConductor; import universalelectricity.api.vector.Vector3; diff --git a/src/main/java/resonantinduction/transport/wire/framed/RenderPartWire.java b/src/main/java/resonantinduction/energy/wire/framed/RenderPartWire.java similarity index 99% rename from src/main/java/resonantinduction/transport/wire/framed/RenderPartWire.java rename to src/main/java/resonantinduction/energy/wire/framed/RenderPartWire.java index 77cc49d3..eafca2c4 100644 --- a/src/main/java/resonantinduction/transport/wire/framed/RenderPartWire.java +++ b/src/main/java/resonantinduction/energy/wire/framed/RenderPartWire.java @@ -1,4 +1,4 @@ -package resonantinduction.transport.wire.framed; +package resonantinduction.energy.wire.framed; import java.nio.FloatBuffer; import java.util.Map; diff --git a/src/main/java/resonantinduction/transport/wire/trait/TraitConductor.java b/src/main/java/resonantinduction/energy/wire/trait/TraitConductor.java similarity index 98% rename from src/main/java/resonantinduction/transport/wire/trait/TraitConductor.java rename to src/main/java/resonantinduction/energy/wire/trait/TraitConductor.java index ebc1819b..5db75b7e 100644 --- a/src/main/java/resonantinduction/transport/wire/trait/TraitConductor.java +++ b/src/main/java/resonantinduction/energy/wire/trait/TraitConductor.java @@ -1,4 +1,4 @@ -package resonantinduction.transport.wire.trait; +package resonantinduction.energy.wire.trait; import java.util.HashSet; import java.util.Set; diff --git a/src/main/java/resonantinduction/transport/wire/trait/TraitEnergyHandler.java b/src/main/java/resonantinduction/energy/wire/trait/TraitEnergyHandler.java similarity index 97% rename from src/main/java/resonantinduction/transport/wire/trait/TraitEnergyHandler.java rename to src/main/java/resonantinduction/energy/wire/trait/TraitEnergyHandler.java index 16156957..dd8b4409 100644 --- a/src/main/java/resonantinduction/transport/wire/trait/TraitEnergyHandler.java +++ b/src/main/java/resonantinduction/energy/wire/trait/TraitEnergyHandler.java @@ -1,10 +1,10 @@ -package resonantinduction.transport.wire.trait; +package resonantinduction.energy.wire.trait; import java.util.HashSet; import java.util.Set; import net.minecraftforge.common.ForgeDirection; -import resonantinduction.transport.wire.PartConductor; +import resonantinduction.energy.wire.PartConductor; import codechicken.multipart.TMultiPart; import codechicken.multipart.TileMultipart; import cofh.api.energy.IEnergyHandler; diff --git a/src/main/java/resonantinduction/transport/wire/trait/TraitEnergySink.java b/src/main/java/resonantinduction/energy/wire/trait/TraitEnergySink.java similarity index 98% rename from src/main/java/resonantinduction/transport/wire/trait/TraitEnergySink.java rename to src/main/java/resonantinduction/energy/wire/trait/TraitEnergySink.java index 628bd466..c0a694d6 100644 --- a/src/main/java/resonantinduction/transport/wire/trait/TraitEnergySink.java +++ b/src/main/java/resonantinduction/energy/wire/trait/TraitEnergySink.java @@ -1,4 +1,4 @@ -package resonantinduction.transport.wire.trait; +package resonantinduction.energy.wire.trait; import ic2.api.energy.tile.IEnergySink; diff --git a/src/main/java/resonantinduction/machine/BlockMachinePart.java b/src/main/java/resonantinduction/mechanics/BlockMachinePart.java similarity index 88% rename from src/main/java/resonantinduction/machine/BlockMachinePart.java rename to src/main/java/resonantinduction/mechanics/BlockMachinePart.java index 173b8833..1a34b33b 100644 --- a/src/main/java/resonantinduction/machine/BlockMachinePart.java +++ b/src/main/java/resonantinduction/mechanics/BlockMachinePart.java @@ -1,4 +1,4 @@ -package resonantinduction.machine; +package resonantinduction.mechanics; import resonantinduction.core.base.BlockBase; import universalelectricity.api.UniversalElectricity; diff --git a/src/main/java/resonantinduction/machine/furnace/BlockAdvancedFurnace.java b/src/main/java/resonantinduction/mechanics/furnace/BlockAdvancedFurnace.java similarity index 98% rename from src/main/java/resonantinduction/machine/furnace/BlockAdvancedFurnace.java rename to src/main/java/resonantinduction/mechanics/furnace/BlockAdvancedFurnace.java index 4d7c6539..45bf38b7 100644 --- a/src/main/java/resonantinduction/machine/furnace/BlockAdvancedFurnace.java +++ b/src/main/java/resonantinduction/mechanics/furnace/BlockAdvancedFurnace.java @@ -1,4 +1,4 @@ -package resonantinduction.machine.furnace; +package resonantinduction.mechanics.furnace; import java.util.Random; diff --git a/src/main/java/resonantinduction/machine/furnace/TileAdvancedFurnace.java b/src/main/java/resonantinduction/mechanics/furnace/TileAdvancedFurnace.java similarity index 99% rename from src/main/java/resonantinduction/machine/furnace/TileAdvancedFurnace.java rename to src/main/java/resonantinduction/mechanics/furnace/TileAdvancedFurnace.java index 5a4e5828..13c78841 100644 --- a/src/main/java/resonantinduction/machine/furnace/TileAdvancedFurnace.java +++ b/src/main/java/resonantinduction/mechanics/furnace/TileAdvancedFurnace.java @@ -1,4 +1,4 @@ -package resonantinduction.machine.furnace; +package resonantinduction.mechanics.furnace; import java.util.ArrayList; diff --git a/src/main/java/resonantinduction/machine/grinder/BlockGrinderWheel.java b/src/main/java/resonantinduction/mechanics/grinder/BlockGrinderWheel.java similarity index 98% rename from src/main/java/resonantinduction/machine/grinder/BlockGrinderWheel.java rename to src/main/java/resonantinduction/mechanics/grinder/BlockGrinderWheel.java index 982195f1..bd04f6c2 100644 --- a/src/main/java/resonantinduction/machine/grinder/BlockGrinderWheel.java +++ b/src/main/java/resonantinduction/mechanics/grinder/BlockGrinderWheel.java @@ -1,4 +1,4 @@ -package resonantinduction.machine.grinder; +package resonantinduction.mechanics.grinder; import net.minecraft.block.ITileEntityProvider; import net.minecraft.entity.Entity; diff --git a/src/main/java/resonantinduction/machine/grinder/TileGrinderWheel.java b/src/main/java/resonantinduction/mechanics/grinder/TileGrinderWheel.java similarity index 98% rename from src/main/java/resonantinduction/machine/grinder/TileGrinderWheel.java rename to src/main/java/resonantinduction/mechanics/grinder/TileGrinderWheel.java index e3ec1cee..d8f80703 100644 --- a/src/main/java/resonantinduction/machine/grinder/TileGrinderWheel.java +++ b/src/main/java/resonantinduction/mechanics/grinder/TileGrinderWheel.java @@ -1,4 +1,4 @@ -package resonantinduction.machine.grinder; +package resonantinduction.mechanics.grinder; import java.util.HashMap; diff --git a/src/main/java/resonantinduction/machine/grinder/TilePurifier.java b/src/main/java/resonantinduction/mechanics/grinder/TilePurifier.java similarity index 97% rename from src/main/java/resonantinduction/machine/grinder/TilePurifier.java rename to src/main/java/resonantinduction/mechanics/grinder/TilePurifier.java index 65fb4229..1120ffde 100644 --- a/src/main/java/resonantinduction/machine/grinder/TilePurifier.java +++ b/src/main/java/resonantinduction/mechanics/grinder/TilePurifier.java @@ -1,4 +1,4 @@ -package resonantinduction.machine.grinder; +package resonantinduction.mechanics.grinder; import java.util.HashMap; import java.util.List; @@ -12,7 +12,7 @@ import resonantinduction.api.MachineRecipes; import resonantinduction.api.MachineRecipes.RecipeType; import resonantinduction.api.RecipeUtils.ItemStackResource; import resonantinduction.api.RecipeUtils.Resource; -import resonantinduction.machine.item.ItemDust; +import resonantinduction.mechanics.item.ItemDust; import universalelectricity.api.energy.EnergyStorageHandler; import universalelectricity.api.vector.Vector3; import calclavia.lib.prefab.tile.TileElectrical; diff --git a/src/main/java/resonantinduction/machine/item/ItemDust.java b/src/main/java/resonantinduction/mechanics/item/ItemDust.java similarity index 99% rename from src/main/java/resonantinduction/machine/item/ItemDust.java rename to src/main/java/resonantinduction/mechanics/item/ItemDust.java index 885a27e5..75b77167 100644 --- a/src/main/java/resonantinduction/machine/item/ItemDust.java +++ b/src/main/java/resonantinduction/mechanics/item/ItemDust.java @@ -1,4 +1,4 @@ -package resonantinduction.machine.item; +package resonantinduction.mechanics.item; import java.awt.Color; import java.awt.image.BufferedImage; diff --git a/src/main/java/resonantinduction/machine/liquid/BlockFluidMixture.java b/src/main/java/resonantinduction/mechanics/liquid/BlockFluidMixture.java similarity index 97% rename from src/main/java/resonantinduction/machine/liquid/BlockFluidMixture.java rename to src/main/java/resonantinduction/mechanics/liquid/BlockFluidMixture.java index 6a3c3bbb..913e64bb 100644 --- a/src/main/java/resonantinduction/machine/liquid/BlockFluidMixture.java +++ b/src/main/java/resonantinduction/mechanics/liquid/BlockFluidMixture.java @@ -1,4 +1,4 @@ -package resonantinduction.machine.liquid; +package resonantinduction.mechanics.liquid; import net.minecraft.block.ITileEntityProvider; import net.minecraft.block.material.Material; diff --git a/src/main/java/resonantinduction/machine/liquid/TileFluidMixture.java b/src/main/java/resonantinduction/mechanics/liquid/TileFluidMixture.java similarity index 97% rename from src/main/java/resonantinduction/machine/liquid/TileFluidMixture.java rename to src/main/java/resonantinduction/mechanics/liquid/TileFluidMixture.java index ed57694c..668ef2ba 100644 --- a/src/main/java/resonantinduction/machine/liquid/TileFluidMixture.java +++ b/src/main/java/resonantinduction/mechanics/liquid/TileFluidMixture.java @@ -1,4 +1,4 @@ -package resonantinduction.machine.liquid; +package resonantinduction.mechanics.liquid; import java.util.TreeSet; diff --git a/src/main/java/resonantinduction/machine/purifier/BlockPurifier.java b/src/main/java/resonantinduction/mechanics/purifier/BlockPurifier.java similarity index 94% rename from src/main/java/resonantinduction/machine/purifier/BlockPurifier.java rename to src/main/java/resonantinduction/mechanics/purifier/BlockPurifier.java index f5d52276..f762775b 100644 --- a/src/main/java/resonantinduction/machine/purifier/BlockPurifier.java +++ b/src/main/java/resonantinduction/mechanics/purifier/BlockPurifier.java @@ -1,11 +1,11 @@ -package resonantinduction.machine.purifier; +package resonantinduction.mechanics.purifier; import net.minecraft.block.ITileEntityProvider; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.common.ForgeDirection; import resonantinduction.core.base.BlockRotatableBase; -import resonantinduction.machine.grinder.TilePurifier; +import resonantinduction.mechanics.grinder.TilePurifier; import universalelectricity.api.vector.VectorWorld; /** diff --git a/src/main/java/resonantinduction/transport/levitator/RenderLevitator.java b/src/main/java/resonantinduction/transport/levitator/RenderLevitator.java index 9bbfa4c0..ad3c93ac 100644 --- a/src/main/java/resonantinduction/transport/levitator/RenderLevitator.java +++ b/src/main/java/resonantinduction/transport/levitator/RenderLevitator.java @@ -7,7 +7,7 @@ import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; import resonantinduction.ResonantInduction; -import resonantinduction.transport.model.ModelEMContractor; +import resonantinduction.energy.model.ModelEMContractor; public class RenderLevitator extends TileEntitySpecialRenderer { diff --git a/src/main/java/resonantinduction/transport/levitator/TileEMLevitator.java b/src/main/java/resonantinduction/transport/levitator/TileEMLevitator.java index 46306269..d5dc07f8 100644 --- a/src/main/java/resonantinduction/transport/levitator/TileEMLevitator.java +++ b/src/main/java/resonantinduction/transport/levitator/TileEMLevitator.java @@ -22,8 +22,8 @@ import net.minecraft.world.World; import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.fluids.IFluidBlock; import resonantinduction.ResonantInduction; -import resonantinduction.transport.ILinkable; -import resonantinduction.transport.tesla.TileTesla; +import resonantinduction.energy.ILinkable; +import resonantinduction.energy.tesla.TileTesla; import universalelectricity.api.vector.Vector3; import universalelectricity.api.vector.VectorWorld; import calclavia.lib.network.IPacketReceiver;