tilera/electrodynamics
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Wiki Activity

import changes

Browse source
This commit is contained in:
DarkGuardsman 2013-09-03 03:10:22 -04:00
parent 8677d4e5b2
commit b8c95c191a
32 changed files with 92 additions and 98 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/dark/api/fluid/INetworkFluidPart.java
View file

@ -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
{

4
src/dark/core/network/fluid/HydraulicNetworkHelper.java
View file

@ -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
{

6
src/dark/core/network/fluid/NetworkFluidContainers.java
View file

@ -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

10
src/dark/core/network/fluid/NetworkFluidTiles.java
View file

@ -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
{

19
src/dark/core/network/fluid/NetworkPipes.java
View file

@ -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;

4
src/dark/fluid/client/render/RenderBoiler.java
View file

@ -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;

2
src/dark/fluid/client/render/RenderConstructionPump.java
View file

@ -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;

2
src/dark/fluid/client/render/RenderFurnace.java
View file

@ -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;

2
src/dark/fluid/client/render/RenderGearPiston.java
View file

@ -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;

2
src/dark/fluid/client/render/RenderPump.java
View file

@ -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;

4
src/dark/fluid/client/render/RenderReleaseValve.java
View file

@ -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

2
src/dark/fluid/client/render/RenderSink.java
View file

@ -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;

6
src/dark/fluid/client/render/RenderTank.java
View file

@ -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

8
src/dark/fluid/client/render/pipe/RenderPipe.java
View file

@ -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

2
src/dark/fluid/common/BlockFM.java
View file

@ -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
{

8
src/dark/fluid/common/FMRecipeLoader.java
View file

@ -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
{

11
src/dark/fluid/common/FluidMech.java
View file

@ -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)

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

@ -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;

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

@ -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));
}

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

@ -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
{

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

@ -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
{

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

@ -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
{

14
src/dark/fluid/common/machines/TileEntityTank.java
View file

@ -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)

4
src/dark/fluid/common/pipes/BlockPipe.java
View file

@ -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));
}

2
src/dark/fluid/common/pipes/TileEntityGenericPipe.java
View file

@ -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
{

16
src/dark/fluid/common/pipes/TileEntityPipe.java
View file

@ -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 */

4
src/dark/fluid/common/prefab/TileEntityFluidDevice.java
View file

@ -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
{

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

@ -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;
}

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 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
*

6
src/dark/fluid/common/pump/TileEntityConstructionPump.java
View file

@ -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
{

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

@ -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

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

@ -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
{