mirror of
https://github.com/Thorfusion/Mekanism-Community-Edition.git
synced 2026-11-22 04:52:25 +00:00
Better ItemStack packet management
This commit is contained in:
1 parent
aa04e34702
commit
471563e083
14 files changed
+196
-252
No files matched your search
@@ -26,22 +26,23 @@ import mekanism.common.config.MekanismConfig.client;
|
||||
import mekanism.common.config.MekanismConfig.general;
|
||||
import mekanism.common.frequency.Frequency;
|
||||
import mekanism.common.item.ItemConfigurator;
|
||||
import mekanism.common.item.ItemConfigurator.ConfiguratorMode;
|
||||
import mekanism.common.item.ItemFlamethrower;
|
||||
import mekanism.common.item.ItemFreeRunners;
|
||||
import mekanism.common.item.ItemGasMask;
|
||||
import mekanism.common.item.ItemJetpack;
|
||||
import mekanism.common.item.ItemConfigurator.ConfiguratorMode;
|
||||
import mekanism.common.item.ItemJetpack.JetpackMode;
|
||||
import mekanism.common.item.ItemScubaTank;
|
||||
import mekanism.common.network.PacketFlamethrowerData;
|
||||
import mekanism.common.network.PacketConfiguratorState.ConfiguratorStateMessage;
|
||||
import mekanism.common.network.PacketFlamethrowerData.FlamethrowerDataMessage;
|
||||
import mekanism.common.network.PacketItemStack.ItemStackMessage;
|
||||
import mekanism.common.network.PacketJetpackData.JetpackDataMessage;
|
||||
import mekanism.common.network.PacketJetpackData.JetpackPacket;
|
||||
import mekanism.common.network.PacketPortableTeleporter.PortableTeleporterMessage;
|
||||
import mekanism.common.network.PacketPortableTeleporter.PortableTeleporterPacketType;
|
||||
import mekanism.common.network.PacketScubaTankData.ScubaTankDataMessage;
|
||||
import mekanism.common.network.PacketScubaTankData.ScubaTankPacket;
|
||||
import mekanism.common.util.ListUtils;
|
||||
import mekanism.common.util.MekanismUtils;
|
||||
import mekanism.common.util.ReflectionUtils;
|
||||
import net.minecraft.client.Minecraft;
|
||||
@@ -460,7 +461,7 @@ public class ClientTickHandler
|
||||
}
|
||||
|
||||
configurator.setState(stack, ConfiguratorMode.values()[newVal]);
|
||||
Mekanism.packetHandler.sendToServer(new ConfiguratorStateMessage(EnumHand.MAIN_HAND, configurator.getState(stack)));
|
||||
Mekanism.packetHandler.sendToServer(new ItemStackMessage(EnumHand.MAIN_HAND, ListUtils.asArrayList(newVal)));
|
||||
event.setCanceled(true);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -14,16 +14,14 @@ import mekanism.common.item.ItemJetpack;
|
||||
import mekanism.common.item.ItemJetpack.JetpackMode;
|
||||
import mekanism.common.item.ItemScubaTank;
|
||||
import mekanism.common.item.ItemWalkieTalkie;
|
||||
import mekanism.common.network.PacketConfiguratorState.ConfiguratorStateMessage;
|
||||
import mekanism.common.network.PacketElectricBowState.ElectricBowStateMessage;
|
||||
import mekanism.common.network.PacketFlamethrowerData;
|
||||
import mekanism.common.network.PacketItemStack.ItemStackMessage;
|
||||
import mekanism.common.network.PacketJetpackData.JetpackDataMessage;
|
||||
import mekanism.common.network.PacketJetpackData.JetpackPacket;
|
||||
import mekanism.common.network.PacketPortableTankState.PortableTankStateMessage;
|
||||
import mekanism.common.network.PacketScubaTankData.ScubaTankDataMessage;
|
||||
import mekanism.common.network.PacketScubaTankData.ScubaTankPacket;
|
||||
import mekanism.common.network.PacketWalkieTalkieState.WalkieTalkieStateMessage;
|
||||
import mekanism.common.util.LangUtils;
|
||||
import mekanism.common.util.ListUtils;
|
||||
import mekanism.common.util.StackUtils;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.settings.KeyBinding;
|
||||
@@ -86,7 +84,7 @@ public class MekanismKeyHandler extends MekKeyHandler
|
||||
|
||||
int toSet = configurator.getState(toolStack).ordinal() < ConfiguratorMode.values().length-1 ? configurator.getState(toolStack).ordinal() + 1 : 0;
|
||||
configurator.setState(toolStack, ConfiguratorMode.values()[toSet]);
|
||||
Mekanism.packetHandler.sendToServer(new ConfiguratorStateMessage(EnumHand.MAIN_HAND, configurator.getState(toolStack)));
|
||||
Mekanism.packetHandler.sendToServer(new ItemStackMessage(EnumHand.MAIN_HAND, ListUtils.asArrayList(toSet)));
|
||||
player.sendMessage(new TextComponentString(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.GREY + LangUtils.localize("tooltip.configureState") + ": " + configurator.getColor(configurator.getState(toolStack)) + configurator.getStateDisplay(configurator.getState(toolStack))));
|
||||
}
|
||||
else if(player.isSneaking() && item instanceof ItemElectricBow)
|
||||
@@ -94,7 +92,7 @@ public class MekanismKeyHandler extends MekKeyHandler
|
||||
ItemElectricBow bow = (ItemElectricBow)item;
|
||||
|
||||
bow.setFireState(toolStack, !bow.getFireState(toolStack));
|
||||
Mekanism.packetHandler.sendToServer(new ElectricBowStateMessage(EnumHand.MAIN_HAND, bow.getFireState(toolStack)));
|
||||
Mekanism.packetHandler.sendToServer(new ItemStackMessage(EnumHand.MAIN_HAND, ListUtils.asArrayList(bow.getFireState(toolStack))));
|
||||
player.sendMessage(new TextComponentString(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.GREY + LangUtils.localize("tooltip.fireMode") + ": " + (bow.getFireState(toolStack) ? EnumColor.DARK_GREEN : EnumColor.DARK_RED) + LangUtils.transOnOff(bow.getFireState(toolStack))));
|
||||
}
|
||||
else if(player.isSneaking() && item instanceof ItemBlockMachine)
|
||||
@@ -104,7 +102,7 @@ public class MekanismKeyHandler extends MekKeyHandler
|
||||
if(BlockStateMachine.MachineType.get(toolStack) == BlockStateMachine.MachineType.FLUID_TANK)
|
||||
{
|
||||
machine.setBucketMode(toolStack, !machine.getBucketMode(toolStack));
|
||||
Mekanism.packetHandler.sendToServer(new PortableTankStateMessage(EnumHand.MAIN_HAND, machine.getBucketMode(toolStack)));
|
||||
Mekanism.packetHandler.sendToServer(new ItemStackMessage(EnumHand.MAIN_HAND, ListUtils.asArrayList(machine.getBucketMode(toolStack))));
|
||||
player.sendMessage(new TextComponentString(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.GREY + LangUtils.localize("tooltip.portableTank.bucketMode") + ": " + (machine.getBucketMode(toolStack) ? EnumColor.DARK_GREEN : EnumColor.DARK_RED) + LangUtils.transOnOff(machine.getBucketMode(toolStack))));
|
||||
}
|
||||
}
|
||||
@@ -116,7 +114,7 @@ public class MekanismKeyHandler extends MekKeyHandler
|
||||
{
|
||||
int newChan = wt.getChannel(toolStack) < 9 ? wt.getChannel(toolStack) + 1 : 1;
|
||||
wt.setChannel(toolStack, newChan);
|
||||
Mekanism.packetHandler.sendToServer(new WalkieTalkieStateMessage(EnumHand.MAIN_HAND, newChan));
|
||||
Mekanism.packetHandler.sendToServer(new ItemStackMessage(EnumHand.MAIN_HAND, ListUtils.asArrayList(newChan)));
|
||||
SoundHandler.playSound(MekanismSounds.DING);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -14,8 +14,6 @@ import mekanism.common.network.PacketConfigSync;
|
||||
import mekanism.common.network.PacketConfigSync.ConfigSyncMessage;
|
||||
import mekanism.common.network.PacketConfigurationUpdate;
|
||||
import mekanism.common.network.PacketConfigurationUpdate.ConfigurationUpdateMessage;
|
||||
import mekanism.common.network.PacketConfiguratorState;
|
||||
import mekanism.common.network.PacketConfiguratorState.ConfiguratorStateMessage;
|
||||
import mekanism.common.network.PacketContainerEditMode;
|
||||
import mekanism.common.network.PacketContainerEditMode.ContainerEditModeMessage;
|
||||
import mekanism.common.network.PacketDataRequest;
|
||||
@@ -26,12 +24,12 @@ import mekanism.common.network.PacketDropperUse;
|
||||
import mekanism.common.network.PacketDropperUse.DropperUseMessage;
|
||||
import mekanism.common.network.PacketEditFilter;
|
||||
import mekanism.common.network.PacketEditFilter.EditFilterMessage;
|
||||
import mekanism.common.network.PacketElectricBowState;
|
||||
import mekanism.common.network.PacketElectricBowState.ElectricBowStateMessage;
|
||||
import mekanism.common.network.PacketEntityMove;
|
||||
import mekanism.common.network.PacketEntityMove.EntityMoveMessage;
|
||||
import mekanism.common.network.PacketFlamethrowerData;
|
||||
import mekanism.common.network.PacketFlamethrowerData.FlamethrowerDataMessage;
|
||||
import mekanism.common.network.PacketItemStack;
|
||||
import mekanism.common.network.PacketItemStack.ItemStackMessage;
|
||||
import mekanism.common.network.PacketJetpackData;
|
||||
import mekanism.common.network.PacketJetpackData.JetpackDataMessage;
|
||||
import mekanism.common.network.PacketKey;
|
||||
@@ -44,8 +42,6 @@ import mekanism.common.network.PacketOredictionificatorGui;
|
||||
import mekanism.common.network.PacketOredictionificatorGui.OredictionificatorGuiMessage;
|
||||
import mekanism.common.network.PacketPersonalChest;
|
||||
import mekanism.common.network.PacketPersonalChest.PersonalChestMessage;
|
||||
import mekanism.common.network.PacketPortableTankState;
|
||||
import mekanism.common.network.PacketPortableTankState.PortableTankStateMessage;
|
||||
import mekanism.common.network.PacketPortableTeleporter;
|
||||
import mekanism.common.network.PacketPortableTeleporter.PortableTeleporterMessage;
|
||||
import mekanism.common.network.PacketPortalFX;
|
||||
@@ -68,8 +64,6 @@ import mekanism.common.network.PacketTileEntity;
|
||||
import mekanism.common.network.PacketTileEntity.TileEntityMessage;
|
||||
import mekanism.common.network.PacketTransmitterUpdate;
|
||||
import mekanism.common.network.PacketTransmitterUpdate.TransmitterUpdateMessage;
|
||||
import mekanism.common.network.PacketWalkieTalkieState;
|
||||
import mekanism.common.network.PacketWalkieTalkieState.WalkieTalkieStateMessage;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.entity.player.EntityPlayerMP;
|
||||
import net.minecraft.item.ItemStack;
|
||||
@@ -101,8 +95,8 @@ public class PacketHandler
|
||||
netHandler.registerMessage(PacketTransmitterUpdate.class, TransmitterUpdateMessage.class, 1, Side.CLIENT);
|
||||
netHandler.registerMessage(PacketPersonalChest.class, PersonalChestMessage.class, 2, Side.CLIENT);
|
||||
netHandler.registerMessage(PacketPersonalChest.class, PersonalChestMessage.class, 2, Side.SERVER);
|
||||
netHandler.registerMessage(PacketElectricBowState.class, ElectricBowStateMessage.class, 3, Side.SERVER);
|
||||
netHandler.registerMessage(PacketConfiguratorState.class, ConfiguratorStateMessage.class, 4, Side.SERVER);
|
||||
//FREE ID 3
|
||||
netHandler.registerMessage(PacketItemStack.class, ItemStackMessage.class, 4, Side.SERVER);
|
||||
netHandler.registerMessage(PacketTileEntity.class, TileEntityMessage.class, 5, Side.CLIENT);
|
||||
netHandler.registerMessage(PacketTileEntity.class, TileEntityMessage.class, 5, Side.SERVER);
|
||||
netHandler.registerMessage(PacketPortalFX.class, PortalFXMessage.class, 6, Side.CLIENT);
|
||||
@@ -114,7 +108,7 @@ public class PacketHandler
|
||||
netHandler.registerMessage(PacketPortableTeleporter.class, PortableTeleporterMessage.class, 10, Side.SERVER);
|
||||
netHandler.registerMessage(PacketRemoveUpgrade.class, RemoveUpgradeMessage.class, 11, Side.SERVER);
|
||||
netHandler.registerMessage(PacketRedstoneControl.class, RedstoneControlMessage.class, 12, Side.SERVER);
|
||||
netHandler.registerMessage(PacketWalkieTalkieState.class, WalkieTalkieStateMessage.class, 13, Side.SERVER);
|
||||
//FREE ID 13
|
||||
netHandler.registerMessage(PacketLogisticalSorterGui.class, LogisticalSorterGuiMessage.class, 14, Side.CLIENT);
|
||||
netHandler.registerMessage(PacketLogisticalSorterGui.class, LogisticalSorterGuiMessage.class, 14, Side.SERVER);
|
||||
netHandler.registerMessage(PacketNewFilter.class, NewFilterMessage.class, 15, Side.SERVER);
|
||||
@@ -131,7 +125,7 @@ public class PacketHandler
|
||||
netHandler.registerMessage(PacketScubaTankData.class, ScubaTankDataMessage.class, 22, Side.SERVER);
|
||||
netHandler.registerMessage(PacketConfigSync.class, ConfigSyncMessage.class, 23, Side.CLIENT);
|
||||
netHandler.registerMessage(PacketBoxBlacklist.class, BoxBlacklistMessage.class, 24, Side.CLIENT);
|
||||
netHandler.registerMessage(PacketPortableTankState.class, PortableTankStateMessage.class, 25, Side.SERVER);
|
||||
//FREE ID 25
|
||||
netHandler.registerMessage(PacketContainerEditMode.class, ContainerEditModeMessage.class, 26, Side.SERVER);
|
||||
netHandler.registerMessage(PacketFlamethrowerData.class, FlamethrowerDataMessage.class, 27, Side.CLIENT);
|
||||
netHandler.registerMessage(PacketFlamethrowerData.class, FlamethrowerDataMessage.class, 27, Side.SERVER);
|
||||
|
||||
@@ -0,0 +1,9 @@
|
||||
package mekanism.common.base;
|
||||
|
||||
import io.netty.buffer.ByteBuf;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
public interface IItemNetwork
|
||||
{
|
||||
public void handlePacketData(ItemStack stack, ByteBuf dataStream) throws Exception;
|
||||
}
|
||||
@@ -2,6 +2,7 @@ package mekanism.common.item;
|
||||
|
||||
import ic2.api.item.IElectricItemManager;
|
||||
import ic2.api.item.ISpecialElectricItem;
|
||||
import io.netty.buffer.ByteBuf;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
@@ -22,6 +23,7 @@ import mekanism.common.Upgrade;
|
||||
import mekanism.common.base.FluidItemWrapper;
|
||||
import mekanism.common.base.IFactory;
|
||||
import mekanism.common.base.IFluidItemWrapper;
|
||||
import mekanism.common.base.IItemNetwork;
|
||||
import mekanism.common.base.IRedstoneControl;
|
||||
import mekanism.common.base.IRedstoneControl.RedstoneControl;
|
||||
import mekanism.common.base.ISideConfiguration;
|
||||
@@ -37,6 +39,7 @@ import mekanism.common.integration.forgeenergy.ForgeEnergyItemWrapper;
|
||||
import mekanism.common.integration.ic2.IC2ItemManager;
|
||||
import mekanism.common.integration.tesla.TeslaItemWrapper;
|
||||
import mekanism.common.inventory.InventoryPersonalChest;
|
||||
import mekanism.common.item.ItemConfigurator.ConfiguratorMode;
|
||||
import mekanism.common.network.PacketTileEntity.TileEntityMessage;
|
||||
import mekanism.common.security.ISecurityItem;
|
||||
import mekanism.common.security.ISecurityTile;
|
||||
@@ -77,6 +80,7 @@ import net.minecraftforge.fluids.Fluid;
|
||||
import net.minecraftforge.fluids.FluidRegistry;
|
||||
import net.minecraftforge.fluids.FluidStack;
|
||||
import net.minecraftforge.fluids.capability.CapabilityFluidHandler;
|
||||
import net.minecraftforge.fml.common.FMLCommonHandler;
|
||||
import net.minecraftforge.fml.common.Optional.Interface;
|
||||
import net.minecraftforge.fml.common.Optional.InterfaceList;
|
||||
import net.minecraftforge.fml.common.Optional.Method;
|
||||
@@ -131,7 +135,7 @@ import cofh.api.energy.IEnergyContainerItem;
|
||||
@InterfaceList({
|
||||
@Interface(iface = "ic2.api.item.ISpecialElectricItem", modid = "IC2")
|
||||
})
|
||||
public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpecialElectricItem, IFactory, ISustainedInventory, ISustainedTank, IEnergyContainerItem, IFluidItemWrapper, ITierItem, ISecurityItem
|
||||
public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpecialElectricItem, IFactory, ISustainedInventory, ISustainedTank, IEnergyContainerItem, IFluidItemWrapper, ITierItem, ISecurityItem, IItemNetwork
|
||||
{
|
||||
public Block metaBlock;
|
||||
|
||||
@@ -941,4 +945,17 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
@Override
|
||||
public void handlePacketData(ItemStack stack, ByteBuf dataStream) throws Exception
|
||||
{
|
||||
if(FMLCommonHandler.instance().getEffectiveSide().isServer())
|
||||
{
|
||||
if(MachineType.get(stack) == MachineType.FLUID_TANK)
|
||||
{
|
||||
boolean state = dataStream.readBoolean();
|
||||
setBucketMode(stack, state);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,5 +1,7 @@
|
||||
package mekanism.common.item;
|
||||
|
||||
import io.netty.buffer.ByteBuf;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
@@ -13,6 +15,7 @@ import mekanism.api.Range4D;
|
||||
import mekanism.api.transmitters.TransmissionType;
|
||||
import mekanism.common.Mekanism;
|
||||
import mekanism.common.SideData;
|
||||
import mekanism.common.base.IItemNetwork;
|
||||
import mekanism.common.base.ISideConfiguration;
|
||||
import mekanism.common.capabilities.Capabilities;
|
||||
import mekanism.common.network.PacketTileEntity.TileEntityMessage;
|
||||
@@ -41,6 +44,7 @@ import net.minecraft.util.math.RayTraceResult;
|
||||
import net.minecraft.util.text.TextComponentString;
|
||||
import net.minecraft.world.IBlockAccess;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.fml.common.FMLCommonHandler;
|
||||
import net.minecraftforge.fml.common.Optional.Interface;
|
||||
import net.minecraftforge.fml.common.Optional.InterfaceList;
|
||||
import net.minecraftforge.fml.common.Optional.Method;
|
||||
@@ -50,7 +54,7 @@ import cofh.api.item.IToolHammer;
|
||||
@InterfaceList({
|
||||
@Interface(iface = "buildcraft.api.tools.IToolWrench", modid = "BuildCraft")
|
||||
})
|
||||
public class ItemConfigurator extends ItemEnergized implements IMekWrench, IToolWrench, IToolHammer
|
||||
public class ItemConfigurator extends ItemEnergized implements IMekWrench, IToolWrench, IToolHammer, IItemNetwork
|
||||
{
|
||||
public final int ENERGY_PER_CONFIGURE = 400;
|
||||
public final int ENERGY_PER_ITEM_DUMP = 8;
|
||||
@@ -353,4 +357,14 @@ public class ItemConfigurator extends ItemEnergized implements IMekWrench, ITool
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void handlePacketData(ItemStack stack, ByteBuf dataStream) throws Exception
|
||||
{
|
||||
if(FMLCommonHandler.instance().getEffectiveSide().isServer())
|
||||
{
|
||||
int state = dataStream.readInt();
|
||||
setState(stack, ConfiguratorMode.values()[state]);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,8 +1,12 @@
|
||||
package mekanism.common.item;
|
||||
|
||||
import io.netty.buffer.ByteBuf;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import mekanism.api.EnumColor;
|
||||
import mekanism.common.base.IItemNetwork;
|
||||
import mekanism.common.item.ItemConfigurator.ConfiguratorMode;
|
||||
import mekanism.common.util.ItemDataUtils;
|
||||
import mekanism.common.util.LangUtils;
|
||||
import net.minecraft.enchantment.EnchantmentHelper;
|
||||
@@ -22,8 +26,9 @@ import net.minecraft.util.EnumHand;
|
||||
import net.minecraft.util.SoundCategory;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.event.ForgeEventFactory;
|
||||
import net.minecraftforge.fml.common.FMLCommonHandler;
|
||||
|
||||
public class ItemElectricBow extends ItemEnergized
|
||||
public class ItemElectricBow extends ItemEnergized implements IItemNetwork
|
||||
{
|
||||
public ItemElectricBow()
|
||||
{
|
||||
@@ -193,4 +198,14 @@ public class ItemElectricBow extends ItemEnergized
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void handlePacketData(ItemStack stack, ByteBuf dataStream) throws Exception
|
||||
{
|
||||
if(FMLCommonHandler.instance().getEffectiveSide().isServer())
|
||||
{
|
||||
boolean state = dataStream.readBoolean();
|
||||
setFireState(stack, state);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,10 +1,14 @@
|
||||
package mekanism.common.item;
|
||||
|
||||
import io.netty.buffer.ByteBuf;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import mekanism.api.EnumColor;
|
||||
import mekanism.common.base.IItemNetwork;
|
||||
import mekanism.common.item.ItemConfigurator.ConfiguratorMode;
|
||||
import mekanism.common.util.ItemDataUtils;
|
||||
import mekanism.common.util.LangUtils;
|
||||
import net.minecraft.client.renderer.block.model.ModelResourceLocation;
|
||||
@@ -14,8 +18,9 @@ import net.minecraft.util.ActionResult;
|
||||
import net.minecraft.util.EnumActionResult;
|
||||
import net.minecraft.util.EnumHand;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.fml.common.FMLCommonHandler;
|
||||
|
||||
public class ItemWalkieTalkie extends ItemMekanism
|
||||
public class ItemWalkieTalkie extends ItemMekanism implements IItemNetwork
|
||||
{
|
||||
public static ModelResourceLocation OFF_MODEL = new ModelResourceLocation("mekanism:WalkieTalkie", "inventory");
|
||||
|
||||
@@ -94,4 +99,14 @@ public class ItemWalkieTalkie extends ItemMekanism
|
||||
|
||||
return channel;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void handlePacketData(ItemStack stack, ByteBuf dataStream) throws Exception
|
||||
{
|
||||
if(FMLCommonHandler.instance().getEffectiveSide().isServer())
|
||||
{
|
||||
int channel = dataStream.readInt();
|
||||
setChannel(stack, channel);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,57 +0,0 @@
|
||||
package mekanism.common.network;
|
||||
|
||||
import io.netty.buffer.ByteBuf;
|
||||
import mekanism.common.PacketHandler;
|
||||
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;
|
||||
|
||||
public class PacketConfiguratorState implements IMessageHandler<ConfiguratorStateMessage, IMessage>
|
||||
{
|
||||
@Override
|
||||
public IMessage onMessage(ConfiguratorStateMessage message, MessageContext context)
|
||||
{
|
||||
ItemStack itemstack = PacketHandler.getPlayer(context).getHeldItem(message.currentHand);
|
||||
|
||||
if(!itemstack.isEmpty() && itemstack.getItem() instanceof ItemConfigurator)
|
||||
{
|
||||
((ItemConfigurator)itemstack.getItem()).setState(itemstack, message.state);
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
public static class ConfiguratorStateMessage implements IMessage
|
||||
{
|
||||
public EnumHand currentHand;
|
||||
|
||||
public ConfiguratorMode state;
|
||||
|
||||
public ConfiguratorStateMessage() {}
|
||||
|
||||
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()];
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,56 +0,0 @@
|
||||
package mekanism.common.network;
|
||||
|
||||
import io.netty.buffer.ByteBuf;
|
||||
import mekanism.common.PacketHandler;
|
||||
import mekanism.common.item.ItemElectricBow;
|
||||
import mekanism.common.network.PacketElectricBowState.ElectricBowStateMessage;
|
||||
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;
|
||||
|
||||
public class PacketElectricBowState implements IMessageHandler<ElectricBowStateMessage, IMessage>
|
||||
{
|
||||
@Override
|
||||
public IMessage onMessage(ElectricBowStateMessage message, MessageContext context)
|
||||
{
|
||||
ItemStack itemstack = PacketHandler.getPlayer(context).getHeldItem(message.currentHand);
|
||||
|
||||
if(!itemstack.isEmpty() && itemstack.getItem() instanceof ItemElectricBow)
|
||||
{
|
||||
((ItemElectricBow)itemstack.getItem()).setFireState(itemstack, message.fireMode);
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
public static class ElectricBowStateMessage implements IMessage
|
||||
{
|
||||
public EnumHand currentHand;
|
||||
|
||||
public boolean fireMode;
|
||||
|
||||
public ElectricBowStateMessage() {}
|
||||
|
||||
public ElectricBowStateMessage(EnumHand hand, boolean state)
|
||||
{
|
||||
currentHand = hand;
|
||||
fireMode = state;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void toBytes(ByteBuf dataStream)
|
||||
{
|
||||
dataStream.writeInt(currentHand.ordinal());
|
||||
dataStream.writeBoolean(fireMode);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void fromBytes(ByteBuf dataStream)
|
||||
{
|
||||
currentHand = EnumHand.values()[dataStream.readInt()];
|
||||
fireMode = dataStream.readBoolean();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,94 @@
|
||||
package mekanism.common.network;
|
||||
|
||||
import io.netty.buffer.ByteBuf;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
||||
import mekanism.common.PacketHandler;
|
||||
import mekanism.common.base.IItemNetwork;
|
||||
import mekanism.common.network.PacketItemStack.ItemStackMessage;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.server.MinecraftServer;
|
||||
import net.minecraft.util.EnumHand;
|
||||
import net.minecraftforge.fml.common.FMLCommonHandler;
|
||||
import net.minecraftforge.fml.common.network.simpleimpl.IMessage;
|
||||
import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler;
|
||||
import net.minecraftforge.fml.common.network.simpleimpl.MessageContext;
|
||||
|
||||
public class PacketItemStack implements IMessageHandler<ItemStackMessage, IMessage>
|
||||
{
|
||||
@Override
|
||||
public IMessage onMessage(ItemStackMessage message, MessageContext context)
|
||||
{
|
||||
EntityPlayer player = PacketHandler.getPlayer(context);
|
||||
|
||||
if(player == null)
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
||||
PacketHandler.handlePacket(new Runnable() {
|
||||
@Override
|
||||
public void run()
|
||||
{
|
||||
ItemStack stack = player.getHeldItem(message.currentHand);
|
||||
|
||||
if(!stack.isEmpty() && stack.getItem() instanceof IItemNetwork)
|
||||
{
|
||||
IItemNetwork network = (IItemNetwork)stack.getItem();
|
||||
|
||||
try {
|
||||
network.handlePacketData(stack, message.storedBuffer);
|
||||
} catch(Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
|
||||
message.storedBuffer.release();
|
||||
}
|
||||
}
|
||||
}, player);
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
public static class ItemStackMessage implements IMessage
|
||||
{
|
||||
public EnumHand currentHand;
|
||||
|
||||
public ArrayList<Object> parameters;
|
||||
|
||||
public ByteBuf storedBuffer = null;
|
||||
|
||||
public ItemStackMessage() {}
|
||||
|
||||
public ItemStackMessage(EnumHand hand, ArrayList<Object> params)
|
||||
{
|
||||
currentHand = hand;
|
||||
parameters = params;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void toBytes(ByteBuf dataStream)
|
||||
{
|
||||
dataStream.writeInt(currentHand.ordinal());
|
||||
|
||||
MinecraftServer server = FMLCommonHandler.instance().getMinecraftServerInstance();
|
||||
|
||||
if(server != null)
|
||||
{
|
||||
PacketHandler.log("Sending ItemStack packet");
|
||||
}
|
||||
|
||||
PacketHandler.encode(new Object[] {parameters}, dataStream);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void fromBytes(ByteBuf dataStream)
|
||||
{
|
||||
currentHand = EnumHand.values()[dataStream.readInt()];
|
||||
|
||||
storedBuffer = dataStream.copy();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,56 +0,0 @@
|
||||
package mekanism.common.network;
|
||||
|
||||
import io.netty.buffer.ByteBuf;
|
||||
import mekanism.common.PacketHandler;
|
||||
import mekanism.common.item.ItemBlockMachine;
|
||||
import mekanism.common.network.PacketPortableTankState.PortableTankStateMessage;
|
||||
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;
|
||||
|
||||
public class PacketPortableTankState implements IMessageHandler<PortableTankStateMessage, IMessage>
|
||||
{
|
||||
@Override
|
||||
public IMessage onMessage(PortableTankStateMessage message, MessageContext context)
|
||||
{
|
||||
ItemStack itemstack = PacketHandler.getPlayer(context).getHeldItem(message.currentHand);
|
||||
|
||||
if(!itemstack.isEmpty() && itemstack.getItem() instanceof ItemBlockMachine)
|
||||
{
|
||||
((ItemBlockMachine)itemstack.getItem()).setBucketMode(itemstack, message.bucketMode);
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
public static class PortableTankStateMessage implements IMessage
|
||||
{
|
||||
public EnumHand currentHand;
|
||||
|
||||
public boolean bucketMode;
|
||||
|
||||
public PortableTankStateMessage() {}
|
||||
|
||||
public PortableTankStateMessage(EnumHand hand, boolean state)
|
||||
{
|
||||
currentHand = hand;
|
||||
bucketMode = state;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void toBytes(ByteBuf dataStream)
|
||||
{
|
||||
dataStream.writeInt(currentHand.ordinal());
|
||||
dataStream.writeBoolean(bucketMode);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void fromBytes(ByteBuf dataStream)
|
||||
{
|
||||
currentHand = EnumHand.values()[dataStream.readInt()];
|
||||
bucketMode = dataStream.readBoolean();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,56 +0,0 @@
|
||||
package mekanism.common.network;
|
||||
|
||||
import io.netty.buffer.ByteBuf;
|
||||
import mekanism.common.PacketHandler;
|
||||
import mekanism.common.item.ItemWalkieTalkie;
|
||||
import mekanism.common.network.PacketWalkieTalkieState.WalkieTalkieStateMessage;
|
||||
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;
|
||||
|
||||
public class PacketWalkieTalkieState implements IMessageHandler<WalkieTalkieStateMessage, IMessage>
|
||||
{
|
||||
@Override
|
||||
public IMessage onMessage(WalkieTalkieStateMessage message, MessageContext context)
|
||||
{
|
||||
ItemStack itemstack = PacketHandler.getPlayer(context).getHeldItem(message.currentHand);
|
||||
|
||||
if(!itemstack.isEmpty() && itemstack.getItem() instanceof ItemWalkieTalkie)
|
||||
{
|
||||
((ItemWalkieTalkie)itemstack.getItem()).setChannel(itemstack, message.channel);
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
public static class WalkieTalkieStateMessage implements IMessage
|
||||
{
|
||||
public EnumHand currentHand;
|
||||
|
||||
public int channel;
|
||||
|
||||
public WalkieTalkieStateMessage() {}
|
||||
|
||||
public WalkieTalkieStateMessage(EnumHand hand, int chan)
|
||||
{
|
||||
currentHand = hand;
|
||||
channel = chan;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void toBytes(ByteBuf dataStream)
|
||||
{
|
||||
dataStream.writeInt(currentHand.ordinal());
|
||||
dataStream.writeInt(channel);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void fromBytes(ByteBuf dataStream)
|
||||
{
|
||||
currentHand = EnumHand.values()[dataStream.readInt()];
|
||||
channel = dataStream.readInt();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -169,6 +169,18 @@ public class ListUtils
|
||||
{
|
||||
return (List<V>)Arrays.asList(values);
|
||||
}
|
||||
|
||||
public static <V> ArrayList<V> asArrayList(V... values)
|
||||
{
|
||||
ArrayList<V> ret = new ArrayList<>();
|
||||
|
||||
for(V value : values)
|
||||
{
|
||||
ret.add(value);
|
||||
}
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
public static double[] splitDouble(int size, double num)
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user