diff --git a/src/main/java/com/glodblock/github/FluidCraft.java b/src/main/java/com/glodblock/github/FluidCraft.java index 855d35f4..1cd4f76a 100644 --- a/src/main/java/com/glodblock/github/FluidCraft.java +++ b/src/main/java/com/glodblock/github/FluidCraft.java @@ -14,15 +14,13 @@ import com.glodblock.github.loader.ChannelLoader; import com.glodblock.github.loader.ItemAndBlockHolder; import com.glodblock.github.loader.RecipeLoader; import com.glodblock.github.loader.filter.FluidFilter; +import com.glodblock.github.network.SPacketMEUpdateBuffer; import com.glodblock.github.proxy.CommonProxy; import com.glodblock.github.util.ModAndClassUtil; import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.SidedProxy; -import cpw.mods.fml.common.event.FMLInitializationEvent; -import cpw.mods.fml.common.event.FMLLoadCompleteEvent; -import cpw.mods.fml.common.event.FMLPostInitializationEvent; -import cpw.mods.fml.common.event.FMLPreInitializationEvent; +import cpw.mods.fml.common.event.*; import cpw.mods.fml.common.network.NetworkRegistry; @Mod( @@ -85,6 +83,16 @@ public class FluidCraft { proxy.postInit(event); } + @Mod.EventHandler + public void onServerStart(FMLServerStartingEvent event) { + SPacketMEUpdateBuffer.init(); + } + + @Mod.EventHandler + public void onServerStop(FMLServerStoppedEvent event) { + SPacketMEUpdateBuffer.disable(); + } + @Mod.EventHandler public void onLoadComplete(FMLLoadCompleteEvent event) {} diff --git a/src/main/java/com/glodblock/github/client/gui/GuiFluidMonitor.java b/src/main/java/com/glodblock/github/client/gui/GuiFluidMonitor.java index 1f96d1f1..eeaa7cae 100644 --- a/src/main/java/com/glodblock/github/client/gui/GuiFluidMonitor.java +++ b/src/main/java/com/glodblock/github/client/gui/GuiFluidMonitor.java @@ -25,13 +25,16 @@ public class GuiFluidMonitor extends FCGuiMonitor { this.repo = new FluidRepo(getScrollBar(), this); } - public void postUpdate(final List list) { + @Override + public void postUpdate(final List list, boolean resort) { for (final IAEFluidStack is : list) { IAEItemStack stack = AEItemStack.create(ItemFluidDrop.newDisplayStack(is.getFluidStack())); stack.setStackSize(is.getStackSize()); this.repo.postUpdate(stack); } - this.repo.updateView(); + if (resort) { + this.repo.updateView(); + } this.setScrollBar(); } diff --git a/src/main/java/com/glodblock/github/client/gui/GuiItemMonitor.java b/src/main/java/com/glodblock/github/client/gui/GuiItemMonitor.java index 4bacec6c..e74a0917 100644 --- a/src/main/java/com/glodblock/github/client/gui/GuiItemMonitor.java +++ b/src/main/java/com/glodblock/github/client/gui/GuiItemMonitor.java @@ -22,11 +22,14 @@ public class GuiItemMonitor extends FCGuiMonitor { this.repo = new ItemRepo(getScrollBar(), this); } - public void postUpdate(final List list) { + @Override + public void postUpdate(final List list, boolean resort) { for (final IAEItemStack is : list) { this.repo.postUpdate(is); } - this.repo.updateView(); + if (resort) { + this.repo.updateView(); + } this.setScrollBar(); } diff --git a/src/main/java/com/glodblock/github/client/gui/base/FCGuiMonitor.java b/src/main/java/com/glodblock/github/client/gui/base/FCGuiMonitor.java index e51b7da4..b7dc7f2a 100644 --- a/src/main/java/com/glodblock/github/client/gui/base/FCGuiMonitor.java +++ b/src/main/java/com/glodblock/github/client/gui/base/FCGuiMonitor.java @@ -107,7 +107,7 @@ public abstract class FCGuiMonitor> extends FCBaseMEGui offsetY = y; } - public abstract void postUpdate(final List list); + public abstract void postUpdate(final List list, boolean resort); protected void setScrollBar() { this.getScrollBar().setTop(18).setLeft(175).setHeight(this.rows * 18 - 2); diff --git a/src/main/java/com/glodblock/github/client/gui/container/ContainerFluidMonitor.java b/src/main/java/com/glodblock/github/client/gui/container/ContainerFluidMonitor.java index 4f1c6e80..9474fae9 100644 --- a/src/main/java/com/glodblock/github/client/gui/container/ContainerFluidMonitor.java +++ b/src/main/java/com/glodblock/github/client/gui/container/ContainerFluidMonitor.java @@ -1,7 +1,8 @@ package com.glodblock.github.client.gui.container; -import java.nio.BufferOverflowException; +import java.util.ArrayList; import java.util.HashMap; +import java.util.List; import java.util.Map; import net.minecraft.entity.player.EntityPlayer; @@ -43,7 +44,7 @@ import com.glodblock.github.client.gui.container.base.FCContainerMonitor; import com.glodblock.github.common.item.ItemFluidDrop; import com.glodblock.github.network.CPacketFluidUpdate; import com.glodblock.github.network.SPacketFluidUpdate; -import com.glodblock.github.network.SPacketMEInventoryUpdate; +import com.glodblock.github.network.SPacketMEUpdateBuffer; import com.glodblock.github.util.Util; public class ContainerFluidMonitor extends FCContainerMonitor { @@ -126,46 +127,34 @@ public class ContainerFluidMonitor extends FCContainerMonitor { protected void processItemList() { if (!this.fluids.isEmpty()) { final IItemList monitorCache = this.monitor.getStorageList(); - final SPacketMEInventoryUpdate piu = new SPacketMEInventoryUpdate(true); - + List toSend = new ArrayList<>(); for (final IAEFluidStack is : this.fluids) { final IAEFluidStack send = monitorCache.findPrecise(is); - if (send == null) { - is.setStackSize(0); - piu.appendFluid(is); + if (send != null) { + toSend.add(send); } else { - piu.appendFluid(send); + is.setStackSize(0); + toSend.add(is); } } - - if (!piu.isEmpty()) { - this.fluids.resetStatus(); - - for (final Object c : this.crafters) { - if (c instanceof EntityPlayer) { - FluidCraft.proxy.netHandler.sendTo(piu, (EntityPlayerMP) c); - } + for (final Object c : this.crafters) { + if (c instanceof EntityPlayerMP) { + SPacketMEUpdateBuffer.scheduleFluidUpdate((EntityPlayerMP) c, toSend); } } + this.fluids.resetStatus(); } } @Override protected void queueInventory(final ICrafting c) { - if (Platform.isServer() && c instanceof EntityPlayer && this.monitor != null) { - SPacketMEInventoryUpdate piu = new SPacketMEInventoryUpdate(true); + if (Platform.isServer() && c instanceof EntityPlayerMP && this.monitor != null) { final IItemList monitorCache = this.monitor.getStorageList(); - - for (final IAEFluidStack send : monitorCache) { - try { - piu.appendFluid(send); - } catch (final BufferOverflowException boe) { - FluidCraft.proxy.netHandler.sendTo(piu, (EntityPlayerMP) c); - piu = new SPacketMEInventoryUpdate(true); - piu.appendFluid(send); - } + List toSend = new ArrayList<>(); + for (final IAEFluidStack is : monitorCache) { + toSend.add(is); } - FluidCraft.proxy.netHandler.sendTo(piu, (EntityPlayerMP) c); + SPacketMEUpdateBuffer.scheduleFluidUpdate((EntityPlayerMP) c, toSend); } } diff --git a/src/main/java/com/glodblock/github/client/gui/container/ContainerItemMonitor.java b/src/main/java/com/glodblock/github/client/gui/container/ContainerItemMonitor.java index 2ff3c6e9..6cba6ea5 100644 --- a/src/main/java/com/glodblock/github/client/gui/container/ContainerItemMonitor.java +++ b/src/main/java/com/glodblock/github/client/gui/container/ContainerItemMonitor.java @@ -1,6 +1,7 @@ package com.glodblock.github.client.gui.container; -import java.nio.BufferOverflowException; +import java.util.ArrayList; +import java.util.List; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; @@ -25,9 +26,8 @@ import appeng.container.slot.SlotRestrictedInput; import appeng.me.helpers.ChannelPowerSrc; import appeng.util.Platform; -import com.glodblock.github.FluidCraft; import com.glodblock.github.client.gui.container.base.FCContainerMonitor; -import com.glodblock.github.network.SPacketMEInventoryUpdate; +import com.glodblock.github.network.SPacketMEUpdateBuffer; public class ContainerItemMonitor extends FCContainerMonitor { @@ -95,46 +95,34 @@ public class ContainerItemMonitor extends FCContainerMonitor { protected void processItemList() { if (!this.items.isEmpty()) { final IItemList monitorCache = this.monitor.getStorageList(); - final SPacketMEInventoryUpdate piu = new SPacketMEInventoryUpdate(); + List toSend = new ArrayList<>(); for (final IAEItemStack is : this.items) { final IAEItemStack send = monitorCache.findPrecise(is); - if (send == null) { - is.setStackSize(0); - piu.appendItem(is); + if (send != null) { + toSend.add(send); } else { - piu.appendItem(send); + is.setStackSize(0); + toSend.add(is); } } - - if (!piu.isEmpty()) { - this.items.resetStatus(); - - for (final Object c : this.crafters) { - if (c instanceof EntityPlayer) { - FluidCraft.proxy.netHandler.sendTo(piu, (EntityPlayerMP) c); - } + for (final Object c : this.crafters) { + if (c instanceof EntityPlayer) { + SPacketMEUpdateBuffer.scheduleItemUpdate((EntityPlayerMP) c, toSend); } } + this.items.resetStatus(); } } @Override protected void queueInventory(final ICrafting c) { if (Platform.isServer() && c instanceof EntityPlayer && this.monitor != null) { - SPacketMEInventoryUpdate piu = new SPacketMEInventoryUpdate(); final IItemList monitorCache = this.monitor.getStorageList(); - - for (final IAEItemStack send : monitorCache) { - try { - piu.appendItem(send); - } catch (final BufferOverflowException boe) { - FluidCraft.proxy.netHandler.sendTo(piu, (EntityPlayerMP) c); - - piu = new SPacketMEInventoryUpdate(); - piu.appendItem(send); - } + List toSend = new ArrayList<>(); + for (final IAEItemStack is : monitorCache) { + toSend.add(is); } - FluidCraft.proxy.netHandler.sendTo(piu, (EntityPlayerMP) c); + SPacketMEUpdateBuffer.scheduleItemUpdate((EntityPlayerMP) c, toSend); } } @@ -143,6 +131,9 @@ public class ContainerItemMonitor extends FCContainerMonitor { super.removeCraftingFromCrafters(c); if (this.crafters.isEmpty() && this.monitor != null) { this.monitor.removeListener(this); + if (c instanceof EntityPlayerMP) { + SPacketMEUpdateBuffer.clear((EntityPlayerMP) c); + } } } diff --git a/src/main/java/com/glodblock/github/client/gui/container/base/FCContainerMonitor.java b/src/main/java/com/glodblock/github/client/gui/container/base/FCContainerMonitor.java index a2cd9fb7..407d0115 100644 --- a/src/main/java/com/glodblock/github/client/gui/container/base/FCContainerMonitor.java +++ b/src/main/java/com/glodblock/github/client/gui/container/base/FCContainerMonitor.java @@ -30,6 +30,7 @@ import appeng.util.IConfigManagerHost; import appeng.util.Platform; import com.glodblock.github.inventory.item.IWirelessTerminal; +import com.glodblock.github.network.SPacketMEUpdateBuffer; public abstract class FCContainerMonitor> extends FCBaseContainer implements IConfigManagerHost, IConfigurableObject, IMEMonitorHandlerReceiver { @@ -158,6 +159,10 @@ public abstract class FCContainerMonitor> extends FCBaseCo super.onContainerClosed(player); if (this.monitor != null) { this.monitor.removeListener(this); + if (player instanceof EntityPlayerMP && Platform.isServer()) { + SPacketMEUpdateBuffer.clear((EntityPlayerMP) player); + } + } } diff --git a/src/main/java/com/glodblock/github/loader/ChannelLoader.java b/src/main/java/com/glodblock/github/loader/ChannelLoader.java index c29316a1..91a37ec9 100644 --- a/src/main/java/com/glodblock/github/loader/ChannelLoader.java +++ b/src/main/java/com/glodblock/github/loader/ChannelLoader.java @@ -25,9 +25,11 @@ public class ChannelLoader implements Runnable { Side.SERVER); FluidCraft.proxy.netHandler .registerMessage(new CPacketEncodePattern.Handler(), CPacketEncodePattern.class, id++, Side.SERVER); + FluidCraft.proxy.netHandler + .registerMessage(new SPacketMEItemInvUpdate.Handler(), SPacketMEItemInvUpdate.class, id++, Side.CLIENT); FluidCraft.proxy.netHandler.registerMessage( - new SPacketMEInventoryUpdate.Handler(), - SPacketMEInventoryUpdate.class, + new SPacketMEFluidInvUpdate.Handler(), + SPacketMEFluidInvUpdate.class, id++, Side.CLIENT); FluidCraft.proxy.netHandler diff --git a/src/main/java/com/glodblock/github/network/CPacketLevelMaintainer.java b/src/main/java/com/glodblock/github/network/CPacketLevelMaintainer.java index e33b4a35..55c80d4d 100644 --- a/src/main/java/com/glodblock/github/network/CPacketLevelMaintainer.java +++ b/src/main/java/com/glodblock/github/network/CPacketLevelMaintainer.java @@ -1,5 +1,8 @@ package com.glodblock.github.network; +import java.util.ArrayList; +import java.util.List; + import javax.annotation.Nullable; import net.minecraft.entity.player.EntityPlayerMP; @@ -9,7 +12,6 @@ import net.minecraft.nbt.NBTTagCompound; import appeng.api.storage.data.IAEItemStack; import appeng.util.item.AEItemStack; -import com.glodblock.github.FluidCraft; import com.glodblock.github.client.gui.container.ContainerLevelMaintainer; import com.glodblock.github.common.tile.TileLevelMaintainer; @@ -88,7 +90,7 @@ public class CPacketLevelMaintainer implements IMessage { public static class Handler implements IMessageHandler { private void refresh(ContainerLevelMaintainer cca, EntityPlayerMP player) { - SPacketMEInventoryUpdate piu = new SPacketMEInventoryUpdate(false); + List toSend = new ArrayList<>(TileLevelMaintainer.REQ_COUNT); for (int i = 0; i < TileLevelMaintainer.REQ_COUNT; i++) { IAEItemStack is = cca.getTile().requests.getRequestQtyStack(i); IAEItemStack is1 = cca.getTile().requests.getRequestBatches().getStack(i); @@ -96,7 +98,7 @@ public class CPacketLevelMaintainer implements IMessage { if (is1 != null) { NBTTagCompound data; data = is1.getItemStack().getTagCompound(); - piu.appendItem( + toSend.add( setTag( is, is1.getStackSize(), @@ -104,11 +106,11 @@ public class CPacketLevelMaintainer implements IMessage { data.getBoolean("Enable"), cca.getTile().requests.getState(i).ordinal())); } else { - piu.appendItem(setTag(is, 0, i, true, 0)); + toSend.add(setTag(is, 0, i, true, 0)); } } } - FluidCraft.proxy.netHandler.sendTo(piu, player); + SPacketMEUpdateBuffer.scheduleItemUpdate(player, toSend); } @Nullable diff --git a/src/main/java/com/glodblock/github/network/SPacketMEInventoryUpdate.java b/src/main/java/com/glodblock/github/network/SPacketMEFluidInvUpdate.java similarity index 50% rename from src/main/java/com/glodblock/github/network/SPacketMEInventoryUpdate.java rename to src/main/java/com/glodblock/github/network/SPacketMEFluidInvUpdate.java index 8750931a..24f8cbce 100644 --- a/src/main/java/com/glodblock/github/network/SPacketMEInventoryUpdate.java +++ b/src/main/java/com/glodblock/github/network/SPacketMEFluidInvUpdate.java @@ -2,62 +2,60 @@ package com.glodblock.github.network; import java.io.IOException; import java.nio.BufferOverflowException; -import java.util.LinkedList; +import java.util.ArrayList; import java.util.List; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; import appeng.api.storage.data.IAEFluidStack; -import appeng.api.storage.data.IAEItemStack; import appeng.util.item.AEFluidStack; -import appeng.util.item.AEItemStack; import com.glodblock.github.client.gui.GuiFluidCraftConfirm; import com.glodblock.github.client.gui.GuiFluidMonitor; -import com.glodblock.github.client.gui.GuiItemMonitor; -import com.glodblock.github.client.gui.GuiLevelMaintainer; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import io.netty.buffer.ByteBuf; -public class SPacketMEInventoryUpdate implements IMessage { +/** + * Dedicated packet for fluid updates. + */ +public class SPacketMEFluidInvUpdate implements IMessage { - private List list; - private byte ref; - private boolean isFluid = false; + private List list = new ArrayList<>(); + private byte ref = (byte) 0; + private boolean resort = true; - public SPacketMEInventoryUpdate() { - ref = 0; - list = new LinkedList<>(); - } + public SPacketMEFluidInvUpdate() {} - public SPacketMEInventoryUpdate(Boolean isFluid) { - ref = 0; - list = new LinkedList<>(); - this.isFluid = isFluid; - } - - public SPacketMEInventoryUpdate(byte b) { + /** + * Used for the GUI to confirm crafting. 0 = available 1 = pending 2 = missing + */ + public SPacketMEFluidInvUpdate(byte b) { ref = b; - list = new LinkedList<>(); + } + + /** + * If resort, call "updateView()". Used when multiple packets are sent to open an inventory; only the last packet + * should resort. + * + * @param resort whether this packet should resort the term or not + */ + public SPacketMEFluidInvUpdate(boolean resort) { + this.resort = resort; } @Override public void fromBytes(ByteBuf buf) { - isFluid = buf.readBoolean(); - long amount = buf.readLong(); ref = buf.readByte(); - list = new LinkedList<>(); + resort = buf.readBoolean(); + long amount = buf.readLong(); + list = new ArrayList<>(); try { for (int i = 0; i < amount; i++) { - if (isFluid) { - list.add(AEFluidStack.loadFluidStackFromPacket(buf)); - } else { - list.add(AEItemStack.loadItemStackFromPacket(buf)); - } + list.add(AEFluidStack.loadFluidStackFromPacket(buf)); } } catch (IOException io) { io.printStackTrace(); @@ -66,21 +64,20 @@ public class SPacketMEInventoryUpdate implements IMessage { @Override public void toBytes(ByteBuf buf) { - buf.writeBoolean(isFluid); - buf.writeLong(list.size()); buf.writeByte(ref); + buf.writeBoolean(resort); + buf.writeLong(list.size()); try { - for (Object is : list) { - if (is instanceof IAEItemStack) ((IAEItemStack) is).writeToPacket(buf); - if (is instanceof IAEFluidStack) ((IAEFluidStack) is).writeToPacket(buf); + for (IAEFluidStack is : list) { + is.writeToPacket(buf); } } catch (IOException io) { io.printStackTrace(); } } - public void appendItem(final IAEItemStack is) throws BufferOverflowException { - list.add(is); + public void setResort(boolean resort) { + this.resort = resort; } public void appendFluid(final IAEFluidStack is) throws BufferOverflowException { @@ -91,20 +88,16 @@ public class SPacketMEInventoryUpdate implements IMessage { return this.list.isEmpty(); } - public static class Handler implements IMessageHandler { + public static class Handler implements IMessageHandler { @Override @SuppressWarnings({ "unchecked", "rawtypes" }) - public IMessage onMessage(SPacketMEInventoryUpdate message, MessageContext ctx) { + public IMessage onMessage(SPacketMEFluidInvUpdate message, MessageContext ctx) { final GuiScreen gs = Minecraft.getMinecraft().currentScreen; if (gs instanceof GuiFluidMonitor) { - ((GuiFluidMonitor) gs).postUpdate((List) message.list); - } else if (gs instanceof GuiItemMonitor) { - ((GuiItemMonitor) gs).postUpdate((List) message.list); + ((GuiFluidMonitor) gs).postUpdate(message.list, message.resort); } else if (gs instanceof GuiFluidCraftConfirm) { ((GuiFluidCraftConfirm) gs).postUpdate((List) message.list, message.ref); - } else if (gs instanceof GuiLevelMaintainer) { - ((GuiLevelMaintainer) gs).postUpdate((List) message.list); } return null; } diff --git a/src/main/java/com/glodblock/github/network/SPacketMEItemInvUpdate.java b/src/main/java/com/glodblock/github/network/SPacketMEItemInvUpdate.java new file mode 100644 index 00000000..e8b63be1 --- /dev/null +++ b/src/main/java/com/glodblock/github/network/SPacketMEItemInvUpdate.java @@ -0,0 +1,109 @@ +package com.glodblock.github.network; + +import java.io.IOException; +import java.nio.BufferOverflowException; +import java.util.ArrayList; +import java.util.List; + +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.GuiScreen; + +import appeng.api.storage.data.IAEItemStack; +import appeng.util.item.AEItemStack; + +import com.glodblock.github.client.gui.GuiFluidCraftConfirm; +import com.glodblock.github.client.gui.GuiItemMonitor; +import com.glodblock.github.client.gui.GuiLevelMaintainer; + +import cpw.mods.fml.common.network.simpleimpl.IMessage; +import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; +import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import io.netty.buffer.ByteBuf; + +/** + * Packet dedicated to item inventory update. + */ +public class SPacketMEItemInvUpdate implements IMessage { + + private List list = new ArrayList<>(); + private byte ref = (byte) 0; + private boolean resort = true; + + public SPacketMEItemInvUpdate() {} + + /** + * Used for the GUI to confirm crafting. 0 = available 1 = pending 2 = missing + */ + public SPacketMEItemInvUpdate(byte b) { + ref = b; + list = new ArrayList<>(); + } + + /** + * If resort, call "updateView()". Used when multiple packets are sent to open an inventory; only the last packet + * should resort. + * + * @param resort whether this packet should resort the term or not + */ + public SPacketMEItemInvUpdate(boolean resort) { + this.resort = resort; + } + + @Override + public void fromBytes(ByteBuf buf) { + ref = buf.readByte(); + resort = buf.readBoolean(); + long amount = buf.readLong(); + list = new ArrayList<>(); + try { + for (int i = 0; i < amount; i++) { + list.add(AEItemStack.loadItemStackFromPacket(buf)); + } + } catch (IOException io) { + io.printStackTrace(); + } + } + + @Override + public void toBytes(ByteBuf buf) { + buf.writeByte(ref); + buf.writeBoolean(resort); + buf.writeLong(list.size()); + try { + for (IAEItemStack is : list) { + is.writeToPacket(buf); + } + } catch (IOException io) { + io.printStackTrace(); + } + } + + public void setResort(boolean resort) { + this.resort = resort; + } + + public void appendItem(final IAEItemStack is) throws BufferOverflowException { + list.add(is); + } + + public boolean isEmpty() { + return this.list.isEmpty(); + } + + public static class Handler implements IMessageHandler { + + @Override + @SuppressWarnings({ "unchecked", "rawtypes" }) + public IMessage onMessage(SPacketMEItemInvUpdate message, MessageContext ctx) { + final GuiScreen gs = Minecraft.getMinecraft().currentScreen; + if (gs instanceof GuiItemMonitor) { + ((GuiItemMonitor) gs).postUpdate(message.list, message.resort); + } else if (gs instanceof GuiFluidCraftConfirm) { + ((GuiFluidCraftConfirm) gs).postUpdate(message.list, message.ref); + } else if (gs instanceof GuiLevelMaintainer) { + ((GuiLevelMaintainer) gs).postUpdate(message.list); + } + return null; + } + } +} diff --git a/src/main/java/com/glodblock/github/network/SPacketMEUpdateBuffer.java b/src/main/java/com/glodblock/github/network/SPacketMEUpdateBuffer.java new file mode 100644 index 00000000..1220c0df --- /dev/null +++ b/src/main/java/com/glodblock/github/network/SPacketMEUpdateBuffer.java @@ -0,0 +1,114 @@ +package com.glodblock.github.network; + +import java.util.*; +import java.util.concurrent.Executors; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.ScheduledFuture; +import java.util.concurrent.TimeUnit; + +import net.minecraft.entity.player.EntityPlayerMP; + +import appeng.api.storage.data.IAEFluidStack; +import appeng.api.storage.data.IAEItemStack; + +import com.glodblock.github.FluidCraft; + +/** + * Only should exist on the server side! + */ +public class SPacketMEUpdateBuffer { + + private static ScheduledExecutorService executor; + private static ScheduledFuture task; + + private static final Map> itemBuffer = new HashMap<>(); + + private static final Map> fluidBuffer = new HashMap<>(); + + public static void init() { + executor = Executors.newSingleThreadScheduledExecutor(r -> { + Thread thread = new Thread(r); + thread.setName("AE2FC Network worker"); + thread.setDaemon(true); + thread.setPriority(6); + return thread; + }); + task = executor.scheduleAtFixedRate(SPacketMEUpdateBuffer::sendBuffer, 0, 50, TimeUnit.MILLISECONDS); + } + + public static void disable() { + task.cancel(false); + executor.shutdown(); + } + + public static void scheduleItemUpdate(EntityPlayerMP player, List stacks) { + synchronized (itemBuffer) { + if (!itemBuffer.containsKey(player)) { + itemBuffer.put(player, new LinkedHashMap<>(1024)); + } + Map buffer = itemBuffer.get(player); + stacks.forEach(s -> buffer.put(s, s)); + } + } + + public static void scheduleFluidUpdate(EntityPlayerMP player, List stacks) { + synchronized (itemBuffer) { + if (!fluidBuffer.containsKey(player)) { + fluidBuffer.put(player, new LinkedHashMap<>(1024)); + } + Map buffer = fluidBuffer.get(player); + stacks.forEach(s -> buffer.put(s, s)); + } + } + + public static void sendBuffer() { + synchronized (itemBuffer) { + itemBuffer.forEach((player, updates) -> { + if (updates.isEmpty()) return; + int i = 0; + SPacketMEItemInvUpdate packet = new SPacketMEItemInvUpdate(); + Iterator it = updates.keySet().iterator(); + while (it.hasNext()) { + if (i < 256) { + packet.appendItem(it.next()); + it.remove(); + } else { + packet.setResort(false); + break; + } + i++; + } + FluidCraft.proxy.netHandler.sendTo(packet, player); + }); + fluidBuffer.forEach((player, updates) -> { + if (updates.isEmpty()) return; + int i = 0; + SPacketMEFluidInvUpdate packet = new SPacketMEFluidInvUpdate(); + Iterator it = updates.keySet().iterator(); + while (it.hasNext()) { + if (i < 256) { + packet.appendFluid(it.next()); + it.remove(); + } else { + packet.setResort(false); + break; + } + i++; + } + FluidCraft.proxy.netHandler.sendTo(packet, player); + }); + + } + } + + public static void clear(EntityPlayerMP player) { + synchronized (itemBuffer) { + if (itemBuffer.containsKey(player)) { + itemBuffer.get(player).clear(); + } + if (fluidBuffer.containsKey(player)) { + fluidBuffer.get(player).clear(); + } + } + } +}