mirror of
https://github.com/GTNewHorizons/EnderIO.git
synced 2026-11-21 04:32:18 +00:00
Fixed power monitor performance.
This commit is contained in:
1 parent
be5a1fb371
commit
641a9d440c
3 files changed
+53
-4
No files matched your search
@@ -17,6 +17,7 @@ public class BlockPowerMonitor extends AbstractMachineBlock<TilePowerMonitor> im
|
||||
public static BlockPowerMonitor create() {
|
||||
|
||||
EnderIO.packetPipeline.registerPacket(PacketPowerMonitor.class);
|
||||
EnderIO.packetPipeline.registerPacket(PacketPowerInfo.class);
|
||||
|
||||
BlockPowerMonitor result = new BlockPowerMonitor();
|
||||
result.init();
|
||||
|
||||
@@ -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<TilePowerMonitor> {
|
||||
|
||||
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);
|
||||
}
|
||||
}
|
||||
@@ -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
|
||||
|
||||
Reference in new issue
Block a user