diff --git a/src/main/java/resonantinduction/blocks/BlockGasOre.java b/src/main/java/resonantinduction/blocks/BlockGasOre.java index b25361cf1..51098cefb 100644 --- a/src/main/java/resonantinduction/blocks/BlockGasOre.java +++ b/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; diff --git a/src/main/java/resonantinduction/client/ClientProxy.java b/src/main/java/resonantinduction/client/ClientProxy.java index c9a1cedd2..4b9f0c408 100644 --- a/src/main/java/resonantinduction/client/ClientProxy.java +++ b/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; diff --git a/src/main/java/resonantinduction/client/render/ItemPipeRenderer.java b/src/main/java/resonantinduction/client/render/ItemPipeRenderer.java index 4105022f7..0298789b3 100644 --- a/src/main/java/resonantinduction/client/render/ItemPipeRenderer.java +++ b/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; diff --git a/src/main/java/resonantinduction/client/render/RenderConstructionPump.java b/src/main/java/resonantinduction/client/render/RenderConstructionPump.java index f2d145dbc..ed95c812e 100644 --- a/src/main/java/resonantinduction/client/render/RenderConstructionPump.java +++ b/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; diff --git a/src/main/java/resonantinduction/client/render/RenderMiningLaser.java b/src/main/java/resonantinduction/client/render/RenderMiningLaser.java index bd2fa7836..bf6bf8774 100644 --- a/src/main/java/resonantinduction/client/render/RenderMiningLaser.java +++ b/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 */ diff --git a/src/main/java/resonantinduction/client/render/RenderPipe.java b/src/main/java/resonantinduction/client/render/RenderPipe.java index 049b2a1be..89ce9aa34 100644 --- a/src/main/java/resonantinduction/client/render/RenderPipe.java +++ b/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; diff --git a/src/main/java/resonantinduction/client/render/RenderPump.java b/src/main/java/resonantinduction/client/render/RenderPump.java index 6606eb58f..05273c9a2 100644 --- a/src/main/java/resonantinduction/client/render/RenderPump.java +++ b/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; diff --git a/src/main/java/resonantinduction/client/render/RenderTurkey.java b/src/main/java/resonantinduction/client/render/RenderTurkey.java index 92bf46424..ce2b9d089 100644 --- a/src/main/java/resonantinduction/client/render/RenderTurkey.java +++ b/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; diff --git a/src/main/java/resonantinduction/tool/BehaviorDispenseEgg.java b/src/main/java/resonantinduction/core/misc/BehaviorDispenseEgg.java similarity index 95% rename from src/main/java/resonantinduction/tool/BehaviorDispenseEgg.java rename to src/main/java/resonantinduction/core/misc/BehaviorDispenseEgg.java index 0cf52cb7b..d2876ad97 100644 --- a/src/main/java/resonantinduction/tool/BehaviorDispenseEgg.java +++ b/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 { diff --git a/src/main/java/resonantinduction/misc/EntityFarmEgg.java b/src/main/java/resonantinduction/core/misc/EntityFarmEgg.java similarity index 98% rename from src/main/java/resonantinduction/misc/EntityFarmEgg.java rename to src/main/java/resonantinduction/core/misc/EntityFarmEgg.java index 0f96a14f7..4b2d055f6 100644 --- a/src/main/java/resonantinduction/misc/EntityFarmEgg.java +++ b/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; diff --git a/src/main/java/resonantinduction/misc/EntityMutantAnimal.java b/src/main/java/resonantinduction/core/misc/EntityMutantAnimal.java similarity index 50% rename from src/main/java/resonantinduction/misc/EntityMutantAnimal.java rename to src/main/java/resonantinduction/core/misc/EntityMutantAnimal.java index 3a6d4e1c3..ed471b448 100644 --- a/src/main/java/resonantinduction/misc/EntityMutantAnimal.java +++ b/src/main/java/resonantinduction/core/misc/EntityMutantAnimal.java @@ -1,4 +1,4 @@ -package resonantinduction.misc; +package resonantinduction.core.misc; public class EntityMutantAnimal { diff --git a/src/main/java/resonantinduction/misc/EntityTurkey.java b/src/main/java/resonantinduction/core/misc/EntityTurkey.java similarity index 99% rename from src/main/java/resonantinduction/misc/EntityTurkey.java rename to src/main/java/resonantinduction/core/misc/EntityTurkey.java index 3661faa71..9ced92590 100644 --- a/src/main/java/resonantinduction/misc/EntityTurkey.java +++ b/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; diff --git a/src/main/java/resonantinduction/misc/EnumBird.java b/src/main/java/resonantinduction/core/misc/EnumBird.java similarity index 98% rename from src/main/java/resonantinduction/misc/EnumBird.java rename to src/main/java/resonantinduction/core/misc/EnumBird.java index 90e0697d7..d8e0a8eff 100644 --- a/src/main/java/resonantinduction/misc/EnumBird.java +++ b/src/main/java/resonantinduction/core/misc/EnumBird.java @@ -1,4 +1,4 @@ -package resonantinduction.misc; +package resonantinduction.core.misc; import java.awt.Color; diff --git a/src/main/java/resonantinduction/tool/EnumTool.java b/src/main/java/resonantinduction/core/misc/EnumTool.java similarity index 98% rename from src/main/java/resonantinduction/tool/EnumTool.java rename to src/main/java/resonantinduction/core/misc/EnumTool.java index 2b8741027..bc184acdf 100644 --- a/src/main/java/resonantinduction/tool/EnumTool.java +++ b/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; diff --git a/src/main/java/resonantinduction/tool/ItemColoredDust.java b/src/main/java/resonantinduction/core/misc/ItemColoredDust.java similarity index 98% rename from src/main/java/resonantinduction/tool/ItemColoredDust.java rename to src/main/java/resonantinduction/core/misc/ItemColoredDust.java index f97340dd3..59e066743 100644 --- a/src/main/java/resonantinduction/tool/ItemColoredDust.java +++ b/src/main/java/resonantinduction/core/misc/ItemColoredDust.java @@ -1,4 +1,4 @@ -package resonantinduction.tool; +package resonantinduction.core.misc; import java.util.List; diff --git a/src/main/java/resonantinduction/tool/ItemCommonTool.java b/src/main/java/resonantinduction/core/misc/ItemCommonTool.java similarity index 99% rename from src/main/java/resonantinduction/tool/ItemCommonTool.java rename to src/main/java/resonantinduction/core/misc/ItemCommonTool.java index ef659fece..11c2ae37f 100644 --- a/src/main/java/resonantinduction/tool/ItemCommonTool.java +++ b/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; diff --git a/src/main/java/resonantinduction/tool/ItemFarmBucket.java b/src/main/java/resonantinduction/core/misc/ItemFarmBucket.java similarity index 97% rename from src/main/java/resonantinduction/tool/ItemFarmBucket.java rename to src/main/java/resonantinduction/core/misc/ItemFarmBucket.java index 4da2aa182..8b962981b 100644 --- a/src/main/java/resonantinduction/tool/ItemFarmBucket.java +++ b/src/main/java/resonantinduction/core/misc/ItemFarmBucket.java @@ -1,4 +1,4 @@ -package resonantinduction.tool; +package resonantinduction.core.misc; import java.util.List; diff --git a/src/main/java/resonantinduction/tool/ItemFarmEgg.java b/src/main/java/resonantinduction/core/misc/ItemFarmEgg.java similarity index 93% rename from src/main/java/resonantinduction/tool/ItemFarmEgg.java rename to src/main/java/resonantinduction/core/misc/ItemFarmEgg.java index 53d693abc..2e2835288 100644 --- a/src/main/java/resonantinduction/tool/ItemFarmEgg.java +++ b/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 { diff --git a/src/main/java/resonantinduction/tool/ItemFarmFood.java b/src/main/java/resonantinduction/core/misc/ItemFarmFood.java similarity index 99% rename from src/main/java/resonantinduction/tool/ItemFarmFood.java rename to src/main/java/resonantinduction/core/misc/ItemFarmFood.java index 6fd857449..c5546f26f 100644 --- a/src/main/java/resonantinduction/tool/ItemFarmFood.java +++ b/src/main/java/resonantinduction/core/misc/ItemFarmFood.java @@ -1,4 +1,4 @@ -package resonantinduction.tool; +package resonantinduction.core.misc; import java.util.List; diff --git a/src/main/java/resonantinduction/core/multimeter/ItemReadoutTools.java b/src/main/java/resonantinduction/core/multimeter/ItemReadoutTools.java index 119c69a56..f7a767674 100644 --- a/src/main/java/resonantinduction/core/multimeter/ItemReadoutTools.java +++ b/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")); } diff --git a/src/main/java/resonantinduction/core/recipe/RecipeLoader.java b/src/main/java/resonantinduction/core/recipe/RecipeLoader.java index 55ed28c7f..bef838cf8 100644 --- a/src/main/java/resonantinduction/core/recipe/RecipeLoader.java +++ b/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; diff --git a/src/main/java/resonantinduction/mechanics/ResonantInductionMechanics.java b/src/main/java/resonantinduction/mechanics/ResonantInductionMechanics.java index 5985fc598..e92e984fb 100644 --- a/src/main/java/resonantinduction/mechanics/ResonantInductionMechanics.java +++ b/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; diff --git a/src/main/java/resonantinduction/mechanics/generator/ContainerCoalGenerator.java b/src/main/java/resonantinduction/mechanics/generator/ContainerCoalGenerator.java deleted file mode 100644 index 475306b71..000000000 --- a/src/main/java/resonantinduction/mechanics/generator/ContainerCoalGenerator.java +++ /dev/null @@ -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; - } -} diff --git a/src/main/java/resonantinduction/mechanics/generator/TileEntityGenerator.java b/src/main/java/resonantinduction/mechanics/generator/TileGenerator.java similarity index 90% rename from src/main/java/resonantinduction/mechanics/generator/TileEntityGenerator.java rename to src/main/java/resonantinduction/mechanics/generator/TileGenerator.java index 3d0cc4146..04ffa91da 100644 --- a/src/main/java/resonantinduction/mechanics/generator/TileEntityGenerator.java +++ b/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); } diff --git a/src/main/java/resonantinduction/mechanics/generator/BlockSolarPanel.java b/src/main/java/resonantinduction/mechanics/generator/solar/BlockSolarPanel.java similarity index 98% rename from src/main/java/resonantinduction/mechanics/generator/BlockSolarPanel.java rename to src/main/java/resonantinduction/mechanics/generator/solar/BlockSolarPanel.java index 6f0efa61f..c250ba523 100644 --- a/src/main/java/resonantinduction/mechanics/generator/BlockSolarPanel.java +++ b/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; diff --git a/src/main/java/resonantinduction/mechanics/generator/TileEntitySolarBox.java b/src/main/java/resonantinduction/mechanics/generator/solar/TileEntitySolarBox.java similarity index 60% rename from src/main/java/resonantinduction/mechanics/generator/TileEntitySolarBox.java rename to src/main/java/resonantinduction/mechanics/generator/solar/TileEntitySolarBox.java index eeccc64f3..4f60ce78a 100644 --- a/src/main/java/resonantinduction/mechanics/generator/TileEntitySolarBox.java +++ b/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 diff --git a/src/main/java/resonantinduction/mechanics/generator/TileEntitySolarPanel.java b/src/main/java/resonantinduction/mechanics/generator/solar/TileEntitySolarPanel.java similarity index 87% rename from src/main/java/resonantinduction/mechanics/generator/TileEntitySolarPanel.java rename to src/main/java/resonantinduction/mechanics/generator/solar/TileEntitySolarPanel.java index 1860d6ac6..7b6b38197 100644 --- a/src/main/java/resonantinduction/mechanics/generator/TileEntitySolarPanel.java +++ b/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() { diff --git a/src/main/java/resonantinduction/mechanics/generator/BlockSmallSteamGen.java b/src/main/java/resonantinduction/mechanics/generator/steam/BlockSmallSteamGen.java similarity index 99% rename from src/main/java/resonantinduction/mechanics/generator/BlockSmallSteamGen.java rename to src/main/java/resonantinduction/mechanics/generator/steam/BlockSmallSteamGen.java index 75ea7bcff..a56c1ed25 100644 --- a/src/main/java/resonantinduction/mechanics/generator/BlockSmallSteamGen.java +++ b/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; diff --git a/src/main/java/resonantinduction/mechanics/generator/TileEntitySteamFan.java b/src/main/java/resonantinduction/mechanics/generator/steam/TileEntitySteamFan.java similarity index 69% rename from src/main/java/resonantinduction/mechanics/generator/TileEntitySteamFan.java rename to src/main/java/resonantinduction/mechanics/generator/steam/TileEntitySteamFan.java index 71a4b2534..81f49b3f6 100644 --- a/src/main/java/resonantinduction/mechanics/generator/TileEntitySteamFan.java +++ b/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 { diff --git a/src/main/java/resonantinduction/mechanics/generator/TileEntitySteamGen.java b/src/main/java/resonantinduction/mechanics/generator/steam/TileEntitySteamGen.java similarity index 98% rename from src/main/java/resonantinduction/mechanics/generator/TileEntitySteamGen.java rename to src/main/java/resonantinduction/mechanics/generator/steam/TileEntitySteamGen.java index e1fff13b8..63f23ebd8 100644 --- a/src/main/java/resonantinduction/mechanics/generator/TileEntitySteamGen.java +++ b/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; diff --git a/src/main/java/resonantinduction/mechanics/generator/TileEntitySteamPiston.java b/src/main/java/resonantinduction/mechanics/generator/steam/TileEntitySteamPiston.java similarity index 96% rename from src/main/java/resonantinduction/mechanics/generator/TileEntitySteamPiston.java rename to src/main/java/resonantinduction/mechanics/generator/steam/TileEntitySteamPiston.java index add73ecd2..390d1cb38 100644 --- a/src/main/java/resonantinduction/mechanics/generator/TileEntitySteamPiston.java +++ b/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; diff --git a/src/main/java/resonantinduction/mechanics/grinder/BlockGrinderWheel.java b/src/main/java/resonantinduction/mechanics/machine/grinder/BlockGrinderWheel.java similarity index 98% rename from src/main/java/resonantinduction/mechanics/grinder/BlockGrinderWheel.java rename to src/main/java/resonantinduction/mechanics/machine/grinder/BlockGrinderWheel.java index 2474ffefb..6986568d3 100644 --- a/src/main/java/resonantinduction/mechanics/grinder/BlockGrinderWheel.java +++ b/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; diff --git a/src/main/java/resonantinduction/mechanics/grinder/TileGrinderWheel.java b/src/main/java/resonantinduction/mechanics/machine/grinder/TileGrinderWheel.java similarity index 98% rename from src/main/java/resonantinduction/mechanics/grinder/TileGrinderWheel.java rename to src/main/java/resonantinduction/mechanics/machine/grinder/TileGrinderWheel.java index 48b1f53e5..4a60d194d 100644 --- a/src/main/java/resonantinduction/mechanics/grinder/TileGrinderWheel.java +++ b/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; diff --git a/src/main/java/resonantinduction/mechanics/grinder/TilePurifier.java b/src/main/java/resonantinduction/mechanics/machine/grinder/TilePurifier.java similarity index 98% rename from src/main/java/resonantinduction/mechanics/grinder/TilePurifier.java rename to src/main/java/resonantinduction/mechanics/machine/grinder/TilePurifier.java index bbf590e9a..c1654bea7 100644 --- a/src/main/java/resonantinduction/mechanics/grinder/TilePurifier.java +++ b/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; diff --git a/src/main/java/resonantinduction/mechanics/mining/BlockApertureExcavator.java b/src/main/java/resonantinduction/mechanics/machine/mining/BlockApertureExcavator.java similarity index 94% rename from src/main/java/resonantinduction/mechanics/mining/BlockApertureExcavator.java rename to src/main/java/resonantinduction/mechanics/machine/mining/BlockApertureExcavator.java index fa2042d6b..4317b76e3 100644 --- a/src/main/java/resonantinduction/mechanics/mining/BlockApertureExcavator.java +++ b/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; diff --git a/src/main/java/resonantinduction/mechanics/mining/BlockFracker.java b/src/main/java/resonantinduction/mechanics/machine/mining/BlockFracker.java similarity index 95% rename from src/main/java/resonantinduction/mechanics/mining/BlockFracker.java rename to src/main/java/resonantinduction/mechanics/machine/mining/BlockFracker.java index c96b311e8..cdcd99ba4 100644 --- a/src/main/java/resonantinduction/mechanics/mining/BlockFracker.java +++ b/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; diff --git a/src/main/java/resonantinduction/mechanics/mining/BlockFrackingPipe.java b/src/main/java/resonantinduction/mechanics/machine/mining/BlockFrackingPipe.java similarity index 95% rename from src/main/java/resonantinduction/mechanics/mining/BlockFrackingPipe.java rename to src/main/java/resonantinduction/mechanics/machine/mining/BlockFrackingPipe.java index 5faea41d4..03da2b913 100644 --- a/src/main/java/resonantinduction/mechanics/mining/BlockFrackingPipe.java +++ b/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; diff --git a/src/main/java/resonantinduction/mechanics/mining/BlockLaserDrill.java b/src/main/java/resonantinduction/mechanics/machine/mining/BlockLaserDrill.java similarity index 96% rename from src/main/java/resonantinduction/mechanics/mining/BlockLaserDrill.java rename to src/main/java/resonantinduction/mechanics/machine/mining/BlockLaserDrill.java index 1b4c51e48..36c3b7697 100644 --- a/src/main/java/resonantinduction/mechanics/mining/BlockLaserDrill.java +++ b/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; diff --git a/src/main/java/resonantinduction/mechanics/mining/BlockMiningLaser.java b/src/main/java/resonantinduction/mechanics/machine/mining/BlockMiningLaser.java similarity index 97% rename from src/main/java/resonantinduction/mechanics/mining/BlockMiningLaser.java rename to src/main/java/resonantinduction/mechanics/machine/mining/BlockMiningLaser.java index e728d69de..02bdadac8 100644 --- a/src/main/java/resonantinduction/mechanics/mining/BlockMiningLaser.java +++ b/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; diff --git a/src/main/java/resonantinduction/mechanics/mining/ItemMiningLaser.java b/src/main/java/resonantinduction/mechanics/machine/mining/ItemMiningLaser.java similarity index 99% rename from src/main/java/resonantinduction/mechanics/mining/ItemMiningLaser.java rename to src/main/java/resonantinduction/mechanics/machine/mining/ItemMiningLaser.java index 09fb53fad..f0b13ce3f 100644 --- a/src/main/java/resonantinduction/mechanics/mining/ItemMiningLaser.java +++ b/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; diff --git a/src/main/java/resonantinduction/mechanics/mining/TileApertureExcavator.java b/src/main/java/resonantinduction/mechanics/machine/mining/TileApertureExcavator.java similarity index 98% rename from src/main/java/resonantinduction/mechanics/mining/TileApertureExcavator.java rename to src/main/java/resonantinduction/mechanics/machine/mining/TileApertureExcavator.java index 2bd8d7646..aebba10be 100644 --- a/src/main/java/resonantinduction/mechanics/mining/TileApertureExcavator.java +++ b/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; diff --git a/src/main/java/resonantinduction/mechanics/mining/TileFracker.java b/src/main/java/resonantinduction/mechanics/machine/mining/TileFracker.java similarity index 95% rename from src/main/java/resonantinduction/mechanics/mining/TileFracker.java rename to src/main/java/resonantinduction/mechanics/machine/mining/TileFracker.java index 09406f4a4..d299860f6 100644 --- a/src/main/java/resonantinduction/mechanics/mining/TileFracker.java +++ b/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; diff --git a/src/main/java/resonantinduction/mechanics/mining/TileFrackingPipe.java b/src/main/java/resonantinduction/mechanics/machine/mining/TileFrackingPipe.java similarity index 70% rename from src/main/java/resonantinduction/mechanics/mining/TileFrackingPipe.java rename to src/main/java/resonantinduction/mechanics/machine/mining/TileFrackingPipe.java index 22121733c..95df6ab31 100644 --- a/src/main/java/resonantinduction/mechanics/mining/TileFrackingPipe.java +++ b/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; diff --git a/src/main/java/resonantinduction/mechanics/mining/TileLaserDrill.java b/src/main/java/resonantinduction/mechanics/machine/mining/TileLaserDrill.java similarity index 98% rename from src/main/java/resonantinduction/mechanics/mining/TileLaserDrill.java rename to src/main/java/resonantinduction/mechanics/machine/mining/TileLaserDrill.java index 270653e6a..788b11052 100644 --- a/src/main/java/resonantinduction/mechanics/mining/TileLaserDrill.java +++ b/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; diff --git a/src/main/java/resonantinduction/mechanics/mining/TileMiningLaser.java b/src/main/java/resonantinduction/mechanics/machine/mining/TileMiningLaser.java similarity index 98% rename from src/main/java/resonantinduction/mechanics/mining/TileMiningLaser.java rename to src/main/java/resonantinduction/mechanics/machine/mining/TileMiningLaser.java index 1ca22f67e..a089d6bab 100644 --- a/src/main/java/resonantinduction/mechanics/mining/TileMiningLaser.java +++ b/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; diff --git a/src/main/java/resonantinduction/mechanics/purifier/BlockPurifier.java b/src/main/java/resonantinduction/mechanics/purifier/BlockPurifier.java index f762775b7..740d5ac6b 100644 --- a/src/main/java/resonantinduction/mechanics/purifier/BlockPurifier.java +++ b/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; /** diff --git a/src/main/java/resonantinduction/transport/CommonProxy.java b/src/main/java/resonantinduction/transport/CommonProxy.java index a49c5f3c1..ae699aa5b 100644 --- a/src/main/java/resonantinduction/transport/CommonProxy.java +++ b/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; diff --git a/src/main/java/resonantinduction/transport/ResonantInductionTransport.java b/src/main/java/resonantinduction/transport/ResonantInductionTransport.java index ae23cebcd..d23cc4af4 100644 --- a/src/main/java/resonantinduction/transport/ResonantInductionTransport.java +++ b/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; diff --git a/src/main/java/resonantinduction/transport/fluid/BlockSteamPiston.java b/src/main/java/resonantinduction/transport/fluid/BlockSteamPiston.java index 5451af1de..9ac13bf5f 100644 --- a/src/main/java/resonantinduction/transport/fluid/BlockSteamPiston.java +++ b/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; diff --git a/src/main/java/resonantinduction/transport/fluid/BlockTank.java b/src/main/java/resonantinduction/transport/fluid/BlockTank.java index 4bb57842e..2d4c6d95e 100644 --- a/src/main/java/resonantinduction/transport/fluid/BlockTank.java +++ b/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; diff --git a/src/main/java/resonantinduction/fluid/EnumFluid.java b/src/main/java/resonantinduction/transport/fluid/EnumFluid.java similarity index 93% rename from src/main/java/resonantinduction/fluid/EnumFluid.java rename to src/main/java/resonantinduction/transport/fluid/EnumFluid.java index 809d1f532..2fc785382 100644 --- a/src/main/java/resonantinduction/fluid/EnumFluid.java +++ b/src/main/java/resonantinduction/transport/fluid/EnumFluid.java @@ -1,4 +1,4 @@ -package resonantinduction.fluid; +package resonantinduction.transport.fluid; import net.minecraftforge.fluids.Fluid; diff --git a/src/main/java/resonantinduction/fluid/EnumGas.java b/src/main/java/resonantinduction/transport/fluid/EnumGas.java similarity index 97% rename from src/main/java/resonantinduction/fluid/EnumGas.java rename to src/main/java/resonantinduction/transport/fluid/EnumGas.java index 8759dd9aa..b7733b69e 100644 --- a/src/main/java/resonantinduction/fluid/EnumGas.java +++ b/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; diff --git a/src/main/java/resonantinduction/fluid/FilteredTank.java b/src/main/java/resonantinduction/transport/fluid/FilteredTank.java similarity index 96% rename from src/main/java/resonantinduction/fluid/FilteredTank.java rename to src/main/java/resonantinduction/transport/fluid/FilteredTank.java index 19f4e97f3..8f5a95c91 100644 --- a/src/main/java/resonantinduction/fluid/FilteredTank.java +++ b/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; diff --git a/src/main/java/resonantinduction/fluid/FluidCraftingHandler.java b/src/main/java/resonantinduction/transport/fluid/FluidCraftingHandler.java similarity index 98% rename from src/main/java/resonantinduction/fluid/FluidCraftingHandler.java rename to src/main/java/resonantinduction/transport/fluid/FluidCraftingHandler.java index 3c1ac9c14..f8566e051 100644 --- a/src/main/java/resonantinduction/fluid/FluidCraftingHandler.java +++ b/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; diff --git a/src/main/java/resonantinduction/fluid/Gas.java b/src/main/java/resonantinduction/transport/fluid/Gas.java similarity index 87% rename from src/main/java/resonantinduction/fluid/Gas.java rename to src/main/java/resonantinduction/transport/fluid/Gas.java index be34cb2f2..dfbcb84b1 100644 --- a/src/main/java/resonantinduction/fluid/Gas.java +++ b/src/main/java/resonantinduction/transport/fluid/Gas.java @@ -1,4 +1,4 @@ -package resonantinduction.fluid; +package resonantinduction.transport.fluid; import net.minecraftforge.fluids.Fluid; diff --git a/src/main/java/resonantinduction/fluid/GasTank.java b/src/main/java/resonantinduction/transport/fluid/GasTank.java similarity index 94% rename from src/main/java/resonantinduction/fluid/GasTank.java rename to src/main/java/resonantinduction/transport/fluid/GasTank.java index b073d456f..489e6a4e3 100644 --- a/src/main/java/resonantinduction/fluid/GasTank.java +++ b/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; diff --git a/src/main/java/resonantinduction/fluid/LiquidTank.java b/src/main/java/resonantinduction/transport/fluid/LiquidTank.java similarity index 94% rename from src/main/java/resonantinduction/fluid/LiquidTank.java rename to src/main/java/resonantinduction/transport/fluid/LiquidTank.java index 8c7bc988e..9b78b603c 100644 --- a/src/main/java/resonantinduction/fluid/LiquidTank.java +++ b/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; diff --git a/src/main/java/resonantinduction/transport/fluid/TileEntityReleaseValve.java b/src/main/java/resonantinduction/transport/fluid/TileEntityReleaseValve.java index 02117662a..76cddf229 100644 --- a/src/main/java/resonantinduction/transport/fluid/TileEntityReleaseValve.java +++ b/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; diff --git a/src/main/java/resonantinduction/transport/fluid/TileEntityTank.java b/src/main/java/resonantinduction/transport/fluid/TileEntityTank.java index f0a39f9af..785428b4a 100644 --- a/src/main/java/resonantinduction/transport/fluid/TileEntityTank.java +++ b/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; diff --git a/src/main/java/resonantinduction/transport/fluid/TileKitchenSink.java b/src/main/java/resonantinduction/transport/fluid/TileKitchenSink.java index bf4e4c5dd..a382e904c 100644 --- a/src/main/java/resonantinduction/transport/fluid/TileKitchenSink.java +++ b/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; diff --git a/src/main/java/resonantinduction/fluid/network/FluidPressurePack.java b/src/main/java/resonantinduction/transport/fluid/network/FluidPressurePack.java similarity index 91% rename from src/main/java/resonantinduction/fluid/network/FluidPressurePack.java rename to src/main/java/resonantinduction/transport/fluid/network/FluidPressurePack.java index c5ec18cb2..2c8a7e9fb 100644 --- a/src/main/java/resonantinduction/fluid/network/FluidPressurePack.java +++ b/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; diff --git a/src/main/java/resonantinduction/fluid/network/FluidRecipeInfo.java b/src/main/java/resonantinduction/transport/fluid/network/FluidRecipeInfo.java similarity index 99% rename from src/main/java/resonantinduction/fluid/network/FluidRecipeInfo.java rename to src/main/java/resonantinduction/transport/fluid/network/FluidRecipeInfo.java index 6ca0f5a32..356574d9f 100644 --- a/src/main/java/resonantinduction/fluid/network/FluidRecipeInfo.java +++ b/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; diff --git a/src/main/java/resonantinduction/fluid/network/IFluidRecipeCrafter.java b/src/main/java/resonantinduction/transport/fluid/network/IFluidRecipeCrafter.java similarity index 94% rename from src/main/java/resonantinduction/fluid/network/IFluidRecipeCrafter.java rename to src/main/java/resonantinduction/transport/fluid/network/IFluidRecipeCrafter.java index b6949bfbe..e539802ce 100644 --- a/src/main/java/resonantinduction/fluid/network/IFluidRecipeCrafter.java +++ b/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 diff --git a/src/main/java/resonantinduction/fluid/network/NetworkFluidContainers.java b/src/main/java/resonantinduction/transport/fluid/network/NetworkFluidContainers.java similarity index 98% rename from src/main/java/resonantinduction/fluid/network/NetworkFluidContainers.java rename to src/main/java/resonantinduction/transport/fluid/network/NetworkFluidContainers.java index 65d676028..5271784a0 100644 --- a/src/main/java/resonantinduction/fluid/network/NetworkFluidContainers.java +++ b/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; diff --git a/src/main/java/resonantinduction/fluid/network/NetworkFluidTiles.java b/src/main/java/resonantinduction/transport/fluid/network/NetworkFluidTiles.java similarity index 98% rename from src/main/java/resonantinduction/fluid/network/NetworkFluidTiles.java rename to src/main/java/resonantinduction/transport/fluid/network/NetworkFluidTiles.java index 1f2be2cc6..1035a01fe 100644 --- a/src/main/java/resonantinduction/fluid/network/NetworkFluidTiles.java +++ b/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; diff --git a/src/main/java/resonantinduction/fluid/network/NetworkPipes.java b/src/main/java/resonantinduction/transport/fluid/network/NetworkPipes.java similarity index 98% rename from src/main/java/resonantinduction/fluid/network/NetworkPipes.java rename to src/main/java/resonantinduction/transport/fluid/network/NetworkPipes.java index ff35b97e9..30f6e6d63 100644 --- a/src/main/java/resonantinduction/fluid/network/NetworkPipes.java +++ b/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; diff --git a/src/main/java/resonantinduction/fluid/pipes/BlockPipe.java b/src/main/java/resonantinduction/transport/fluid/pipes/BlockPipe.java similarity index 98% rename from src/main/java/resonantinduction/fluid/pipes/BlockPipe.java rename to src/main/java/resonantinduction/transport/fluid/pipes/BlockPipe.java index 36e18ad8f..f405b9726 100644 --- a/src/main/java/resonantinduction/fluid/pipes/BlockPipe.java +++ b/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; diff --git a/src/main/java/resonantinduction/fluid/pipes/EnumPipeType.java b/src/main/java/resonantinduction/transport/fluid/pipes/EnumPipeType.java similarity index 97% rename from src/main/java/resonantinduction/fluid/pipes/EnumPipeType.java rename to src/main/java/resonantinduction/transport/fluid/pipes/EnumPipeType.java index 7eccdc717..8c327f862 100644 --- a/src/main/java/resonantinduction/fluid/pipes/EnumPipeType.java +++ b/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; diff --git a/src/main/java/resonantinduction/fluid/pipes/EnumTankTypes.java b/src/main/java/resonantinduction/transport/fluid/pipes/EnumTankTypes.java similarity index 97% rename from src/main/java/resonantinduction/fluid/pipes/EnumTankTypes.java rename to src/main/java/resonantinduction/transport/fluid/pipes/EnumTankTypes.java index 0296e4a16..4445916a7 100644 --- a/src/main/java/resonantinduction/fluid/pipes/EnumTankTypes.java +++ b/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; diff --git a/src/main/java/resonantinduction/fluid/pipes/FluidPartsMaterial.java b/src/main/java/resonantinduction/transport/fluid/pipes/FluidPartsMaterial.java similarity index 97% rename from src/main/java/resonantinduction/fluid/pipes/FluidPartsMaterial.java rename to src/main/java/resonantinduction/transport/fluid/pipes/FluidPartsMaterial.java index b6823e9c9..8c1ffaa05 100644 --- a/src/main/java/resonantinduction/fluid/pipes/FluidPartsMaterial.java +++ b/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; diff --git a/src/main/java/resonantinduction/fluid/pipes/IPipeType.java b/src/main/java/resonantinduction/transport/fluid/pipes/IPipeType.java similarity index 75% rename from src/main/java/resonantinduction/fluid/pipes/IPipeType.java rename to src/main/java/resonantinduction/transport/fluid/pipes/IPipeType.java index e520493e3..8ec28da31 100644 --- a/src/main/java/resonantinduction/fluid/pipes/IPipeType.java +++ b/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; diff --git a/src/main/java/resonantinduction/fluid/pipes/ItemBlockPipe.java b/src/main/java/resonantinduction/transport/fluid/pipes/ItemBlockPipe.java similarity index 96% rename from src/main/java/resonantinduction/fluid/pipes/ItemBlockPipe.java rename to src/main/java/resonantinduction/transport/fluid/pipes/ItemBlockPipe.java index 1bed61add..6a633d76d 100644 --- a/src/main/java/resonantinduction/fluid/pipes/ItemBlockPipe.java +++ b/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 diff --git a/src/main/java/resonantinduction/fluid/pipes/TileEntityPipe.java b/src/main/java/resonantinduction/transport/fluid/pipes/TileEntityPipe.java similarity index 97% rename from src/main/java/resonantinduction/fluid/pipes/TileEntityPipe.java rename to src/main/java/resonantinduction/transport/fluid/pipes/TileEntityPipe.java index 27ff53f44..936e2837c 100644 --- a/src/main/java/resonantinduction/fluid/pipes/TileEntityPipe.java +++ b/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; diff --git a/src/main/java/resonantinduction/fluid/prefab/TileEntityFluidDevice.java b/src/main/java/resonantinduction/transport/fluid/prefab/TileEntityFluidDevice.java similarity index 94% rename from src/main/java/resonantinduction/fluid/prefab/TileEntityFluidDevice.java rename to src/main/java/resonantinduction/transport/fluid/prefab/TileEntityFluidDevice.java index 8373393d3..86f4b34b4 100644 --- a/src/main/java/resonantinduction/fluid/prefab/TileEntityFluidDevice.java +++ b/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; diff --git a/src/main/java/resonantinduction/fluid/prefab/TileEntityFluidNetworkTile.java b/src/main/java/resonantinduction/transport/fluid/prefab/TileEntityFluidNetworkTile.java similarity index 98% rename from src/main/java/resonantinduction/fluid/prefab/TileEntityFluidNetworkTile.java rename to src/main/java/resonantinduction/transport/fluid/prefab/TileEntityFluidNetworkTile.java index 43bba061e..9a5fdce80 100644 --- a/src/main/java/resonantinduction/fluid/prefab/TileEntityFluidNetworkTile.java +++ b/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; diff --git a/src/main/java/resonantinduction/fluid/prefab/TileEntityFluidStorage.java b/src/main/java/resonantinduction/transport/fluid/prefab/TileEntityFluidStorage.java similarity index 98% rename from src/main/java/resonantinduction/fluid/prefab/TileEntityFluidStorage.java rename to src/main/java/resonantinduction/transport/fluid/prefab/TileEntityFluidStorage.java index dc11f52f9..a3abb7e58 100644 --- a/src/main/java/resonantinduction/fluid/prefab/TileEntityFluidStorage.java +++ b/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; diff --git a/src/main/java/resonantinduction/fluid/pump/BlockConstructionPump.java b/src/main/java/resonantinduction/transport/fluid/pump/BlockConstructionPump.java similarity index 98% rename from src/main/java/resonantinduction/fluid/pump/BlockConstructionPump.java rename to src/main/java/resonantinduction/transport/fluid/pump/BlockConstructionPump.java index 291bb0b1f..257df5efa 100644 --- a/src/main/java/resonantinduction/fluid/pump/BlockConstructionPump.java +++ b/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; diff --git a/src/main/java/resonantinduction/fluid/pump/BlockDrain.java b/src/main/java/resonantinduction/transport/fluid/pump/BlockDrain.java similarity index 98% rename from src/main/java/resonantinduction/fluid/pump/BlockDrain.java rename to src/main/java/resonantinduction/transport/fluid/pump/BlockDrain.java index f484c20ca..82d70c234 100644 --- a/src/main/java/resonantinduction/fluid/pump/BlockDrain.java +++ b/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; diff --git a/src/main/java/resonantinduction/fluid/pump/BlockPumpMachine.java b/src/main/java/resonantinduction/transport/fluid/pump/BlockPumpMachine.java similarity index 97% rename from src/main/java/resonantinduction/fluid/pump/BlockPumpMachine.java rename to src/main/java/resonantinduction/transport/fluid/pump/BlockPumpMachine.java index fbad61424..c3001c8d7 100644 --- a/src/main/java/resonantinduction/fluid/pump/BlockPumpMachine.java +++ b/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; diff --git a/src/main/java/resonantinduction/fluid/pump/LiquidPathFinder.java b/src/main/java/resonantinduction/transport/fluid/pump/LiquidPathFinder.java similarity index 99% rename from src/main/java/resonantinduction/fluid/pump/LiquidPathFinder.java rename to src/main/java/resonantinduction/transport/fluid/pump/LiquidPathFinder.java index 93f5e28a4..705244f46 100644 --- a/src/main/java/resonantinduction/fluid/pump/LiquidPathFinder.java +++ b/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; diff --git a/src/main/java/resonantinduction/fluid/pump/TileEntityConstructionPump.java b/src/main/java/resonantinduction/transport/fluid/pump/TileEntityConstructionPump.java similarity index 97% rename from src/main/java/resonantinduction/fluid/pump/TileEntityConstructionPump.java rename to src/main/java/resonantinduction/transport/fluid/pump/TileEntityConstructionPump.java index 4f2a57430..df33d955a 100644 --- a/src/main/java/resonantinduction/fluid/pump/TileEntityConstructionPump.java +++ b/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; diff --git a/src/main/java/resonantinduction/fluid/pump/TileEntityDrain.java b/src/main/java/resonantinduction/transport/fluid/pump/TileEntityDrain.java similarity index 98% rename from src/main/java/resonantinduction/fluid/pump/TileEntityDrain.java rename to src/main/java/resonantinduction/transport/fluid/pump/TileEntityDrain.java index 7cbdc0562..869f2d990 100644 --- a/src/main/java/resonantinduction/fluid/pump/TileEntityDrain.java +++ b/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; diff --git a/src/main/java/resonantinduction/fluid/pump/TileEntityStarterPump.java b/src/main/java/resonantinduction/transport/fluid/pump/TileEntityStarterPump.java similarity index 99% rename from src/main/java/resonantinduction/fluid/pump/TileEntityStarterPump.java rename to src/main/java/resonantinduction/transport/fluid/pump/TileEntityStarterPump.java index 044a12439..ac1557853 100644 --- a/src/main/java/resonantinduction/fluid/pump/TileEntityStarterPump.java +++ b/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;