diff --git a/src/dark/api/fluid/INetworkFluidPart.java b/src/dark/api/fluid/INetworkFluidPart.java index 38d602ca..31a13af3 100644 --- a/src/dark/api/fluid/INetworkFluidPart.java +++ b/src/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.interfaces.IColorCoded; -import dark.interfaces.INetworkPart; +import dark.core.interfaces.INetworkPart; +import dark.core.interfaces.ColorCode.IColorCoded; public interface INetworkFluidPart extends IColorCoded, IFluidHandler, INetworkPart { diff --git a/src/dark/core/network/fluid/HydraulicNetworkHelper.java b/src/dark/core/network/fluid/HydraulicNetworkHelper.java index 9a07f066..125b6f5d 100644 --- a/src/dark/core/network/fluid/HydraulicNetworkHelper.java +++ b/src/dark/core/network/fluid/HydraulicNetworkHelper.java @@ -4,8 +4,8 @@ import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.ForgeDirection; import universalelectricity.core.vector.Vector3; import universalelectricity.core.vector.VectorHelper; -import dark.core.tile.network.NetworkTileEntities; -import dark.interfaces.INetworkPart; +import dark.core.interfaces.INetworkPart; +import dark.core.prefab.tilenetwork.NetworkTileEntities; public class HydraulicNetworkHelper { diff --git a/src/dark/core/network/fluid/NetworkFluidContainers.java b/src/dark/core/network/fluid/NetworkFluidContainers.java index 00b99628..c220a4db 100644 --- a/src/dark/core/network/fluid/NetworkFluidContainers.java +++ b/src/dark/core/network/fluid/NetworkFluidContainers.java @@ -8,9 +8,9 @@ import net.minecraft.tileentity.TileEntity; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidHandler; import dark.api.fluid.INetworkFluidPart; -import dark.core.tile.network.NetworkTileEntities; -import dark.interfaces.ColorCode; -import dark.interfaces.INetworkPart; +import dark.core.interfaces.ColorCode; +import dark.core.interfaces.INetworkPart; +import dark.core.prefab.tilenetwork.NetworkTileEntities; /** 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/dark/core/network/fluid/NetworkFluidTiles.java b/src/dark/core/network/fluid/NetworkFluidTiles.java index e576e559..e6d80c92 100644 --- a/src/dark/core/network/fluid/NetworkFluidTiles.java +++ b/src/dark/core/network/fluid/NetworkFluidTiles.java @@ -21,13 +21,13 @@ import universalelectricity.core.vector.Vector3; import dark.api.fluid.AdvancedFluidEvent; import dark.api.fluid.AdvancedFluidEvent.FluidMergeEvent; import dark.api.fluid.INetworkFluidPart; -import dark.core.helpers.FluidHelper; -import dark.core.helpers.Pair; -import dark.core.tile.network.NetworkTileEntities; +import dark.core.interfaces.ColorCode; +import dark.core.interfaces.INetworkPart; +import dark.core.prefab.helpers.FluidHelper; +import dark.core.prefab.helpers.Pair; +import dark.core.prefab.tilenetwork.NetworkTileEntities; import dark.fluid.common.machines.TileEntityTank; import dark.fluid.common.pipes.TileEntityPipe; -import dark.interfaces.ColorCode; -import dark.interfaces.INetworkPart; public class NetworkFluidTiles extends NetworkTileEntities { diff --git a/src/dark/core/network/fluid/NetworkPipes.java b/src/dark/core/network/fluid/NetworkPipes.java index cb63df2f..00d4ed68 100644 --- a/src/dark/core/network/fluid/NetworkPipes.java +++ b/src/dark/core/network/fluid/NetworkPipes.java @@ -10,17 +10,16 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; import dark.api.fluid.INetworkPipe; -import dark.core.helpers.ConnectionHelper; -import dark.core.helpers.FluidHelper; -import dark.core.helpers.FluidRestrictionHandler; -import dark.core.tile.network.NetworkTileEntities; -import dark.interfaces.ColorCode; -import dark.interfaces.INetworkPart; +import dark.core.interfaces.ColorCode; +import dark.core.interfaces.INetworkPart; +import dark.core.prefab.helpers.ConnectionHelper; +import dark.core.prefab.helpers.FluidHelper; +import dark.core.prefab.tilenetwork.NetworkTileEntities; /** 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 * Liquids - * + * * @author Rseifert */ public class NetworkPipes extends NetworkFluidTiles { @@ -164,7 +163,7 @@ public class NetworkPipes extends NetworkFluidTiles } /** Adds FLuid to this network from one of the connected Pipes - * + * * @param source - Were this liquid came from * @param stack - LiquidStack to be sent * @param doFill - actually fill the tank or just check numbers @@ -175,7 +174,7 @@ public class NetworkPipes extends NetworkFluidTiles } /** Adds FLuid to this network from one of the connected Pipes - * + * * @param source - Were this liquid came from * @param stack - LiquidStack to be sent * @param doFill - actually fill the tank or just check numbers @@ -187,7 +186,7 @@ public class NetworkPipes extends NetworkFluidTiles FluidStack prevCombined = this.combinedStorage().getFluid(); FluidStack stack = sta.copy(); - if (!this.processingRequest && stack != null && FluidRestrictionHandler.isValidLiquid(color, stack.getFluid())) + if (!this.processingRequest && stack != null && FluidHelper.isValidLiquid(color, stack.getFluid())) { this.processingRequest = true; diff --git a/src/dark/fluid/client/render/RenderBoiler.java b/src/dark/fluid/client/render/RenderBoiler.java index 059a22d5..1167f925 100644 --- a/src/dark/fluid/client/render/RenderBoiler.java +++ b/src/dark/fluid/client/render/RenderBoiler.java @@ -5,8 +5,8 @@ import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; -import dark.client.renders.RenderMachine; -import dark.core.helpers.ConnectionHelper; +import dark.core.client.renders.RenderMachine; +import dark.core.prefab.helpers.ConnectionHelper; import dark.fluid.client.model.ModelCenterTank; import dark.fluid.client.model.ModelCornerTank; import dark.fluid.client.model.ModelTank; diff --git a/src/dark/fluid/client/render/RenderConstructionPump.java b/src/dark/fluid/client/render/RenderConstructionPump.java index 0b411c0d..f195e095 100644 --- a/src/dark/fluid/client/render/RenderConstructionPump.java +++ b/src/dark/fluid/client/render/RenderConstructionPump.java @@ -7,7 +7,7 @@ import org.lwjgl.opengl.GL11; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import dark.client.renders.RenderMachine; +import dark.core.client.renders.RenderMachine; import dark.fluid.client.model.ModelConstructionPump; import dark.fluid.common.FluidMech; import dark.fluid.common.pump.TileEntityConstructionPump; diff --git a/src/dark/fluid/client/render/RenderFurnace.java b/src/dark/fluid/client/render/RenderFurnace.java index 4c7aae22..b4b5b38c 100644 --- a/src/dark/fluid/client/render/RenderFurnace.java +++ b/src/dark/fluid/client/render/RenderFurnace.java @@ -5,7 +5,7 @@ import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; -import dark.client.renders.RenderMachine; +import dark.core.client.renders.RenderMachine; import dark.fluid.client.model.ModelFurnace; import dark.fluid.common.FluidMech; diff --git a/src/dark/fluid/client/render/RenderGearPiston.java b/src/dark/fluid/client/render/RenderGearPiston.java index 3144e4e0..047c822f 100644 --- a/src/dark/fluid/client/render/RenderGearPiston.java +++ b/src/dark/fluid/client/render/RenderGearPiston.java @@ -5,7 +5,7 @@ import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; -import dark.client.renders.RenderMachine; +import dark.core.client.renders.RenderMachine; import dark.fluid.client.model.ModelGearPiston; import dark.fluid.common.FluidMech; import dark.fluid.common.machines.TileEntitySteamPiston; diff --git a/src/dark/fluid/client/render/RenderPump.java b/src/dark/fluid/client/render/RenderPump.java index d761eec3..c6f474ff 100644 --- a/src/dark/fluid/client/render/RenderPump.java +++ b/src/dark/fluid/client/render/RenderPump.java @@ -7,7 +7,7 @@ import org.lwjgl.opengl.GL11; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import dark.client.renders.RenderMachine; +import dark.core.client.renders.RenderMachine; import dark.fluid.client.model.ModelPump; import dark.fluid.common.FluidMech; import dark.fluid.common.pump.TileEntityStarterPump; diff --git a/src/dark/fluid/client/render/RenderReleaseValve.java b/src/dark/fluid/client/render/RenderReleaseValve.java index 18ac1e4e..db8b567d 100644 --- a/src/dark/fluid/client/render/RenderReleaseValve.java +++ b/src/dark/fluid/client/render/RenderReleaseValve.java @@ -7,12 +7,12 @@ import org.lwjgl.opengl.GL11; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import dark.client.renders.RenderMachine; +import dark.core.client.renders.RenderMachine; +import dark.core.interfaces.ColorCode; import dark.fluid.client.model.ModelLargePipe; import dark.fluid.client.model.ModelReleaseValve; import dark.fluid.common.FluidMech; import dark.fluid.common.machines.TileEntityReleaseValve; -import dark.interfaces.ColorCode; @SideOnly(Side.CLIENT) public class RenderReleaseValve extends RenderMachine diff --git a/src/dark/fluid/client/render/RenderSink.java b/src/dark/fluid/client/render/RenderSink.java index 6ebd87a3..85bda3b7 100644 --- a/src/dark/fluid/client/render/RenderSink.java +++ b/src/dark/fluid/client/render/RenderSink.java @@ -8,7 +8,7 @@ import org.lwjgl.opengl.GL11; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import dark.client.renders.RenderMachine; +import dark.core.client.renders.RenderMachine; import dark.fluid.client.model.ModelSink; import dark.fluid.common.FluidMech; import dark.fluid.common.machines.TileEntitySink; diff --git a/src/dark/fluid/client/render/RenderTank.java b/src/dark/fluid/client/render/RenderTank.java index e7724811..ee996e10 100644 --- a/src/dark/fluid/client/render/RenderTank.java +++ b/src/dark/fluid/client/render/RenderTank.java @@ -9,12 +9,12 @@ import org.lwjgl.opengl.GL11; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import dark.client.renders.FluidBlockRenderer; -import dark.client.renders.RenderMachine; +import dark.core.client.renders.FluidBlockRenderer; +import dark.core.client.renders.RenderMachine; +import dark.core.interfaces.ColorCode; import dark.fluid.client.model.ModelTankSide; import dark.fluid.common.FluidMech; import dark.fluid.common.machines.TileEntityTank; -import dark.interfaces.ColorCode; @SideOnly(Side.CLIENT) public class RenderTank extends RenderMachine diff --git a/src/dark/fluid/client/render/pipe/RenderPipe.java b/src/dark/fluid/client/render/pipe/RenderPipe.java index 490f9f0b..801bb01c 100644 --- a/src/dark/fluid/client/render/pipe/RenderPipe.java +++ b/src/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.client.renders.RenderMachine; -import dark.core.helpers.FluidRestrictionHandler; +import dark.core.client.renders.RenderMachine; +import dark.core.interfaces.ColorCode; +import dark.core.prefab.helpers.FluidHelper; 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.interfaces.ColorCode; @SideOnly(Side.CLIENT) public class RenderPipe extends RenderMachine @@ -87,7 +87,7 @@ public class RenderPipe extends RenderMachine String name = ""; if (block == FluidMech.recipeLoader.blockPipe.blockID) { - Fluid stack = FluidRestrictionHandler.getStackForColor(ColorCode.get(meta)); + Fluid stack = FluidHelper.getStackForColor(ColorCode.get(meta)); name = stack != null ? stack.getName() : ""; } else diff --git a/src/dark/fluid/common/BlockFM.java b/src/dark/fluid/common/BlockFM.java index 54c682f4..0e269f0d 100644 --- a/src/dark/fluid/common/BlockFM.java +++ b/src/dark/fluid/common/BlockFM.java @@ -1,7 +1,7 @@ package dark.fluid.common; import net.minecraft.block.material.Material; -import dark.prefab.BlockMachine; +import dark.core.prefab.BlockMachine; public abstract class BlockFM extends BlockMachine { diff --git a/src/dark/fluid/common/FMRecipeLoader.java b/src/dark/fluid/common/FMRecipeLoader.java index e3448d2f..d4a02df0 100644 --- a/src/dark/fluid/common/FMRecipeLoader.java +++ b/src/dark/fluid/common/FMRecipeLoader.java @@ -5,11 +5,11 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.ShapedOreRecipe; import cpw.mods.fml.common.registry.GameRegistry; -import dark.core.CoreRecipeLoader; -import dark.core.RecipeLoader; -import dark.core.items.ItemParts.Parts; +import dark.core.common.CoreRecipeLoader; +import dark.core.common.RecipeLoader; +import dark.core.common.items.ItemParts.Parts; +import dark.core.interfaces.ColorCode; import dark.fluid.common.machines.BlockFluid; -import dark.interfaces.ColorCode; public class FMRecipeLoader extends RecipeLoader { diff --git a/src/dark/fluid/common/FluidMech.java b/src/dark/fluid/common/FluidMech.java index 7c3409bf..777471d1 100644 --- a/src/dark/fluid/common/FluidMech.java +++ b/src/dark/fluid/common/FluidMech.java @@ -27,12 +27,10 @@ import cpw.mods.fml.common.event.FMLInitializationEvent; 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.core.CoreRecipeLoader; -import dark.core.DarkMain; -import dark.core.BlockRegistry.BlockData; -import dark.core.items.ItemBlockHolder; -import dark.core.items.ItemBlockOre; +import dark.core.common.DarkMain; +import dark.core.common.BlockRegistry.BlockData; +import dark.core.prefab.ModPrefab; +import dark.core.prefab.items.ItemBlockHolder; import dark.fluid.common.machines.BlockBoiler; import dark.fluid.common.machines.BlockFluid; import dark.fluid.common.machines.BlockReleaseValve; @@ -56,7 +54,6 @@ import dark.fluid.common.pump.TileEntityDrain; import dark.fluid.common.pump.TileEntityStarterPump; import dark.mech.common.machines.BlockGenerator; import dark.mech.common.machines.BlockRod; -import dark.prefab.ModPrefab; @ModstatInfo(prefix = "fluidmech") @Mod(modid = FluidMech.MOD_ID, name = FluidMech.MOD_NAME, version = DarkMain.VERSION, dependencies = "after:DarkCore", useMetadata = true) diff --git a/src/dark/fluid/common/machines/BlockSink.java b/src/dark/fluid/common/machines/BlockSink.java index abaacb84..c92bf9ce 100644 --- a/src/dark/fluid/common/machines/BlockSink.java +++ b/src/dark/fluid/common/machines/BlockSink.java @@ -9,7 +9,7 @@ import net.minecraft.util.MathHelper; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; import universalelectricity.prefab.tile.TileEntityAdvanced; -import dark.core.helpers.MetaGroup; +import dark.core.prefab.helpers.MetaGroup; import dark.fluid.client.render.BlockRenderHelper; import dark.fluid.common.BlockFM; diff --git a/src/dark/fluid/common/machines/BlockTank.java b/src/dark/fluid/common/machines/BlockTank.java index 7900a13d..fbf31113 100644 --- a/src/dark/fluid/common/machines/BlockTank.java +++ b/src/dark/fluid/common/machines/BlockTank.java @@ -13,12 +13,11 @@ import net.minecraft.world.World; import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidStack; -import dark.core.helpers.AutoCraftingManager; -import dark.core.helpers.FluidHelper; -import dark.core.helpers.FluidRestrictionHandler; +import dark.core.interfaces.INetworkPart; +import dark.core.prefab.helpers.AutoCraftingManager; +import dark.core.prefab.helpers.FluidHelper; import dark.fluid.client.render.BlockRenderHelper; import dark.fluid.common.BlockFM; -import dark.interfaces.INetworkPart; public class BlockTank extends BlockFM { @@ -199,7 +198,7 @@ public class BlockTank extends BlockFM par3List.add(new ItemStack(par1, 1, 15)); for (int i = 0; i < 16; i++) { - if (FluidRestrictionHandler.hasRestrictedStack(i)) + if (FluidHelper.hasRestrictedStack(i)) { par3List.add(new ItemStack(par1, 1, i)); } diff --git a/src/dark/fluid/common/machines/TileEntityReleaseValve.java b/src/dark/fluid/common/machines/TileEntityReleaseValve.java index e38c4066..4a9ab285 100644 --- a/src/dark/fluid/common/machines/TileEntityReleaseValve.java +++ b/src/dark/fluid/common/machines/TileEntityReleaseValve.java @@ -11,13 +11,13 @@ import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidHandler; import dark.api.fluid.INetworkPipe; -import dark.core.helpers.ConnectionHelper; +import dark.core.interfaces.ColorCode; +import dark.core.interfaces.ITileConnector; +import dark.core.interfaces.IToolReadOut; +import dark.core.interfaces.ColorCode.IColorCoded; import dark.core.network.fluid.NetworkPipes; +import dark.core.prefab.helpers.ConnectionHelper; import dark.fluid.common.prefab.TileEntityFluidDevice; -import dark.interfaces.ColorCode; -import dark.interfaces.IColorCoded; -import dark.interfaces.ITileConnector; -import dark.interfaces.IToolReadOut; public class TileEntityReleaseValve extends TileEntityFluidDevice implements ITileConnector, IToolReadOut { diff --git a/src/dark/fluid/common/machines/TileEntitySink.java b/src/dark/fluid/common/machines/TileEntitySink.java index 12040278..785a21d2 100644 --- a/src/dark/fluid/common/machines/TileEntitySink.java +++ b/src/dark/fluid/common/machines/TileEntitySink.java @@ -15,9 +15,9 @@ import universalelectricity.prefab.network.PacketManager; import com.google.common.io.ByteArrayDataInput; +import dark.core.interfaces.ColorCode; import dark.fluid.common.FluidMech; import dark.fluid.common.prefab.TileEntityFluidStorage; -import dark.interfaces.ColorCode; public class TileEntitySink extends TileEntityFluidStorage implements IPacketReceiver { diff --git a/src/dark/fluid/common/machines/TileEntitySteamPiston.java b/src/dark/fluid/common/machines/TileEntitySteamPiston.java index 723b8d2e..27180504 100644 --- a/src/dark/fluid/common/machines/TileEntitySteamPiston.java +++ b/src/dark/fluid/common/machines/TileEntitySteamPiston.java @@ -1,7 +1,7 @@ package dark.fluid.common.machines; +import dark.core.prefab.TileEntityMachine; import dark.fluid.common.FluidMech; -import dark.prefab.TileEntityMachine; public class TileEntitySteamPiston extends TileEntityMachine { diff --git a/src/dark/fluid/common/machines/TileEntityTank.java b/src/dark/fluid/common/machines/TileEntityTank.java index c70d56f7..7dec6903 100644 --- a/src/dark/fluid/common/machines/TileEntityTank.java +++ b/src/dark/fluid/common/machines/TileEntityTank.java @@ -31,15 +31,15 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import dark.api.fluid.INetworkFluidPart; import dark.api.fluid.INetworkPipe; -import dark.core.helpers.FluidRestrictionHandler; +import dark.core.interfaces.ColorCode; +import dark.core.interfaces.IToolReadOut; +import dark.core.interfaces.ColorCode.IColorCoded; import dark.core.network.fluid.NetworkFluidContainers; import dark.core.network.fluid.NetworkFluidTiles; -import dark.core.tile.network.NetworkTileEntities; +import dark.core.prefab.helpers.FluidHelper; +import dark.core.prefab.tilenetwork.NetworkTileEntities; import dark.fluid.common.FluidMech; import dark.fluid.common.prefab.TileEntityFluidStorage; -import dark.interfaces.ColorCode; -import dark.interfaces.IColorCoded; -import dark.interfaces.IToolReadOut; public class TileEntityTank extends TileEntityFluidStorage implements IFluidHandler, IToolReadOut, IColorCoded, INetworkFluidPart, IPacketReceiver { @@ -165,7 +165,7 @@ public class TileEntityTank extends TileEntityFluidStorage implements IFluidHand @Override public int fill(ForgeDirection from, FluidStack resource, boolean doFill) { - if (resource == null || !FluidRestrictionHandler.isValidLiquid(this.getColor(), resource.getFluid()) || this.worldObj.isRemote) + if (resource == null || !FluidHelper.isValidLiquid(this.getColor(), resource.getFluid()) || this.worldObj.isRemote) { return 0; } @@ -199,7 +199,7 @@ public class TileEntityTank extends TileEntityFluidStorage implements IFluidHand } /** Checks to make sure the connection is valid to the tileEntity - * + * * @param tileEntity - the tileEntity being checked * @param side - side the connection is too */ public void validateConnectionSide(TileEntity tileEntity, ForgeDirection side) diff --git a/src/dark/fluid/common/pipes/BlockPipe.java b/src/dark/fluid/common/pipes/BlockPipe.java index e052c591..191a04ac 100644 --- a/src/dark/fluid/common/pipes/BlockPipe.java +++ b/src/dark/fluid/common/pipes/BlockPipe.java @@ -12,7 +12,7 @@ import net.minecraft.world.World; import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.fluids.IFluidTank; import dark.api.fluid.INetworkPipe; -import dark.core.helpers.FluidRestrictionHandler; +import dark.core.prefab.helpers.FluidHelper; import dark.fluid.common.BlockFM; import dark.fluid.common.FluidMech; @@ -98,7 +98,7 @@ public class BlockPipe extends BlockFM { for (int i = 0; i < 16; i++) { - if (this.blockID == FluidMech.recipeLoader.blockGenPipe.blockID || FluidRestrictionHandler.hasRestrictedStack(i)) + if (this.blockID == FluidMech.recipeLoader.blockGenPipe.blockID || FluidHelper.hasRestrictedStack(i)) { par3List.add(new ItemStack(par1, 1, i)); } diff --git a/src/dark/fluid/common/pipes/TileEntityGenericPipe.java b/src/dark/fluid/common/pipes/TileEntityGenericPipe.java index ee5c6d4d..a19af0e0 100644 --- a/src/dark/fluid/common/pipes/TileEntityGenericPipe.java +++ b/src/dark/fluid/common/pipes/TileEntityGenericPipe.java @@ -7,8 +7,8 @@ import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidStack; import universalelectricity.core.vector.Vector3; import universalelectricity.core.vector.VectorHelper; +import dark.core.interfaces.ColorCode; import dark.core.network.fluid.NetworkPipes; -import dark.interfaces.ColorCode; public class TileEntityGenericPipe extends TileEntityPipe { diff --git a/src/dark/fluid/common/pipes/TileEntityPipe.java b/src/dark/fluid/common/pipes/TileEntityPipe.java index 8b7c1851..a7aecaf6 100644 --- a/src/dark/fluid/common/pipes/TileEntityPipe.java +++ b/src/dark/fluid/common/pipes/TileEntityPipe.java @@ -34,15 +34,15 @@ import com.google.common.io.ByteArrayDataInput; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import dark.api.fluid.INetworkPipe; -import dark.core.helpers.FluidRestrictionHandler; +import dark.core.interfaces.ColorCode; +import dark.core.interfaces.ITileConnector; +import dark.core.interfaces.IToolReadOut; +import dark.core.interfaces.ColorCode.IColorCoded; import dark.core.network.fluid.NetworkPipes; -import dark.core.tile.network.NetworkTileEntities; +import dark.core.prefab.helpers.FluidHelper; +import dark.core.prefab.tilenetwork.NetworkTileEntities; import dark.fluid.common.FluidMech; import dark.fluid.common.pipes.addon.IPipeExtention; -import dark.interfaces.ColorCode; -import dark.interfaces.IColorCoded; -import dark.interfaces.ITileConnector; -import dark.interfaces.IToolReadOut; public class TileEntityPipe extends TileEntityAdvanced implements IFluidHandler, IToolReadOut, IColorCoded, INetworkPipe, IPacketReceiver { @@ -397,7 +397,7 @@ public class TileEntityPipe extends TileEntityAdvanced implements IFluidHandler, @Override public int fill(ForgeDirection from, FluidStack resource, boolean doFill) { - if (resource == null || !FluidRestrictionHandler.isValidLiquid(this.getColor(), resource.getFluid())) + if (resource == null || !FluidHelper.isValidLiquid(this.getColor(), resource.getFluid())) { return 0; } @@ -418,7 +418,7 @@ public class TileEntityPipe extends TileEntityAdvanced implements IFluidHandler, } /** Checks to make sure the connection is valid to the tileEntity - * + * * @param tileEntity - the tileEntity being checked * @param side - side the connection is too * @return */ diff --git a/src/dark/fluid/common/prefab/TileEntityFluidDevice.java b/src/dark/fluid/common/prefab/TileEntityFluidDevice.java index d8b4a746..cc1b5967 100644 --- a/src/dark/fluid/common/prefab/TileEntityFluidDevice.java +++ b/src/dark/fluid/common/prefab/TileEntityFluidDevice.java @@ -5,9 +5,9 @@ import java.util.Random; import net.minecraft.entity.player.EntityPlayer; import net.minecraftforge.common.ForgeDirection; import universalelectricity.prefab.tile.TileEntityAdvanced; +import dark.core.interfaces.ITileConnector; +import dark.core.interfaces.IToolReadOut; import dark.core.network.fluid.HydraulicNetworkHelper; -import dark.interfaces.ITileConnector; -import dark.interfaces.IToolReadOut; public abstract class TileEntityFluidDevice extends TileEntityAdvanced implements IToolReadOut, ITileConnector { diff --git a/src/dark/fluid/common/prefab/TileEntityFluidStorage.java b/src/dark/fluid/common/prefab/TileEntityFluidStorage.java index 62624a43..25569dc4 100644 --- a/src/dark/fluid/common/prefab/TileEntityFluidStorage.java +++ b/src/dark/fluid/common/prefab/TileEntityFluidStorage.java @@ -11,9 +11,8 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTank; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; -import dark.core.helpers.FluidHelper; -import dark.core.helpers.FluidRestrictionHandler; -import dark.interfaces.IColorCoded; +import dark.core.interfaces.ColorCode.IColorCoded; +import dark.core.prefab.helpers.FluidHelper; public abstract class TileEntityFluidStorage extends TileEntityFluidDevice implements IFluidHandler, IColorCoded { @@ -43,7 +42,7 @@ public abstract class TileEntityFluidStorage extends TileEntityFluidDevice imple @Override public int fill(ForgeDirection from, FluidStack resource, boolean doFill) { - if (resource == null || resource.getFluid() == null || !FluidRestrictionHandler.isValidLiquid(getColor(), resource.getFluid())) + if (resource == null || resource.getFluid() == null || !FluidHelper.isValidLiquid(getColor(), resource.getFluid())) { return 0; } diff --git a/src/dark/fluid/common/pump/LiquidPathFinder.java b/src/dark/fluid/common/pump/LiquidPathFinder.java index dded4276..bfc3aa63 100644 --- a/src/dark/fluid/common/pump/LiquidPathFinder.java +++ b/src/dark/fluid/common/pump/LiquidPathFinder.java @@ -13,7 +13,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.helpers.FluidHelper; +import dark.core.prefab.helpers.FluidHelper; /** A simpler path Finder used to find drainable or fillable tiles * diff --git a/src/dark/fluid/common/pump/TileEntityConstructionPump.java b/src/dark/fluid/common/pump/TileEntityConstructionPump.java index 105fab78..a0de8259 100644 --- a/src/dark/fluid/common/pump/TileEntityConstructionPump.java +++ b/src/dark/fluid/common/pump/TileEntityConstructionPump.java @@ -16,11 +16,11 @@ import universalelectricity.core.vector.Vector3; import universalelectricity.core.vector.VectorHelper; import dark.api.fluid.IDrain; import dark.api.fluid.INetworkPipe; -import dark.core.helpers.MetaGroup; -import dark.core.helpers.Pair; +import dark.core.interfaces.ITileConnector; import dark.core.network.fluid.HydraulicNetworkHelper; import dark.core.network.fluid.NetworkFluidTiles; -import dark.interfaces.ITileConnector; +import dark.core.prefab.helpers.MetaGroup; +import dark.core.prefab.helpers.Pair; public class TileEntityConstructionPump extends TileEntityStarterPump implements IFluidHandler, ITileConnector { diff --git a/src/dark/fluid/common/pump/TileEntityDrain.java b/src/dark/fluid/common/pump/TileEntityDrain.java index a5de3e65..1acaaf1c 100644 --- a/src/dark/fluid/common/pump/TileEntityDrain.java +++ b/src/dark/fluid/common/pump/TileEntityDrain.java @@ -17,8 +17,8 @@ import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; import universalelectricity.core.vector.Vector3; import dark.api.fluid.IDrain; -import dark.core.helpers.FluidHelper; -import dark.core.helpers.Pair; +import dark.core.prefab.helpers.FluidHelper; +import dark.core.prefab.helpers.Pair; import dark.fluid.common.prefab.TileEntityFluidDevice; public class TileEntityDrain extends TileEntityFluidDevice implements IFluidHandler, IDrain diff --git a/src/dark/fluid/common/pump/TileEntityStarterPump.java b/src/dark/fluid/common/pump/TileEntityStarterPump.java index acc34b1a..79ef3aac 100644 --- a/src/dark/fluid/common/pump/TileEntityStarterPump.java +++ b/src/dark/fluid/common/pump/TileEntityStarterPump.java @@ -12,12 +12,12 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidHandler; import universalelectricity.core.vector.Vector3; import dark.api.fluid.IDrain; -import dark.core.helpers.FluidHelper; -import dark.core.helpers.Pair; +import dark.core.interfaces.ITileConnector; +import dark.core.interfaces.IToolReadOut; +import dark.core.prefab.TileEntityMachine; +import dark.core.prefab.helpers.FluidHelper; +import dark.core.prefab.helpers.Pair; import dark.fluid.common.FluidMech; -import dark.interfaces.ITileConnector; -import dark.interfaces.IToolReadOut; -import dark.prefab.TileEntityMachine; public class TileEntityStarterPump extends TileEntityMachine implements IToolReadOut, ITileConnector {