From b5b43736728c952d445fcc5223bdf10bc6a9f54b Mon Sep 17 00:00:00 2001 From: DarkGuardsman Date: Mon, 22 Jul 2013 00:35:42 -0400 Subject: [PATCH] cleanup --- .../dark/api/fluid/INetworkFluidPart.java | 4 ++-- .../network/fluid/HydraulicNetworkHelper.java | 2 +- .../network/fluid/NetworkFluidContainers.java | 4 ++-- .../core/network/fluid/NetworkFluidTiles.java | 6 +++--- .../dark/core/network/fluid/NetworkPipes.java | 8 ++++---- .../fluid/client/render/RenderReleaseValve.java | 2 +- .../dark/fluid/client/render/RenderTank.java | 2 +- .../fluid/client/render/pipe/RenderPipe.java | 4 ++-- src/minecraft/dark/fluid/common/BlockFM.java | 2 +- src/minecraft/dark/fluid/common/FluidMech.java | 4 ++-- .../dark/fluid/common/item/ItemTools.java | 4 ++-- .../dark/fluid/common/machines/BlockTank.java | 8 ++++---- .../common/machines/TileEntityReleaseValve.java | 8 ++++---- .../fluid/common/machines/TileEntitySink.java | 2 +- .../fluid/common/machines/TileEntityTank.java | 8 ++++---- .../dark/fluid/common/pipes/BlockPipe.java | 2 +- .../common/pipes/TileEntityGenericPipe.java | 2 +- .../dark/fluid/common/pipes/TileEntityPipe.java | 10 +++++----- .../common/prefab/TileEntityFluidDevice.java | 4 ++-- .../common/prefab/TileEntityFluidStorage.java | 6 +++--- .../dark/fluid/common/pump/LiquidPathFinder.java | 2 +- .../common/pump/TileEntityConstructionPump.java | 6 +++--- .../dark/fluid/common/pump/TileEntityDrain.java | 2 +- .../fluid/common/pump/TileEntityStarterPump.java | 16 ++++++++-------- 24 files changed, 59 insertions(+), 59 deletions(-) diff --git a/src/minecraft/dark/api/fluid/INetworkFluidPart.java b/src/minecraft/dark/api/fluid/INetworkFluidPart.java index 763b5522..395c2456 100644 --- a/src/minecraft/dark/api/fluid/INetworkFluidPart.java +++ b/src/minecraft/dark/api/fluid/INetworkFluidPart.java @@ -3,8 +3,8 @@ package dark.api.fluid; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidHandler; import net.minecraftforge.fluids.IFluidTank; -import dark.core.api.IColorCoded; -import dark.core.api.INetworkPart; +import dark.api.IColorCoded; +import dark.api.INetworkPart; public interface INetworkFluidPart extends IColorCoded, IFluidHandler, INetworkPart { diff --git a/src/minecraft/dark/core/network/fluid/HydraulicNetworkHelper.java b/src/minecraft/dark/core/network/fluid/HydraulicNetworkHelper.java index 8511cb9f..4aeaf811 100644 --- a/src/minecraft/dark/core/network/fluid/HydraulicNetworkHelper.java +++ b/src/minecraft/dark/core/network/fluid/HydraulicNetworkHelper.java @@ -5,8 +5,8 @@ import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.fluids.IFluidHandler; import universalelectricity.core.vector.Vector3; import universalelectricity.core.vector.VectorHelper; +import dark.api.INetworkPart; import dark.api.fluid.IDrain; -import dark.core.api.INetworkPart; import dark.core.tile.network.NetworkTileEntities; public class HydraulicNetworkHelper diff --git a/src/minecraft/dark/core/network/fluid/NetworkFluidContainers.java b/src/minecraft/dark/core/network/fluid/NetworkFluidContainers.java index 074bc144..d4aa733d 100644 --- a/src/minecraft/dark/core/network/fluid/NetworkFluidContainers.java +++ b/src/minecraft/dark/core/network/fluid/NetworkFluidContainers.java @@ -6,9 +6,9 @@ import java.util.List; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; +import dark.api.ColorCode; +import dark.api.INetworkPart; import dark.api.fluid.INetworkFluidPart; -import dark.core.api.ColorCode; -import dark.core.api.INetworkPart; import dark.core.tile.network.NetworkTileEntities; /** Side note: the network should act like this when done {@link http diff --git a/src/minecraft/dark/core/network/fluid/NetworkFluidTiles.java b/src/minecraft/dark/core/network/fluid/NetworkFluidTiles.java index 307ecff4..f8cdeddc 100644 --- a/src/minecraft/dark/core/network/fluid/NetworkFluidTiles.java +++ b/src/minecraft/dark/core/network/fluid/NetworkFluidTiles.java @@ -13,13 +13,13 @@ import net.minecraftforge.fluids.FluidTank; import net.minecraftforge.fluids.IFluidHandler; import universalelectricity.core.path.Pathfinder; import universalelectricity.core.vector.Vector3; +import dark.api.ColorCode; +import dark.api.INetworkPart; import dark.api.fluid.INetworkFluidPart; -import dark.core.api.ColorCode; -import dark.core.api.INetworkPart; -import dark.core.hydraulic.helpers.FluidHelper; import dark.core.tile.network.NetworkPathFinder; import dark.core.tile.network.NetworkTileEntities; import dark.helpers.ConnectionHelper; +import dark.helpers.FluidHelper; public class NetworkFluidTiles extends NetworkTileEntities { diff --git a/src/minecraft/dark/core/network/fluid/NetworkPipes.java b/src/minecraft/dark/core/network/fluid/NetworkPipes.java index 453dfeff..3f2310c1 100644 --- a/src/minecraft/dark/core/network/fluid/NetworkPipes.java +++ b/src/minecraft/dark/core/network/fluid/NetworkPipes.java @@ -9,13 +9,13 @@ import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; +import dark.api.ColorCode; +import dark.api.INetworkPart; import dark.api.fluid.INetworkPipe; -import dark.core.api.ColorCode; -import dark.core.api.INetworkPart; -import dark.core.hydraulic.helpers.FluidHelper; -import dark.core.hydraulic.helpers.FluidRestrictionHandler; import dark.core.tile.network.NetworkTileEntities; import dark.helpers.ConnectionHelper; +import dark.helpers.FluidHelper; +import dark.helpers.FluidRestrictionHandler; /** Side note: the network should act like this when done {@link http * ://www.e4training.com/hydraulic_calculators/B1.htm} as well as stay compatible with the forge diff --git a/src/minecraft/dark/fluid/client/render/RenderReleaseValve.java b/src/minecraft/dark/fluid/client/render/RenderReleaseValve.java index 9323ed13..510f05f0 100644 --- a/src/minecraft/dark/fluid/client/render/RenderReleaseValve.java +++ b/src/minecraft/dark/fluid/client/render/RenderReleaseValve.java @@ -7,7 +7,7 @@ import org.lwjgl.opengl.GL11; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import dark.core.api.ColorCode; +import dark.api.ColorCode; import dark.core.render.RenderMachine; import dark.fluid.client.model.ModelLargePipe; import dark.fluid.client.model.ModelReleaseValve; diff --git a/src/minecraft/dark/fluid/client/render/RenderTank.java b/src/minecraft/dark/fluid/client/render/RenderTank.java index 1d786d96..aba4cf81 100644 --- a/src/minecraft/dark/fluid/client/render/RenderTank.java +++ b/src/minecraft/dark/fluid/client/render/RenderTank.java @@ -9,7 +9,7 @@ import org.lwjgl.opengl.GL11; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import dark.core.api.ColorCode; +import dark.api.ColorCode; import dark.core.render.FluidBlockRenderer; import dark.core.render.RenderMachine; import dark.fluid.client.model.ModelTankSide; diff --git a/src/minecraft/dark/fluid/client/render/pipe/RenderPipe.java b/src/minecraft/dark/fluid/client/render/pipe/RenderPipe.java index a5d57aca..ef377c9d 100644 --- a/src/minecraft/dark/fluid/client/render/pipe/RenderPipe.java +++ b/src/minecraft/dark/fluid/client/render/pipe/RenderPipe.java @@ -10,13 +10,13 @@ import org.lwjgl.opengl.GL11; import universalelectricity.core.vector.Vector3; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import dark.core.api.ColorCode; -import dark.core.hydraulic.helpers.FluidRestrictionHandler; +import dark.api.ColorCode; import dark.core.render.RenderMachine; import dark.fluid.client.model.ModelLargePipe; import dark.fluid.common.FluidMech; import dark.fluid.common.pipes.TileEntityPipe; import dark.fluid.common.pipes.addon.IPipeExtention; +import dark.helpers.FluidRestrictionHandler; @SideOnly(Side.CLIENT) public class RenderPipe extends RenderMachine diff --git a/src/minecraft/dark/fluid/common/BlockFM.java b/src/minecraft/dark/fluid/common/BlockFM.java index e0031677..cc65f0d7 100644 --- a/src/minecraft/dark/fluid/common/BlockFM.java +++ b/src/minecraft/dark/fluid/common/BlockFM.java @@ -1,7 +1,7 @@ package dark.fluid.common; import net.minecraft.block.material.Material; -import dark.library.machine.BlockMachine; +import dark.prefab.machine.BlockMachine; public abstract class BlockFM extends BlockMachine { diff --git a/src/minecraft/dark/fluid/common/FluidMech.java b/src/minecraft/dark/fluid/common/FluidMech.java index c68a5ede..90d9bd8a 100644 --- a/src/minecraft/dark/fluid/common/FluidMech.java +++ b/src/minecraft/dark/fluid/common/FluidMech.java @@ -34,8 +34,8 @@ import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.network.NetworkMod; import cpw.mods.fml.common.registry.GameRegistry; +import dark.api.ColorCode; import dark.core.ModPrefab; -import dark.core.api.ColorCode; import dark.fluid.common.item.ItemParts; import dark.fluid.common.item.ItemParts.Parts; import dark.fluid.common.item.ItemTools; @@ -61,7 +61,7 @@ import dark.mech.common.machines.BlockGenerator; import dark.mech.common.machines.BlockRod; @ModstatInfo(prefix = "fluidmech") -@Mod(modid = FluidMech.MOD_ID, name = FluidMech.MOD_NAME, version = FluidMech.VERSION, useMetadata = true) +@Mod(modid = FluidMech.MOD_ID, name = FluidMech.MOD_NAME, version = FluidMech.VERSION,dependencies = "after:DarkCore", useMetadata = true) @NetworkMod(channels = { FluidMech.CHANNEL }, clientSideRequired = true, serverSideRequired = false, packetHandler = PacketManager.class) public class FluidMech extends ModPrefab { diff --git a/src/minecraft/dark/fluid/common/item/ItemTools.java b/src/minecraft/dark/fluid/common/item/ItemTools.java index 890f9830..f54be86f 100644 --- a/src/minecraft/dark/fluid/common/item/ItemTools.java +++ b/src/minecraft/dark/fluid/common/item/ItemTools.java @@ -9,8 +9,8 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ChatMessageComponent; import net.minecraft.world.World; import net.minecraftforge.common.ForgeDirection; -import dark.core.api.IToolReadOut; -import dark.core.api.IToolReadOut.EnumTools; +import dark.api.IToolReadOut; +import dark.api.IToolReadOut.EnumTools; import dark.fluid.common.FluidMech; public class ItemTools extends ItemBasic diff --git a/src/minecraft/dark/fluid/common/machines/BlockTank.java b/src/minecraft/dark/fluid/common/machines/BlockTank.java index bd454103..df76dfed 100644 --- a/src/minecraft/dark/fluid/common/machines/BlockTank.java +++ b/src/minecraft/dark/fluid/common/machines/BlockTank.java @@ -13,12 +13,12 @@ import net.minecraft.world.World; import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidStack; -import dark.core.api.INetworkPart; -import dark.core.hydraulic.helpers.FluidHelper; -import dark.core.hydraulic.helpers.FluidRestrictionHandler; +import dark.api.INetworkPart; import dark.fluid.client.render.BlockRenderHelper; import dark.fluid.common.BlockFM; -import dark.library.machine.AutoCraftingManager; +import dark.helpers.FluidHelper; +import dark.helpers.FluidRestrictionHandler; +import dark.prefab.machine.AutoCraftingManager; public class BlockTank extends BlockFM { diff --git a/src/minecraft/dark/fluid/common/machines/TileEntityReleaseValve.java b/src/minecraft/dark/fluid/common/machines/TileEntityReleaseValve.java index e0fa666d..7235eea7 100644 --- a/src/minecraft/dark/fluid/common/machines/TileEntityReleaseValve.java +++ b/src/minecraft/dark/fluid/common/machines/TileEntityReleaseValve.java @@ -10,11 +10,11 @@ import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidHandler; +import dark.api.ColorCode; +import dark.api.IColorCoded; +import dark.api.ITileConnector; +import dark.api.IToolReadOut; import dark.api.fluid.INetworkPipe; -import dark.core.api.ColorCode; -import dark.core.api.IColorCoded; -import dark.core.api.ITileConnector; -import dark.core.api.IToolReadOut; import dark.core.network.fluid.NetworkPipes; import dark.fluid.common.prefab.TileEntityFluidDevice; import dark.helpers.ConnectionHelper; diff --git a/src/minecraft/dark/fluid/common/machines/TileEntitySink.java b/src/minecraft/dark/fluid/common/machines/TileEntitySink.java index 9bd566ba..bf71e6eb 100644 --- a/src/minecraft/dark/fluid/common/machines/TileEntitySink.java +++ b/src/minecraft/dark/fluid/common/machines/TileEntitySink.java @@ -14,7 +14,7 @@ import universalelectricity.prefab.network.PacketManager; import com.google.common.io.ByteArrayDataInput; -import dark.core.api.ColorCode; +import dark.api.ColorCode; import dark.fluid.common.FluidMech; import dark.fluid.common.prefab.TileEntityFluidStorage; diff --git a/src/minecraft/dark/fluid/common/machines/TileEntityTank.java b/src/minecraft/dark/fluid/common/machines/TileEntityTank.java index 99bb0d35..a791b995 100644 --- a/src/minecraft/dark/fluid/common/machines/TileEntityTank.java +++ b/src/minecraft/dark/fluid/common/machines/TileEntityTank.java @@ -31,17 +31,17 @@ import com.google.common.io.ByteArrayDataInput; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import dark.api.ColorCode; +import dark.api.IColorCoded; +import dark.api.IToolReadOut; import dark.api.fluid.INetworkFluidPart; import dark.api.fluid.INetworkPipe; -import dark.core.api.ColorCode; -import dark.core.api.IColorCoded; -import dark.core.api.IToolReadOut; -import dark.core.hydraulic.helpers.FluidRestrictionHandler; import dark.core.network.fluid.NetworkFluidContainers; import dark.core.network.fluid.NetworkFluidTiles; import dark.core.tile.network.NetworkTileEntities; import dark.fluid.common.FluidMech; import dark.fluid.common.prefab.TileEntityFluidStorage; +import dark.helpers.FluidRestrictionHandler; public class TileEntityTank extends TileEntityFluidStorage implements IFluidHandler, IToolReadOut, IColorCoded, INetworkFluidPart, IPacketReceiver { diff --git a/src/minecraft/dark/fluid/common/pipes/BlockPipe.java b/src/minecraft/dark/fluid/common/pipes/BlockPipe.java index 37a774b8..a356884e 100644 --- a/src/minecraft/dark/fluid/common/pipes/BlockPipe.java +++ b/src/minecraft/dark/fluid/common/pipes/BlockPipe.java @@ -12,9 +12,9 @@ import net.minecraft.world.World; import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.fluids.IFluidTank; import dark.api.fluid.INetworkPipe; -import dark.core.hydraulic.helpers.FluidRestrictionHandler; import dark.fluid.common.BlockFM; import dark.fluid.common.FluidMech; +import dark.helpers.FluidRestrictionHandler; public class BlockPipe extends BlockFM { diff --git a/src/minecraft/dark/fluid/common/pipes/TileEntityGenericPipe.java b/src/minecraft/dark/fluid/common/pipes/TileEntityGenericPipe.java index e2efa418..5a98edcd 100644 --- a/src/minecraft/dark/fluid/common/pipes/TileEntityGenericPipe.java +++ b/src/minecraft/dark/fluid/common/pipes/TileEntityGenericPipe.java @@ -7,7 +7,7 @@ import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidStack; import universalelectricity.core.vector.Vector3; import universalelectricity.core.vector.VectorHelper; -import dark.core.api.ColorCode; +import dark.api.ColorCode; import dark.core.network.fluid.NetworkPipes; public class TileEntityGenericPipe extends TileEntityPipe diff --git a/src/minecraft/dark/fluid/common/pipes/TileEntityPipe.java b/src/minecraft/dark/fluid/common/pipes/TileEntityPipe.java index 32170170..bc80fdd6 100644 --- a/src/minecraft/dark/fluid/common/pipes/TileEntityPipe.java +++ b/src/minecraft/dark/fluid/common/pipes/TileEntityPipe.java @@ -33,16 +33,16 @@ import com.google.common.io.ByteArrayDataInput; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import dark.api.ColorCode; +import dark.api.IColorCoded; +import dark.api.ITileConnector; +import dark.api.IToolReadOut; import dark.api.fluid.INetworkPipe; -import dark.core.api.ColorCode; -import dark.core.api.IColorCoded; -import dark.core.api.ITileConnector; -import dark.core.api.IToolReadOut; -import dark.core.hydraulic.helpers.FluidRestrictionHandler; import dark.core.network.fluid.NetworkPipes; import dark.core.tile.network.NetworkTileEntities; import dark.fluid.common.FluidMech; import dark.fluid.common.pipes.addon.IPipeExtention; +import dark.helpers.FluidRestrictionHandler; public class TileEntityPipe extends TileEntityAdvanced implements IFluidHandler, IToolReadOut, IColorCoded, INetworkPipe, IPacketReceiver { diff --git a/src/minecraft/dark/fluid/common/prefab/TileEntityFluidDevice.java b/src/minecraft/dark/fluid/common/prefab/TileEntityFluidDevice.java index 0843e2c9..54fc195b 100644 --- a/src/minecraft/dark/fluid/common/prefab/TileEntityFluidDevice.java +++ b/src/minecraft/dark/fluid/common/prefab/TileEntityFluidDevice.java @@ -3,8 +3,8 @@ package dark.fluid.common.prefab; import java.util.Random; import universalelectricity.prefab.tile.TileEntityAdvanced; -import dark.core.api.ITileConnector; -import dark.core.api.IToolReadOut; +import dark.api.ITileConnector; +import dark.api.IToolReadOut; import dark.core.network.fluid.HydraulicNetworkHelper; public abstract class TileEntityFluidDevice extends TileEntityAdvanced implements IToolReadOut, ITileConnector diff --git a/src/minecraft/dark/fluid/common/prefab/TileEntityFluidStorage.java b/src/minecraft/dark/fluid/common/prefab/TileEntityFluidStorage.java index c413180d..4861a317 100644 --- a/src/minecraft/dark/fluid/common/prefab/TileEntityFluidStorage.java +++ b/src/minecraft/dark/fluid/common/prefab/TileEntityFluidStorage.java @@ -11,9 +11,9 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTank; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; -import dark.core.api.IColorCoded; -import dark.core.hydraulic.helpers.FluidHelper; -import dark.core.hydraulic.helpers.FluidRestrictionHandler; +import dark.api.IColorCoded; +import dark.helpers.FluidHelper; +import dark.helpers.FluidRestrictionHandler; public abstract class TileEntityFluidStorage extends TileEntityFluidDevice implements IFluidHandler, IColorCoded { diff --git a/src/minecraft/dark/fluid/common/pump/LiquidPathFinder.java b/src/minecraft/dark/fluid/common/pump/LiquidPathFinder.java index 49ef5bd1..f645fa91 100644 --- a/src/minecraft/dark/fluid/common/pump/LiquidPathFinder.java +++ b/src/minecraft/dark/fluid/common/pump/LiquidPathFinder.java @@ -10,7 +10,7 @@ import net.minecraft.world.chunk.Chunk; import net.minecraftforge.common.ForgeDirection; import universalelectricity.core.vector.Vector2; import universalelectricity.core.vector.Vector3; -import dark.core.hydraulic.helpers.FluidHelper; +import dark.helpers.FluidHelper; /** A simpler pathfinder based on Calclavia's PathFinder from UE api */ public class LiquidPathFinder diff --git a/src/minecraft/dark/fluid/common/pump/TileEntityConstructionPump.java b/src/minecraft/dark/fluid/common/pump/TileEntityConstructionPump.java index 07ea438d..0b5e61cf 100644 --- a/src/minecraft/dark/fluid/common/pump/TileEntityConstructionPump.java +++ b/src/minecraft/dark/fluid/common/pump/TileEntityConstructionPump.java @@ -10,14 +10,14 @@ import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; import universalelectricity.core.vector.Vector3; import universalelectricity.core.vector.VectorHelper; +import dark.api.ITileConnector; import dark.api.fluid.INetworkPipe; -import dark.core.api.ITileConnector; import dark.core.network.fluid.HydraulicNetworkHelper; import dark.core.network.fluid.NetworkFluidTiles; import dark.helpers.MetaGroup; -import dark.library.machine.TileEntityRunnableMachine; +import dark.prefab.machine.TileEntityMachine; -public class TileEntityConstructionPump extends TileEntityRunnableMachine implements IFluidHandler, ITileConnector +public class TileEntityConstructionPump extends TileEntityMachine implements IFluidHandler, ITileConnector { /* LIQUID FLOW CONNECTION SIDES */ /** Internal tank for interaction but not real storage */ diff --git a/src/minecraft/dark/fluid/common/pump/TileEntityDrain.java b/src/minecraft/dark/fluid/common/pump/TileEntityDrain.java index 883cc847..e907d998 100644 --- a/src/minecraft/dark/fluid/common/pump/TileEntityDrain.java +++ b/src/minecraft/dark/fluid/common/pump/TileEntityDrain.java @@ -21,8 +21,8 @@ import universalelectricity.core.vector.Vector3; import universalelectricity.core.vector.VectorHelper; import dark.api.fluid.IDrain; import dark.api.fluid.INetworkPipe; -import dark.core.hydraulic.helpers.FluidHelper; import dark.fluid.common.prefab.TileEntityFluidDevice; +import dark.helpers.FluidHelper; public class TileEntityDrain extends TileEntityFluidDevice implements IFluidHandler, IDrain { diff --git a/src/minecraft/dark/fluid/common/pump/TileEntityStarterPump.java b/src/minecraft/dark/fluid/common/pump/TileEntityStarterPump.java index fb8467c1..04a84701 100644 --- a/src/minecraft/dark/fluid/common/pump/TileEntityStarterPump.java +++ b/src/minecraft/dark/fluid/common/pump/TileEntityStarterPump.java @@ -14,16 +14,16 @@ import universalelectricity.prefab.network.IPacketReceiver; import com.google.common.io.ByteArrayDataInput; -import dark.core.api.ColorCode; -import dark.core.api.IColorCoded; -import dark.core.api.ITileConnector; -import dark.core.api.IToolReadOut; -import dark.core.hydraulic.helpers.FluidHelper; -import dark.core.hydraulic.helpers.FluidRestrictionHandler; +import dark.api.ColorCode; +import dark.api.IColorCoded; +import dark.api.ITileConnector; +import dark.api.IToolReadOut; +import dark.helpers.FluidHelper; +import dark.helpers.FluidRestrictionHandler; import dark.helpers.MetaGroup; -import dark.library.machine.TileEntityRunnableMachine; +import dark.prefab.machine.TileEntityMachine; -public class TileEntityStarterPump extends TileEntityRunnableMachine implements IPacketReceiver, IToolReadOut, ITileConnector +public class TileEntityStarterPump extends TileEntityMachine implements IPacketReceiver, IToolReadOut, ITileConnector { public final static float WATTS_PER_TICK = 20; private double percentPumped = 0.0;