Anvilcraft/resonant-induction
2
1
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

import changes

Browse source
This commit is contained in:
Robert 2013-11-09 19:48:00 -05:00
parent 1b2d075986
commit 5006dbe895
11 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/dark/core/prefab/tilenetwork/fluid/FluidCraftingHandler.java
View file

@ -14,7 +14,7 @@ import net.minecraftforge.fluids.FluidStack;
import com.builtbroken.common.Pair; import com.builtbroken.common.Pair;
import com.builtbroken.common.Triple; 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; import dark.core.prefab.tilenetwork.fluid.FluidRecipeInfo.SimpleFluidRecipe;
/** Handles all kinds of process involving mixing Fluids with other fluids and/or Items, Blocks, /** Handles all kinds of process involving mixing Fluids with other fluids and/or Items, Blocks,

6
src/dark/core/prefab/tilenetwork/fluid/NetworkFluidContainers.java
View file

@ -8,8 +8,8 @@ import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.IFluidHandler; import net.minecraftforge.fluids.IFluidHandler;
import dark.api.fluid.INetworkFluidPart; import dark.api.fluid.INetworkFluidPart;
import dark.api.parts.INetworkPart; import dark.api.parts.INetworkPart;
import dark.core.prefab.helpers.FluidHelper; import dark.core.prefab.fluids.FluidHelper;
import dark.core.prefab.tilenetwork.NetworkHandler; import dark.core.prefab.tilenetwork.NetworkUpdateHandler;
/** Basically the same as network Fluid tiles class with the only difference being in how it stores /** 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 * 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 static
{ {
NetworkHandler.registerNetworkClass("FluidContainers", NetworkFluidContainers.class); NetworkUpdateHandler.registerNetworkClass("FluidContainers", NetworkFluidContainers.class);
} }
public NetworkFluidContainers(INetworkPart... parts) public NetworkFluidContainers(INetworkPart... parts)

8
src/dark/core/prefab/tilenetwork/fluid/NetworkFluidTiles.java
View file

@ -14,8 +14,8 @@ import net.minecraftforge.fluids.IFluidHandler;
import dark.api.fluid.INetworkFluidPart; import dark.api.fluid.INetworkFluidPart;
import dark.api.parts.INetworkPart; import dark.api.parts.INetworkPart;
import dark.api.parts.ITileNetwork; import dark.api.parts.ITileNetwork;
import dark.core.prefab.helpers.FluidHelper; import dark.core.prefab.fluids.FluidHelper;
import dark.core.prefab.tilenetwork.NetworkHandler; import dark.core.prefab.tilenetwork.NetworkUpdateHandler;
import dark.core.prefab.tilenetwork.NetworkTileEntities; import dark.core.prefab.tilenetwork.NetworkTileEntities;
public class NetworkFluidTiles extends NetworkTileEntities public class NetworkFluidTiles extends NetworkTileEntities
@ -31,7 +31,7 @@ public class NetworkFluidTiles extends NetworkTileEntities
static static
{ {
NetworkHandler.registerNetworkClass("FluidTiles", NetworkFluidTiles.class); NetworkUpdateHandler.registerNetworkClass("FluidTiles", NetworkFluidTiles.class);
} }
public NetworkFluidTiles(INetworkPart... parts) public NetworkFluidTiles(INetworkPart... parts)
@ -222,7 +222,7 @@ public class NetworkFluidTiles extends NetworkTileEntities
@Override @Override
protected void mergeDo(ITileNetwork network) 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) if (newNetwork instanceof NetworkFluidTiles)
{ {
FluidStack one = this.getNetworkTank().getFluid(); FluidStack one = this.getNetworkTank().getFluid();

8
src/dark/core/prefab/tilenetwork/fluid/NetworkPipes.java
View file

@ -7,9 +7,9 @@ import net.minecraftforge.fluids.FluidTankInfo;
import net.minecraftforge.fluids.IFluidHandler; import net.minecraftforge.fluids.IFluidHandler;
import dark.api.fluid.INetworkPipe; import dark.api.fluid.INetworkPipe;
import dark.api.parts.INetworkPart; import dark.api.parts.INetworkPart;
import dark.core.prefab.helpers.ConnectionHelper; import dark.core.helpers.ConnectionHelper;
import dark.core.prefab.helpers.FluidHelper; import dark.core.prefab.fluids.FluidHelper;
import dark.core.prefab.tilenetwork.NetworkHandler; import dark.core.prefab.tilenetwork.NetworkUpdateHandler;
/** Extension on the fluid container network to provide a more advanced reaction to fluid passing /** 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 * 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 static
{ {
NetworkHandler.registerNetworkClass("FluidPipes", NetworkPipes.class); NetworkUpdateHandler.registerNetworkClass("FluidPipes", NetworkPipes.class);
} }
public NetworkPipes(INetworkPart... parts) public NetworkPipes(INetworkPart... parts)

2
src/dark/fluid/common/machines/BlockSink.java
View file

@ -16,7 +16,7 @@ import com.builtbroken.common.Pair;
import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly; 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.client.render.BlockRenderHelper;
public class BlockSink extends BlockFM public class BlockSink extends BlockFM

2
src/dark/fluid/common/machines/BlockTank.java
View file

@ -17,7 +17,7 @@ import com.builtbroken.common.Pair;
import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly; 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.client.render.BlockRenderHelper;
import dark.fluid.common.FluidPartsMaterial; import dark.fluid.common.FluidPartsMaterial;
import dark.fluid.common.pipes.TileEntityPipe; import dark.fluid.common.pipes.TileEntityPipe;

2
src/dark/fluid/common/machines/TileEntityReleaseValve.java
View file

@ -16,7 +16,7 @@ import dark.api.ColorCode.IColorCoded;
import dark.api.IToolReadOut; import dark.api.IToolReadOut;
import dark.api.fluid.INetworkPipe; import dark.api.fluid.INetworkPipe;
import dark.api.parts.ITileConnector; 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.core.prefab.tilenetwork.fluid.NetworkPipes;
import dark.fluid.common.prefab.TileEntityFluidDevice; import dark.fluid.common.prefab.TileEntityFluidDevice;

2
src/dark/fluid/common/prefab/TileEntityFluidStorage.java
View file

@ -11,7 +11,7 @@ import net.minecraftforge.fluids.FluidTank;
import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.FluidTankInfo;
import net.minecraftforge.fluids.IFluidHandler; import net.minecraftforge.fluids.IFluidHandler;
import dark.api.ColorCode.IColorCoded; 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 public abstract class TileEntityFluidStorage extends TileEntityFluidDevice implements IFluidHandler, IColorCoded
{ {

2
src/dark/fluid/common/pump/LiquidPathFinder.java
View file

@ -13,7 +13,7 @@ import net.minecraft.world.chunk.Chunk;
import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.common.ForgeDirection;
import universalelectricity.core.vector.Vector2; import universalelectricity.core.vector.Vector2;
import universalelectricity.core.vector.Vector3; 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 /** A simpler path Finder used to find drainable or fillable tiles
* *

2
src/dark/fluid/common/pump/TileEntityDrain.java
View file

@ -20,7 +20,7 @@ import universalelectricity.core.vector.Vector3;
import com.builtbroken.common.Pair; import com.builtbroken.common.Pair;
import dark.api.fluid.IDrain; import dark.api.fluid.IDrain;
import dark.core.prefab.helpers.FluidHelper; import dark.core.prefab.fluids.FluidHelper;
import dark.fluid.common.prefab.TileEntityFluidDevice; import dark.fluid.common.prefab.TileEntityFluidDevice;
public class TileEntityDrain extends TileEntityFluidDevice implements IFluidHandler, IDrain public class TileEntityDrain extends TileEntityFluidDevice implements IFluidHandler, IDrain

2
src/dark/fluid/common/pump/TileEntityStarterPump.java
View file

@ -18,7 +18,7 @@ import dark.api.IToolReadOut;
import dark.api.fluid.IDrain; import dark.api.fluid.IDrain;
import dark.api.parts.ITileConnector; import dark.api.parts.ITileConnector;
import dark.core.common.ExternalModHandler; import dark.core.common.ExternalModHandler;
import dark.core.prefab.helpers.FluidHelper; import dark.core.prefab.fluids.FluidHelper;
import dark.core.prefab.machine.TileEntityEnergyMachine; import dark.core.prefab.machine.TileEntityEnergyMachine;
public class TileEntityStarterPump extends TileEntityEnergyMachine implements IToolReadOut, ITileConnector public class TileEntityStarterPump extends TileEntityEnergyMachine implements IToolReadOut, ITileConnector