From fc2c7b6cde07379cd8ae6705970b26f4182399c3 Mon Sep 17 00:00:00 2001 From: pahimar Date: Thu, 2 Apr 2015 15:14:31 -0400 Subject: [PATCH] Getting closer on proper inventory syncing in the Transmutation Tablet --- .../ee3/inventory/ContainerTransmutationTablet.java | 7 +++---- .../message/MessageTransmutationKnowledgeUpdate.java | 4 ++++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/pahimar/ee3/inventory/ContainerTransmutationTablet.java b/src/main/java/com/pahimar/ee3/inventory/ContainerTransmutationTablet.java index 7df03012..aa3939e4 100644 --- a/src/main/java/com/pahimar/ee3/inventory/ContainerTransmutationTablet.java +++ b/src/main/java/com/pahimar/ee3/inventory/ContainerTransmutationTablet.java @@ -282,13 +282,12 @@ public class ContainerTransmutationTablet extends ContainerEE implements IElemen { super.onPickupFromSlot(entityPlayer, itemStack); - Set knownTransmutations = TransmutationKnowledgeRegistry.getInstance().getPlayersKnownTransmutations(ItemHelper.getOwnerUUID(itemStack)); - this.containerTransmutationTablet.inventoryTransmutationTablet = new InventoryTransmutationTablet(knownTransmutations); + this.containerTransmutationTablet.inventoryTransmutationTablet = new InventoryTransmutationTablet(); this.containerTransmutationTablet.updateInventory(); if (!this.tileEntityTransmutationTablet.getWorldObj().isRemote && itemStack != null && itemStack.getItem() instanceof ItemAlchemicalTome && ItemHelper.hasOwnerUUID(itemStack)) { - PacketHandler.INSTANCE.sendToAllAround(new MessageTransmutationKnowledgeUpdate(knownTransmutations), new NetworkRegistry.TargetPoint(this.tileEntityTransmutationTablet.getWorldObj().provider.dimensionId, (double) this.tileEntityTransmutationTablet.xCoord, (double) this.tileEntityTransmutationTablet.yCoord, (double) this.tileEntityTransmutationTablet.zCoord, 5d)); + PacketHandler.INSTANCE.sendToAllAround(new MessageTransmutationKnowledgeUpdate(), new NetworkRegistry.TargetPoint(this.tileEntityTransmutationTablet.getWorldObj().provider.dimensionId, (double) this.tileEntityTransmutationTablet.xCoord, (double) this.tileEntityTransmutationTablet.yCoord, (double) this.tileEntityTransmutationTablet.zCoord, 5d)); } } @@ -325,7 +324,7 @@ public class ContainerTransmutationTablet extends ContainerEE implements IElemen @Override public boolean canTakeStack(EntityPlayer entityPlayer) { - return false; + return true; } @Override diff --git a/src/main/java/com/pahimar/ee3/network/message/MessageTransmutationKnowledgeUpdate.java b/src/main/java/com/pahimar/ee3/network/message/MessageTransmutationKnowledgeUpdate.java index 89fb78e0..953894fe 100644 --- a/src/main/java/com/pahimar/ee3/network/message/MessageTransmutationKnowledgeUpdate.java +++ b/src/main/java/com/pahimar/ee3/network/message/MessageTransmutationKnowledgeUpdate.java @@ -3,6 +3,7 @@ package com.pahimar.ee3.network.message; import com.pahimar.ee3.inventory.ContainerTransmutationTablet; import com.pahimar.ee3.knowledge.TransmutationKnowledge; import com.pahimar.ee3.util.CompressionHelper; +import com.pahimar.ee3.util.LogHelper; import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; @@ -19,6 +20,7 @@ public class MessageTransmutationKnowledgeUpdate implements IMessage, IMessageHa public MessageTransmutationKnowledgeUpdate() { + this.transmutationKnowledge = new TransmutationKnowledge(); } public MessageTransmutationKnowledgeUpdate(Collection knownTransmutationsCollection) @@ -32,6 +34,8 @@ public class MessageTransmutationKnowledgeUpdate implements IMessage, IMessageHa byte[] compressedString = null; int readableBytes = buf.readInt(); + LogHelper.info(readableBytes); + if (readableBytes > 0) { compressedString = buf.readBytes(readableBytes).array();