From 5006dbe8958741872eeba750dcf275526f5c6e68 Mon Sep 17 00:00:00 2001 From: Robert Date: Sat, 9 Nov 2013 19:48:00 -0500 Subject: [PATCH] import changes --- .../prefab/tilenetwork/fluid/FluidCraftingHandler.java | 2 +- .../prefab/tilenetwork/fluid/NetworkFluidContainers.java | 6 +++--- .../core/prefab/tilenetwork/fluid/NetworkFluidTiles.java | 8 ++++---- src/dark/core/prefab/tilenetwork/fluid/NetworkPipes.java | 8 ++++---- src/dark/fluid/common/machines/BlockSink.java | 2 +- src/dark/fluid/common/machines/BlockTank.java | 2 +- .../fluid/common/machines/TileEntityReleaseValve.java | 2 +- src/dark/fluid/common/prefab/TileEntityFluidStorage.java | 2 +- src/dark/fluid/common/pump/LiquidPathFinder.java | 2 +- src/dark/fluid/common/pump/TileEntityDrain.java | 2 +- src/dark/fluid/common/pump/TileEntityStarterPump.java | 2 +- 11 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/dark/core/prefab/tilenetwork/fluid/FluidCraftingHandler.java b/src/dark/core/prefab/tilenetwork/fluid/FluidCraftingHandler.java index 0ac9b145..b3963322 100644 --- a/src/dark/core/prefab/tilenetwork/fluid/FluidCraftingHandler.java +++ b/src/dark/core/prefab/tilenetwork/fluid/FluidCraftingHandler.java @@ -14,7 +14,7 @@ import net.minecraftforge.fluids.FluidStack; import com.builtbroken.common.Pair; import com.builtbroken.common.Triple; -import dark.core.prefab.helpers.FluidHelper; +import dark.core.prefab.fluids.FluidHelper; import dark.core.prefab.tilenetwork.fluid.FluidRecipeInfo.SimpleFluidRecipe; /** Handles all kinds of process involving mixing Fluids with other fluids and/or Items, Blocks, diff --git a/src/dark/core/prefab/tilenetwork/fluid/NetworkFluidContainers.java b/src/dark/core/prefab/tilenetwork/fluid/NetworkFluidContainers.java index f985229f..85a13d4e 100644 --- a/src/dark/core/prefab/tilenetwork/fluid/NetworkFluidContainers.java +++ b/src/dark/core/prefab/tilenetwork/fluid/NetworkFluidContainers.java @@ -8,8 +8,8 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidHandler; import dark.api.fluid.INetworkFluidPart; import dark.api.parts.INetworkPart; -import dark.core.prefab.helpers.FluidHelper; -import dark.core.prefab.tilenetwork.NetworkHandler; +import dark.core.prefab.fluids.FluidHelper; +import dark.core.prefab.tilenetwork.NetworkUpdateHandler; /** Basically the same as network Fluid tiles class with the only difference being in how it stores * the fluid. When it goes to sort the fluid it will use the fluid properties to adjust its position @@ -20,7 +20,7 @@ public class NetworkFluidContainers extends NetworkFluidTiles { static { - NetworkHandler.registerNetworkClass("FluidContainers", NetworkFluidContainers.class); + NetworkUpdateHandler.registerNetworkClass("FluidContainers", NetworkFluidContainers.class); } public NetworkFluidContainers(INetworkPart... parts) diff --git a/src/dark/core/prefab/tilenetwork/fluid/NetworkFluidTiles.java b/src/dark/core/prefab/tilenetwork/fluid/NetworkFluidTiles.java index e389ccda..edc77a42 100644 --- a/src/dark/core/prefab/tilenetwork/fluid/NetworkFluidTiles.java +++ b/src/dark/core/prefab/tilenetwork/fluid/NetworkFluidTiles.java @@ -14,8 +14,8 @@ import net.minecraftforge.fluids.IFluidHandler; import dark.api.fluid.INetworkFluidPart; import dark.api.parts.INetworkPart; import dark.api.parts.ITileNetwork; -import dark.core.prefab.helpers.FluidHelper; -import dark.core.prefab.tilenetwork.NetworkHandler; +import dark.core.prefab.fluids.FluidHelper; +import dark.core.prefab.tilenetwork.NetworkUpdateHandler; import dark.core.prefab.tilenetwork.NetworkTileEntities; public class NetworkFluidTiles extends NetworkTileEntities @@ -31,7 +31,7 @@ public class NetworkFluidTiles extends NetworkTileEntities static { - NetworkHandler.registerNetworkClass("FluidTiles", NetworkFluidTiles.class); + NetworkUpdateHandler.registerNetworkClass("FluidTiles", NetworkFluidTiles.class); } public NetworkFluidTiles(INetworkPart... parts) @@ -222,7 +222,7 @@ public class NetworkFluidTiles extends NetworkTileEntities @Override protected void mergeDo(ITileNetwork network) { - ITileNetwork newNetwork = NetworkHandler.createNewNetwork(NetworkHandler.getID(this.getClass())); + ITileNetwork newNetwork = NetworkUpdateHandler.createNewNetwork(NetworkUpdateHandler.getID(this.getClass())); if (newNetwork instanceof NetworkFluidTiles) { FluidStack one = this.getNetworkTank().getFluid(); diff --git a/src/dark/core/prefab/tilenetwork/fluid/NetworkPipes.java b/src/dark/core/prefab/tilenetwork/fluid/NetworkPipes.java index ce32f5bc..ed504bbc 100644 --- a/src/dark/core/prefab/tilenetwork/fluid/NetworkPipes.java +++ b/src/dark/core/prefab/tilenetwork/fluid/NetworkPipes.java @@ -7,9 +7,9 @@ import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; import dark.api.fluid.INetworkPipe; import dark.api.parts.INetworkPart; -import dark.core.prefab.helpers.ConnectionHelper; -import dark.core.prefab.helpers.FluidHelper; -import dark.core.prefab.tilenetwork.NetworkHandler; +import dark.core.helpers.ConnectionHelper; +import dark.core.prefab.fluids.FluidHelper; +import dark.core.prefab.tilenetwork.NetworkUpdateHandler; /** Extension on the fluid container network to provide a more advanced reaction to fluid passing * threw each pipe. As well this doubled as a pressure network for those machines that support the @@ -23,7 +23,7 @@ public class NetworkPipes extends NetworkFluidTiles static { - NetworkHandler.registerNetworkClass("FluidPipes", NetworkPipes.class); + NetworkUpdateHandler.registerNetworkClass("FluidPipes", NetworkPipes.class); } public NetworkPipes(INetworkPart... parts) diff --git a/src/dark/fluid/common/machines/BlockSink.java b/src/dark/fluid/common/machines/BlockSink.java index d8678246..8ebd86b3 100644 --- a/src/dark/fluid/common/machines/BlockSink.java +++ b/src/dark/fluid/common/machines/BlockSink.java @@ -16,7 +16,7 @@ import com.builtbroken.common.Pair; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import dark.core.prefab.helpers.FluidHelper; +import dark.core.prefab.fluids.FluidHelper; import dark.fluid.client.render.BlockRenderHelper; public class BlockSink extends BlockFM diff --git a/src/dark/fluid/common/machines/BlockTank.java b/src/dark/fluid/common/machines/BlockTank.java index 8a29f40d..e2b7ae8e 100644 --- a/src/dark/fluid/common/machines/BlockTank.java +++ b/src/dark/fluid/common/machines/BlockTank.java @@ -17,7 +17,7 @@ import com.builtbroken.common.Pair; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import dark.core.prefab.helpers.FluidHelper; +import dark.core.prefab.fluids.FluidHelper; import dark.fluid.client.render.BlockRenderHelper; import dark.fluid.common.FluidPartsMaterial; import dark.fluid.common.pipes.TileEntityPipe; diff --git a/src/dark/fluid/common/machines/TileEntityReleaseValve.java b/src/dark/fluid/common/machines/TileEntityReleaseValve.java index e02cc83a..31e262bf 100644 --- a/src/dark/fluid/common/machines/TileEntityReleaseValve.java +++ b/src/dark/fluid/common/machines/TileEntityReleaseValve.java @@ -16,7 +16,7 @@ import dark.api.ColorCode.IColorCoded; import dark.api.IToolReadOut; import dark.api.fluid.INetworkPipe; import dark.api.parts.ITileConnector; -import dark.core.prefab.helpers.ConnectionHelper; +import dark.core.helpers.ConnectionHelper; import dark.core.prefab.tilenetwork.fluid.NetworkPipes; import dark.fluid.common.prefab.TileEntityFluidDevice; diff --git a/src/dark/fluid/common/prefab/TileEntityFluidStorage.java b/src/dark/fluid/common/prefab/TileEntityFluidStorage.java index 1982b9e8..c930116b 100644 --- a/src/dark/fluid/common/prefab/TileEntityFluidStorage.java +++ b/src/dark/fluid/common/prefab/TileEntityFluidStorage.java @@ -11,7 +11,7 @@ import net.minecraftforge.fluids.FluidTank; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; import dark.api.ColorCode.IColorCoded; -import dark.core.prefab.helpers.FluidHelper; +import dark.core.prefab.fluids.FluidHelper; public abstract class TileEntityFluidStorage extends TileEntityFluidDevice implements IFluidHandler, IColorCoded { diff --git a/src/dark/fluid/common/pump/LiquidPathFinder.java b/src/dark/fluid/common/pump/LiquidPathFinder.java index bc58a577..a098f7f1 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.prefab.helpers.FluidHelper; +import dark.core.prefab.fluids.FluidHelper; /** A simpler path Finder used to find drainable or fillable tiles * diff --git a/src/dark/fluid/common/pump/TileEntityDrain.java b/src/dark/fluid/common/pump/TileEntityDrain.java index f0521fcd..db675e64 100644 --- a/src/dark/fluid/common/pump/TileEntityDrain.java +++ b/src/dark/fluid/common/pump/TileEntityDrain.java @@ -20,7 +20,7 @@ import universalelectricity.core.vector.Vector3; import com.builtbroken.common.Pair; import dark.api.fluid.IDrain; -import dark.core.prefab.helpers.FluidHelper; +import dark.core.prefab.fluids.FluidHelper; 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 5cda5db9..2b97d514 100644 --- a/src/dark/fluid/common/pump/TileEntityStarterPump.java +++ b/src/dark/fluid/common/pump/TileEntityStarterPump.java @@ -18,7 +18,7 @@ import dark.api.IToolReadOut; import dark.api.fluid.IDrain; import dark.api.parts.ITileConnector; import dark.core.common.ExternalModHandler; -import dark.core.prefab.helpers.FluidHelper; +import dark.core.prefab.fluids.FluidHelper; import dark.core.prefab.machine.TileEntityEnergyMachine; public class TileEntityStarterPump extends TileEntityEnergyMachine implements IToolReadOut, ITileConnector