More organization

src/main/java/resonantinduction/blocks/BlockGasOre.java

@@ -20,8 +20,8 @@ import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fluids.IFluidBlock;
 import resonantinduction.core.ResonantInductionTabs;
-import resonantinduction.fluid.EnumGas;
 import resonantinduction.transport.ResonantInductionTransport;
+import resonantinduction.transport.fluid.EnumGas;
 import universalelectricity.api.vector.Vector3;
 
 import com.builtbroken.minecraft.DarkCore;

src/main/java/resonantinduction/client/ClientProxy.java

@@ -27,18 +27,18 @@ import resonantinduction.client.render.RenderSink;
 import resonantinduction.client.render.RenderTank;
 import resonantinduction.client.render.RenderTestCar;
 import resonantinduction.client.render.RenderTurkey;
+import resonantinduction.core.misc.EntityFarmEgg;
+import resonantinduction.core.misc.EntityTurkey;
 import resonantinduction.core.recipe.RecipeLoader;
 import resonantinduction.energy.battery.TileBatteryBox;
-import resonantinduction.fluid.pipes.TileEntityPipe;
-import resonantinduction.fluid.pump.TileEntityConstructionPump;
-import resonantinduction.fluid.pump.TileEntityStarterPump;
 import resonantinduction.mechanics.processor.TileEntityProcessor;
-import resonantinduction.misc.EntityFarmEgg;
-import resonantinduction.misc.EntityTurkey;
 import resonantinduction.transport.encoder.TileEntityEncoder;
 import resonantinduction.transport.fluid.TileEntityReleaseValve;
 import resonantinduction.transport.fluid.TileEntityTank;
 import resonantinduction.transport.fluid.TileKitchenSink;
+import resonantinduction.transport.fluid.pipes.TileEntityPipe;
+import resonantinduction.transport.fluid.pump.TileEntityConstructionPump;
+import resonantinduction.transport.fluid.pump.TileEntityStarterPump;
 import resonantinduction.transport.imprinter.TileEntityImprinter;
 import resonantinduction.transport.vechicle.EntityTestCar;
 import cpw.mods.fml.client.registry.ClientRegistry;

src/main/java/resonantinduction/client/render/ItemPipeRenderer.java

@@ -8,8 +8,8 @@ import org.lwjgl.opengl.GL11;
 
 import resonantinduction.client.model.ModelReleaseValve;
 import resonantinduction.core.recipe.RecipeLoader;
-import resonantinduction.fluid.pipes.FluidPartsMaterial;
 import resonantinduction.transport.ResonantInductionTransport;
+import resonantinduction.transport.fluid.pipes.FluidPartsMaterial;
 import cpw.mods.fml.client.FMLClientHandler;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;

src/main/java/resonantinduction/client/render/RenderConstructionPump.java

@@ -7,8 +7,8 @@ import net.minecraft.util.ResourceLocation;
 import org.lwjgl.opengl.GL11;
 
 import resonantinduction.client.model.ModelConstructionPump;
-import resonantinduction.fluid.pump.TileEntityConstructionPump;
 import resonantinduction.transport.ResonantInductionTransport;
+import resonantinduction.transport.fluid.pump.TileEntityConstructionPump;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 

src/main/java/resonantinduction/client/render/RenderMiningLaser.java

@@ -7,7 +7,7 @@ import net.minecraft.util.ResourceLocation;
 import org.lwjgl.opengl.GL11;
 
 import resonantinduction.client.model.ModelLaserTile;
-import resonantinduction.mechanics.mining.TileMiningLaser;
+import resonantinduction.mechanics.machine.mining.TileMiningLaser;
 import resonantinduction.transport.ResonantInductionTransport;
 
 /** @author Darkguardsman */

src/main/java/resonantinduction/client/render/RenderPipe.java

@@ -11,10 +11,10 @@ import org.lwjgl.opengl.GL11;
 
 import resonantinduction.client.model.ModelLargePipe;
 import resonantinduction.client.model.ModelOpenTrough;
-import resonantinduction.fluid.pipes.EnumPipeType;
-import resonantinduction.fluid.pipes.FluidPartsMaterial;
-import resonantinduction.fluid.pipes.TileEntityPipe;
 import resonantinduction.transport.ResonantInductionTransport;
+import resonantinduction.transport.fluid.pipes.EnumPipeType;
+import resonantinduction.transport.fluid.pipes.FluidPartsMaterial;
+import resonantinduction.transport.fluid.pipes.TileEntityPipe;
 
 import com.builtbroken.common.Pair;
 

src/main/java/resonantinduction/client/render/RenderPump.java

@@ -7,8 +7,8 @@ import net.minecraft.util.ResourceLocation;
 import org.lwjgl.opengl.GL11;
 
 import resonantinduction.client.model.ModelPump;
-import resonantinduction.fluid.pump.TileEntityStarterPump;
 import resonantinduction.transport.ResonantInductionTransport;
+import resonantinduction.transport.fluid.pump.TileEntityStarterPump;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 

src/main/java/resonantinduction/client/render/RenderTurkey.java

@@ -7,7 +7,7 @@ import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.util.MathHelper;
 import net.minecraft.util.ResourceLocation;
 import resonantinduction.client.model.ModelTurkey;
-import resonantinduction.misc.EntityTurkey;
+import resonantinduction.core.misc.EntityTurkey;
 import resonantinduction.transport.ResonantInductionTransport;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;

