From a9191fad32b09b0f63d4560936470536be0b6036 Mon Sep 17 00:00:00 2001 From: Ben Spiers Date: Sat, 16 Aug 2014 17:22:07 +0100 Subject: [PATCH 1/5] Fix Dissolution Chamber upgrades. Closes #1690 --- .../common/tile/TileEntityChemicalDissolutionChamber.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/mekanism/common/tile/TileEntityChemicalDissolutionChamber.java b/src/main/java/mekanism/common/tile/TileEntityChemicalDissolutionChamber.java index acd0af5e7..d39f1a4bb 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChemicalDissolutionChamber.java +++ b/src/main/java/mekanism/common/tile/TileEntityChemicalDissolutionChamber.java @@ -58,7 +58,7 @@ public class TileEntityChemicalDissolutionChamber extends TileEntityElectricBloc public final double ENERGY_USAGE = Mekanism.chemicalDissolutionChamberUsage; - public TileComponentUpgrade upgradeComponent = new TileComponentUpgrade(this, 3); + public TileComponentUpgrade upgradeComponent = new TileComponentUpgrade(this, 4); public RedstoneControl controlType = RedstoneControl.DISABLED; From 0ac449404997ec98429b12737cd9cb944504220a Mon Sep 17 00:00:00 2001 From: Ben Spiers Date: Sun, 17 Aug 2014 04:17:12 +0100 Subject: [PATCH 2/5] Fix Gas Networks losing all their capacity --- src/main/java/mekanism/api/gas/GasNetwork.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/mekanism/api/gas/GasNetwork.java b/src/main/java/mekanism/api/gas/GasNetwork.java index 341df9464..dc8619eed 100644 --- a/src/main/java/mekanism/api/gas/GasNetwork.java +++ b/src/main/java/mekanism/api/gas/GasNetwork.java @@ -464,7 +464,7 @@ public class GasNetwork extends DynamicNetwork } network.gasScale = network.getScale(); - + network.updateCapacity(); return network; } From 090bd9b9c32b81336c84e414ac2890c0b287117e Mon Sep 17 00:00:00 2001 From: Ben Spiers Date: Sun, 17 Aug 2014 04:18:34 +0100 Subject: [PATCH 3/5] Get rid of two redundant factory methods. --- .../java/mekanism/api/gas/GasNetwork.java | 31 ------------------ .../api/transmitters/DynamicNetwork.java | 4 --- .../java/mekanism/common/EnergyNetwork.java | 18 ----------- .../java/mekanism/common/FluidNetwork.java | 32 ------------------- .../mekanism/common/InventoryNetwork.java | 12 ------- 5 files changed, 97 deletions(-) diff --git a/src/main/java/mekanism/api/gas/GasNetwork.java b/src/main/java/mekanism/api/gas/GasNetwork.java index dc8619eed..f1b7941a1 100644 --- a/src/main/java/mekanism/api/gas/GasNetwork.java +++ b/src/main/java/mekanism/api/gas/GasNetwork.java @@ -421,31 +421,6 @@ public class GasNetwork extends DynamicNetwork return true; } - @Override - protected GasNetwork create(IGridTransmitter... varTransmitters) - { - GasNetwork network = new GasNetwork(varTransmitters); - network.refGas = refGas; - - if(gasStored != null) - { - if(network.gasStored == null) - { - network.gasStored = gasStored; - } - else { - network.gasStored.amount += gasStored.amount; - } - } - - network.gasScale = network.getScale(); - gasScale = 0; - refGas = null; - gasStored = null; - - return network; - } - @Override protected GasNetwork create(Collection> collection) { @@ -468,12 +443,6 @@ public class GasNetwork extends DynamicNetwork return network; } - @Override - protected GasNetwork create(Set networks) - { - return new GasNetwork(networks); - } - @Override public TransmissionType getTransmissionType() { diff --git a/src/main/java/mekanism/api/transmitters/DynamicNetwork.java b/src/main/java/mekanism/api/transmitters/DynamicNetwork.java index 2b6ca7068..d5d77dcda 100644 --- a/src/main/java/mekanism/api/transmitters/DynamicNetwork.java +++ b/src/main/java/mekanism/api/transmitters/DynamicNetwork.java @@ -42,12 +42,8 @@ public abstract class DynamicNetwork> implemen protected boolean needsUpdate = false; - protected abstract ITransmitterNetwork create(IGridTransmitter... varTransmitters); - protected abstract ITransmitterNetwork create(Collection> collection); - protected abstract ITransmitterNetwork create(Set networks); - protected void clearAround(IGridTransmitter transmitter) { for(ForgeDirection side : ForgeDirection.VALID_DIRECTIONS) diff --git a/src/main/java/mekanism/common/EnergyNetwork.java b/src/main/java/mekanism/common/EnergyNetwork.java index f34ca3be0..594ff87fa 100644 --- a/src/main/java/mekanism/common/EnergyNetwork.java +++ b/src/main/java/mekanism/common/EnergyNetwork.java @@ -429,18 +429,6 @@ public class EnergyNetwork extends DynamicNetwork return jouleBufferLastTick * 20; } - @Override - protected EnergyNetwork create(IGridTransmitter... varTransmitters) - { - EnergyNetwork network = new EnergyNetwork(varTransmitters); - network.clientEnergyScale = clientEnergyScale; - network.jouleBufferLastTick = jouleBufferLastTick; - network.joulesTransmitted = joulesTransmitted; - network.lastPowerScale = lastPowerScale; - network.electricityStored += electricityStored; - return network; - } - @Override protected EnergyNetwork create(Collection> collection) { @@ -454,12 +442,6 @@ public class EnergyNetwork extends DynamicNetwork return network; } - @Override - protected EnergyNetwork create(Set networks) - { - return new EnergyNetwork(networks); - } - @Override public TransmissionType getTransmissionType() { diff --git a/src/main/java/mekanism/common/FluidNetwork.java b/src/main/java/mekanism/common/FluidNetwork.java index 596e0fea2..20677a0c6 100644 --- a/src/main/java/mekanism/common/FluidNetwork.java +++ b/src/main/java/mekanism/common/FluidNetwork.java @@ -405,32 +405,6 @@ public class FluidNetwork extends DynamicNetwork return "[FluidNetwork] " + transmitters.size() + " transmitters, " + possibleAcceptors.size() + " acceptors."; } - @Override - protected FluidNetwork create(IGridTransmitter... varTransmitters) - { - FluidNetwork network = new FluidNetwork(varTransmitters); - network.refFluid = refFluid; - - if(fluidStored != null) - { - if(network.fluidStored == null) - { - network.fluidStored = fluidStored; - } - else { - network.fluidStored.amount += fluidStored.amount; - } - } - - network.fluidScale = network.getScale(); - - fluidScale = 0; - refFluid = null; - fluidStored = null; - - return network; - } - @Override protected FluidNetwork create(Collection> collection) { @@ -480,12 +454,6 @@ public class FluidNetwork extends DynamicNetwork return true; } - @Override - protected FluidNetwork create(Set networks) - { - return new FluidNetwork(networks); - } - @Override public TransmissionType getTransmissionType() { diff --git a/src/main/java/mekanism/common/InventoryNetwork.java b/src/main/java/mekanism/common/InventoryNetwork.java index f0754227e..c71771f13 100644 --- a/src/main/java/mekanism/common/InventoryNetwork.java +++ b/src/main/java/mekanism/common/InventoryNetwork.java @@ -157,24 +157,12 @@ public class InventoryNetwork extends DynamicNetwork... varTransmitters) - { - return new InventoryNetwork(varTransmitters); - } - @Override protected InventoryNetwork create(Collection> collection) { return new InventoryNetwork(collection); } - @Override - protected InventoryNetwork create(Set networks) - { - return new InventoryNetwork(networks); - } - @Override public TransmissionType getTransmissionType() { From c706d2ebb19fcef9618ad544d5b443c9878de8ca Mon Sep 17 00:00:00 2001 From: Ben Spiers Date: Sun, 17 Aug 2014 04:20:14 +0100 Subject: [PATCH 4/5] Fix ports not connecting and being able to reignite a hot reactor without the proper procedure. --- .../java/mekanism/generators/common/FusionReactor.java | 7 ++++++- .../common/tile/reactor/TileEntityReactorPort.java | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/main/java/mekanism/generators/common/FusionReactor.java b/src/main/java/mekanism/generators/common/FusionReactor.java index 423bb9b56..e725fb552 100644 --- a/src/main/java/mekanism/generators/common/FusionReactor.java +++ b/src/main/java/mekanism/generators/common/FusionReactor.java @@ -110,7 +110,12 @@ public class FusionReactor implements IFusionReactor if(burning) { injectFuel(); - neutronFlux(burnFuel()); + int fuelBurned = burnFuel(); + neutronFlux(fuelBurned); + if(fuelBurned == 0) + { + burning = false; + } } } else { 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 3c82fcb09..5ca402789 100644 --- a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorPort.java +++ b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorPort.java @@ -39,7 +39,7 @@ public class TileEntityReactorPort extends TileEntityReactorBlock implements IFl { if(changed) { - worldObj.notifyBlocksOfNeighborChange(xCoord, yCoord, zCoord, getBlockType()); + worldObj.func_147453_f(xCoord, yCoord, zCoord, getBlockType()); } super.onUpdate(); From db8ec6cb2e40410b253b059f05b685d96df779b3 Mon Sep 17 00:00:00 2001 From: Ben Spiers Date: Sun, 17 Aug 2014 17:25:55 +0100 Subject: [PATCH 5/5] Fix energy and gas transmitters rendering without proper transparency. --- .../mekanism/client/render/RenderPartTransmitter.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/mekanism/client/render/RenderPartTransmitter.java b/src/main/java/mekanism/client/render/RenderPartTransmitter.java index f8a9d71ad..f348fd856 100644 --- a/src/main/java/mekanism/client/render/RenderPartTransmitter.java +++ b/src/main/java/mekanism/client/render/RenderPartTransmitter.java @@ -237,7 +237,7 @@ public class RenderPartTransmitter implements IIconSelfRegister return; } - GL11.glPushMatrix(); + push(); CCRenderState.reset(); CCRenderState.useNormals = true; CCRenderState.startDrawing(); @@ -256,7 +256,7 @@ public class RenderPartTransmitter implements IIconSelfRegister MekanismRenderer.disableCullFace(); MekanismRenderer.glowOff(); - GL11.glPopMatrix(); + pop(); } public void renderContents(PartMechanicalPipe pipe, Vector3 pos) @@ -468,7 +468,7 @@ public class RenderPartTransmitter implements IIconSelfRegister return; } - GL11.glPushMatrix(); + push(); CCRenderState.reset(); CCRenderState.useNormals = true; CCRenderState.startDrawing(); @@ -486,7 +486,7 @@ public class RenderPartTransmitter implements IIconSelfRegister MekanismRenderer.disableCullFace(); MekanismRenderer.glowOff(); - GL11.glPopMatrix(); + pop(); } public void renderStatic(PartSidedPipe transmitter)