No more errors, the game launches, rejoice!

This commit is contained in:
aidancbrady committed 2016-05-26 03:14:44 -04:00
1 parent 79af86daae
commit ceec3e71e9
67 files changed
+951 -676

No files matched your search

@@ -6,6 +6,7 @@ import mekanism.common.item.ItemConfigurator;
import mekanism.common.item.ItemConfigurator.ConfiguratorMode;
import mekanism.common.network.PacketConfiguratorState.ConfiguratorStateMessage;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumHand;
import net.minecraftforge.fml.common.network.simpleimpl.IMessage;
import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler;
import net.minecraftforge.fml.common.network.simpleimpl.MessageContext;
@@ -15,7 +16,7 @@ public class PacketConfiguratorState implements IMessageHandler<ConfiguratorStat
@Override
public IMessage onMessage(ConfiguratorStateMessage message, MessageContext context)
{
ItemStack itemstack = PacketHandler.getPlayer(context).getCurrentEquippedItem();
ItemStack itemstack = PacketHandler.getPlayer(context).getHeldItem(message.currentHand);
if(itemstack != null && itemstack.getItem() instanceof ItemConfigurator)
{
@@ -27,24 +28,29 @@ public class PacketConfiguratorState implements IMessageHandler<ConfiguratorStat
public static class ConfiguratorStateMessage implements IMessage
{
public EnumHand currentHand;
public ConfiguratorMode state;
public ConfiguratorStateMessage() {}
public ConfiguratorStateMessage(ConfiguratorMode s)
public ConfiguratorStateMessage(EnumHand hand, ConfiguratorMode s)
{
currentHand = hand;
state = s;
}
@Override
public void toBytes(ByteBuf dataStream)
{
dataStream.writeInt(currentHand.ordinal());
dataStream.writeInt(state.ordinal());
}
@Override
public void fromBytes(ByteBuf dataStream)
{
currentHand = EnumHand.values()[dataStream.readInt()];
state = ConfiguratorMode.values()[dataStream.readInt()];
}
}