dave/refinedstorage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Only send item updates if is active

Browse Source
This commit is contained in:
Raoul Van den Berge
2016-04-04 17:51:21 +02:00
parent b2fa3c7f69
commit f53d6593c1
2 changed files with 5 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/refinedstorage/gui/GuiController.java
View File

@@ -119,7 +119,7 @@ public class GuiController extends GuiBase {
} }
if (inBounds(barX, barY, barWidth, barHeight, mouseX, mouseY)) { if (inBounds(barX, barY, barWidth, barHeight, mouseX, mouseY)) {
String message = t("misc.refinedstorage:energy_usage", controller.isActiveClientSide() ? controller.getEnergyUsage() : 0); String message = t("misc.refinedstorage:energy_usage", controller.getEnergyUsage());
message += "\n" + t("misc.refinedstorage:energy_stored", controller.getEnergyStored(null), controller.getMaxEnergyStored(null)); message += "\n" + t("misc.refinedstorage:energy_stored", controller.getEnergyStored(null), controller.getMaxEnergyStored(null));
drawTooltip(mouseX, mouseY, message); drawTooltip(mouseX, mouseY, message);

19
src/main/java/refinedstorage/tile/TileController.java
View File

@@ -12,8 +12,6 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumFacing;
import net.minecraft.util.EnumHand; import net.minecraft.util.EnumHand;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import refinedstorage.RefinedStorage; import refinedstorage.RefinedStorage;
import refinedstorage.RefinedStorageBlocks; import refinedstorage.RefinedStorageBlocks;
import refinedstorage.RefinedStorageGui; import refinedstorage.RefinedStorageGui;
@@ -52,9 +50,6 @@ public class TileController extends TileBase implements IEnergyReceiver, INetwor
private boolean destroyed = false; private boolean destroyed = false;
@SideOnly(Side.CLIENT)
private boolean activeClientSide;
@Override @Override
public void update() { public void update() {
super.update(); super.update();
@@ -135,7 +130,9 @@ public class TileController extends TileBase implements IEnergyReceiver, INetwor
if (!InventoryUtils.compareStack(consumer.getWirelessGrid(), consumer.getPlayer().getHeldItem(consumer.getHand()))) { if (!InventoryUtils.compareStack(consumer.getWirelessGrid(), consumer.getPlayer().getHeldItem(consumer.getHand()))) {
consumer.getPlayer().closeScreen(); // This will call onContainerClosed on the Container and remove it from the list consumer.getPlayer().closeScreen(); // This will call onContainerClosed on the Container and remove it from the list
} else { } else {
RefinedStorage.NETWORK.sendTo(new MessageWirelessGridItems(itemGroups), (EntityPlayerMP) consumer.getPlayer()); if (isActive()) {
RefinedStorage.NETWORK.sendTo(new MessageWirelessGridItems(itemGroups), (EntityPlayerMP) consumer.getPlayer());
}
} }
} }
@@ -404,8 +401,6 @@ public class TileController extends TileBase implements IEnergyReceiver, INetwor
public void receiveData(ByteBuf buf) { public void receiveData(ByteBuf buf) {
int lastEnergy = energy.getEnergyStored(); int lastEnergy = energy.getEnergyStored();
activeClientSide = buf.readBoolean();
energy.setEnergyStored(buf.readInt()); energy.setEnergyStored(buf.readInt());
if (lastEnergy != energy.getEnergyStored()) { if (lastEnergy != energy.getEnergyStored()) {
@@ -415,8 +410,6 @@ public class TileController extends TileBase implements IEnergyReceiver, INetwor
@Override @Override
public void sendData(ByteBuf buf) { public void sendData(ByteBuf buf) {
buf.writeBoolean(isActive());
buf.writeInt(energy.getEnergyStored()); buf.writeInt(energy.getEnergyStored());
} }
@@ -441,7 +434,7 @@ public class TileController extends TileBase implements IEnergyReceiver, INetwor
@Override @Override
public void sendContainerData(ByteBuf buf) { public void sendContainerData(ByteBuf buf) {
buf.writeInt(energyUsage); buf.writeInt(isActive() ? energyUsage : 0);
buf.writeInt(redstoneMode.id); buf.writeInt(redstoneMode.id);
@@ -454,10 +447,6 @@ public class TileController extends TileBase implements IEnergyReceiver, INetwor
} }
} }
public boolean isActiveClientSide() {
return activeClientSide;
}
@Override @Override
public Class<? extends Container> getContainer() { public Class<? extends Container> getContainer() {
return ContainerController.class; return ContainerController.class;