From c5a414df37b9bfc84d36b251e978ca36f47cf590 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Wed, 29 Jun 2016 19:58:13 -0400 Subject: [PATCH 1/3] Remove deprecated gas API methods --- .../java/mekanism/api/gas/IGasHandler.java | 6 ----- .../common/multipart/PartPressurizedTube.java | 12 ---------- .../TileEntityAdvancedElectricMachine.java | 12 ---------- .../tile/TileEntityAmbientAccumulator.java | 12 ---------- .../tile/TileEntityChemicalCrystallizer.java | 12 ---------- .../TileEntityChemicalDissolutionChamber.java | 12 ---------- .../tile/TileEntityChemicalInfuser.java | 12 ---------- .../common/tile/TileEntityChemicalWasher.java | 12 ---------- .../tile/TileEntityElectrolyticSeparator.java | 12 ---------- .../common/tile/TileEntityFactory.java | 12 ---------- .../common/tile/TileEntityGasTank.java | 12 ---------- .../mekanism/common/tile/TileEntityPRC.java | 12 ---------- .../tile/TileEntityQuantumEntangloporter.java | 12 ---------- .../tile/TileEntityRotaryCondensentrator.java | 12 ---------- .../tile/TileEntitySolarNeutronActivator.java | 12 ---------- .../common/tile/TileEntityGasGenerator.java | 12 ---------- .../tile/reactor/TileEntityReactorPort.java | 22 +------------------ 17 files changed, 1 insertion(+), 207 deletions(-) diff --git a/src/main/java/mekanism/api/gas/IGasHandler.java b/src/main/java/mekanism/api/gas/IGasHandler.java index e06952317..3d99da62e 100644 --- a/src/main/java/mekanism/api/gas/IGasHandler.java +++ b/src/main/java/mekanism/api/gas/IGasHandler.java @@ -16,9 +16,6 @@ public interface IGasHandler */ public int receiveGas(ForgeDirection side, GasStack stack, boolean doTransfer); - @Deprecated - public int receiveGas(ForgeDirection side, GasStack stack); - /** * Draws a certain amount of gas from this block. * @param amount - amount to draw @@ -26,9 +23,6 @@ public interface IGasHandler */ public GasStack drawGas(ForgeDirection side, int amount, boolean doTransfer); - @Deprecated - public GasStack drawGas(ForgeDirection side, int amount); - /** * Whether or not this block can accept gas from a certain side. * @param side - side to check diff --git a/src/main/java/mekanism/common/multipart/PartPressurizedTube.java b/src/main/java/mekanism/common/multipart/PartPressurizedTube.java index 8a108cc98..f3d1ad25e 100644 --- a/src/main/java/mekanism/common/multipart/PartPressurizedTube.java +++ b/src/main/java/mekanism/common/multipart/PartPressurizedTube.java @@ -272,24 +272,12 @@ public class PartPressurizedTube extends PartTransmitter 0) - { - return new GasStack(GasRegistry.getGas("steam"), getReactor().getSteamTank().drain(amount, doTransfer).amount); - } - } - return null; } - @Override - public GasStack drawGas(ForgeDirection side, int amount) - { - return drawGas(side, amount, true); - } - @Override public boolean canReceiveGas(ForgeDirection side, Gas type) { @@ -164,7 +144,7 @@ public class TileEntityReactorPort extends TileEntityReactorBlock implements IFl @Override public boolean canDrawGas(ForgeDirection side, Gas type) { - return (type == GasRegistry.getGas("steam")); + return false; } @Override From 425b43a4c4b50a9b3bfc7fc035ea531e55f4e394 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Thu, 30 Jun 2016 00:46:02 -0400 Subject: [PATCH 2/3] Reactor Ports now auto-eject steam --- .../tile/reactor/TileEntityReactorPort.java | 25 ++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorPort.java b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorPort.java index dabfe4c28..76b103667 100644 --- a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorPort.java +++ b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorPort.java @@ -10,6 +10,7 @@ import mekanism.api.gas.GasStack; import mekanism.api.gas.IGasHandler; import mekanism.api.gas.ITubeConnection; import mekanism.api.reactor.IReactorBlock; +import mekanism.common.tile.TileEntityBoilerValve; import mekanism.common.util.CableUtils; import mekanism.common.util.HeatUtils; import mekanism.common.util.InventoryUtils; @@ -22,6 +23,7 @@ import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; +import net.minecraftforge.fluids.IFluidTank; public class TileEntityReactorPort extends TileEntityReactorBlock implements IFluidHandler, IGasHandler, ITubeConnection, IHeatTransfer { @@ -48,7 +50,28 @@ public class TileEntityReactorPort extends TileEntityReactorBlock implements IFl super.onUpdate(); - CableUtils.emit(this); + if(!worldObj.isRemote) + { + CableUtils.emit(this); + + if(getReactor() != null && getReactor().getSteamTank().getFluidAmount() > 0) + { + IFluidTank tank = getReactor().getSteamTank(); + + for(ForgeDirection side : ForgeDirection.VALID_DIRECTIONS) + { + TileEntity tile = Coord4D.get(this).getFromSide(side).getTileEntity(worldObj); + + if(tile instanceof IFluidHandler && !(tile instanceof TileEntityBoilerValve)) + { + if(((IFluidHandler)tile).canFill(side.getOpposite(), tank.getFluid().getFluid())) + { + tank.drain(((IFluidHandler)tile).fill(side.getOpposite(), tank.getFluid(), true), true); + } + } + } + } + } } @Override From b77ca6ff0c65b070757df7454962fc72fdcbf189 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Thu, 30 Jun 2016 01:03:13 -0400 Subject: [PATCH 3/3] Revert "Remove deprecated gas API methods" This reverts commit c5a414df37b9bfc84d36b251e978ca36f47cf590. --- .../java/mekanism/api/gas/IGasHandler.java | 6 +++++ .../common/multipart/PartPressurizedTube.java | 12 ++++++++++ .../TileEntityAdvancedElectricMachine.java | 12 ++++++++++ .../tile/TileEntityAmbientAccumulator.java | 12 ++++++++++ .../tile/TileEntityChemicalCrystallizer.java | 12 ++++++++++ .../TileEntityChemicalDissolutionChamber.java | 12 ++++++++++ .../tile/TileEntityChemicalInfuser.java | 12 ++++++++++ .../common/tile/TileEntityChemicalWasher.java | 12 ++++++++++ .../tile/TileEntityElectrolyticSeparator.java | 12 ++++++++++ .../common/tile/TileEntityFactory.java | 12 ++++++++++ .../common/tile/TileEntityGasTank.java | 12 ++++++++++ .../mekanism/common/tile/TileEntityPRC.java | 12 ++++++++++ .../tile/TileEntityQuantumEntangloporter.java | 12 ++++++++++ .../tile/TileEntityRotaryCondensentrator.java | 12 ++++++++++ .../tile/TileEntitySolarNeutronActivator.java | 12 ++++++++++ .../common/tile/TileEntityGasGenerator.java | 12 ++++++++++ .../tile/reactor/TileEntityReactorPort.java | 22 ++++++++++++++++++- 17 files changed, 207 insertions(+), 1 deletion(-) diff --git a/src/main/java/mekanism/api/gas/IGasHandler.java b/src/main/java/mekanism/api/gas/IGasHandler.java index 3d99da62e..e06952317 100644 --- a/src/main/java/mekanism/api/gas/IGasHandler.java +++ b/src/main/java/mekanism/api/gas/IGasHandler.java @@ -16,6 +16,9 @@ public interface IGasHandler */ public int receiveGas(ForgeDirection side, GasStack stack, boolean doTransfer); + @Deprecated + public int receiveGas(ForgeDirection side, GasStack stack); + /** * Draws a certain amount of gas from this block. * @param amount - amount to draw @@ -23,6 +26,9 @@ public interface IGasHandler */ public GasStack drawGas(ForgeDirection side, int amount, boolean doTransfer); + @Deprecated + public GasStack drawGas(ForgeDirection side, int amount); + /** * Whether or not this block can accept gas from a certain side. * @param side - side to check diff --git a/src/main/java/mekanism/common/multipart/PartPressurizedTube.java b/src/main/java/mekanism/common/multipart/PartPressurizedTube.java index f3d1ad25e..8a108cc98 100644 --- a/src/main/java/mekanism/common/multipart/PartPressurizedTube.java +++ b/src/main/java/mekanism/common/multipart/PartPressurizedTube.java @@ -272,12 +272,24 @@ public class PartPressurizedTube extends PartTransmitter 0) + { + return new GasStack(GasRegistry.getGas("steam"), getReactor().getSteamTank().drain(amount, doTransfer).amount); + } + } + return null; } + @Override + public GasStack drawGas(ForgeDirection side, int amount) + { + return drawGas(side, amount, true); + } + @Override public boolean canReceiveGas(ForgeDirection side, Gas type) { @@ -167,7 +187,7 @@ public class TileEntityReactorPort extends TileEntityReactorBlock implements IFl @Override public boolean canDrawGas(ForgeDirection side, Gas type) { - return false; + return (type == GasRegistry.getGas("steam")); } @Override