From 8abbbfdba2e50e7fbd882c3a336f1fc27283fcb2 Mon Sep 17 00:00:00 2001 From: Rseifert Date: Wed, 20 Feb 2013 15:10:29 -0500 Subject: [PATCH] cleanup of interfaces --- .../machines/pipes/TileEntityNewPipes.java | 7 +++---- .../hydraulic/core/implement/IFluidPipe.java | 10 +--------- .../hydraulic/core/implement/IHeatCreator.java | 18 ------------------ .../core/implement/IHeatProducer.java | 16 ++++++++++++++++ .../{IPsiReceiver.java => IPsiMachine.java} | 4 ++-- .../hydraulic/core/implement/IPsiReciever.java | 11 +++++++++++ .../core/prefab/TileEntityFluidHandler.java | 5 +++-- 7 files changed, 36 insertions(+), 35 deletions(-) delete mode 100644 src/minecraft/hydraulic/core/implement/IHeatCreator.java create mode 100644 src/minecraft/hydraulic/core/implement/IHeatProducer.java rename src/minecraft/hydraulic/core/implement/{IPsiReceiver.java => IPsiMachine.java} (65%) create mode 100644 src/minecraft/hydraulic/core/implement/IPsiReciever.java diff --git a/src/minecraft/fluidmech/common/machines/pipes/TileEntityNewPipes.java b/src/minecraft/fluidmech/common/machines/pipes/TileEntityNewPipes.java index 20625ab3..335fb7cc 100644 --- a/src/minecraft/fluidmech/common/machines/pipes/TileEntityNewPipes.java +++ b/src/minecraft/fluidmech/common/machines/pipes/TileEntityNewPipes.java @@ -8,13 +8,14 @@ import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.network.INetworkManager; import net.minecraft.network.packet.Packet250CustomPayload; +import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.liquids.LiquidStack; import universalelectricity.prefab.tile.TileEntityConductor; import basiccomponents.common.BCLoader; public class TileEntityNewPipes extends TileEntityFluidHandler { - public static double RESISTANCE = 0.05; + public static double RESISTANCE = 0.5; public static double MAX_AMPS = 200; public TileEntityNewPipes() @@ -29,7 +30,7 @@ public class TileEntityNewPipes extends TileEntityFluidHandler } @Override - public double getMaxPressure() + public double getMaxPressure(ForgeDirection side) { return this.MAX_AMPS; } @@ -49,7 +50,5 @@ public class TileEntityNewPipes extends TileEntityFluidHandler @Override public void handlePacketData(INetworkManager network, int packetType, Packet250CustomPayload packet, EntityPlayer player, ByteArrayDataInput dataStream) { - // TODO Auto-generated method stub - } } diff --git a/src/minecraft/hydraulic/core/implement/IFluidPipe.java b/src/minecraft/hydraulic/core/implement/IFluidPipe.java index 9a82ec9e..fb1f0c4e 100644 --- a/src/minecraft/hydraulic/core/implement/IFluidPipe.java +++ b/src/minecraft/hydraulic/core/implement/IFluidPipe.java @@ -12,7 +12,7 @@ import universalelectricity.core.electricity.ElectricityNetwork; * @author Calclavia * */ -public interface IFluidPipe +public interface IFluidPipe extends IPsiMachine { /** * The Fluid network that this pipe is part of @@ -35,14 +35,6 @@ public interface IFluidPipe */ public double getResistance(LiquidStack stack); - /** - * The maximum amount of amps this pipe can handle before bursting. This is calculating - * PER TICK! - * - * @return The amount of amps in volts - */ - public double getMaxPressure(); - /** * Called when the pressure on the pipe passes max */ diff --git a/src/minecraft/hydraulic/core/implement/IHeatCreator.java b/src/minecraft/hydraulic/core/implement/IHeatCreator.java deleted file mode 100644 index 1155810c..00000000 --- a/src/minecraft/hydraulic/core/implement/IHeatCreator.java +++ /dev/null @@ -1,18 +0,0 @@ -package hydraulic.core.implement; - -import net.minecraftforge.common.ForgeDirection; - -public interface IHeatCreator -{ - /** - * @param dir - direction - * @return Can create heat in this direction - */ - public boolean canOutputHeat(ForgeDirection dir); - - /** - * @param dir - direction - * @return ammount of heat created in joules - */ - public int outputHeat(ForgeDirection dir); -} diff --git a/src/minecraft/hydraulic/core/implement/IHeatProducer.java b/src/minecraft/hydraulic/core/implement/IHeatProducer.java new file mode 100644 index 00000000..1697f15a --- /dev/null +++ b/src/minecraft/hydraulic/core/implement/IHeatProducer.java @@ -0,0 +1,16 @@ +package hydraulic.core.implement; + +import net.minecraftforge.common.ForgeDirection; + +public interface IHeatProducer +{ + /** + *Checks too see if this can produce heat + */ + public boolean getCanProduceHeat(ForgeDirection dir); + + /** + * Gets the amount of heat in joules this can output + */ + public double getHeatAmmount(ForgeDirection dir); +} diff --git a/src/minecraft/hydraulic/core/implement/IPsiReceiver.java b/src/minecraft/hydraulic/core/implement/IPsiMachine.java similarity index 65% rename from src/minecraft/hydraulic/core/implement/IPsiReceiver.java rename to src/minecraft/hydraulic/core/implement/IPsiMachine.java index 4394255a..afca7756 100644 --- a/src/minecraft/hydraulic/core/implement/IPsiReceiver.java +++ b/src/minecraft/hydraulic/core/implement/IPsiMachine.java @@ -2,11 +2,11 @@ package hydraulic.core.implement; import net.minecraftforge.common.ForgeDirection; -public interface IPsiReceiver +public interface IPsiMachine { /** * gets the devices pressure from a given side */ - public int getInputPressure(ForgeDirection side); + public double getMaxPressure(ForgeDirection side); } diff --git a/src/minecraft/hydraulic/core/implement/IPsiReciever.java b/src/minecraft/hydraulic/core/implement/IPsiReciever.java new file mode 100644 index 00000000..419443fa --- /dev/null +++ b/src/minecraft/hydraulic/core/implement/IPsiReciever.java @@ -0,0 +1,11 @@ +package hydraulic.core.implement; + +public interface IPsiReciever extends IPsiMachine +{ + /** + * Called when this machine receives pressure/Fluid + * Too get force take pressure x Surface area of you machine + * @param pressure - input pressure. make sure to output a pressure later on, plus remaining liquid + */ + public void onReceivePressure(double pressure); +} diff --git a/src/minecraft/hydraulic/core/prefab/TileEntityFluidHandler.java b/src/minecraft/hydraulic/core/prefab/TileEntityFluidHandler.java index 2bf29350..ecfdda03 100644 --- a/src/minecraft/hydraulic/core/prefab/TileEntityFluidHandler.java +++ b/src/minecraft/hydraulic/core/prefab/TileEntityFluidHandler.java @@ -1,8 +1,9 @@ package hydraulic.core.prefab; +import hydraulic.core.implement.IColorCoded; import hydraulic.core.implement.IFluidPipe; import hydraulic.core.implement.IPsiCreator; -import hydraulic.core.implement.IPsiReceiver; +import hydraulic.core.implement.IPsiMachine; import hydraulic.core.liquids.Hydraulic; import hydraulic.core.liquids.HydraulicNetwork; import hydraulic.core.liquids.LiquidData; @@ -111,7 +112,7 @@ public abstract class TileEntityFluidHandler extends TileEntityAdvanced implemen */ public boolean canConnect(TileEntity tileEntity, ForgeDirection opposite) { - if (tileEntity instanceof IPsiReceiver && ((IPsiReceiver) tileEntity).getInputPressure(opposite) <= this.getMaxPressure()) + if (tileEntity instanceof IPsiMachine && ((IPsiMachine) tileEntity).getMaxPressure(opposite) <= this.getMaxPressure(opposite)) { return true; }