src/main/java/resonantinduction/core/misc/BehaviorDispenseEgg.java

@@ -1,4 +1,4 @@
-package resonantinduction.tool;
+package resonantinduction.core.misc;
 
 import net.minecraft.block.BlockDispenser;
 import net.minecraft.dispenser.BehaviorDefaultDispenseItem;
@@ -9,7 +9,6 @@ import net.minecraft.entity.IProjectile;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.world.World;
-import resonantinduction.misc.EntityFarmEgg;
 
 public class BehaviorDispenseEgg extends BehaviorDefaultDispenseItem
 {

src/main/java/resonantinduction/core/misc/EntityFarmEgg.java

@@ -1,4 +1,4 @@
-package resonantinduction.misc;
+package resonantinduction.core.misc;
 
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.passive.EntityAnimal;

src/main/java/resonantinduction/core/misc/EntityMutantAnimal.java

@@ -1,4 +1,4 @@
-package resonantinduction.misc;
+package resonantinduction.core.misc;
 
 public class EntityMutantAnimal
 {

src/main/java/resonantinduction/core/misc/EntityTurkey.java

@@ -1,4 +1,4 @@
-package resonantinduction.misc;
+package resonantinduction.core.misc;
 
 import net.minecraft.entity.EntityAgeable;
 import net.minecraft.entity.SharedMonsterAttributes;

src/main/java/resonantinduction/core/misc/EnumBird.java

@@ -1,4 +1,4 @@
-package resonantinduction.misc;
+package resonantinduction.core.misc;
 
 import java.awt.Color;
 

src/main/java/resonantinduction/core/misc/EnumTool.java

@@ -1,4 +1,4 @@
-package resonantinduction.tool;
+package resonantinduction.core.misc;
 
 import java.util.ArrayList;
 import java.util.List;

src/main/java/resonantinduction/core/misc/ItemColoredDust.java

@@ -1,4 +1,4 @@
-package resonantinduction.tool;
+package resonantinduction.core.misc;
 
 import java.util.List;
 

src/main/java/resonantinduction/core/misc/ItemCommonTool.java

@@ -1,4 +1,4 @@
-package resonantinduction.tool;
+package resonantinduction.core.misc;
 
 import java.awt.Color;
 import java.util.ArrayList;

src/main/java/resonantinduction/core/misc/ItemFarmBucket.java

@@ -1,4 +1,4 @@
-package resonantinduction.tool;
+package resonantinduction.core.misc;
 
 import java.util.List;
 

src/main/java/resonantinduction/core/misc/ItemFarmEgg.java

@@ -1,11 +1,10 @@
-package resonantinduction.tool;
+package resonantinduction.core.misc;
 
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
-import resonantinduction.misc.EntityFarmEgg;
 
 public class ItemFarmEgg extends Item
 {

src/main/java/resonantinduction/core/misc/ItemFarmFood.java

@@ -1,4 +1,4 @@
-package resonantinduction.tool;
+package resonantinduction.core.misc;
 
 import java.util.List;
 

src/main/java/resonantinduction/core/multimeter/ItemReadoutTools.java

@@ -14,7 +14,7 @@ import net.minecraftforge.common.ForgeDirection;
 import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fluids.FluidTankInfo;
 import net.minecraftforge.fluids.IFluidHandler;
-import resonantinduction.mechanics.generator.TileEntityGenerator;
+import resonantinduction.mechanics.generator.TileGenerator;
 import resonantinduction.transport.ResonantInductionTransport;
 import universalelectricity.api.electricity.IVoltageInput;
 import universalelectricity.api.electricity.IVoltageOutput;
@@ -168,7 +168,7 @@ public class ItemReadoutTools extends ItemBasic
 						}
 						if (tileEntity instanceof TileEntityEnergyMachine)
 						{
-							if (tileEntity instanceof TileEntityGenerator)
+							if (tileEntity instanceof TileGenerator)
 							{
 								player.sendChatToPlayer(ChatMessageComponent.createFromText("E~Out:" + UnitDisplay.getDisplay(((TileEntityEnergyMachine) tileEntity).getJoulesPerTick(), Unit.JOULES, 2, true) + "/tick"));
 							}

src/main/java/resonantinduction/core/recipe/RecipeLoader.java

@@ -11,12 +11,12 @@ import net.minecraftforge.oredict.OreDictionary;
 import net.minecraftforge.oredict.ShapedOreRecipe;
 import net.minecraftforge.oredict.ShapelessOreRecipe;
 import resonantinduction.blocks.BlockBasalt;
+import resonantinduction.core.misc.EnumTool;
 import resonantinduction.core.resource.ItemOreDirv;
 import resonantinduction.core.resource.ItemParts.Parts;
-import resonantinduction.fluid.pipes.FluidPartsMaterial;
 import resonantinduction.mechanics.processor.BlockProcessor;
-import resonantinduction.tool.EnumTool;
 import resonantinduction.transport.crate.BlockCrate;
+import resonantinduction.transport.fluid.pipes.FluidPartsMaterial;
 
 import com.builtbroken.minecraft.EnumMaterial;
 import com.builtbroken.minecraft.EnumOrePart;

src/main/java/resonantinduction/mechanics/ResonantInductionMechanics.java

@@ -25,12 +25,12 @@ import resonantinduction.core.Settings;
 import resonantinduction.core.resource.ResourceGenerator;
 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.machine.grinder.BlockGrinderWheel;
+import resonantinduction.mechanics.machine.grinder.TileGrinderWheel;
+import resonantinduction.mechanics.machine.grinder.TilePurifier;
 import resonantinduction.mechanics.purifier.BlockPurifier;
 import calclavia.lib.network.PacketHandler;
 import calclavia.lib.network.PacketTile;

src/main/java/resonantinduction/mechanics/generator/ContainerCoalGenerator.java

@@ -1,97 +0,0 @@
-package resonantinduction.mechanics.generator;
-
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.inventory.Container;
-import net.minecraft.inventory.Slot;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-
-public class ContainerCoalGenerator extends Container
-{
-	private TileEntitySteamGen tileEntity;
-
-	public ContainerCoalGenerator(InventoryPlayer par1InventoryPlayer, TileEntitySteamGen tileEntity)
-	{
-		this.tileEntity = tileEntity;
-		this.addSlotToContainer(new Slot(tileEntity, 0, 33, 34));
-		int var3;
-
-		for (var3 = 0; var3 < 3; ++var3)
-		{
-			for (int var4 = 0; var4 < 9; ++var4)
-			{
-				this.addSlotToContainer(new Slot(par1InventoryPlayer, var4 + var3 * 9 + 9, 8 + var4 * 18, 84 + var3 * 18));
-			}
-		}
-
-		for (var3 = 0; var3 < 9; ++var3)
-		{
-			this.addSlotToContainer(new Slot(par1InventoryPlayer, var3, 8 + var3 * 18, 142));
-		}
-
-	}
-
-	@Override
-	public void onContainerClosed(EntityPlayer entityplayer)
-	{
-		super.onContainerClosed(entityplayer);
-	}
-
-	@Override
-	public boolean canInteractWith(EntityPlayer par1EntityPlayer)
-	{
-		return this.tileEntity.isUseableByPlayer(par1EntityPlayer);
-	}
-
-	/** Called to transfer a stack from one inventory to the other eg. when shift clicking. */
-	@Override
-	public ItemStack transferStackInSlot(EntityPlayer par1EntityPlayer, int par1)
-	{
-		ItemStack var2 = null;
-		Slot var3 = (Slot) this.inventorySlots.get(par1);
-
-		if (var3 != null && var3.getHasStack())
-		{
-			ItemStack var4 = var3.getStack();
-			var2 = var4.copy();
-
-			if (par1 != 0)
-			{
-				if (var4.itemID == Item.coal.itemID)
-				{
-					if (!this.mergeItemStack(var4, 0, 1, false))
-					{
-						return null;
-					}
-				}
-				else if (par1 >= 30 && par1 < 37 && !this.mergeItemStack(var4, 3, 30, false))
-				{
-					return null;
-				}
-			}
-			else if (!this.mergeItemStack(var4, 3, 37, false))
-			{
-				return null;
-			}
-
-			if (var4.stackSize == 0)
-			{
-				var3.putStack((ItemStack) null);
-			}
-			else
-			{
-				var3.onSlotChanged();
-			}
-
-			if (var4.stackSize == var2.stackSize)
-			{
-				return null;
-			}
-
-			var3.onPickupFromSlot(par1EntityPlayer, var4);
-		}
-
-		return var2;
-	}
-}

src/main/java/resonantinduction/mechanics/generator/TileGenerator.java

@@ -8,19 +8,19 @@ import universalelectricity.api.vector.VectorHelper;
 
 import com.builtbroken.minecraft.prefab.TileEntityEnergyMachine;
 
-public abstract class TileEntityGenerator extends TileEntityEnergyMachine
+public abstract class TileGenerator extends TileEntityEnergyMachine
 {
-	public TileEntityGenerator()
+	public TileGenerator()
 	{
 		super();
 	}
 
-	public TileEntityGenerator(long wattsPerTick)
+	public TileGenerator(long wattsPerTick)
 	{
 		super(wattsPerTick);
 	}
 
-	public TileEntityGenerator(long wattsPerTick, long maxEnergy)
+	public TileGenerator(long wattsPerTick, long maxEnergy)
 	{
 		super(wattsPerTick, maxEnergy);
 	}

src/main/java/resonantinduction/mechanics/generator/solar/BlockSolarPanel.java

@@ -1,4 +1,4 @@
-package resonantinduction.mechanics.generator;
+package resonantinduction.mechanics.generator.solar;
 
 import java.util.List;
 import java.util.Set;

src/main/java/resonantinduction/mechanics/generator/solar/TileEntitySolarBox.java

@@ -1,7 +1,9 @@
-package resonantinduction.mechanics.generator;
+package resonantinduction.mechanics.generator.solar;
+
+import resonantinduction.mechanics.generator.TileGenerator;
 
 /** TileEntity that acts as the connection node for the solar panel */
-public class TileEntitySolarBox extends TileEntityGenerator
+public class TileEntitySolarBox extends TileGenerator
 {
 
 	@Override

src/main/java/resonantinduction/mechanics/generator/solar/TileEntitySolarPanel.java

@@ -1,10 +1,11 @@
-package resonantinduction.mechanics.generator;
+package resonantinduction.mechanics.generator.solar;
 
 import java.util.EnumSet;
 
+import resonantinduction.mechanics.generator.TileGenerator;
 import net.minecraftforge.common.ForgeDirection;
 
-public class TileEntitySolarPanel extends TileEntityGenerator
+public class TileEntitySolarPanel extends TileGenerator
 {
 	public TileEntitySolarPanel()
 	{

src/main/java/resonantinduction/mechanics/generator/steam/BlockSmallSteamGen.java

@@ -1,4 +1,4 @@
-package resonantinduction.mechanics.generator;
+package resonantinduction.mechanics.generator.steam;
 
 import java.util.List;
 import java.util.Random;

src/main/java/resonantinduction/mechanics/generator/steam/TileEntitySteamFan.java

@@ -1,4 +1,4 @@
-package resonantinduction.mechanics.generator;
+package resonantinduction.mechanics.generator.steam;
 
 public class TileEntitySteamFan extends TileEntitySteamPiston
 {

src/main/java/resonantinduction/mechanics/generator/steam/TileEntitySteamGen.java

@@ -1,4 +1,4 @@
-package resonantinduction.mechanics.generator;
+package resonantinduction.mechanics.generator.steam;
 
 import net.minecraft.tileentity.TileEntity;
 import net.minecraftforge.common.ForgeDirection;

src/main/java/resonantinduction/mechanics/generator/steam/TileEntitySteamPiston.java

@@ -1,4 +1,4 @@
-package resonantinduction.mechanics.generator;
+package resonantinduction.mechanics.generator.steam;
 
 import java.util.EnumSet;
 

src/main/java/resonantinduction/mechanics/machine/grinder/BlockGrinderWheel.java

@@ -1,4 +1,4 @@
-package resonantinduction.mechanics.grinder;
+package resonantinduction.mechanics.machine.grinder;
 
 import net.minecraft.block.ITileEntityProvider;
 import net.minecraft.entity.Entity;

src/main/java/resonantinduction/mechanics/machine/grinder/TileGrinderWheel.java

@@ -1,4 +1,4 @@
-package resonantinduction.mechanics.grinder;
+package resonantinduction.mechanics.machine.grinder;
 
 import java.util.HashMap;
 

src/main/java/resonantinduction/mechanics/machine/grinder/TilePurifier.java

@@ -1,4 +1,4 @@
-package resonantinduction.mechanics.grinder;
+package resonantinduction.mechanics.machine.grinder;
 
 import java.util.HashMap;
 import java.util.List;

src/main/java/resonantinduction/mechanics/machine/mining/BlockApertureExcavator.java

@@ -1,4 +1,4 @@
-package resonantinduction.mechanics.mining;
+package resonantinduction.mechanics.machine.mining;
 
 import java.util.Set;
 

src/main/java/resonantinduction/mechanics/machine/mining/BlockFracker.java

@@ -1,4 +1,4 @@
-package resonantinduction.mechanics.mining;
+package resonantinduction.mechanics.machine.mining;
 
 import java.util.Set;
 

src/main/java/resonantinduction/mechanics/machine/mining/BlockFrackingPipe.java

@@ -1,4 +1,4 @@
-package resonantinduction.mechanics.mining;
+package resonantinduction.mechanics.machine.mining;
 
 import java.util.List;
 

src/main/java/resonantinduction/mechanics/machine/mining/BlockLaserDrill.java

@@ -1,4 +1,4 @@
-package resonantinduction.mechanics.mining;
+package resonantinduction.mechanics.machine.mining;
 
 import java.util.Set;
 

src/main/java/resonantinduction/mechanics/machine/mining/BlockMiningLaser.java

@@ -1,4 +1,4 @@
-package resonantinduction.mechanics.mining;
+package resonantinduction.mechanics.machine.mining;
 
 import java.util.Set;
 

src/main/java/resonantinduction/mechanics/machine/mining/ItemMiningLaser.java

@@ -1,4 +1,4 @@
-package resonantinduction.mechanics.mining;
+package resonantinduction.mechanics.machine.mining;
 
 import java.awt.Color;
 import java.util.HashMap;

src/main/java/resonantinduction/mechanics/machine/mining/TileApertureExcavator.java

@@ -1,4 +1,4 @@
-package resonantinduction.mechanics.mining;
+package resonantinduction.mechanics.machine.mining;
 
 import java.util.ArrayList;
 import java.util.List;

src/main/java/resonantinduction/mechanics/machine/mining/TileFracker.java

@@ -1,4 +1,4 @@
-package resonantinduction.mechanics.mining;
+package resonantinduction.mechanics.machine.mining;
 
 import net.minecraft.block.Block;
 import net.minecraft.entity.player.EntityPlayer;
@@ -9,8 +9,8 @@ import net.minecraftforge.fluids.FluidTankInfo;
 import net.minecraftforge.fluids.IFluidBlock;
 import net.minecraftforge.fluids.IFluidHandler;
 import resonantinduction.core.recipe.RecipeLoader;
-import resonantinduction.fluid.EnumGas;
-import resonantinduction.fluid.GasTank;
+import resonantinduction.transport.fluid.EnumGas;
+import resonantinduction.transport.fluid.GasTank;
 import universalelectricity.api.vector.Vector3;
 
 import com.builtbroken.minecraft.FluidHelper;

src/main/java/resonantinduction/mechanics/machine/mining/TileFrackingPipe.java

@@ -1,4 +1,4 @@
-package resonantinduction.mechanics.mining;
+package resonantinduction.mechanics.machine.mining;
 
 import net.minecraft.tileentity.TileEntity;
 

src/main/java/resonantinduction/mechanics/machine/mining/TileLaserDrill.java

@@ -1,4 +1,4 @@
-package resonantinduction.mechanics.mining;
+package resonantinduction.mechanics.machine.mining;
 
 import java.awt.Color;
 

src/main/java/resonantinduction/mechanics/machine/mining/TileMiningLaser.java

@@ -1,4 +1,4 @@
-package resonantinduction.mechanics.mining;
+package resonantinduction.mechanics.machine.mining;
 
 import java.awt.Color;
 

src/main/java/resonantinduction/mechanics/purifier/BlockPurifier.java

@@ -5,7 +5,7 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 import net.minecraftforge.common.ForgeDirection;
 import resonantinduction.core.base.BlockRotatableBase;
-import resonantinduction.mechanics.grinder.TilePurifier;
+import resonantinduction.mechanics.machine.grinder.TilePurifier;
 import universalelectricity.api.vector.VectorWorld;
 
 /**

src/main/java/resonantinduction/transport/CommonProxy.java

@@ -12,7 +12,7 @@ import net.minecraft.world.World;
 import resonantinduction.energy.battery.ContainerBatteryBox;
 import resonantinduction.energy.battery.TileBatteryBox;
 import resonantinduction.mechanics.generator.ContainerCoalGenerator;
-import resonantinduction.mechanics.generator.TileEntitySteamGen;
+import resonantinduction.mechanics.generator.steam.TileEntitySteamGen;
 import resonantinduction.mechanics.processor.ContainerProcessor;
 import resonantinduction.mechanics.processor.TileEntityProcessor;
 import resonantinduction.transport.encoder.ContainerEncoder;

src/main/java/resonantinduction/transport/ResonantInductionTransport.java

@@ -28,6 +28,12 @@ import resonantinduction.blocks.ItemBlockColored;
 import resonantinduction.core.ResonantInductionTabs;
 import resonantinduction.core.Settings;
 import resonantinduction.core.debug.BlockDebug;
+import resonantinduction.core.misc.BehaviorDispenseEgg;
+import resonantinduction.core.misc.EntityFarmEgg;
+import resonantinduction.core.misc.EnumBird;
+import resonantinduction.core.misc.ItemColoredDust;
+import resonantinduction.core.misc.ItemCommonTool;
+import resonantinduction.core.misc.ItemFarmEgg;
 import resonantinduction.core.multimeter.ItemReadoutTools;
 import resonantinduction.core.network.PacketIDTile;
 import resonantinduction.core.recipe.RecipeLoader;
@@ -38,13 +44,6 @@ import resonantinduction.core.resource.ItemParts.Parts;
 import resonantinduction.energy.battery.BlockBatteryBox;
 import resonantinduction.energy.battery.ItemBattery;
 import resonantinduction.energy.battery.ItemBlockEnergyStorage;
-import resonantinduction.fluid.EnumGas;
-import resonantinduction.fluid.pipes.BlockPipe;
-import resonantinduction.fluid.pipes.FluidPartsMaterial;
-import resonantinduction.fluid.pipes.ItemBlockPipe;
-import resonantinduction.fluid.pump.BlockConstructionPump;
-import resonantinduction.fluid.pump.BlockDrain;
-import resonantinduction.fluid.pump.BlockPumpMachine;
 import resonantinduction.mechanics.armbot.BlockArmbot;
 import resonantinduction.mechanics.armbot.command.TaskBreak;
 import resonantinduction.mechanics.armbot.command.TaskDrop;
@@ -64,15 +63,9 @@ import resonantinduction.mechanics.armbot.command.TaskRotateTo;
 import resonantinduction.mechanics.armbot.command.TaskStart;
 import resonantinduction.mechanics.armbot.command.TaskTake;
 import resonantinduction.mechanics.armbot.command.TaskUse;
-import resonantinduction.mechanics.generator.BlockSmallSteamGen;
-import resonantinduction.mechanics.generator.BlockSolarPanel;
+import resonantinduction.mechanics.generator.solar.BlockSolarPanel;
+import resonantinduction.mechanics.generator.steam.BlockSmallSteamGen;
 import resonantinduction.mechanics.processor.BlockProcessor;
-import resonantinduction.misc.EntityFarmEgg;
-import resonantinduction.misc.EnumBird;
-import resonantinduction.tool.BehaviorDispenseEgg;
-import resonantinduction.tool.ItemColoredDust;
-import resonantinduction.tool.ItemCommonTool;
-import resonantinduction.tool.ItemFarmEgg;
 import resonantinduction.transport.belt.BlockConveyorBelt;
 import resonantinduction.transport.crate.BlockCrate;
 import resonantinduction.transport.crate.ItemBlockCrate;
@@ -81,7 +74,14 @@ import resonantinduction.transport.encoder.ItemDisk;
 import resonantinduction.transport.fluid.BlockKitchenSink;
 import resonantinduction.transport.fluid.BlockReleaseValve;
 import resonantinduction.transport.fluid.BlockTank;
+import resonantinduction.transport.fluid.EnumGas;
 import resonantinduction.transport.fluid.ItemFluidCan;
+import resonantinduction.transport.fluid.pipes.BlockPipe;
+import resonantinduction.transport.fluid.pipes.FluidPartsMaterial;
+import resonantinduction.transport.fluid.pipes.ItemBlockPipe;
+import resonantinduction.transport.fluid.pump.BlockConstructionPump;
+import resonantinduction.transport.fluid.pump.BlockDrain;
+import resonantinduction.transport.fluid.pump.BlockPumpMachine;
 import resonantinduction.transport.hopper.BlockAdvancedHopper;
 import resonantinduction.transport.imprinter.BlockImprinter;
 import resonantinduction.transport.imprinter.ItemImprinter;

src/main/java/resonantinduction/transport/fluid/BlockSteamPiston.java

@@ -9,7 +9,7 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.MathHelper;
 import net.minecraft.world.World;
 import resonantinduction.blocks.BlockHydraulic;
-import resonantinduction.mechanics.generator.TileEntitySteamPiston;
+import resonantinduction.mechanics.generator.steam.TileEntitySteamPiston;
 
 import com.builtbroken.common.Pair;
 

src/main/java/resonantinduction/transport/fluid/BlockTank.java

@@ -14,9 +14,9 @@ import net.minecraft.world.World;
 import net.minecraftforge.common.Configuration;
 import resonantinduction.blocks.BlockHydraulic;
 import resonantinduction.client.render.BlockRenderHelper;
-import resonantinduction.fluid.pipes.FluidPartsMaterial;
-import resonantinduction.fluid.pipes.ItemBlockPipe;
-import resonantinduction.fluid.pipes.TileEntityPipe;
+import resonantinduction.transport.fluid.pipes.FluidPartsMaterial;
+import resonantinduction.transport.fluid.pipes.ItemBlockPipe;
+import resonantinduction.transport.fluid.pipes.TileEntityPipe;
 import universalelectricity.api.vector.Vector3;
 
 import com.builtbroken.common.Pair;

src/main/java/resonantinduction/transport/fluid/EnumFluid.java

@@ -1,4 +1,4 @@
-package resonantinduction.fluid;
+package resonantinduction.transport.fluid;
 
 import net.minecraftforge.fluids.Fluid;
 

src/main/java/resonantinduction/transport/fluid/EnumGas.java

@@ -1,4 +1,4 @@
-package resonantinduction.fluid;
+package resonantinduction.transport.fluid;
 
 import com.builtbroken.common.science.ChemElement;
 import com.builtbroken.common.science.ChemicalCompound;

src/main/java/resonantinduction/transport/fluid/FilteredTank.java

@@ -1,4 +1,4 @@
-package resonantinduction.fluid;
+package resonantinduction.transport.fluid;
 
 import java.util.ArrayList;
 import java.util.List;

src/main/java/resonantinduction/transport/fluid/FluidCraftingHandler.java

@@ -1,4 +1,4 @@
-package resonantinduction.fluid;
+package resonantinduction.transport.fluid;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -10,8 +10,8 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidRegistry;
 import net.minecraftforge.fluids.FluidStack;
-import resonantinduction.fluid.network.FluidRecipeInfo.SimpleFluidRecipe;
-import resonantinduction.fluid.network.IFluidRecipeCrafter;
+import resonantinduction.transport.fluid.network.IFluidRecipeCrafter;
+import resonantinduction.transport.fluid.network.FluidRecipeInfo.SimpleFluidRecipe;
 
 import com.builtbroken.common.Pair;
 import com.builtbroken.common.Triple;

src/main/java/resonantinduction/transport/fluid/Gas.java

@@ -1,4 +1,4 @@
-package resonantinduction.fluid;
+package resonantinduction.transport.fluid;
 
 import net.minecraftforge.fluids.Fluid;
 

src/main/java/resonantinduction/transport/fluid/GasTank.java

@@ -1,4 +1,4 @@
-package resonantinduction.fluid;
+package resonantinduction.transport.fluid;
 
 import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidStack;

src/main/java/resonantinduction/transport/fluid/LiquidTank.java

@@ -1,4 +1,4 @@
-package resonantinduction.fluid;
+package resonantinduction.transport.fluid;
 
 import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidStack;

src/main/java/resonantinduction/transport/fluid/TileEntityReleaseValve.java

@@ -7,8 +7,8 @@ import net.minecraftforge.fluids.FluidContainerRegistry;
 import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fluids.IFluidHandler;
 import resonantinduction.api.fluid.INetworkPipe;
-import resonantinduction.fluid.network.NetworkPipes;
-import resonantinduction.fluid.prefab.TileEntityFluidDevice;
+import resonantinduction.transport.fluid.network.NetworkPipes;
+import resonantinduction.transport.fluid.prefab.TileEntityFluidDevice;
 
 import com.builtbroken.minecraft.helpers.HelperMethods;
 import com.builtbroken.minecraft.interfaces.IToolReadOut;

src/main/java/resonantinduction/transport/fluid/TileEntityTank.java

@@ -3,8 +3,8 @@ package resonantinduction.transport.fluid;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraftforge.common.ForgeDirection;
 import resonantinduction.api.fluid.INetworkFluidPart;
-import resonantinduction.fluid.network.NetworkFluidContainers;
-import resonantinduction.fluid.prefab.TileEntityFluidNetworkTile;
+import resonantinduction.transport.fluid.network.NetworkFluidContainers;
+import resonantinduction.transport.fluid.prefab.TileEntityFluidNetworkTile;
 
 import com.builtbroken.minecraft.tilenetwork.INetworkPart;
 import com.builtbroken.minecraft.tilenetwork.ITileNetwork;

src/main/java/resonantinduction/transport/fluid/TileKitchenSink.java

@@ -8,8 +8,8 @@ import net.minecraftforge.fluids.FluidContainerRegistry;
 import net.minecraftforge.fluids.FluidRegistry;
 import net.minecraftforge.fluids.FluidStack;
 import resonantinduction.core.network.ISimplePacketReceiver;
-import resonantinduction.fluid.prefab.TileEntityFluidStorage;
 import resonantinduction.transport.ResonantInductionTransport;
+import resonantinduction.transport.fluid.prefab.TileEntityFluidStorage;
 import calclavia.lib.network.PacketHandler;
 
 import com.builtbroken.minecraft.helpers.ColorCode;

src/main/java/resonantinduction/transport/fluid/network/FluidPressurePack.java

@@ -1,4 +1,4 @@
-package resonantinduction.fluid.network;
+package resonantinduction.transport.fluid.network;
 
 import net.minecraftforge.fluids.FluidStack;
 

src/main/java/resonantinduction/transport/fluid/network/FluidRecipeInfo.java

@@ -1,4 +1,4 @@
-package resonantinduction.fluid.network;
+package resonantinduction.transport.fluid.network;
 
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;

src/main/java/resonantinduction/transport/fluid/network/IFluidRecipeCrafter.java

@@ -1,4 +1,4 @@
-package resonantinduction.fluid.network;
+package resonantinduction.transport.fluid.network;
 
 /**
  * Use this if you want to take advantage of the {@link #FluidCraftingHandler} 's auto crafting

src/main/java/resonantinduction/transport/fluid/network/NetworkFluidContainers.java

@@ -1,4 +1,4 @@
-package resonantinduction.fluid.network;
+package resonantinduction.transport.fluid.network;
 
 import java.util.ArrayList;
 import java.util.List;

src/main/java/resonantinduction/transport/fluid/network/NetworkFluidTiles.java

@@ -1,4 +1,4 @@
-package resonantinduction.fluid.network;
+package resonantinduction.transport.fluid.network;
 
 import java.util.EnumSet;
 import java.util.HashMap;
@@ -13,7 +13,7 @@ import net.minecraftforge.fluids.FluidTank;
 import net.minecraftforge.fluids.FluidTankInfo;
 import net.minecraftforge.fluids.IFluidHandler;
 import resonantinduction.api.fluid.INetworkFluidPart;
-import resonantinduction.fluid.FluidCraftingHandler;
+import resonantinduction.transport.fluid.FluidCraftingHandler;
 
 import com.builtbroken.minecraft.FluidHelper;
 import com.builtbroken.minecraft.tilenetwork.INetworkPart;

src/main/java/resonantinduction/transport/fluid/network/NetworkPipes.java

@@ -1,4 +1,4 @@
-package resonantinduction.fluid.network;
+package resonantinduction.transport.fluid.network;
 
 import java.util.EnumSet;
 import java.util.Map.Entry;

src/main/java/resonantinduction/transport/fluid/pipes/BlockPipe.java

@@ -1,4 +1,4 @@
-package resonantinduction.fluid.pipes;
+package resonantinduction.transport.fluid.pipes;
 
 import java.util.ArrayList;
 import java.util.List;

src/main/java/resonantinduction/transport/fluid/pipes/EnumPipeType.java

@@ -1,4 +1,4 @@
-package resonantinduction.fluid.pipes;
+package resonantinduction.transport.fluid.pipes;
 
 import com.builtbroken.minecraft.helpers.ColorCode;
 import com.builtbroken.minecraft.helpers.ColorCode.IColoredId;

src/main/java/resonantinduction/transport/fluid/pipes/EnumTankTypes.java

@@ -1,4 +1,4 @@
-package resonantinduction.fluid.pipes;
+package resonantinduction.transport.fluid.pipes;
 
 import com.builtbroken.minecraft.helpers.ColorCode;
 import com.builtbroken.minecraft.helpers.ColorCode.IColoredId;

src/main/java/resonantinduction/transport/fluid/pipes/FluidPartsMaterial.java

@@ -1,4 +1,4 @@
-package resonantinduction.fluid.pipes;
+package resonantinduction.transport.fluid.pipes;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -8,7 +8,7 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 import net.minecraftforge.fluids.FluidStack;
 import resonantinduction.core.recipe.RecipeLoader;
-import resonantinduction.fluid.prefab.TileEntityFluidNetworkTile;
+import resonantinduction.transport.fluid.prefab.TileEntityFluidNetworkTile;
 
 import com.builtbroken.minecraft.helpers.ColorCode;
 

src/main/java/resonantinduction/transport/fluid/pipes/IPipeType.java

@@ -1,4 +1,4 @@
-package resonantinduction.fluid.pipes;
+package resonantinduction.transport.fluid.pipes;
 
 import com.builtbroken.minecraft.helpers.ColorCode.IColoredId;
 

src/main/java/resonantinduction/transport/fluid/pipes/ItemBlockPipe.java

@@ -1,4 +1,4 @@
-package resonantinduction.fluid.pipes;
+package resonantinduction.transport.fluid.pipes;
 
 import java.util.List;
 
@@ -15,8 +15,8 @@ import net.minecraft.world.World;
 import net.minecraftforge.common.ForgeDirection;
 import net.minecraftforge.fluids.FluidStack;
 import resonantinduction.core.recipe.RecipeLoader;
-import resonantinduction.fluid.prefab.TileEntityFluidNetworkTile;
 import resonantinduction.transport.fluid.TileEntityTank;
+import resonantinduction.transport.fluid.prefab.TileEntityFluidNetworkTile;
 import universalelectricity.api.vector.Vector3;
 
 public class ItemBlockPipe extends ItemBlock

src/main/java/resonantinduction/transport/fluid/pipes/TileEntityPipe.java

@@ -1,4 +1,4 @@
-package resonantinduction.fluid.pipes;
+package resonantinduction.transport.fluid.pipes;
 
 import net.minecraft.tileentity.TileEntity;
 import net.minecraftforge.common.ForgeDirection;
@@ -6,8 +6,8 @@ import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fluids.IFluidHandler;
 import resonantinduction.api.fluid.INetworkPipe;
-import resonantinduction.fluid.network.NetworkPipes;
-import resonantinduction.fluid.prefab.TileEntityFluidNetworkTile;
+import resonantinduction.transport.fluid.network.NetworkPipes;
+import resonantinduction.transport.fluid.prefab.TileEntityFluidNetworkTile;
 import universalelectricity.api.vector.Vector3;
 
 import com.builtbroken.minecraft.FluidHelper;

src/main/java/resonantinduction/transport/fluid/prefab/TileEntityFluidDevice.java

@@ -1,4 +1,4 @@
-package resonantinduction.fluid.prefab;
+package resonantinduction.transport.fluid.prefab;
 
 import java.util.Random;
 

src/main/java/resonantinduction/transport/fluid/prefab/TileEntityFluidNetworkTile.java

@@ -1,4 +1,4 @@
-package resonantinduction.fluid.prefab;
+package resonantinduction.transport.fluid.prefab;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -23,9 +23,9 @@ import org.bouncycastle.util.Arrays;
 import resonantinduction.api.fluid.FluidMasterList;
 import resonantinduction.api.fluid.INetworkFluidPart;
 import resonantinduction.core.network.ISimplePacketReceiver;
-import resonantinduction.fluid.network.NetworkFluidTiles;
-import resonantinduction.fluid.pipes.FluidPartsMaterial;
 import resonantinduction.transport.ResonantInductionTransport;
+import resonantinduction.transport.fluid.network.NetworkFluidTiles;
+import resonantinduction.transport.fluid.pipes.FluidPartsMaterial;
 import universalelectricity.api.vector.Vector3;
 import calclavia.lib.network.PacketHandler;
 

src/main/java/resonantinduction/transport/fluid/prefab/TileEntityFluidStorage.java

@@ -1,4 +1,4 @@
-package resonantinduction.fluid.prefab;
+package resonantinduction.transport.fluid.prefab;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.nbt.NBTTagCompound;

src/main/java/resonantinduction/transport/fluid/pump/BlockConstructionPump.java

@@ -1,4 +1,4 @@
-package resonantinduction.fluid.pump;
+package resonantinduction.transport.fluid.pump;
 
 import java.util.List;
 import java.util.Set;

src/main/java/resonantinduction/transport/fluid/pump/BlockDrain.java

@@ -1,4 +1,4 @@
-package resonantinduction.fluid.pump;
+package resonantinduction.transport.fluid.pump;
 
 import java.util.Set;
 

src/main/java/resonantinduction/transport/fluid/pump/BlockPumpMachine.java

@@ -1,4 +1,4 @@
-package resonantinduction.fluid.pump;
+package resonantinduction.transport.fluid.pump;
 
 import java.util.List;
 import java.util.Set;

src/main/java/resonantinduction/transport/fluid/pump/LiquidPathFinder.java

@@ -1,4 +1,4 @@
-package resonantinduction.fluid.pump;
+package resonantinduction.transport.fluid.pump;
 
 import java.util.ArrayList;
 import java.util.Collections;

src/main/java/resonantinduction/transport/fluid/pump/TileEntityConstructionPump.java

@@ -1,4 +1,4 @@
-package resonantinduction.fluid.pump;
+package resonantinduction.transport.fluid.pump;
 
 import java.util.ArrayList;
 import java.util.EnumSet;
@@ -17,7 +17,7 @@ import net.minecraftforge.fluids.FluidTankInfo;
 import net.minecraftforge.fluids.IFluidHandler;
 import resonantinduction.api.fluid.IDrain;
 import resonantinduction.api.fluid.INetworkPipe;
-import resonantinduction.fluid.network.NetworkFluidTiles;
+import resonantinduction.transport.fluid.network.NetworkFluidTiles;
 import universalelectricity.api.vector.Vector3;
 import universalelectricity.api.vector.VectorHelper;
 

src/main/java/resonantinduction/transport/fluid/pump/TileEntityDrain.java

@@ -1,4 +1,4 @@
-package resonantinduction.fluid.pump;
+package resonantinduction.transport.fluid.pump;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -16,7 +16,7 @@ import net.minecraftforge.fluids.FluidTank;
 import net.minecraftforge.fluids.FluidTankInfo;
 import net.minecraftforge.fluids.IFluidHandler;
 import resonantinduction.api.fluid.IDrain;
-import resonantinduction.fluid.prefab.TileEntityFluidDevice;
+import resonantinduction.transport.fluid.prefab.TileEntityFluidDevice;
 import universalelectricity.api.vector.Vector3;
 
 import com.builtbroken.common.Pair;

src/main/java/resonantinduction/transport/fluid/pump/TileEntityStarterPump.java

@@ -1,4 +1,4 @@
-package resonantinduction.fluid.pump;
+package resonantinduction.transport.fluid.pump;
 
 import java.util.Iterator;
 import java.util.Set;