Fix #1427 Engines do not show RF/t output properly

This commit is contained in:
Nedelosk committed 2016-09-17 22:50:46 +02:00
1 parent 253e9f18ed
commit 80de4d6490
9 files changed
+57 -135

No files matched your search

@@ -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;
}
@@ -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<TileEngineBiogas
this.addSlotToContainer(new SlotLiquidIn(engine, InventoryEngineBiogas.SLOT_CAN, 143, 40));
}
@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);
}
}
@@ -26,21 +26,11 @@ public class ContainerEngineElectric extends ContainerSocketed<TileEngineElectri
this.addSlotToContainer(new SlotFiltered(tile, InventoryEngineElectric.SLOT_BATTERY, 84, 53));
}
@Override
public void updateProgressBar(int i, int j) {
if (tile != null) {
tile.getGUINetworkData(i, j);
}
}
@Override
public void detectAndSendChanges() {
super.detectAndSendChanges();
if (tile != null) {
PacketGuiUpdate packet = new PacketGuiUpdate(tile);
sendPacketToListeners(packet);
}
PacketGuiUpdate packet = new PacketGuiUpdate(tile);
sendPacketToListeners(packet);
}
}
@@ -16,6 +16,7 @@ import net.minecraft.inventory.IContainerListener;
import forestry.core.gui.ContainerTile;
import forestry.core.gui.slots.SlotFiltered;
import forestry.core.gui.slots.SlotOutput;
import forestry.core.network.packets.PacketGuiUpdate;
import forestry.energy.tiles.TileEnginePeat;
public class ContainerEnginePeat extends ContainerTile<TileEnginePeat> {
@@ -31,19 +32,10 @@ public class ContainerEnginePeat extends ContainerTile<TileEnginePeat> {
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);
}
}
@@ -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<TileEuGenerator> {
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);
}
}
@@ -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
@@ -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;
@@ -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 */
@@ -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());
}
}