From 80de4d6490e0a971fa27ae2704becd78f04ed48d Mon Sep 17 00:00:00 2001 From: Nedelosk Date: Sat, 17 Sep 2016 22:50:46 +0200 Subject: [PATCH] Fix #1427 Engines do not show RF/t output properly --- .../java/forestry/core/tiles/TileEngine.java | 25 +++++++---- .../energy/gui/ContainerEngineBiogas.java | 14 ++----- .../energy/gui/ContainerEngineElectric.java | 14 +------ .../energy/gui/ContainerEnginePeat.java | 14 ++----- .../energy/gui/ContainerGenerator.java | 14 ++----- .../energy/tiles/TileEngineBiogas.java | 29 +------------ .../energy/tiles/TileEngineElectric.java | 18 +------- .../forestry/energy/tiles/TileEnginePeat.java | 42 +++++++------------ .../energy/tiles/TileEuGenerator.java | 22 +++++----- 9 files changed, 57 insertions(+), 135 deletions(-) diff --git a/src/main/java/forestry/core/tiles/TileEngine.java b/src/main/java/forestry/core/tiles/TileEngine.java index 1429ec064..49633ecc5 100644 --- a/src/main/java/forestry/core/tiles/TileEngine.java +++ b/src/main/java/forestry/core/tiles/TileEngine.java @@ -22,6 +22,7 @@ import forestry.core.config.Constants; import forestry.core.errors.EnumErrorCode; import forestry.core.network.DataInputStreamForestry; import forestry.core.network.DataOutputStreamForestry; +import forestry.core.network.IStreamableGui; import forestry.core.proxy.Proxies; import forestry.energy.EnergyHelper; import forestry.energy.EnergyManager; @@ -35,7 +36,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraftforge.common.capabilities.Capability; -public abstract class TileEngine extends TileBase implements IEnergyConnectionDelegated, IActivatable { +public abstract class TileEngine extends TileBase implements IEnergyConnectionDelegated, IActivatable, IStreamableGui { private static final int CANT_SEND_ENERGY_TIME = 20; private boolean active = false; // Used for smp. @@ -276,14 +277,22 @@ public abstract class TileEngine extends TileBase implements IEnergyConnectionDe pistonSpeedServer = data.readFloat(); energyManager.readData(data); } + + @Override + public void writeGuiData(DataOutputStreamForestry data) throws IOException { + data.writeInt(currentOutput); + data.writeInt(heat); + energyManager.writeData(data); + } + + @Override + public void readGuiData(DataInputStreamForestry data) throws IOException { + currentOutput = data.readInt(); + heat = data.readInt(); + energyManager.readData(data); + } - /* SMP GUI */ - @Deprecated //use packets - public abstract void getGUINetworkData(int i, int j); - - @Deprecated //use packets - public abstract void sendGUINetworkData(Container containerEngine, IContainerListener iCrafting); - + @Override public EnergyManager getEnergyManager() { return energyManager; } diff --git a/src/main/java/forestry/energy/gui/ContainerEngineBiogas.java b/src/main/java/forestry/energy/gui/ContainerEngineBiogas.java index 715a1a86e..519c13b61 100644 --- a/src/main/java/forestry/energy/gui/ContainerEngineBiogas.java +++ b/src/main/java/forestry/energy/gui/ContainerEngineBiogas.java @@ -15,6 +15,7 @@ import net.minecraft.inventory.IContainerListener; import forestry.core.gui.ContainerLiquidTanks; import forestry.core.gui.slots.SlotLiquidIn; +import forestry.core.network.packets.PacketGuiUpdate; import forestry.energy.inventory.InventoryEngineBiogas; import forestry.energy.tiles.TileEngineBiogas; @@ -26,19 +27,10 @@ public class ContainerEngineBiogas extends ContainerLiquidTanks { @@ -31,19 +32,10 @@ public class ContainerEnginePeat extends ContainerTile { this.addSlotToContainer(new SlotOutput(tile, 4, 116, 53)); } - @Override - public void updateProgressBar(int i, int j) { - if (tile != null) { - tile.getGUINetworkData(i, j); - } - } - @Override public void detectAndSendChanges() { super.detectAndSendChanges(); - - for (IContainerListener crafter : listeners) { - tile.sendGUINetworkData(this, crafter); - } + PacketGuiUpdate packet = new PacketGuiUpdate(tile); + sendPacketToListeners(packet); } } diff --git a/src/main/java/forestry/energy/gui/ContainerGenerator.java b/src/main/java/forestry/energy/gui/ContainerGenerator.java index 18e1e5eb7..d91b0096b 100755 --- a/src/main/java/forestry/energy/gui/ContainerGenerator.java +++ b/src/main/java/forestry/energy/gui/ContainerGenerator.java @@ -15,6 +15,7 @@ import net.minecraft.inventory.IContainerListener; import forestry.core.gui.ContainerLiquidTanks; import forestry.core.gui.slots.SlotLiquidIn; +import forestry.core.network.packets.PacketGuiUpdate; import forestry.energy.inventory.InventoryGenerator; import forestry.energy.tiles.TileEuGenerator; @@ -26,19 +27,10 @@ public class ContainerGenerator extends ContainerLiquidTanks { this.addSlotToContainer(new SlotLiquidIn(tile, InventoryGenerator.SLOT_CAN, 22, 38)); } - @Override - public void updateProgressBar(int messageId, int data) { - super.updateProgressBar(messageId, data); - - tile.getGUINetworkData(messageId, data); - } - @Override public void detectAndSendChanges() { super.detectAndSendChanges(); - - for (IContainerListener crafter : listeners) { - tile.sendGUINetworkData(this, crafter); - } + PacketGuiUpdate packet = new PacketGuiUpdate(tile); + sendPacketToListeners(packet); } } diff --git a/src/main/java/forestry/energy/tiles/TileEngineBiogas.java b/src/main/java/forestry/energy/tiles/TileEngineBiogas.java index 8360c3c84..26c7ba3da 100644 --- a/src/main/java/forestry/energy/tiles/TileEngineBiogas.java +++ b/src/main/java/forestry/energy/tiles/TileEngineBiogas.java @@ -255,6 +255,7 @@ public class TileEngineBiogas extends TileEngine implements ISidedInventory, ILi super.writeData(data); data.writeBoolean(shutdown); tankManager.writeData(data); + burnTank.writeData(data); } @Override @@ -262,33 +263,7 @@ public class TileEngineBiogas extends TileEngine implements ISidedInventory, ILi super.readData(data); shutdown = data.readBoolean(); tankManager.readData(data); - } - - /* GUI */ - @Override - public void getGUINetworkData(int id, int data) { - switch (id) { - case 0: - currentOutput = data; - break; - case 1: - energyManager.setEnergyStored(data); - break; - case 2: - heat = data; - break; - case 3: - burnTank.setCapacity(data); - break; - } - } - - @Override - public void sendGUINetworkData(Container containerEngine, IContainerListener iCrafting) { - iCrafting.sendProgressBarUpdate(containerEngine, 0, currentOutput); - iCrafting.sendProgressBarUpdate(containerEngine, 1, energyManager.getEnergyStored()); - iCrafting.sendProgressBarUpdate(containerEngine, 2, heat); - iCrafting.sendProgressBarUpdate(containerEngine, 3, burnTank.getCapacity()); + burnTank.readData(data); } @Override diff --git a/src/main/java/forestry/energy/tiles/TileEngineElectric.java b/src/main/java/forestry/energy/tiles/TileEngineElectric.java index 83a0ddf5b..731f09087 100644 --- a/src/main/java/forestry/energy/tiles/TileEngineElectric.java +++ b/src/main/java/forestry/energy/tiles/TileEngineElectric.java @@ -226,10 +226,8 @@ public class TileEngineElectric extends TileEngine implements ISocketable, IInve // / SMP GUI @Override public void writeGuiData(DataOutputStreamForestry data) throws IOException { - data.writeVarInt(currentOutput); - data.writeVarInt(heat); + super.writeGuiData(data); sockets.writeData(data); - energyManager.writeData(data); final boolean hasIc2EnergySink = (ic2EnergySink != null); data.writeBoolean(hasIc2EnergySink); if (hasIc2EnergySink) { @@ -239,10 +237,8 @@ public class TileEngineElectric extends TileEngine implements ISocketable, IInve @Override public void readGuiData(DataInputStreamForestry data) throws IOException { - currentOutput = data.readVarInt(); - heat = data.readVarInt(); + super.readGuiData(data); sockets.readData(data); - energyManager.readData(data); final boolean hasIc2EnergySink = data.readBoolean(); if (hasIc2EnergySink) { final int energyStored = data.readVarInt(); @@ -250,16 +246,6 @@ public class TileEngineElectric extends TileEngine implements ISocketable, IInve } } - @Override - public void getGUINetworkData(int i, int j) { - // handled by IStreamableGui - } - - @Override - public void sendGUINetworkData(Container containerEngine, IContainerListener iCrafting) { - // handled by IStreamableGui - } - // / ENERGY CONFIG CHANGE public void changeEnergyConfig(int euChange, int rfChange, int storageChange) { euConfig.euForCycle += euChange; diff --git a/src/main/java/forestry/energy/tiles/TileEnginePeat.java b/src/main/java/forestry/energy/tiles/TileEnginePeat.java index 6211327ca..3982c65b1 100644 --- a/src/main/java/forestry/energy/tiles/TileEnginePeat.java +++ b/src/main/java/forestry/energy/tiles/TileEnginePeat.java @@ -10,6 +10,8 @@ ******************************************************************************/ package forestry.energy.tiles; +import java.io.IOException; + import javax.annotation.Nonnull; import forestry.api.fuels.FuelManager; @@ -19,6 +21,8 @@ import forestry.core.errors.EnumErrorCode; import forestry.core.inventory.AdjacentInventoryCache; import forestry.core.inventory.IInventoryAdapter; import forestry.core.inventory.wrappers.InventoryMapper; +import forestry.core.network.DataInputStreamForestry; +import forestry.core.network.DataOutputStreamForestry; import forestry.core.tiles.TemperatureState; import forestry.core.tiles.TileEngine; import forestry.core.utils.InventoryUtil; @@ -296,37 +300,19 @@ public class TileEnginePeat extends TileEngine implements ISidedInventory { nbttagcompound.setInteger("AshProduction", ashProduction); return nbttagcompound; } - - // / SMP GUI + @Override - public void getGUINetworkData(int i, int j) { - - switch (i) { - case 0: - burnTime = j; - break; - case 1: - totalBurnTime = j; - break; - case 2: - currentOutput = j; - break; - case 3: - energyManager.setEnergyStored(j); - break; - case 4: - heat = j; - break; - } + public void writeGuiData(DataOutputStreamForestry data) throws IOException { + super.writeGuiData(data); + data.writeInt(burnTime); + data.writeInt(totalBurnTime); } - + @Override - public void sendGUINetworkData(Container containerEngine, IContainerListener iCrafting) { - iCrafting.sendProgressBarUpdate(containerEngine, 0, burnTime); - iCrafting.sendProgressBarUpdate(containerEngine, 1, totalBurnTime); - iCrafting.sendProgressBarUpdate(containerEngine, 2, currentOutput); - iCrafting.sendProgressBarUpdate(containerEngine, 3, energyManager.getEnergyStored()); - iCrafting.sendProgressBarUpdate(containerEngine, 4, heat); + public void readGuiData(DataInputStreamForestry data) throws IOException { + super.readGuiData(data); + burnTime = data.readInt(); + totalBurnTime = data.readInt(); } /* ITriggerProvider */ diff --git a/src/main/java/forestry/energy/tiles/TileEuGenerator.java b/src/main/java/forestry/energy/tiles/TileEuGenerator.java index c9a8b2707..216504983 100644 --- a/src/main/java/forestry/energy/tiles/TileEuGenerator.java +++ b/src/main/java/forestry/energy/tiles/TileEuGenerator.java @@ -35,6 +35,7 @@ import forestry.core.fluids.TankManager; import forestry.core.fluids.tanks.FilteredTank; import forestry.core.network.DataInputStreamForestry; import forestry.core.network.DataOutputStreamForestry; +import forestry.core.network.IStreamableGui; import forestry.core.render.TankRenderInfo; import forestry.core.tiles.ILiquidTankTile; import forestry.core.tiles.IRenderableTile; @@ -46,7 +47,7 @@ import forestry.plugins.compat.PluginIC2; import ic2.api.energy.prefab.BasicSource; -public class TileEuGenerator extends TileBase implements ISidedInventory, ILiquidTankTile, IRenderableTile { +public class TileEuGenerator extends TileBase implements ISidedInventory, ILiquidTankTile, IRenderableTile, IStreamableGui { private static final int maxEnergy = 30000; private final TankManager tankManager; @@ -183,19 +184,18 @@ public class TileEuGenerator extends TileBase implements ISidedInventory, ILiqui public TankRenderInfo getProductTankInfo() { return TankRenderInfo.EMPTY; } - - /* SMP GUI */ - public void getGUINetworkData(int i, int j) { - if (i == 0) { - if (ic2EnergySource != null) { - ic2EnergySource.setEnergyStored(j); - } + + @Override + public void writeGuiData(DataOutputStreamForestry data) throws IOException { + if (ic2EnergySource != null) { + data.writeDouble(ic2EnergySource.getEnergyStored()); } } - - public void sendGUINetworkData(Container container, IContainerListener iCrafting) { + + @Override + public void readGuiData(DataInputStreamForestry data) throws IOException { if (ic2EnergySource != null) { - iCrafting.sendProgressBarUpdate(container, 0, (short) ic2EnergySource.getEnergyStored()); + ic2EnergySource.setEnergyStored(data.readDouble()); } }