diff --git a/src/main/java/com/pahimar/ee3/network/message/MessageGuiElementClicked.java b/src/main/java/com/pahimar/ee3/network/message/MessageGuiElementClicked.java index fed8b603..d534f1e1 100644 --- a/src/main/java/com/pahimar/ee3/network/message/MessageGuiElementClicked.java +++ b/src/main/java/com/pahimar/ee3/network/message/MessageGuiElementClicked.java @@ -7,49 +7,43 @@ import cpw.mods.fml.common.network.simpleimpl.MessageContext; import io.netty.buffer.ByteBuf; import net.minecraft.entity.player.EntityPlayer; -public class MessageGuiElementClicked implements IMessage, IMessageHandler -{ +public class MessageGuiElementClicked implements IMessage, IMessageHandler { + public String elementName; public int buttonPressed; - public MessageGuiElementClicked() - { - + public MessageGuiElementClicked(){ } - public MessageGuiElementClicked(String elementName, int buttonPressed) - { + public MessageGuiElementClicked(String elementName, int buttonPressed) { + this.elementName = elementName; this.buttonPressed = buttonPressed; } @Override - public void fromBytes(ByteBuf buf) - { + public void fromBytes(ByteBuf buf) { + int elementNameLength = buf.readInt(); this.elementName = new String(buf.readBytes(elementNameLength).array()); this.buttonPressed = buf.readInt(); } @Override - public void toBytes(ByteBuf buf) - { + public void toBytes(ByteBuf buf) { + buf.writeInt(elementName.length()); buf.writeBytes(elementName.getBytes()); buf.writeInt(buttonPressed); } @Override - public IMessage onMessage(MessageGuiElementClicked message, MessageContext ctx) - { + public IMessage onMessage(MessageGuiElementClicked message, MessageContext ctx) { + EntityPlayer entityPlayer = ctx.getServerHandler().playerEntity; - if (entityPlayer != null) - { - if (entityPlayer.openContainer instanceof IElementButtonHandler) - { - ((IElementButtonHandler) entityPlayer.openContainer).handleElementButtonClick(message.elementName, message.buttonPressed); - } + if (entityPlayer != null && entityPlayer.openContainer instanceof IElementButtonHandler) { + ((IElementButtonHandler) entityPlayer.openContainer).handleElementButtonClick(message.elementName, message.buttonPressed); } return null;