From a1ac29149c6689bbbed5c6966023e29dfc8896d5 Mon Sep 17 00:00:00 2001 From: Calclavia Date: Sat, 4 Jan 2014 12:04:43 +0800 Subject: [PATCH] Reorganized packages --- .../java/resonantinduction/ClientProxy.java | 18 ++++----- .../java/resonantinduction/MultipartRI.java | 10 ++--- .../resonantinduction/ResonantInduction.java | 28 ++++++------- .../battery/BatteryManager.java | 39 ------------------- .../{ => core}/base/BlockBase.java | 2 +- .../{ => core}/base/InventoryUtil.java | 2 +- .../{ => core}/base/ItemBase.java | 2 +- .../{ => core}/base/ItemMultipartBase.java | 2 +- .../{ => core}/base/ListUtil.java | 2 +- .../{ => core}/base/PartAdvanced.java | 2 +- .../render/BlockRenderingHandler.java | 14 +++---- .../{ => core}/render/InvertX.java | 2 +- .../furnace/BlockAdvancedFurnace.java | 2 +- .../furnace/TileAdvancedFurnace.java | 2 +- .../multimeter/ItemMultimeter.java | 5 +-- .../multimeter/RenderMultimeter.java | 2 +- .../multimeter/RenderRIItem.java | 4 +- .../battery/BatteryStructure.java | 2 +- .../{ => transport}/battery/BlockBattery.java | 6 +-- .../battery/ItemBlockBattery.java | 2 +- .../battery/RenderBattery.java | 4 +- .../{ => transport}/battery/TileBattery.java | 2 +- .../{ => transport}/fx/FXElectricBolt.java | 2 +- .../{ => transport}/gui/GuiMultimeter.java | 2 +- .../levitator/BlockEMContractor.java | 6 +-- .../levitator/ItemBlockContractor.java | 2 +- .../{ => transport}/levitator/ItemLinker.java | 2 +- .../levitator/PathfinderEMContractor.java | 2 +- .../levitator/RenderLevitator.java | 4 +- .../levitator/ThreadEMPathfinding.java | 2 +- .../levitator/TileEMLevitator.java | 4 +- .../{ => transport}/model/ModelBattery.java | 2 +- .../model/ModelEMContractor.java | 2 +- .../model/ModelInsulation.java | 2 +- .../model/ModelMultimeter.java | 2 +- .../model/ModelTeslaBottom.java | 2 +- .../model/ModelTeslaMiddle.java | 2 +- .../{ => transport}/model/ModelTeslaTop.java | 2 +- .../{ => transport}/model/ModelWire.java | 2 +- .../{ => transport}/tesla/BlockTesla.java | 6 +-- .../{ => transport}/tesla/RenderTesla.java | 8 ++-- .../{ => transport}/tesla/TeslaGrid.java | 2 +- .../{ => transport}/tesla/TileTesla.java | 2 +- .../transformer/ItemTransformer.java | 6 +-- .../transformer/ModelTransformer.java | 2 +- .../transformer/PartTransformer.java | 2 +- .../transformer/RenderTransformer.java | 2 +- .../wire/EnumWireMaterial.java | 2 +- .../{ => transport}/wire/ItemWire.java | 10 ++--- .../wire/PartAdvancedWire.java | 2 +- .../{ => transport}/wire/PartConductor.java | 4 +- .../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 | 4 +- .../wire/trait/TraitConductor.java | 2 +- .../wire/trait/TraitEnergyHandler.java | 4 +- .../wire/trait/TraitEnergySink.java | 2 +- 60 files changed, 117 insertions(+), 157 deletions(-) delete mode 100644 src/main/java/resonantinduction/battery/BatteryManager.java rename src/main/java/resonantinduction/{ => core}/base/BlockBase.java (94%) rename src/main/java/resonantinduction/{ => core}/base/InventoryUtil.java (99%) rename src/main/java/resonantinduction/{ => core}/base/ItemBase.java (93%) rename src/main/java/resonantinduction/{ => core}/base/ItemMultipartBase.java (93%) rename src/main/java/resonantinduction/{ => core}/base/ListUtil.java (98%) rename src/main/java/resonantinduction/{ => core}/base/PartAdvanced.java (90%) rename src/main/java/resonantinduction/{ => core}/render/BlockRenderingHandler.java (84%) rename src/main/java/resonantinduction/{ => core}/render/InvertX.java (91%) rename src/main/java/resonantinduction/{ => machine}/furnace/BlockAdvancedFurnace.java (98%) rename src/main/java/resonantinduction/{ => machine}/furnace/TileAdvancedFurnace.java (99%) rename src/main/java/resonantinduction/{ => transport}/battery/BatteryStructure.java (96%) rename src/main/java/resonantinduction/{ => transport}/battery/BlockBattery.java (91%) rename src/main/java/resonantinduction/{ => transport}/battery/ItemBlockBattery.java (99%) rename src/main/java/resonantinduction/{ => transport}/battery/RenderBattery.java (97%) rename src/main/java/resonantinduction/{ => transport}/battery/TileBattery.java (99%) rename src/main/java/resonantinduction/{ => transport}/fx/FXElectricBolt.java (99%) rename src/main/java/resonantinduction/{ => transport}/gui/GuiMultimeter.java (98%) rename src/main/java/resonantinduction/{ => transport}/levitator/BlockEMContractor.java (95%) rename src/main/java/resonantinduction/{ => transport}/levitator/ItemBlockContractor.java (96%) rename src/main/java/resonantinduction/{ => transport}/levitator/ItemLinker.java (95%) rename src/main/java/resonantinduction/{ => transport}/levitator/PathfinderEMContractor.java (97%) rename src/main/java/resonantinduction/{ => transport}/levitator/RenderLevitator.java (94%) rename src/main/java/resonantinduction/{ => transport}/levitator/ThreadEMPathfinding.java (93%) rename src/main/java/resonantinduction/{ => transport}/levitator/TileEMLevitator.java (99%) rename src/main/java/resonantinduction/{ => transport}/model/ModelBattery.java (99%) rename src/main/java/resonantinduction/{ => transport}/model/ModelEMContractor.java (99%) rename src/main/java/resonantinduction/{ => transport}/model/ModelInsulation.java (99%) rename src/main/java/resonantinduction/{ => transport}/model/ModelMultimeter.java (97%) rename src/main/java/resonantinduction/{ => transport}/model/ModelTeslaBottom.java (99%) rename src/main/java/resonantinduction/{ => transport}/model/ModelTeslaMiddle.java (99%) rename src/main/java/resonantinduction/{ => transport}/model/ModelTeslaTop.java (99%) rename src/main/java/resonantinduction/{ => transport}/model/ModelWire.java (98%) rename src/main/java/resonantinduction/{ => transport}/tesla/BlockTesla.java (96%) rename src/main/java/resonantinduction/{ => transport}/tesla/RenderTesla.java (88%) rename src/main/java/resonantinduction/{ => transport}/tesla/TeslaGrid.java (96%) rename src/main/java/resonantinduction/{ => transport}/tesla/TileTesla.java (99%) rename src/main/java/resonantinduction/{ => transport}/transformer/ItemTransformer.java (84%) rename src/main/java/resonantinduction/{ => transport}/transformer/ModelTransformer.java (98%) rename src/main/java/resonantinduction/{ => transport}/transformer/PartTransformer.java (99%) rename src/main/java/resonantinduction/{ => transport}/transformer/RenderTransformer.java (97%) rename src/main/java/resonantinduction/{ => transport}/wire/EnumWireMaterial.java (97%) rename src/main/java/resonantinduction/{ => transport}/wire/ItemWire.java (94%) rename src/main/java/resonantinduction/{ => transport}/wire/PartAdvancedWire.java (99%) rename src/main/java/resonantinduction/{ => transport}/wire/PartConductor.java (97%) rename src/main/java/resonantinduction/{ => transport}/wire/flat/PartFlatSwitchWire.java (97%) rename src/main/java/resonantinduction/{ => transport}/wire/flat/PartFlatWire.java (99%) rename src/main/java/resonantinduction/{ => transport}/wire/flat/RenderFlatWire.java (99%) rename src/main/java/resonantinduction/{ => transport}/wire/framed/PartFramedSwitchWire.java (98%) rename src/main/java/resonantinduction/{ => transport}/wire/framed/PartFramedWire.java (98%) rename src/main/java/resonantinduction/{ => transport}/wire/framed/RenderPartWire.java (98%) rename src/main/java/resonantinduction/{ => transport}/wire/trait/TraitConductor.java (98%) rename src/main/java/resonantinduction/{ => transport}/wire/trait/TraitEnergyHandler.java (97%) rename src/main/java/resonantinduction/{ => transport}/wire/trait/TraitEnergySink.java (98%) diff --git a/src/main/java/resonantinduction/ClientProxy.java b/src/main/java/resonantinduction/ClientProxy.java index e9b956d8..3b4f76d4 100644 --- a/src/main/java/resonantinduction/ClientProxy.java +++ b/src/main/java/resonantinduction/ClientProxy.java @@ -6,17 +6,17 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.client.MinecraftForgeClient; import net.minecraftforge.common.MinecraftForge; -import resonantinduction.battery.RenderBattery; -import resonantinduction.battery.TileBattery; -import resonantinduction.fx.FXElectricBolt; -import resonantinduction.gui.GuiMultimeter; -import resonantinduction.levitator.RenderLevitator; -import resonantinduction.levitator.TileEMLevitator; +import resonantinduction.core.render.BlockRenderingHandler; import resonantinduction.multimeter.PartMultimeter; import resonantinduction.multimeter.RenderRIItem; -import resonantinduction.render.BlockRenderingHandler; -import resonantinduction.tesla.RenderTesla; -import resonantinduction.tesla.TileTesla; +import resonantinduction.transport.battery.RenderBattery; +import resonantinduction.transport.battery.TileBattery; +import resonantinduction.transport.fx.FXElectricBolt; +import resonantinduction.transport.gui.GuiMultimeter; +import resonantinduction.transport.levitator.RenderLevitator; +import resonantinduction.transport.levitator.TileEMLevitator; +import resonantinduction.transport.tesla.RenderTesla; +import resonantinduction.transport.tesla.TileTesla; import universalelectricity.api.vector.Vector3; import codechicken.multipart.TMultiPart; import codechicken.multipart.TileMultipart; diff --git a/src/main/java/resonantinduction/MultipartRI.java b/src/main/java/resonantinduction/MultipartRI.java index cb9dca26..e9a31d41 100644 --- a/src/main/java/resonantinduction/MultipartRI.java +++ b/src/main/java/resonantinduction/MultipartRI.java @@ -1,11 +1,11 @@ package resonantinduction; import resonantinduction.multimeter.PartMultimeter; -import resonantinduction.transformer.PartTransformer; -import resonantinduction.wire.flat.PartFlatSwitchWire; -import resonantinduction.wire.flat.PartFlatWire; -import resonantinduction.wire.framed.PartFramedSwitchWire; -import resonantinduction.wire.framed.PartFramedWire; +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 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 617be20b..469fb871 100644 --- a/src/main/java/resonantinduction/ResonantInduction.java +++ b/src/main/java/resonantinduction/ResonantInduction.java @@ -19,21 +19,21 @@ import net.minecraftforge.oredict.ShapelessOreRecipe; import org.modstats.ModstatInfo; import org.modstats.Modstats; -import resonantinduction.battery.BlockBattery; -import resonantinduction.battery.ItemBlockBattery; -import resonantinduction.battery.TileBattery; -import resonantinduction.furnace.BlockAdvancedFurnace; -import resonantinduction.furnace.TileAdvancedFurnace; -import resonantinduction.levitator.BlockEMContractor; -import resonantinduction.levitator.ItemBlockContractor; -import resonantinduction.levitator.ItemLinker; -import resonantinduction.levitator.TileEMLevitator; +import resonantinduction.machine.furnace.BlockAdvancedFurnace; +import resonantinduction.machine.furnace.TileAdvancedFurnace; import resonantinduction.multimeter.ItemMultimeter; -import resonantinduction.tesla.BlockTesla; -import resonantinduction.tesla.TileTesla; -import resonantinduction.transformer.ItemTransformer; -import resonantinduction.wire.EnumWireMaterial; -import resonantinduction.wire.ItemWire; +import resonantinduction.transport.battery.BlockBattery; +import resonantinduction.transport.battery.ItemBlockBattery; +import resonantinduction.transport.battery.TileBattery; +import resonantinduction.transport.levitator.BlockEMContractor; +import resonantinduction.transport.levitator.ItemBlockContractor; +import resonantinduction.transport.levitator.ItemLinker; +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 calclavia.lib.UniversalRecipe; import calclavia.lib.network.PacketHandler; import calclavia.lib.network.PacketTile; diff --git a/src/main/java/resonantinduction/battery/BatteryManager.java b/src/main/java/resonantinduction/battery/BatteryManager.java deleted file mode 100644 index 4db090b7..00000000 --- a/src/main/java/resonantinduction/battery/BatteryManager.java +++ /dev/null @@ -1,39 +0,0 @@ -package resonantinduction.battery; - -import net.minecraft.inventory.IInventory; -import net.minecraft.inventory.Slot; -import net.minecraft.item.ItemStack; -import universalelectricity.api.item.IEnergyItem; - -public class BatteryManager -{ - public static final int CELLS_PER_BATTERY = 16; - - public static class SlotOut extends Slot - { - public SlotOut(IInventory inventory, int index, int x, int y) - { - super(inventory, index, x, y); - } - - @Override - public boolean isItemValid(ItemStack itemstack) - { - return false; - } - } - - public static class SlotBattery extends Slot - { - public SlotBattery(IInventory inventory, int index, int x, int y) - { - super(inventory, index, x, y); - } - - @Override - public boolean isItemValid(ItemStack itemstack) - { - return itemstack.getItem() instanceof IEnergyItem; - } - } -} diff --git a/src/main/java/resonantinduction/base/BlockBase.java b/src/main/java/resonantinduction/core/base/BlockBase.java similarity index 94% rename from src/main/java/resonantinduction/base/BlockBase.java rename to src/main/java/resonantinduction/core/base/BlockBase.java index e3da18b1..e83dd2dd 100644 --- a/src/main/java/resonantinduction/base/BlockBase.java +++ b/src/main/java/resonantinduction/core/base/BlockBase.java @@ -1,7 +1,7 @@ /** * */ -package resonantinduction.base; +package resonantinduction.core.base; import net.minecraft.block.Block; import net.minecraft.block.material.Material; diff --git a/src/main/java/resonantinduction/base/InventoryUtil.java b/src/main/java/resonantinduction/core/base/InventoryUtil.java similarity index 99% rename from src/main/java/resonantinduction/base/InventoryUtil.java rename to src/main/java/resonantinduction/core/base/InventoryUtil.java index 2978b91a..c918512e 100644 --- a/src/main/java/resonantinduction/base/InventoryUtil.java +++ b/src/main/java/resonantinduction/core/base/InventoryUtil.java @@ -1,4 +1,4 @@ -package resonantinduction.base; +package resonantinduction.core.base; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.ISidedInventory; diff --git a/src/main/java/resonantinduction/base/ItemBase.java b/src/main/java/resonantinduction/core/base/ItemBase.java similarity index 93% rename from src/main/java/resonantinduction/base/ItemBase.java rename to src/main/java/resonantinduction/core/base/ItemBase.java index b9964f7f..4885b006 100644 --- a/src/main/java/resonantinduction/base/ItemBase.java +++ b/src/main/java/resonantinduction/core/base/ItemBase.java @@ -1,4 +1,4 @@ -package resonantinduction.base; +package resonantinduction.core.base; import net.minecraft.item.Item; import net.minecraftforge.common.Configuration; diff --git a/src/main/java/resonantinduction/base/ItemMultipartBase.java b/src/main/java/resonantinduction/core/base/ItemMultipartBase.java similarity index 93% rename from src/main/java/resonantinduction/base/ItemMultipartBase.java rename to src/main/java/resonantinduction/core/base/ItemMultipartBase.java index 668cd147..ab692538 100644 --- a/src/main/java/resonantinduction/base/ItemMultipartBase.java +++ b/src/main/java/resonantinduction/core/base/ItemMultipartBase.java @@ -1,4 +1,4 @@ -package resonantinduction.base; +package resonantinduction.core.base; import net.minecraftforge.common.Configuration; import resonantinduction.ResonantInduction; diff --git a/src/main/java/resonantinduction/base/ListUtil.java b/src/main/java/resonantinduction/core/base/ListUtil.java similarity index 98% rename from src/main/java/resonantinduction/base/ListUtil.java rename to src/main/java/resonantinduction/core/base/ListUtil.java index 39760543..61caf7d5 100644 --- a/src/main/java/resonantinduction/base/ListUtil.java +++ b/src/main/java/resonantinduction/core/base/ListUtil.java @@ -1,4 +1,4 @@ -package resonantinduction.base; +package resonantinduction.core.base; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/main/java/resonantinduction/base/PartAdvanced.java b/src/main/java/resonantinduction/core/base/PartAdvanced.java similarity index 90% rename from src/main/java/resonantinduction/base/PartAdvanced.java rename to src/main/java/resonantinduction/core/base/PartAdvanced.java index 7bf6c7b7..a711fbc9 100644 --- a/src/main/java/resonantinduction/base/PartAdvanced.java +++ b/src/main/java/resonantinduction/core/base/PartAdvanced.java @@ -1,4 +1,4 @@ -package resonantinduction.base; +package resonantinduction.core.base; import codechicken.multipart.TMultiPart; diff --git a/src/main/java/resonantinduction/render/BlockRenderingHandler.java b/src/main/java/resonantinduction/core/render/BlockRenderingHandler.java similarity index 84% rename from src/main/java/resonantinduction/render/BlockRenderingHandler.java rename to src/main/java/resonantinduction/core/render/BlockRenderingHandler.java index 8a53e420..8dd99fc2 100644 --- a/src/main/java/resonantinduction/render/BlockRenderingHandler.java +++ b/src/main/java/resonantinduction/core/render/BlockRenderingHandler.java @@ -1,7 +1,7 @@ /** * */ -package resonantinduction.render; +package resonantinduction.core.render; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; @@ -9,12 +9,12 @@ import net.minecraft.world.IBlockAccess; import org.lwjgl.opengl.GL11; -import resonantinduction.battery.BlockBattery; -import resonantinduction.battery.RenderBattery; -import resonantinduction.levitator.BlockEMContractor; -import resonantinduction.levitator.RenderLevitator; -import resonantinduction.tesla.BlockTesla; -import resonantinduction.tesla.RenderTesla; +import resonantinduction.transport.battery.BlockBattery; +import resonantinduction.transport.battery.RenderBattery; +import resonantinduction.transport.levitator.BlockEMContractor; +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/render/InvertX.java b/src/main/java/resonantinduction/core/render/InvertX.java similarity index 91% rename from src/main/java/resonantinduction/render/InvertX.java rename to src/main/java/resonantinduction/core/render/InvertX.java index d7165597..1570424e 100644 --- a/src/main/java/resonantinduction/render/InvertX.java +++ b/src/main/java/resonantinduction/core/render/InvertX.java @@ -1,4 +1,4 @@ -package resonantinduction.render; +package resonantinduction.core.render; import codechicken.lib.vec.Matrix4; import codechicken.lib.vec.Transformation; diff --git a/src/main/java/resonantinduction/furnace/BlockAdvancedFurnace.java b/src/main/java/resonantinduction/machine/furnace/BlockAdvancedFurnace.java similarity index 98% rename from src/main/java/resonantinduction/furnace/BlockAdvancedFurnace.java rename to src/main/java/resonantinduction/machine/furnace/BlockAdvancedFurnace.java index 5b0bea1f..4d7c6539 100644 --- a/src/main/java/resonantinduction/furnace/BlockAdvancedFurnace.java +++ b/src/main/java/resonantinduction/machine/furnace/BlockAdvancedFurnace.java @@ -1,4 +1,4 @@ -package resonantinduction.furnace; +package resonantinduction.machine.furnace; import java.util.Random; diff --git a/src/main/java/resonantinduction/furnace/TileAdvancedFurnace.java b/src/main/java/resonantinduction/machine/furnace/TileAdvancedFurnace.java similarity index 99% rename from src/main/java/resonantinduction/furnace/TileAdvancedFurnace.java rename to src/main/java/resonantinduction/machine/furnace/TileAdvancedFurnace.java index 27aa8d30..5a4e5828 100644 --- a/src/main/java/resonantinduction/furnace/TileAdvancedFurnace.java +++ b/src/main/java/resonantinduction/machine/furnace/TileAdvancedFurnace.java @@ -1,4 +1,4 @@ -package resonantinduction.furnace; +package resonantinduction.machine.furnace; import java.util.ArrayList; diff --git a/src/main/java/resonantinduction/multimeter/ItemMultimeter.java b/src/main/java/resonantinduction/multimeter/ItemMultimeter.java index b9724836..96c0a0b3 100644 --- a/src/main/java/resonantinduction/multimeter/ItemMultimeter.java +++ b/src/main/java/resonantinduction/multimeter/ItemMultimeter.java @@ -3,15 +3,14 @@ package resonantinduction.multimeter; import java.util.List; import calclavia.lib.prefab.TranslationHelper; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.Icon; import net.minecraft.world.World; import net.minecraftforge.common.ForgeDirection; -import resonantinduction.base.ItemMultipartBase; -import resonantinduction.wire.EnumWireMaterial; +import resonantinduction.core.base.ItemMultipartBase; +import resonantinduction.transport.wire.EnumWireMaterial; import codechicken.lib.vec.BlockCoord; import codechicken.lib.vec.Vector3; import codechicken.multipart.MultiPartRegistry; diff --git a/src/main/java/resonantinduction/multimeter/RenderMultimeter.java b/src/main/java/resonantinduction/multimeter/RenderMultimeter.java index 76a3ec4a..72c6e12d 100644 --- a/src/main/java/resonantinduction/multimeter/RenderMultimeter.java +++ b/src/main/java/resonantinduction/multimeter/RenderMultimeter.java @@ -8,7 +8,7 @@ import net.minecraftforge.common.ForgeDirection; import org.lwjgl.opengl.GL11; import resonantinduction.ResonantInduction; -import resonantinduction.model.ModelMultimeter; +import resonantinduction.transport.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/multimeter/RenderRIItem.java b/src/main/java/resonantinduction/multimeter/RenderRIItem.java index e72ddcab..9163e276 100644 --- a/src/main/java/resonantinduction/multimeter/RenderRIItem.java +++ b/src/main/java/resonantinduction/multimeter/RenderRIItem.java @@ -5,8 +5,8 @@ import net.minecraftforge.client.IItemRenderer; import org.lwjgl.opengl.GL11; -import resonantinduction.transformer.ItemTransformer; -import resonantinduction.transformer.RenderTransformer; +import resonantinduction.transport.transformer.ItemTransformer; +import resonantinduction.transport.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/battery/BatteryStructure.java b/src/main/java/resonantinduction/transport/battery/BatteryStructure.java similarity index 96% rename from src/main/java/resonantinduction/battery/BatteryStructure.java rename to src/main/java/resonantinduction/transport/battery/BatteryStructure.java index e0ea8c62..3fba1917 100644 --- a/src/main/java/resonantinduction/battery/BatteryStructure.java +++ b/src/main/java/resonantinduction/transport/battery/BatteryStructure.java @@ -1,4 +1,4 @@ -package resonantinduction.battery; +package resonantinduction.transport.battery; import java.util.Arrays; diff --git a/src/main/java/resonantinduction/battery/BlockBattery.java b/src/main/java/resonantinduction/transport/battery/BlockBattery.java similarity index 91% rename from src/main/java/resonantinduction/battery/BlockBattery.java rename to src/main/java/resonantinduction/transport/battery/BlockBattery.java index 67319e98..517b7b4c 100644 --- a/src/main/java/resonantinduction/battery/BlockBattery.java +++ b/src/main/java/resonantinduction/transport/battery/BlockBattery.java @@ -1,7 +1,7 @@ /** * */ -package resonantinduction.battery; +package resonantinduction.transport.battery; import net.minecraft.block.ITileEntityProvider; import net.minecraft.entity.EntityLivingBase; @@ -10,8 +10,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import resonantinduction.ResonantInduction; -import resonantinduction.base.BlockBase; -import resonantinduction.render.BlockRenderingHandler; +import resonantinduction.core.base.BlockBase; +import resonantinduction.core.render.BlockRenderingHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/resonantinduction/battery/ItemBlockBattery.java b/src/main/java/resonantinduction/transport/battery/ItemBlockBattery.java similarity index 99% rename from src/main/java/resonantinduction/battery/ItemBlockBattery.java rename to src/main/java/resonantinduction/transport/battery/ItemBlockBattery.java index 08f4ffff..ea1c401e 100644 --- a/src/main/java/resonantinduction/battery/ItemBlockBattery.java +++ b/src/main/java/resonantinduction/transport/battery/ItemBlockBattery.java @@ -1,4 +1,4 @@ -package resonantinduction.battery; +package resonantinduction.transport.battery; import java.util.List; diff --git a/src/main/java/resonantinduction/battery/RenderBattery.java b/src/main/java/resonantinduction/transport/battery/RenderBattery.java similarity index 97% rename from src/main/java/resonantinduction/battery/RenderBattery.java rename to src/main/java/resonantinduction/transport/battery/RenderBattery.java index 5d789f3f..2997a635 100644 --- a/src/main/java/resonantinduction/battery/RenderBattery.java +++ b/src/main/java/resonantinduction/transport/battery/RenderBattery.java @@ -1,7 +1,7 @@ /** * */ -package resonantinduction.battery; +package resonantinduction.transport.battery; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; @@ -12,7 +12,7 @@ import net.minecraftforge.client.model.IModelCustom; import org.lwjgl.opengl.GL11; import resonantinduction.ResonantInduction; -import resonantinduction.model.ModelBattery; +import resonantinduction.transport.model.ModelBattery; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/resonantinduction/battery/TileBattery.java b/src/main/java/resonantinduction/transport/battery/TileBattery.java similarity index 99% rename from src/main/java/resonantinduction/battery/TileBattery.java rename to src/main/java/resonantinduction/transport/battery/TileBattery.java index 999672aa..bb75f027 100644 --- a/src/main/java/resonantinduction/battery/TileBattery.java +++ b/src/main/java/resonantinduction/transport/battery/TileBattery.java @@ -1,4 +1,4 @@ -package resonantinduction.battery; +package resonantinduction.transport.battery; import java.util.ArrayList; import java.util.EnumSet; diff --git a/src/main/java/resonantinduction/fx/FXElectricBolt.java b/src/main/java/resonantinduction/transport/fx/FXElectricBolt.java similarity index 99% rename from src/main/java/resonantinduction/fx/FXElectricBolt.java rename to src/main/java/resonantinduction/transport/fx/FXElectricBolt.java index 8953ba04..44023ebb 100644 --- a/src/main/java/resonantinduction/fx/FXElectricBolt.java +++ b/src/main/java/resonantinduction/transport/fx/FXElectricBolt.java @@ -1,4 +1,4 @@ -package resonantinduction.fx; +package resonantinduction.transport.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/gui/GuiMultimeter.java b/src/main/java/resonantinduction/transport/gui/GuiMultimeter.java similarity index 98% rename from src/main/java/resonantinduction/gui/GuiMultimeter.java rename to src/main/java/resonantinduction/transport/gui/GuiMultimeter.java index 8d303426..f10ff608 100644 --- a/src/main/java/resonantinduction/gui/GuiMultimeter.java +++ b/src/main/java/resonantinduction/transport/gui/GuiMultimeter.java @@ -1,7 +1,7 @@ /** * */ -package resonantinduction.gui; +package resonantinduction.transport.gui; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiTextField; diff --git a/src/main/java/resonantinduction/levitator/BlockEMContractor.java b/src/main/java/resonantinduction/transport/levitator/BlockEMContractor.java similarity index 95% rename from src/main/java/resonantinduction/levitator/BlockEMContractor.java rename to src/main/java/resonantinduction/transport/levitator/BlockEMContractor.java index b8235b73..ba63a560 100644 --- a/src/main/java/resonantinduction/levitator/BlockEMContractor.java +++ b/src/main/java/resonantinduction/transport/levitator/BlockEMContractor.java @@ -1,4 +1,4 @@ -package resonantinduction.levitator; +package resonantinduction.transport.levitator; import calclavia.lib.prefab.item.ItemCoordLink; import net.minecraft.block.ITileEntityProvider; @@ -9,8 +9,8 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.common.ForgeDirection; import resonantinduction.ResonantInduction; -import resonantinduction.base.BlockBase; -import resonantinduction.render.BlockRenderingHandler; +import resonantinduction.core.base.BlockBase; +import resonantinduction.core.render.BlockRenderingHandler; import universalelectricity.api.vector.Vector3; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/resonantinduction/levitator/ItemBlockContractor.java b/src/main/java/resonantinduction/transport/levitator/ItemBlockContractor.java similarity index 96% rename from src/main/java/resonantinduction/levitator/ItemBlockContractor.java rename to src/main/java/resonantinduction/transport/levitator/ItemBlockContractor.java index cef1423b..9c476767 100644 --- a/src/main/java/resonantinduction/levitator/ItemBlockContractor.java +++ b/src/main/java/resonantinduction/transport/levitator/ItemBlockContractor.java @@ -1,4 +1,4 @@ -package resonantinduction.levitator; +package resonantinduction.transport.levitator; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; diff --git a/src/main/java/resonantinduction/levitator/ItemLinker.java b/src/main/java/resonantinduction/transport/levitator/ItemLinker.java similarity index 95% rename from src/main/java/resonantinduction/levitator/ItemLinker.java rename to src/main/java/resonantinduction/transport/levitator/ItemLinker.java index edf3e00a..ad541bd6 100644 --- a/src/main/java/resonantinduction/levitator/ItemLinker.java +++ b/src/main/java/resonantinduction/transport/levitator/ItemLinker.java @@ -1,7 +1,7 @@ /** * */ -package resonantinduction.levitator; +package resonantinduction.transport.levitator; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; diff --git a/src/main/java/resonantinduction/levitator/PathfinderEMContractor.java b/src/main/java/resonantinduction/transport/levitator/PathfinderEMContractor.java similarity index 97% rename from src/main/java/resonantinduction/levitator/PathfinderEMContractor.java rename to src/main/java/resonantinduction/transport/levitator/PathfinderEMContractor.java index 183774ea..eb1f3bff 100644 --- a/src/main/java/resonantinduction/levitator/PathfinderEMContractor.java +++ b/src/main/java/resonantinduction/transport/levitator/PathfinderEMContractor.java @@ -1,7 +1,7 @@ /** * */ -package resonantinduction.levitator; +package resonantinduction.transport.levitator; import java.util.HashSet; import java.util.Set; diff --git a/src/main/java/resonantinduction/levitator/RenderLevitator.java b/src/main/java/resonantinduction/transport/levitator/RenderLevitator.java similarity index 94% rename from src/main/java/resonantinduction/levitator/RenderLevitator.java rename to src/main/java/resonantinduction/transport/levitator/RenderLevitator.java index a0292d39..9bbfa4c0 100644 --- a/src/main/java/resonantinduction/levitator/RenderLevitator.java +++ b/src/main/java/resonantinduction/transport/levitator/RenderLevitator.java @@ -1,4 +1,4 @@ -package resonantinduction.levitator; +package resonantinduction.transport.levitator; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; @@ -7,7 +7,7 @@ import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; import resonantinduction.ResonantInduction; -import resonantinduction.model.ModelEMContractor; +import resonantinduction.transport.model.ModelEMContractor; public class RenderLevitator extends TileEntitySpecialRenderer { diff --git a/src/main/java/resonantinduction/levitator/ThreadEMPathfinding.java b/src/main/java/resonantinduction/transport/levitator/ThreadEMPathfinding.java similarity index 93% rename from src/main/java/resonantinduction/levitator/ThreadEMPathfinding.java rename to src/main/java/resonantinduction/transport/levitator/ThreadEMPathfinding.java index f5e73400..c1b0e532 100644 --- a/src/main/java/resonantinduction/levitator/ThreadEMPathfinding.java +++ b/src/main/java/resonantinduction/transport/levitator/ThreadEMPathfinding.java @@ -1,7 +1,7 @@ /** * */ -package resonantinduction.levitator; +package resonantinduction.transport.levitator; import universalelectricity.api.vector.Vector3; diff --git a/src/main/java/resonantinduction/levitator/TileEMLevitator.java b/src/main/java/resonantinduction/transport/levitator/TileEMLevitator.java similarity index 99% rename from src/main/java/resonantinduction/levitator/TileEMLevitator.java rename to src/main/java/resonantinduction/transport/levitator/TileEMLevitator.java index 61078ed8..6c0015ab 100644 --- a/src/main/java/resonantinduction/levitator/TileEMLevitator.java +++ b/src/main/java/resonantinduction/transport/levitator/TileEMLevitator.java @@ -1,4 +1,4 @@ -package resonantinduction.levitator; +package resonantinduction.transport.levitator; import java.util.ArrayList; import java.util.HashSet; @@ -22,7 +22,7 @@ import net.minecraft.world.World; import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.fluids.IFluidBlock; import resonantinduction.ResonantInduction; -import resonantinduction.tesla.TileTesla; +import resonantinduction.transport.tesla.TileTesla; import universalelectricity.api.vector.Vector3; import calclavia.lib.network.IPacketReceiver; import calclavia.lib.network.IPacketSender; diff --git a/src/main/java/resonantinduction/model/ModelBattery.java b/src/main/java/resonantinduction/transport/model/ModelBattery.java similarity index 99% rename from src/main/java/resonantinduction/model/ModelBattery.java rename to src/main/java/resonantinduction/transport/model/ModelBattery.java index 4d893bdd..7d5068a0 100644 --- a/src/main/java/resonantinduction/model/ModelBattery.java +++ b/src/main/java/resonantinduction/transport/model/ModelBattery.java @@ -1,4 +1,4 @@ -package resonantinduction.model; +package resonantinduction.transport.model; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; diff --git a/src/main/java/resonantinduction/model/ModelEMContractor.java b/src/main/java/resonantinduction/transport/model/ModelEMContractor.java similarity index 99% rename from src/main/java/resonantinduction/model/ModelEMContractor.java rename to src/main/java/resonantinduction/transport/model/ModelEMContractor.java index 3ae54f21..784427da 100644 --- a/src/main/java/resonantinduction/model/ModelEMContractor.java +++ b/src/main/java/resonantinduction/transport/model/ModelEMContractor.java @@ -1,4 +1,4 @@ -package resonantinduction.model; +package resonantinduction.transport.model; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; diff --git a/src/main/java/resonantinduction/model/ModelInsulation.java b/src/main/java/resonantinduction/transport/model/ModelInsulation.java similarity index 99% rename from src/main/java/resonantinduction/model/ModelInsulation.java rename to src/main/java/resonantinduction/transport/model/ModelInsulation.java index 80d28c94..6d2bdde2 100644 --- a/src/main/java/resonantinduction/model/ModelInsulation.java +++ b/src/main/java/resonantinduction/transport/model/ModelInsulation.java @@ -1,4 +1,4 @@ -package resonantinduction.model; +package resonantinduction.transport.model; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; diff --git a/src/main/java/resonantinduction/model/ModelMultimeter.java b/src/main/java/resonantinduction/transport/model/ModelMultimeter.java similarity index 97% rename from src/main/java/resonantinduction/model/ModelMultimeter.java rename to src/main/java/resonantinduction/transport/model/ModelMultimeter.java index f7932016..1881df0e 100644 --- a/src/main/java/resonantinduction/model/ModelMultimeter.java +++ b/src/main/java/resonantinduction/transport/model/ModelMultimeter.java @@ -1,4 +1,4 @@ -package resonantinduction.model; +package resonantinduction.transport.model; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; diff --git a/src/main/java/resonantinduction/model/ModelTeslaBottom.java b/src/main/java/resonantinduction/transport/model/ModelTeslaBottom.java similarity index 99% rename from src/main/java/resonantinduction/model/ModelTeslaBottom.java rename to src/main/java/resonantinduction/transport/model/ModelTeslaBottom.java index 18d2e141..c16d3a1d 100644 --- a/src/main/java/resonantinduction/model/ModelTeslaBottom.java +++ b/src/main/java/resonantinduction/transport/model/ModelTeslaBottom.java @@ -1,4 +1,4 @@ -package resonantinduction.model; +package resonantinduction.transport.model; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; diff --git a/src/main/java/resonantinduction/model/ModelTeslaMiddle.java b/src/main/java/resonantinduction/transport/model/ModelTeslaMiddle.java similarity index 99% rename from src/main/java/resonantinduction/model/ModelTeslaMiddle.java rename to src/main/java/resonantinduction/transport/model/ModelTeslaMiddle.java index ec70238b..a3e95196 100644 --- a/src/main/java/resonantinduction/model/ModelTeslaMiddle.java +++ b/src/main/java/resonantinduction/transport/model/ModelTeslaMiddle.java @@ -1,4 +1,4 @@ -package resonantinduction.model; +package resonantinduction.transport.model; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; diff --git a/src/main/java/resonantinduction/model/ModelTeslaTop.java b/src/main/java/resonantinduction/transport/model/ModelTeslaTop.java similarity index 99% rename from src/main/java/resonantinduction/model/ModelTeslaTop.java rename to src/main/java/resonantinduction/transport/model/ModelTeslaTop.java index e0c860f9..3f6cbc3a 100644 --- a/src/main/java/resonantinduction/model/ModelTeslaTop.java +++ b/src/main/java/resonantinduction/transport/model/ModelTeslaTop.java @@ -1,4 +1,4 @@ -package resonantinduction.model; +package resonantinduction.transport.model; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; diff --git a/src/main/java/resonantinduction/model/ModelWire.java b/src/main/java/resonantinduction/transport/model/ModelWire.java similarity index 98% rename from src/main/java/resonantinduction/model/ModelWire.java rename to src/main/java/resonantinduction/transport/model/ModelWire.java index e366f6ea..dc5d6fb0 100644 --- a/src/main/java/resonantinduction/model/ModelWire.java +++ b/src/main/java/resonantinduction/transport/model/ModelWire.java @@ -1,4 +1,4 @@ -package resonantinduction.model; +package resonantinduction.transport.model; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; diff --git a/src/main/java/resonantinduction/tesla/BlockTesla.java b/src/main/java/resonantinduction/transport/tesla/BlockTesla.java similarity index 96% rename from src/main/java/resonantinduction/tesla/BlockTesla.java rename to src/main/java/resonantinduction/transport/tesla/BlockTesla.java index b8d19724..db77c792 100644 --- a/src/main/java/resonantinduction/tesla/BlockTesla.java +++ b/src/main/java/resonantinduction/transport/tesla/BlockTesla.java @@ -1,7 +1,7 @@ /** * */ -package resonantinduction.tesla; +package resonantinduction.transport.tesla; import calclavia.lib.prefab.TranslationHelper; import calclavia.lib.prefab.item.ItemCoordLink; @@ -13,8 +13,8 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import resonantinduction.ResonantInduction; import resonantinduction.Utility; -import resonantinduction.base.BlockBase; -import resonantinduction.render.BlockRenderingHandler; +import resonantinduction.core.base.BlockBase; +import resonantinduction.core.render.BlockRenderingHandler; import universalelectricity.api.vector.Vector3; import universalelectricity.api.vector.VectorWorld; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/resonantinduction/tesla/RenderTesla.java b/src/main/java/resonantinduction/transport/tesla/RenderTesla.java similarity index 88% rename from src/main/java/resonantinduction/tesla/RenderTesla.java rename to src/main/java/resonantinduction/transport/tesla/RenderTesla.java index 1cb4dc0c..ba435dfd 100644 --- a/src/main/java/resonantinduction/tesla/RenderTesla.java +++ b/src/main/java/resonantinduction/transport/tesla/RenderTesla.java @@ -1,7 +1,7 @@ /** * */ -package resonantinduction.tesla; +package resonantinduction.transport.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.model.ModelTeslaBottom; -import resonantinduction.model.ModelTeslaMiddle; -import resonantinduction.model.ModelTeslaTop; +import resonantinduction.transport.model.ModelTeslaBottom; +import resonantinduction.transport.model.ModelTeslaMiddle; +import resonantinduction.transport.model.ModelTeslaTop; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/resonantinduction/tesla/TeslaGrid.java b/src/main/java/resonantinduction/transport/tesla/TeslaGrid.java similarity index 96% rename from src/main/java/resonantinduction/tesla/TeslaGrid.java rename to src/main/java/resonantinduction/transport/tesla/TeslaGrid.java index 93872a3e..a80b277f 100644 --- a/src/main/java/resonantinduction/tesla/TeslaGrid.java +++ b/src/main/java/resonantinduction/transport/tesla/TeslaGrid.java @@ -1,7 +1,7 @@ /** * */ -package resonantinduction.tesla; +package resonantinduction.transport.tesla; import java.util.HashSet; import java.util.Iterator; diff --git a/src/main/java/resonantinduction/tesla/TileTesla.java b/src/main/java/resonantinduction/transport/tesla/TileTesla.java similarity index 99% rename from src/main/java/resonantinduction/tesla/TileTesla.java rename to src/main/java/resonantinduction/transport/tesla/TileTesla.java index 8a362274..969247f6 100644 --- a/src/main/java/resonantinduction/tesla/TileTesla.java +++ b/src/main/java/resonantinduction/transport/tesla/TileTesla.java @@ -1,7 +1,7 @@ /** * */ -package resonantinduction.tesla; +package resonantinduction.transport.tesla; import java.util.ArrayList; import java.util.Collections; diff --git a/src/main/java/resonantinduction/transformer/ItemTransformer.java b/src/main/java/resonantinduction/transport/transformer/ItemTransformer.java similarity index 84% rename from src/main/java/resonantinduction/transformer/ItemTransformer.java rename to src/main/java/resonantinduction/transport/transformer/ItemTransformer.java index 4126f3fc..6bc5ec17 100644 --- a/src/main/java/resonantinduction/transformer/ItemTransformer.java +++ b/src/main/java/resonantinduction/transport/transformer/ItemTransformer.java @@ -1,11 +1,11 @@ -package resonantinduction.transformer; +package resonantinduction.transport.transformer; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.Icon; import net.minecraft.world.World; -import resonantinduction.base.ItemMultipartBase; -import resonantinduction.wire.EnumWireMaterial; +import resonantinduction.core.base.ItemMultipartBase; +import resonantinduction.transport.wire.EnumWireMaterial; import codechicken.lib.vec.BlockCoord; import codechicken.lib.vec.Vector3; import codechicken.multipart.MultiPartRegistry; diff --git a/src/main/java/resonantinduction/transformer/ModelTransformer.java b/src/main/java/resonantinduction/transport/transformer/ModelTransformer.java similarity index 98% rename from src/main/java/resonantinduction/transformer/ModelTransformer.java rename to src/main/java/resonantinduction/transport/transformer/ModelTransformer.java index 4986a58e..98b79061 100644 --- a/src/main/java/resonantinduction/transformer/ModelTransformer.java +++ b/src/main/java/resonantinduction/transport/transformer/ModelTransformer.java @@ -1,4 +1,4 @@ -package resonantinduction.transformer; +package resonantinduction.transport.transformer; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; diff --git a/src/main/java/resonantinduction/transformer/PartTransformer.java b/src/main/java/resonantinduction/transport/transformer/PartTransformer.java similarity index 99% rename from src/main/java/resonantinduction/transformer/PartTransformer.java rename to src/main/java/resonantinduction/transport/transformer/PartTransformer.java index c803b43e..49c6564c 100644 --- a/src/main/java/resonantinduction/transformer/PartTransformer.java +++ b/src/main/java/resonantinduction/transport/transformer/PartTransformer.java @@ -1,4 +1,4 @@ -package resonantinduction.transformer; +package resonantinduction.transport.transformer; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/main/java/resonantinduction/transformer/RenderTransformer.java b/src/main/java/resonantinduction/transport/transformer/RenderTransformer.java similarity index 97% rename from src/main/java/resonantinduction/transformer/RenderTransformer.java rename to src/main/java/resonantinduction/transport/transformer/RenderTransformer.java index da8fe6dc..ec1364c1 100644 --- a/src/main/java/resonantinduction/transformer/RenderTransformer.java +++ b/src/main/java/resonantinduction/transport/transformer/RenderTransformer.java @@ -1,4 +1,4 @@ -package resonantinduction.transformer; +package resonantinduction.transport.transformer; import net.minecraft.client.Minecraft; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/resonantinduction/wire/EnumWireMaterial.java b/src/main/java/resonantinduction/transport/wire/EnumWireMaterial.java similarity index 97% rename from src/main/java/resonantinduction/wire/EnumWireMaterial.java rename to src/main/java/resonantinduction/transport/wire/EnumWireMaterial.java index 99046ba1..4ba5ad5c 100644 --- a/src/main/java/resonantinduction/wire/EnumWireMaterial.java +++ b/src/main/java/resonantinduction/transport/wire/EnumWireMaterial.java @@ -1,4 +1,4 @@ -package resonantinduction.wire; +package resonantinduction.transport.wire; import net.minecraft.block.Block; import net.minecraft.item.Item; diff --git a/src/main/java/resonantinduction/wire/ItemWire.java b/src/main/java/resonantinduction/transport/wire/ItemWire.java similarity index 94% rename from src/main/java/resonantinduction/wire/ItemWire.java rename to src/main/java/resonantinduction/transport/wire/ItemWire.java index f4bcfa7b..fc3a305a 100644 --- a/src/main/java/resonantinduction/wire/ItemWire.java +++ b/src/main/java/resonantinduction/transport/wire/ItemWire.java @@ -1,4 +1,4 @@ -package resonantinduction.wire; +package resonantinduction.transport.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.wire.flat.PartFlatWire; -import resonantinduction.wire.flat.RenderFlatWire; -import resonantinduction.wire.framed.PartFramedWire; -import resonantinduction.wire.framed.RenderPartWire; +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 universalelectricity.api.energy.UnitDisplay; import universalelectricity.api.energy.UnitDisplay.Unit; import calclavia.lib.Calclavia; diff --git a/src/main/java/resonantinduction/wire/PartAdvancedWire.java b/src/main/java/resonantinduction/transport/wire/PartAdvancedWire.java similarity index 99% rename from src/main/java/resonantinduction/wire/PartAdvancedWire.java rename to src/main/java/resonantinduction/transport/wire/PartAdvancedWire.java index ccfdb5ec..6da16b6b 100644 --- a/src/main/java/resonantinduction/wire/PartAdvancedWire.java +++ b/src/main/java/resonantinduction/transport/wire/PartAdvancedWire.java @@ -1,4 +1,4 @@ -package resonantinduction.wire; +package resonantinduction.transport.wire; import java.util.ArrayList; import java.util.Collections; diff --git a/src/main/java/resonantinduction/wire/PartConductor.java b/src/main/java/resonantinduction/transport/wire/PartConductor.java similarity index 97% rename from src/main/java/resonantinduction/wire/PartConductor.java rename to src/main/java/resonantinduction/transport/wire/PartConductor.java index 2f17943a..36aa7112 100644 --- a/src/main/java/resonantinduction/wire/PartConductor.java +++ b/src/main/java/resonantinduction/transport/wire/PartConductor.java @@ -1,4 +1,4 @@ -package resonantinduction.wire; +package resonantinduction.transport.wire; import ic2.api.energy.event.EnergyTileLoadEvent; import ic2.api.energy.event.EnergyTileUnloadEvent; @@ -7,7 +7,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.common.MinecraftForge; -import resonantinduction.base.PartAdvanced; +import resonantinduction.core.base.PartAdvanced; import universalelectricity.api.CompatibilityModule; import universalelectricity.api.UniversalClass; import universalelectricity.api.energy.EnergyNetworkLoader; diff --git a/src/main/java/resonantinduction/wire/flat/PartFlatSwitchWire.java b/src/main/java/resonantinduction/transport/wire/flat/PartFlatSwitchWire.java similarity index 97% rename from src/main/java/resonantinduction/wire/flat/PartFlatSwitchWire.java rename to src/main/java/resonantinduction/transport/wire/flat/PartFlatSwitchWire.java index ec269ca4..40649449 100644 --- a/src/main/java/resonantinduction/wire/flat/PartFlatSwitchWire.java +++ b/src/main/java/resonantinduction/transport/wire/flat/PartFlatSwitchWire.java @@ -1,4 +1,4 @@ -package resonantinduction.wire.flat; +package resonantinduction.transport.wire.flat; import java.util.Collections; import java.util.List; diff --git a/src/main/java/resonantinduction/wire/flat/PartFlatWire.java b/src/main/java/resonantinduction/transport/wire/flat/PartFlatWire.java similarity index 99% rename from src/main/java/resonantinduction/wire/flat/PartFlatWire.java rename to src/main/java/resonantinduction/transport/wire/flat/PartFlatWire.java index 8517e793..101949a9 100644 --- a/src/main/java/resonantinduction/wire/flat/PartFlatWire.java +++ b/src/main/java/resonantinduction/transport/wire/flat/PartFlatWire.java @@ -1,4 +1,4 @@ -package resonantinduction.wire.flat; +package resonantinduction.transport.wire.flat; import java.util.Arrays; @@ -17,8 +17,8 @@ import org.lwjgl.opengl.GL11; import resonantinduction.ResonantInduction; import resonantinduction.Utility; -import resonantinduction.wire.EnumWireMaterial; -import resonantinduction.wire.PartAdvancedWire; +import resonantinduction.transport.wire.EnumWireMaterial; +import resonantinduction.transport.wire.PartAdvancedWire; import codechicken.lib.colour.Colour; import codechicken.lib.data.MCDataInput; import codechicken.lib.data.MCDataOutput; diff --git a/src/main/java/resonantinduction/wire/flat/RenderFlatWire.java b/src/main/java/resonantinduction/transport/wire/flat/RenderFlatWire.java similarity index 99% rename from src/main/java/resonantinduction/wire/flat/RenderFlatWire.java rename to src/main/java/resonantinduction/transport/wire/flat/RenderFlatWire.java index f36bd65a..7d87f26a 100644 --- a/src/main/java/resonantinduction/wire/flat/RenderFlatWire.java +++ b/src/main/java/resonantinduction/transport/wire/flat/RenderFlatWire.java @@ -1,4 +1,4 @@ -package resonantinduction.wire.flat; +package resonantinduction.transport.wire.flat; import java.util.Arrays; import java.util.LinkedList; diff --git a/src/main/java/resonantinduction/wire/framed/PartFramedSwitchWire.java b/src/main/java/resonantinduction/transport/wire/framed/PartFramedSwitchWire.java similarity index 98% rename from src/main/java/resonantinduction/wire/framed/PartFramedSwitchWire.java rename to src/main/java/resonantinduction/transport/wire/framed/PartFramedSwitchWire.java index 04f51caa..8db790f6 100644 --- a/src/main/java/resonantinduction/wire/framed/PartFramedSwitchWire.java +++ b/src/main/java/resonantinduction/transport/wire/framed/PartFramedSwitchWire.java @@ -1,4 +1,4 @@ -package resonantinduction.wire.framed; +package resonantinduction.transport.wire.framed; import java.util.Collections; import java.util.List; diff --git a/src/main/java/resonantinduction/wire/framed/PartFramedWire.java b/src/main/java/resonantinduction/transport/wire/framed/PartFramedWire.java similarity index 98% rename from src/main/java/resonantinduction/wire/framed/PartFramedWire.java rename to src/main/java/resonantinduction/transport/wire/framed/PartFramedWire.java index 1a792169..af52cb86 100644 --- a/src/main/java/resonantinduction/wire/framed/PartFramedWire.java +++ b/src/main/java/resonantinduction/transport/wire/framed/PartFramedWire.java @@ -1,4 +1,4 @@ -package resonantinduction.wire.framed; +package resonantinduction.transport.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.wire.EnumWireMaterial; -import resonantinduction.wire.PartAdvancedWire; +import resonantinduction.transport.wire.EnumWireMaterial; +import resonantinduction.transport.wire.PartAdvancedWire; import universalelectricity.api.CompatibilityModule; import universalelectricity.api.energy.IConductor; import universalelectricity.api.vector.Vector3; diff --git a/src/main/java/resonantinduction/wire/framed/RenderPartWire.java b/src/main/java/resonantinduction/transport/wire/framed/RenderPartWire.java similarity index 98% rename from src/main/java/resonantinduction/wire/framed/RenderPartWire.java rename to src/main/java/resonantinduction/transport/wire/framed/RenderPartWire.java index 62fd6bb1..77cc49d3 100644 --- a/src/main/java/resonantinduction/wire/framed/RenderPartWire.java +++ b/src/main/java/resonantinduction/transport/wire/framed/RenderPartWire.java @@ -1,4 +1,4 @@ -package resonantinduction.wire.framed; +package resonantinduction.transport.wire.framed; import java.nio.FloatBuffer; import java.util.Map; @@ -12,7 +12,7 @@ import org.lwjgl.BufferUtils; import org.lwjgl.opengl.GL11; import resonantinduction.ResonantInduction; -import resonantinduction.render.InvertX; +import resonantinduction.core.render.InvertX; import codechicken.lib.colour.Colour; import codechicken.lib.lighting.LightModel; import codechicken.lib.render.CCModel; diff --git a/src/main/java/resonantinduction/wire/trait/TraitConductor.java b/src/main/java/resonantinduction/transport/wire/trait/TraitConductor.java similarity index 98% rename from src/main/java/resonantinduction/wire/trait/TraitConductor.java rename to src/main/java/resonantinduction/transport/wire/trait/TraitConductor.java index d64f5ef0..ebc1819b 100644 --- a/src/main/java/resonantinduction/wire/trait/TraitConductor.java +++ b/src/main/java/resonantinduction/transport/wire/trait/TraitConductor.java @@ -1,4 +1,4 @@ -package resonantinduction.wire.trait; +package resonantinduction.transport.wire.trait; import java.util.HashSet; import java.util.Set; diff --git a/src/main/java/resonantinduction/wire/trait/TraitEnergyHandler.java b/src/main/java/resonantinduction/transport/wire/trait/TraitEnergyHandler.java similarity index 97% rename from src/main/java/resonantinduction/wire/trait/TraitEnergyHandler.java rename to src/main/java/resonantinduction/transport/wire/trait/TraitEnergyHandler.java index 27e284c7..16156957 100644 --- a/src/main/java/resonantinduction/wire/trait/TraitEnergyHandler.java +++ b/src/main/java/resonantinduction/transport/wire/trait/TraitEnergyHandler.java @@ -1,10 +1,10 @@ -package resonantinduction.wire.trait; +package resonantinduction.transport.wire.trait; import java.util.HashSet; import java.util.Set; import net.minecraftforge.common.ForgeDirection; -import resonantinduction.wire.PartConductor; +import resonantinduction.transport.wire.PartConductor; import codechicken.multipart.TMultiPart; import codechicken.multipart.TileMultipart; import cofh.api.energy.IEnergyHandler; diff --git a/src/main/java/resonantinduction/wire/trait/TraitEnergySink.java b/src/main/java/resonantinduction/transport/wire/trait/TraitEnergySink.java similarity index 98% rename from src/main/java/resonantinduction/wire/trait/TraitEnergySink.java rename to src/main/java/resonantinduction/transport/wire/trait/TraitEnergySink.java index 2c6efc5d..628bd466 100644 --- a/src/main/java/resonantinduction/wire/trait/TraitEnergySink.java +++ b/src/main/java/resonantinduction/transport/wire/trait/TraitEnergySink.java @@ -1,4 +1,4 @@ -package resonantinduction.wire.trait; +package resonantinduction.transport.wire.trait; import ic2.api.energy.tile.IEnergySink;