From 641a9d440ccbd8fbe6a60ff60fd288824e4b533a Mon Sep 17 00:00:00 2001 From: CrazyPants Date: Wed, 28 May 2014 20:32:43 +0800 Subject: [PATCH] Fixed power monitor performance. --- .../machine/monitor/BlockPowerMonitor.java | 1 + .../machine/monitor/PacketPowerInfo.java | 41 +++++++++++++++++++ .../machine/monitor/TilePowerMonitor.java | 15 +++++-- 3 files changed, 53 insertions(+), 4 deletions(-) create mode 100644 src/main/java/crazypants/enderio/machine/monitor/PacketPowerInfo.java diff --git a/src/main/java/crazypants/enderio/machine/monitor/BlockPowerMonitor.java b/src/main/java/crazypants/enderio/machine/monitor/BlockPowerMonitor.java index 5d6340f9..229eb4dd 100644 --- a/src/main/java/crazypants/enderio/machine/monitor/BlockPowerMonitor.java +++ b/src/main/java/crazypants/enderio/machine/monitor/BlockPowerMonitor.java @@ -17,6 +17,7 @@ public class BlockPowerMonitor extends AbstractMachineBlock im public static BlockPowerMonitor create() { EnderIO.packetPipeline.registerPacket(PacketPowerMonitor.class); + EnderIO.packetPipeline.registerPacket(PacketPowerInfo.class); BlockPowerMonitor result = new BlockPowerMonitor(); result.init(); diff --git a/src/main/java/crazypants/enderio/machine/monitor/PacketPowerInfo.java b/src/main/java/crazypants/enderio/machine/monitor/PacketPowerInfo.java new file mode 100644 index 00000000..21cfae26 --- /dev/null +++ b/src/main/java/crazypants/enderio/machine/monitor/PacketPowerInfo.java @@ -0,0 +1,41 @@ +package crazypants.enderio.machine.monitor; + +import io.netty.buffer.ByteBuf; +import io.netty.channel.ChannelHandlerContext; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.world.World; +import crazypants.enderio.machine.tank.TileTank; +import crazypants.enderio.network.AbstractPacketTileEntity; +import crazypants.enderio.network.NetworkUtil; + +public class PacketPowerInfo extends AbstractPacketTileEntity { + + private NBTTagCompound nbtRoot; + + public PacketPowerInfo() { + } + + public PacketPowerInfo(TilePowerMonitor tile) { + super(tile); + nbtRoot = new NBTTagCompound(); + tile.writePowerInfoToNBT(nbtRoot); + } + + @Override + public void encode(ChannelHandlerContext ctx, ByteBuf buf) { + super.encode(ctx, buf); + NetworkUtil.writeNBTTagCompound(nbtRoot, buf); + } + + @Override + public void decode(ChannelHandlerContext ctx, ByteBuf buf) { + super.decode(ctx, buf); + nbtRoot = NetworkUtil.readNBTTagCompound(buf); + } + + @Override + protected void handleClientSide(EntityPlayer player, World worldObj, TilePowerMonitor tile) { + tile.readPowerInfoFromNBT(nbtRoot); + } +} \ No newline at end of file diff --git a/src/main/java/crazypants/enderio/machine/monitor/TilePowerMonitor.java b/src/main/java/crazypants/enderio/machine/monitor/TilePowerMonitor.java index 462e8cbd..337fa6d0 100644 --- a/src/main/java/crazypants/enderio/machine/monitor/TilePowerMonitor.java +++ b/src/main/java/crazypants/enderio/machine/monitor/TilePowerMonitor.java @@ -137,7 +137,6 @@ public class TilePowerMonitor extends AbstractMachineEntity implements IInternal protected boolean processTasks(boolean redstoneCheckPassed) { powerHandler.setEnergy(powerHandler.getEnergyStored() - energyPerTick); boolean update = worldObj.getWorldInfo().getWorldTotalTime() % 10 == 0; - NetworkPowerManager pm = getPowerManager(); if(pm != null && update) { update(pm); @@ -163,8 +162,10 @@ public class TilePowerMonitor extends AbstractMachineEntity implements IInternal broadcastSignal(); } } - - return update; + if(update) { + EnderIO.packetPipeline.sendToAllAround(new PacketPowerInfo(this), this); + } + return false; } private void broadcastSignal() { @@ -186,7 +187,6 @@ public class TilePowerMonitor extends AbstractMachineEntity implements IInternal PowerTracker tracker = pm.getNetworkPowerTracker(); aveMjSent = tracker.getAverageMjTickSent(); aveMjRecieved = tracker.getAverageMjTickRecieved(); - } private NetworkPowerManager getPowerManager() { @@ -208,7 +208,10 @@ public class TilePowerMonitor extends AbstractMachineEntity implements IInternal @Override public void readCustomNBT(NBTTagCompound nbtRoot) { super.readCustomNBT(nbtRoot); + readPowerInfoFromNBT(nbtRoot); + } + public void readPowerInfoFromNBT(NBTTagCompound nbtRoot) { powerInConduits = nbtRoot.getFloat("powerInConduits"); maxPowerInCoduits = nbtRoot.getFloat("maxPowerInCoduits"); powerInCapBanks = nbtRoot.getFloat("powerInCapBanks"); @@ -226,7 +229,10 @@ public class TilePowerMonitor extends AbstractMachineEntity implements IInternal @Override public void writeCustomNBT(NBTTagCompound nbtRoot) { super.writeCustomNBT(nbtRoot); + writePowerInfoToNBT(nbtRoot); + } + public void writePowerInfoToNBT(NBTTagCompound nbtRoot) { nbtRoot.setFloat("powerInConduits", powerInConduits); nbtRoot.setFloat("maxPowerInCoduits", maxPowerInCoduits); nbtRoot.setFloat("powerInCapBanks", powerInCapBanks); @@ -239,6 +245,7 @@ public class TilePowerMonitor extends AbstractMachineEntity implements IInternal nbtRoot.setBoolean("engineControlEnabled", engineControlEnabled); nbtRoot.setFloat("startLevel", startLevel); nbtRoot.setFloat("stopLevel", stopLevel); + } @Override