From c0fbd23374f3818d87e79e7462ba4a51ab163506 Mon Sep 17 00:00:00 2001 From: DarkGuardsman Date: Fri, 8 Nov 2013 12:04:38 -0500 Subject: [PATCH] CleanupFormatting --- src/dark/api/mech/IForceDevice.java | 35 ------------------- .../fluid/NetworkFluidContainers.java | 3 +- .../tilenetwork/fluid/NetworkPipes.java | 7 ++-- .../fluid/common/pipes/TileEntityPipe.java | 2 +- .../prefab/TileEntityFluidNetworkTile.java | 2 +- .../pump/TileEntityConstructionPump.java | 4 +-- 6 files changed, 8 insertions(+), 45 deletions(-) delete mode 100644 src/dark/api/mech/IForceDevice.java diff --git a/src/dark/api/mech/IForceDevice.java b/src/dark/api/mech/IForceDevice.java deleted file mode 100644 index 17ecaccaf..000000000 --- a/src/dark/api/mech/IForceDevice.java +++ /dev/null @@ -1,35 +0,0 @@ -package dark.api.mech; - -import net.minecraftforge.common.ForgeDirection; -import dark.api.parts.ITileConnector; - -/** Think of this in the same way as an electrical device from UE. getforce methods are designed to - * get the idea amount of force that a side should be outputting at the time. Apply force is the - * input for force for the tile, and should return the actually force the machine is using. Supply - * is when the code asks for your tile to output force on the side, just return the force value - * don't try to apply the force to other machines. - * - * Tip Supply should never equal load as everything will stop moving since your need more force to - * move an object than it creates as a load, 100Power - 100Load = 0Force/0Movement. The supply of - * force should be greater than the load required to do the work - * - * @author DarkGuardsman */ -public interface IForceDevice extends ITileConnector -{ - /** Applies force to this tile - * - * @param side - side its coming from - * @param force - amount of force - * @return amount of force actually loaded down */ - public float applyForce(ForgeDirection side, float force); - - /** @param side - side that force should be supplied in - * @return force to apply in direction */ - public float supplyForce(ForgeDirection side); - - /** Idea force to output on the given side. */ - public float getForceOut(ForgeDirection side); - - /** Idea force to load down on the given side */ - public float getForceLoad(ForgeDirection side); -} diff --git a/src/dark/core/prefab/tilenetwork/fluid/NetworkFluidContainers.java b/src/dark/core/prefab/tilenetwork/fluid/NetworkFluidContainers.java index 32987904d..f985229fc 100644 --- a/src/dark/core/prefab/tilenetwork/fluid/NetworkFluidContainers.java +++ b/src/dark/core/prefab/tilenetwork/fluid/NetworkFluidContainers.java @@ -10,12 +10,11 @@ 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.tilenetwork.NetworkTileEntities; /** 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 * in the over all tank. Eg water goes down air goes up. - * + * * @author DarkGuardsman */ public class NetworkFluidContainers extends NetworkFluidTiles { diff --git a/src/dark/core/prefab/tilenetwork/fluid/NetworkPipes.java b/src/dark/core/prefab/tilenetwork/fluid/NetworkPipes.java index d8b37616b..ce32f5bcb 100644 --- a/src/dark/core/prefab/tilenetwork/fluid/NetworkPipes.java +++ b/src/dark/core/prefab/tilenetwork/fluid/NetworkPipes.java @@ -10,12 +10,11 @@ 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.prefab.tilenetwork.NetworkTileEntities; /** 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 * use of pressure. - * + * * @author Rseifert */ public class NetworkPipes extends NetworkFluidTiles { @@ -33,7 +32,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 @@ -44,7 +43,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 diff --git a/src/dark/fluid/common/pipes/TileEntityPipe.java b/src/dark/fluid/common/pipes/TileEntityPipe.java index 7df7e61d9..03f313a9e 100644 --- a/src/dark/fluid/common/pipes/TileEntityPipe.java +++ b/src/dark/fluid/common/pipes/TileEntityPipe.java @@ -126,7 +126,7 @@ public class TileEntityPipe extends TileEntityFluidNetworkTile implements IColor } /** Calculates flow rate based on viscosity & temp of the fluid as all other factors are know - * + * * @param fluid - fluidStack * @param temp = tempature of the fluid * @param pressure - pressure difference of were the fluid is flowing too. diff --git a/src/dark/fluid/common/prefab/TileEntityFluidNetworkTile.java b/src/dark/fluid/common/prefab/TileEntityFluidNetworkTile.java index fda62786e..1616b812c 100644 --- a/src/dark/fluid/common/prefab/TileEntityFluidNetworkTile.java +++ b/src/dark/fluid/common/prefab/TileEntityFluidNetworkTile.java @@ -194,7 +194,7 @@ public abstract class TileEntityFluidNetworkTile extends TileEntityFluidDevice i } /** 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/pump/TileEntityConstructionPump.java b/src/dark/fluid/common/pump/TileEntityConstructionPump.java index 976259eb0..d4fd22dad 100644 --- a/src/dark/fluid/common/pump/TileEntityConstructionPump.java +++ b/src/dark/fluid/common/pump/TileEntityConstructionPump.java @@ -37,7 +37,7 @@ public class TileEntityConstructionPump extends TileEntityStarterPump implements } /** Gets the facing direction - * + * * @param input true for input side, false for output side * @return */ public ForgeDirection getFacing(boolean input) @@ -67,7 +67,7 @@ public class TileEntityConstructionPump extends TileEntityStarterPump implements } /** Gets the nextDrain in the list - * + * * @param inputTile - input tile must be an instance of INetworkPipe * @param outputTile - output tile must be an instance of IFluidHandler * @param ignoreList - list of drains to ignore so that the next one is selected