Begin SimpleImpl upgrade.

This commit is contained in:
tterrag1098 committed 2014-06-03 05:18:09 -04:00
1 parent d000c53811
commit d16b3ddd6b
47 files changed
+242 -550

No files matched your search

@@ -22,6 +22,7 @@ import cpw.mods.fml.common.event.FMLPreInitializationEvent;
import cpw.mods.fml.common.event.FMLServerStartedEvent;
import cpw.mods.fml.common.event.FMLServerStoppedEvent;
import cpw.mods.fml.common.network.NetworkRegistry;
import cpw.mods.fml.relauncher.Side;
import crazypants.enderio.conduit.BlockConduitBundle;
import crazypants.enderio.conduit.ConduitRecipes;
import crazypants.enderio.conduit.facade.BlockConduitFacade;
@@ -84,8 +85,8 @@ import crazypants.enderio.material.ItemMachinePart;
import crazypants.enderio.material.ItemMaterial;
import crazypants.enderio.material.ItemPowderIngot;
import crazypants.enderio.material.MaterialRecipes;
import crazypants.enderio.network.PacketPipeline;
import crazypants.enderio.network.PacketTileEntityNbt;
import crazypants.enderio.network.MessageTileNBT;
import crazypants.enderio.network.PacketHandler;
import crazypants.enderio.teleport.BlockTravelAnchor;
import crazypants.enderio.teleport.ItemTravelStaff;
import crazypants.enderio.teleport.TeleportRecipes;
@@ -99,7 +100,7 @@ public class EnderIO {
@SidedProxy(clientSide = "crazypants.enderio.ClientProxy", serverSide = "crazypants.enderio.CommonProxy")
public static CommonProxy proxy;
public static final PacketPipeline packetPipeline = new PacketPipeline();
public static final PacketHandler packetPipeline = new PacketHandler();
public static GuiHandler guiHandler = new GuiHandler();
@@ -200,7 +201,7 @@ public class EnderIO {
public void preInit(FMLPreInitializationEvent event) {
Config.load(event);
ConduitGeometryUtil.setupBounds((float) Config.conduitScale);
blockEnderIo = BlockEnderIO.create();
@@ -319,9 +320,8 @@ public class EnderIO {
instance = this;
packetPipeline.initalise();
packetPipeline.registerPacket(PacketTileEntityNbt.class);
packetPipeline.registerPacket(PacketRedstoneMode.class);
PacketHandler.INSTANCE.registerMessage(MessageTileNBT.class, MessageTileNBT.class, PacketHandler.nextID(), Side.SERVER);
PacketHandler.INSTANCE.registerMessage(PacketRedstoneMode.class, PacketRedstoneMode.class, PacketHandler.nextID(), Side.SERVER);
NetworkRegistry.INSTANCE.registerGuiHandler(this, guiHandler);
MinecraftForge.EVENT_BUS.register(this);
@@ -8,9 +8,9 @@ import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection;
import crazypants.enderio.EnderIO;
import crazypants.enderio.GuiHandler;
import crazypants.enderio.network.AbstractPacketTileEntity;
import crazypants.enderio.network.MessageTileEntity;
public class PacketOpenConduitUI extends AbstractPacketTileEntity<TileEntity> {
public class PacketOpenConduitUI extends MessageTileEntity<TileEntity> {
private ForgeDirection dir;
@@ -24,13 +24,13 @@ public class PacketOpenConduitUI extends AbstractPacketTileEntity<TileEntity> {
@Override
public void encode(ChannelHandlerContext ctx, ByteBuf buf) {
super.encode(ctx, buf);
super.toBytes(ctx, buf);
buf.writeShort(dir.ordinal());
}
@Override
public void decode(ChannelHandlerContext ctx, ByteBuf buf) {
super.decode(ctx, buf);
super.fromBytes(ctx, buf);
dir = ForgeDirection.values()[buf.readShort()];
}
@@ -9,9 +9,9 @@ import net.minecraft.world.World;
import cpw.mods.fml.common.network.ByteBufUtils;
import crazypants.enderio.conduit.IConduitBundle;
import crazypants.enderio.conduit.TileConduitBundle;
import crazypants.enderio.network.AbstractPacketTileEntity;
import crazypants.enderio.network.MessageTileEntity;
public class PacketFluidLevel extends AbstractPacketTileEntity<TileEntity> {
public class PacketFluidLevel extends MessageTileEntity<TileEntity> {
NBTTagCompound tc;
@@ -26,13 +26,13 @@ public class PacketFluidLevel extends AbstractPacketTileEntity<TileEntity> {
@Override
public void encode(ChannelHandlerContext ctx, ByteBuf buf) {
super.encode(ctx, buf);
super.toBytes(ctx, buf);
ByteBufUtils.writeTag(buf, tc);
}
@Override
public void decode(ChannelHandlerContext ctx, ByteBuf buf) {
super.decode(ctx, buf);
super.fromBytes(ctx, buf);
tc = ByteBufUtils.readTag(buf);
}
@@ -4,9 +4,9 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import crazypants.enderio.conduit.IConduitBundle;
import crazypants.enderio.network.AbstractPacketTileEntity;
import crazypants.enderio.network.MessageTileEntity;
public abstract class AbstractConduitBundlePacket extends AbstractPacketTileEntity<TileEntity> {
public abstract class AbstractConduitBundlePacket extends MessageTileEntity<TileEntity> {
public AbstractConduitBundlePacket() {
}
@@ -23,13 +23,13 @@ public class AbstractConduitPacket<T extends IConduit> extends AbstractConduitBu
@Override
public void encode(ChannelHandlerContext ctx, ByteBuf buf) {
super.encode(ctx, buf);
super.toBytes(ctx, buf);
buf.writeShort(conType.ordinal());
}
@Override
public void decode(ChannelHandlerContext ctx, ByteBuf buf) {
super.decode(ctx, buf);
super.fromBytes(ctx, buf);
conType = ConTypeEnum.values()[buf.readShort()];
}
@@ -22,9 +22,9 @@ import net.sf.cglib.proxy.MethodProxy;
import com.mojang.authlib.GameProfile;
import crazypants.enderio.network.IPacketEio;
import crazypants.enderio.network.IMessage;
public class PacketOpenRemoteUi implements IPacketEio {
public class PacketOpenRemoteUi implements IMessage {
int x;
int y;
@@ -5,9 +5,9 @@ import io.netty.channel.ChannelHandlerContext;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import crazypants.enderio.conduit.ConduitDisplayMode;
import crazypants.enderio.network.IPacketEio;
import crazypants.enderio.network.IMessage;
public class YetaWrenchPacketProcessor implements IPacketEio {
public class YetaWrenchPacketProcessor implements IMessage {
private int slot;
private ConduitDisplayMode mode;
@@ -3,9 +3,9 @@ package crazypants.enderio.item.darksteel;
import io.netty.buffer.ByteBuf;
import io.netty.channel.ChannelHandlerContext;
import net.minecraft.entity.player.EntityPlayer;
import crazypants.enderio.network.IPacketEio;
import crazypants.enderio.network.IMessage;
public class PacketDarkSteelPowerPacket implements IPacketEio {
public class PacketDarkSteelPowerPacket implements IMessage {
private int powerUse;
private short armorType;
@@ -6,10 +6,10 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.world.World;
import crazypants.enderio.machine.tank.TileTank;
import crazypants.enderio.network.AbstractPacketTileEntity;
import crazypants.enderio.network.MessageTileEntity;
import crazypants.enderio.network.NetworkUtil;
public class PacketCurrentTask extends AbstractPacketTileEntity<AbstractPoweredTaskEntity> {
public class PacketCurrentTask extends MessageTileEntity<AbstractPoweredTaskEntity> {
private NBTTagCompound nbtRoot;
@@ -27,14 +27,14 @@ public class PacketCurrentTask extends AbstractPacketTileEntity<AbstractPoweredT
}
@Override
public void encode(ChannelHandlerContext ctx, ByteBuf buf) {
super.encode(ctx, buf);
public void toBytes(ByteBuf buf) {
super.toBytes(buf);
NetworkUtil.writeNBTTagCompound(nbtRoot, buf);
}
@Override
public void decode(ChannelHandlerContext ctx, ByteBuf buf) {
super.decode(ctx, buf);
public void fromBytes(ByteBuf buf) {
super.fromBytes(buf);
nbtRoot = NetworkUtil.readNBTTagCompound(buf);
}
@@ -5,9 +5,9 @@ import io.netty.channel.ChannelHandlerContext;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.util.ForgeDirection;
import crazypants.enderio.network.IPacketEio;
import crazypants.enderio.network.IMessage;
public class PacketIoMode implements IPacketEio {
public class PacketIoMode implements IMessage {
private int x;
private int y;
@@ -5,9 +5,9 @@ import io.netty.channel.ChannelHandlerContext;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.util.ForgeDirection;
import crazypants.enderio.network.IPacketEio;
import crazypants.enderio.network.IMessage;
public class PacketPowerStorage implements IPacketEio {
public class PacketPowerStorage implements IMessage {
private int x;
private int y;
@@ -4,9 +4,11 @@ import io.netty.buffer.ByteBuf;
import io.netty.channel.ChannelHandlerContext;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity;
import crazypants.enderio.network.IPacketEio;
import cpw.mods.fml.common.network.simpleimpl.IMessage;
import cpw.mods.fml.common.network.simpleimpl.IMessageHandler;
import cpw.mods.fml.common.network.simpleimpl.MessageContext;
public class PacketRedstoneMode implements IPacketEio {
public class PacketRedstoneMode implements IMessage, IMessageHandler<PacketRedstoneMode, IMessage> {
private int x;
private int y;
@@ -31,7 +33,7 @@ public class PacketRedstoneMode implements IPacketEio {
}
@Override
public void encode(ChannelHandlerContext ctx, ByteBuf buf) {
public void toBytes(ByteBuf buf) {
buf.writeInt(x);
buf.writeInt(y);
buf.writeInt(z);
@@ -39,7 +41,7 @@ public class PacketRedstoneMode implements IPacketEio {
}
@Override
public void decode(ChannelHandlerContext ctx, ByteBuf buf) {
public void fromBytes(ByteBuf buf) {
x = buf.readInt();
y = buf.readInt();
z = buf.readInt();
@@ -48,13 +50,10 @@ public class PacketRedstoneMode implements IPacketEio {
}
@Override
public void handleClientSide(EntityPlayer player) {
handle(player);
}
@Override
public void handleServerSide(EntityPlayer player) {
handle(player);
public IMessage onMessage(PacketRedstoneMode message, MessageContext ctx)
{
handle(ctx.getServerHandler().playerEntity);
return null;
}
private void handle(EntityPlayer player) {
@@ -5,16 +5,17 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.IIcon;
import net.minecraft.world.World;
import crazypants.enderio.EnderIO;
import cpw.mods.fml.relauncher.Side;
import crazypants.enderio.GuiHandler;
import crazypants.enderio.ModObject;
import crazypants.enderio.machine.AbstractMachineBlock;
import crazypants.enderio.network.PacketHandler;
public class BlockAlloySmelter extends AbstractMachineBlock<TileAlloySmelter> {
public static BlockAlloySmelter create() {
EnderIO.packetPipeline.registerPacket(PacketClientState.class);
PacketHandler.INSTANCE.registerMessage(PacketClientState.class, PacketClientState.class, PacketHandler.nextID(), Side.SERVER);
BlockAlloySmelter ppainter = new BlockAlloySmelter();
ppainter.init();
@@ -11,6 +11,7 @@ import org.lwjgl.opengl.GL11;
import crazypants.enderio.EnderIO;
import crazypants.enderio.machine.GuiMachineBase;
import crazypants.enderio.machine.alloy.TileAlloySmelter.Mode;
import crazypants.enderio.network.PacketHandler;
import crazypants.gui.GuiToolTip;
import crazypants.gui.IconButton;
import crazypants.render.RenderUtil;
@@ -80,7 +81,7 @@ public class GuiAlloySmelter extends GuiMachineBase {
if(par1GuiButton.id == SMELT_MODE_BUTTON_ID) {
tileEntity.setMode(tileEntity.getMode().next());
vanillaFurnaceButton.setIcon(getIconForMode());
EnderIO.packetPipeline.sendToServer(new PacketClientState(tileEntity));
PacketHandler.INSTANCE.sendToServer(new PacketClientState(tileEntity));
} else {
super.actionPerformed(par1GuiButton);
}
@@ -4,9 +4,11 @@ import io.netty.buffer.ByteBuf;
import io.netty.channel.ChannelHandlerContext;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity;
import crazypants.enderio.network.IPacketEio;
import cpw.mods.fml.common.network.simpleimpl.IMessage;
import cpw.mods.fml.common.network.simpleimpl.IMessageHandler;
import cpw.mods.fml.common.network.simpleimpl.MessageContext;
public class PacketClientState implements IPacketEio {
public class PacketClientState implements IMessage, IMessageHandler<PacketClientState, IMessage> {
private int x;
private int y;
@@ -26,7 +28,7 @@ public class PacketClientState implements IPacketEio {
}
@Override
public void encode(ChannelHandlerContext ctx, ByteBuf buf) {
public void toBytes(ByteBuf buf) {
buf.writeInt(x);
buf.writeInt(y);
buf.writeInt(z);
@@ -34,7 +36,7 @@ public class PacketClientState implements IPacketEio {
}
@Override
public void decode(ChannelHandlerContext ctx, ByteBuf buf) {
public void fromBytes(ByteBuf buf) {
x = buf.readInt();
y = buf.readInt();
z = buf.readInt();
@@ -43,14 +45,9 @@ public class PacketClientState implements IPacketEio {
}
@Override
public void handleClientSide(EntityPlayer player) {
handle(player);
}
@Override
public void handleServerSide(EntityPlayer player) {
handle(player);
public IMessage onMessage(PacketClientState message, MessageContext ctx) {
handle(ctx.getServerHandler().playerEntity);
return null;
}
private void handle(EntityPlayer player) {
@@ -8,10 +8,10 @@ import java.util.List;
import java.util.Random;
import net.minecraft.entity.player.EntityPlayer;
import crazypants.enderio.network.IPacketEio;
import crazypants.enderio.network.IMessage;
import crazypants.util.BlockCoord;
public class PacketFarmAction implements IPacketEio {
public class PacketFarmAction implements IMessage {
private static Random rand = new Random();
@@ -3,7 +3,6 @@ package crazypants.enderio.machine.farm;
import java.util.List;
import buildcraft.api.power.PowerHandler.Type;
import net.minecraft.block.Block;
import net.minecraft.command.IEntitySelector;
import net.minecraft.enchantment.Enchantment;
@@ -36,6 +35,7 @@ import crazypants.enderio.machine.IMachineRecipe;
import crazypants.enderio.machine.IMachineRecipe.ResultStack;
import crazypants.enderio.machine.IPoweredTask;
import crazypants.enderio.machine.SlotDefinition;
import crazypants.enderio.network.PacketHandler;
import crazypants.enderio.power.BasicCapacitor;
import crazypants.enderio.power.Capacitors;
import crazypants.enderio.power.ICapacitor;
@@ -253,7 +253,7 @@ public class TileFarmStation extends AbstractPoweredTaskEntity /*implements IEnt
if(harvest != null) {
if(harvest.getDrops() != null) {
PacketFarmAction pkt = new PacketFarmAction(harvest.getHarvestedBlocks());
EnderIO.packetPipeline.sendToAllAround(pkt, new TargetPoint(worldObj.provider.dimensionId, bc.x, bc.y, bc.z, 64));
PacketHandler.INSTANCE.sendToAllAround(new TargetPoint(worldObj.provider.dimensionId, bc.x, bc.y, bc.z, 64), pkt);
for (EntityItem ei : harvest.getDrops()) {
if(ei != null) {
insertHarvestDrop(ei);
@@ -5,10 +5,10 @@ import io.netty.channel.ChannelHandlerContext;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.world.World;
import crazypants.enderio.network.AbstractPacketTileEntity;
import crazypants.enderio.network.MessageTileEntity;
import crazypants.enderio.network.NetworkUtil;
public class PacketTanks extends AbstractPacketTileEntity<TileCombustionGenerator> {
public class PacketTanks extends MessageTileEntity<TileCombustionGenerator> {
private NBTTagCompound nbtRoot;
@@ -32,13 +32,13 @@ public class PacketTanks extends AbstractPacketTileEntity<TileCombustionGenerato
@Override
public void encode(ChannelHandlerContext ctx, ByteBuf buf) {
super.encode(ctx, buf);
super.toBytes(ctx, buf);
NetworkUtil.writeNBTTagCompound(nbtRoot, buf);
}
@Override
public void decode(ChannelHandlerContext ctx, ByteBuf buf) {
super.decode(ctx, buf);
super.fromBytes(ctx, buf);
nbtRoot = NetworkUtil.readNBTTagCompound(buf);
}
@@ -4,10 +4,10 @@ import io.netty.buffer.ByteBuf;
import io.netty.channel.ChannelHandlerContext;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.world.World;
import crazypants.enderio.network.AbstractPacketTileEntity;
import crazypants.enderio.network.PacketTileEntityNbt;
import crazypants.enderio.network.MessageTileEntity;
import crazypants.enderio.network.MessageTileNBT;
public class PacketBurnTime extends AbstractPacketTileEntity<TileEntityStirlingGenerator> {
public class PacketBurnTime extends MessageTileEntity<TileEntityStirlingGenerator> {
private int burnTime;
private int totalBurnTime;
@@ -22,15 +22,15 @@ public class PacketBurnTime extends AbstractPacketTileEntity<TileEntityStirlingG
}
@Override
public void encode(ChannelHandlerContext ctx, ByteBuf buf) {
super.encode(ctx, buf);
public void toBytes(ByteBuf buf) {
super.toBytes(ctx, buf);
buf.writeInt(burnTime);
buf.writeInt(totalBurnTime);
}
@Override
public void decode(ChannelHandlerContext ctx, ByteBuf buf) {
super.decode(ctx, buf);
public void fromBytes(ByteBuf buf) {
super.fromBytes(ctx, buf);
burnTime = buf.readInt();
totalBurnTime = buf.readInt();
}
@@ -6,10 +6,10 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.world.World;
import crazypants.enderio.machine.generator.combustion.TileCombustionGenerator;
import crazypants.enderio.network.AbstractPacketTileEntity;
import crazypants.enderio.network.MessageTileEntity;
import crazypants.enderio.network.NetworkUtil;
public class PacketTank extends AbstractPacketTileEntity<TileZombieGenerator> {
public class PacketTank extends MessageTileEntity<TileZombieGenerator> {
private NBTTagCompound nbtRoot;
@@ -28,13 +28,13 @@ public class PacketTank extends AbstractPacketTileEntity<TileZombieGenerator> {
@Override
public void encode(ChannelHandlerContext ctx, ByteBuf buf) {
super.encode(ctx, buf);
super.toBytes(ctx, buf);
NetworkUtil.writeNBTTagCompound(nbtRoot, buf);
}
@Override
public void decode(ChannelHandlerContext ctx, ByteBuf buf) {
super.decode(ctx, buf);
super.fromBytes(ctx, buf);
nbtRoot = NetworkUtil.readNBTTagCompound(buf);
}
@@ -5,9 +5,9 @@ import io.netty.channel.ChannelHandlerContext;
import net.minecraft.entity.player.EntityPlayer;
import cpw.mods.fml.common.network.ByteBufUtils;
import crazypants.enderio.EnderIO;
import crazypants.enderio.network.IPacketEio;
import crazypants.enderio.network.IMessage;
public class PacketAddRemoveChannel implements IPacketEio {
public class PacketAddRemoveChannel implements IMessage {
private boolean isAdd;
private Channel channel;
@@ -8,9 +8,9 @@ import java.util.List;
import net.minecraft.entity.player.EntityPlayer;
import cpw.mods.fml.common.network.ByteBufUtils;
import crazypants.enderio.network.IPacketEio;
import crazypants.enderio.network.IMessage;
public class PacketChannelList implements IPacketEio {
public class PacketChannelList implements IMessage {
private boolean isPrivate;
private List<Channel> channels;
@@ -11,9 +11,9 @@ import net.minecraft.tileentity.TileEntity;
import cpw.mods.fml.common.network.ByteBufUtils;
import crazypants.enderio.machine.hypercube.TileHyperCube.IoMode;
import crazypants.enderio.machine.hypercube.TileHyperCube.SubChannel;
import crazypants.enderio.network.IPacketEio;
import crazypants.enderio.network.IMessage;
public class PacketClientState implements IPacketEio {
public class PacketClientState implements IMessage {
private int x;
private int y;
@@ -26,13 +26,13 @@ import crazypants.enderio.conduit.power.NetworkPowerManager;
import crazypants.enderio.conduit.power.PowerConduitNetwork;
import crazypants.enderio.conduit.power.PowerTracker;
import crazypants.enderio.machine.power.PowerDisplayUtil;
import crazypants.enderio.network.IPacketEio;
import crazypants.enderio.network.IMessage;
import crazypants.enderio.power.IInternalPowerReceptor;
import crazypants.enderio.power.PowerInterfaceBC;
import crazypants.enderio.power.PowerInterfaceRF;
import crazypants.util.Lang;
public class PacketConduitProbe implements IPacketEio {
public class PacketConduitProbe implements IMessage {
private static final String OF = " " + Lang.localize("gui.powerMonitor.of") + " ";
private static final String CON_STORAGE = " " + Lang.localize("gui.powerMonitor.monHeading1") + ": ";
@@ -6,10 +6,10 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.world.World;
import crazypants.enderio.machine.tank.TileTank;
import crazypants.enderio.network.AbstractPacketTileEntity;
import crazypants.enderio.network.MessageTileEntity;
import crazypants.enderio.network.NetworkUtil;
public class PacketPowerInfo extends AbstractPacketTileEntity<TilePowerMonitor> {
public class PacketPowerInfo extends MessageTileEntity<TilePowerMonitor> {
private NBTTagCompound nbtRoot;
@@ -24,13 +24,13 @@ public class PacketPowerInfo extends AbstractPacketTileEntity<TilePowerMonitor>
@Override
public void encode(ChannelHandlerContext ctx, ByteBuf buf) {
super.encode(ctx, buf);
super.toBytes(ctx, buf);
NetworkUtil.writeNBTTagCompound(nbtRoot, buf);
}
@Override
public void decode(ChannelHandlerContext ctx, ByteBuf buf) {
super.decode(ctx, buf);
super.fromBytes(ctx, buf);
nbtRoot = NetworkUtil.readNBTTagCompound(buf);
}
@@ -5,9 +5,9 @@ import io.netty.channel.ChannelHandlerContext;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity;
import crazypants.enderio.Log;
import crazypants.enderio.network.IPacketEio;
import crazypants.enderio.network.IMessage;
public class PacketPowerMonitor implements IPacketEio {
public class PacketPowerMonitor implements IMessage {
int x;
int y;
@@ -5,9 +5,9 @@ import io.netty.channel.ChannelHandlerContext;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity;
import crazypants.enderio.machine.RedstoneControlMode;
import crazypants.enderio.network.IPacketEio;
import crazypants.enderio.network.IMessage;
public class PacketClientState implements IPacketEio {
public class PacketClientState implements IMessage {
private int x;
private int y;
@@ -8,10 +8,10 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection;
import crazypants.enderio.network.IPacketEio;
import crazypants.enderio.network.IMessage;
import crazypants.util.BlockCoord;
public class PacketPowerStorage implements IPacketEio {
public class PacketPowerStorage implements IMessage {
private int x;
private int y;
@@ -5,10 +5,10 @@ import io.netty.channel.ChannelHandlerContext;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.world.World;
import crazypants.enderio.network.AbstractPacketTileEntity;
import crazypants.enderio.network.MessageTileEntity;
import crazypants.enderio.network.NetworkUtil;
public class PacketTanks extends AbstractPacketTileEntity<TileVat> {
public class PacketTanks extends MessageTileEntity<TileVat> {
private NBTTagCompound nbtRoot;
@@ -32,13 +32,13 @@ public class PacketTanks extends AbstractPacketTileEntity<TileVat> {
@Override
public void encode(ChannelHandlerContext ctx, ByteBuf buf) {
super.encode(ctx, buf);
super.toBytes(ctx, buf);
NetworkUtil.writeNBTTagCompound(nbtRoot, buf);
}
@Override
public void decode(ChannelHandlerContext ctx, ByteBuf buf) {
super.decode(ctx, buf);
super.fromBytes(ctx, buf);
nbtRoot = NetworkUtil.readNBTTagCompound(buf);
}
@@ -6,10 +6,10 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.world.World;
import crazypants.enderio.machine.generator.combustion.TileCombustionGenerator;
import crazypants.enderio.network.AbstractPacketTileEntity;
import crazypants.enderio.network.MessageTileEntity;
import crazypants.enderio.network.NetworkUtil;
public class PacketTank extends AbstractPacketTileEntity<TileTank> {
public class PacketTank extends MessageTileEntity<TileTank> {
private NBTTagCompound nbtRoot;
@@ -28,13 +28,13 @@ public class PacketTank extends AbstractPacketTileEntity<TileTank> {
@Override
public void encode(ChannelHandlerContext ctx, ByteBuf buf) {
super.encode(ctx, buf);
super.toBytes(ctx, buf);
NetworkUtil.writeNBTTagCompound(nbtRoot, buf);
}
@Override
public void decode(ChannelHandlerContext ctx, ByteBuf buf) {
super.decode(ctx, buf);
super.fromBytes(ctx, buf);
nbtRoot = NetworkUtil.readNBTTagCompound(buf);
}
@@ -1,21 +0,0 @@
package crazypants.enderio.network;
import io.netty.buffer.ByteBuf;
import io.netty.channel.ChannelHandlerContext;
import net.minecraft.entity.player.EntityPlayer;
/**
*
*/
public interface IPacketEio {
void encode(ChannelHandlerContext ctx, ByteBuf buffer);
void decode(ChannelHandlerContext ctx, ByteBuf buffer);
void handleClientSide(EntityPlayer player);
void handleServerSide(EntityPlayer player);
}
@@ -1,14 +1,13 @@
package crazypants.enderio.network;
import io.netty.buffer.ByteBuf;
import io.netty.channel.ChannelHandlerContext;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import cpw.mods.fml.common.network.ByteBufUtils;
import cpw.mods.fml.common.network.simpleimpl.IMessage;
import crazypants.enderio.Log;
public class AbstractPacketTileEntity<T extends TileEntity> implements IPacketEio {
public abstract class MessageTileEntity<T extends TileEntity> implements IMessage {
protected int x;
protected int y;
@@ -16,18 +15,17 @@ public class AbstractPacketTileEntity<T extends TileEntity> implements IPacketEi
private Class<? extends TileEntity> tileClass;
protected AbstractPacketTileEntity() {
protected MessageTileEntity() {
}
protected AbstractPacketTileEntity(T tile) {
protected MessageTileEntity(T tile) {
tileClass = tile.getClass();
x = tile.xCoord;
y = tile.yCoord;
z = tile.zCoord;
}
@Override
public void encode(ChannelHandlerContext ctx, ByteBuf buf) {
public void toBytes(ByteBuf buf) {
buf.writeInt(x);
buf.writeInt(y);
buf.writeInt(z);
@@ -36,7 +34,7 @@ public class AbstractPacketTileEntity<T extends TileEntity> implements IPacketEi
}
@Override
public void decode(ChannelHandlerContext ctx, ByteBuf buf) {
public void fromBytes(ByteBuf buf) {
x = buf.readInt();
y = buf.readInt();
z = buf.readInt();
@@ -48,34 +46,6 @@ public class AbstractPacketTileEntity<T extends TileEntity> implements IPacketEi
}
}
@Override
public void handleClientSide(EntityPlayer player) {
T tile = getTileEntity(player.worldObj);
if(tile != null) {
handleClientSide(player, player.worldObj, tile);
}
}
protected void handleClientSide(EntityPlayer player, World worldObj, T tile) {
handle(player, worldObj, tile);
}
@Override
public void handleServerSide(EntityPlayer player) {
T tile = getTileEntity(player.worldObj);
if(tile != null) {
handleServerSide(player, player.worldObj, tile);
}
}
protected void handleServerSide(EntityPlayer player, World worldObj, T tile) {
handle(player, worldObj, tile);
}
protected void handle(EntityPlayer player, World worldObj, T tile) {
}
protected T getTileEntity(World worldObj) {
if(worldObj == null) {
return null;
@@ -1,17 +1,18 @@
package crazypants.enderio.network;
import crazypants.enderio.Log;
import io.netty.buffer.ByteBuf;
import io.netty.channel.ChannelHandlerContext;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
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 crazypants.enderio.Log;
/**
* Created by CrazyPants on 27/02/14.
*/
public class PacketTileEntityNbt implements IPacketEio {
public class MessageTileNBT implements IMessage, IMessageHandler<MessageTileNBT, IMessage> {
TileEntity te;
@@ -22,11 +23,11 @@ public class PacketTileEntityNbt implements IPacketEio {
boolean renderOnUpdate = false;
public PacketTileEntityNbt() {
public MessageTileNBT() {
}
public PacketTileEntityNbt(TileEntity te) {
public MessageTileNBT(TileEntity te) {
this.te = te;
x = te.xCoord;
y = te.yCoord;
@@ -36,7 +37,7 @@ public class PacketTileEntityNbt implements IPacketEio {
}
@Override
public void encode(ChannelHandlerContext ctx, ByteBuf buffer) {
public void toBytes(ByteBuf buffer) {
buffer.writeInt(x);
buffer.writeInt(y);
buffer.writeInt(z);
@@ -44,7 +45,7 @@ public class PacketTileEntityNbt implements IPacketEio {
}
@Override
public void decode(ChannelHandlerContext ctx, ByteBuf dis) {
public void fromBytes(ByteBuf dis) {
x = dis.readInt();
y = dis.readInt();
z = dis.readInt();
@@ -52,20 +53,13 @@ public class PacketTileEntityNbt implements IPacketEio {
}
@Override
public void handleClientSide(EntityPlayer player) {
te = handle(player.getEntityWorld());
public IMessage onMessage(MessageTileNBT msg, MessageContext ctx)
{
te = handle(ctx.getServerHandler().playerEntity.worldObj);
if(te != null && renderOnUpdate) {
te.getWorldObj().markBlockForUpdate(x,y,z);
}
}
@Override
public void handleServerSide(EntityPlayer player) {
System.out.println("crazypants.enderio.network.PacketTileEntity.handleServerSide");
te = handle(player.getEntityWorld());
if(te != null) {
te.getWorldObj().markBlockForUpdate(x,y,z);
}
return null;
}
private TileEntity handle(World world) {
@@ -0,0 +1,16 @@
package crazypants.enderio.network;
import cpw.mods.fml.common.network.NetworkRegistry;
import cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper;
public class PacketHandler {
public static final SimpleNetworkWrapper INSTANCE = NetworkRegistry.INSTANCE.newSimpleChannel("smt");
private static int ID = 0;
public static int nextID()
{
return ID++;
}
}
@@ -1,254 +0,0 @@
package crazypants.enderio.network;
import io.netty.buffer.ByteBuf;
import io.netty.buffer.Unpooled;
import io.netty.channel.ChannelHandler;
import io.netty.channel.ChannelHandlerContext;
import io.netty.handler.codec.MessageToMessageCodec;
import java.util.Collections;
import java.util.Comparator;
import java.util.EnumMap;
import java.util.LinkedList;
import java.util.List;
import net.minecraft.client.Minecraft;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.network.INetHandler;
import net.minecraft.network.NetHandlerPlayServer;
import net.minecraft.tileentity.TileEntity;
import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.common.network.FMLEmbeddedChannel;
import cpw.mods.fml.common.network.FMLOutboundHandler;
import cpw.mods.fml.common.network.NetworkRegistry;
import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint;
import cpw.mods.fml.common.network.internal.FMLProxyPacket;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
/**
* Packet pipeline class. Directs all registered packet data to be handled by
* the packets themselves.
*
* @author sirgingalot some code from: cpw
*/
@ChannelHandler.Sharable
public class PacketPipeline extends MessageToMessageCodec<FMLProxyPacket, IPacketEio> {
private EnumMap<Side, FMLEmbeddedChannel> channels;
private LinkedList<Class<? extends IPacketEio>> packets = new LinkedList<Class<? extends IPacketEio>>();
private boolean isPostInitialised = false;
/**
* Register your packet with the pipeline. Discriminators are automatically
* set.
*
* @param clazz
* the class to register
*
* @return whether registration was successful. Failure may occur if 256
* packets have been registered or if the registry already contains
* this packet
*/
public boolean registerPacket(Class<? extends IPacketEio> clazz) {
if(this.packets.size() > 256) {
// You should log here!!
return false;
}
if(this.packets.contains(clazz)) {
// You should log here!!
return false;
}
if(this.isPostInitialised) {
// You should log here!!
return false;
}
this.packets.add(clazz);
return true;
}
// In line encoding of the packet, including discriminator setting
@Override
protected void encode(ChannelHandlerContext ctx, IPacketEio msg, List<Object> out) throws Exception {
ByteBuf buffer = Unpooled.buffer();
Class<? extends IPacketEio> clazz = msg.getClass();
if(!this.packets.contains(msg.getClass())) {
throw new NullPointerException("No Packet Registered for: " + msg.getClass().getCanonicalName());
}
byte discriminator = (byte) this.packets.indexOf(clazz);
buffer.writeByte(discriminator);
msg.encode(ctx, buffer);
FMLProxyPacket proxyPacket = new FMLProxyPacket(buffer.copy(), ctx.channel().attr(NetworkRegistry.FML_CHANNEL).get());
out.add(proxyPacket);
}
// In line decoding and handling of the packet
@Override
protected void decode(ChannelHandlerContext ctx, FMLProxyPacket msg, List<Object> out) throws Exception {
ByteBuf payload = msg.payload();
byte discriminator = payload.readByte();
Class<? extends IPacketEio> clazz = this.packets.get(discriminator);
if(clazz == null) {
throw new NullPointerException("No packet registered for discriminator: " + discriminator);
}
IPacketEio pkt = clazz.newInstance();
pkt.decode(ctx, payload.slice());
EntityPlayer player;
switch (FMLCommonHandler.instance().getEffectiveSide()) {
case CLIENT:
player = this.getClientPlayer();
pkt.handleClientSide(player);
break;
case SERVER:
INetHandler netHandler = ctx.channel().attr(NetworkRegistry.NET_HANDLER).get();
player = ((NetHandlerPlayServer) netHandler).playerEntity;
pkt.handleServerSide(player);
break;
default:
}
out.add(pkt);
}
// Method to call from FMLInitializationEvent
public void initalise() {
this.channels = NetworkRegistry.INSTANCE.newChannel("EnderIO", this);
registerPackets();
}
public void registerPackets() {
}
// Method to call from FMLPostInitializationEvent
// Ensures that packet discriminators are common between server and client by using logical sorting
public void postInitialise() {
if(this.isPostInitialised) {
return;
}
this.isPostInitialised = true;
Collections.sort(this.packets, new Comparator<Class<? extends IPacketEio>>() {
@Override
public int compare(Class<? extends IPacketEio> clazz1, Class<? extends IPacketEio> clazz2) {
int com = String.CASE_INSENSITIVE_ORDER.compare(clazz1.getCanonicalName(), clazz2.getCanonicalName());
if(com == 0) {
com = clazz1.getCanonicalName().compareTo(clazz2.getCanonicalName());
}
return com;
}
});
}
@SideOnly(Side.CLIENT)
private EntityPlayer getClientPlayer() {
return Minecraft.getMinecraft().thePlayer;
}
/**
* Send this message to everyone.
* <p/>
* Adapted from CPW's code in
* cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper
*
* @param message
* The message to send
*/
public void sendToAll(IPacketEio message) {
this.channels.get(Side.SERVER).attr(FMLOutboundHandler.FML_MESSAGETARGET).set(FMLOutboundHandler.OutboundTarget.ALL);
this.channels.get(Side.SERVER).writeAndFlush(message);
}
/**
* Send this message to the specified player.
* <p/>
* Adapted from CPW's code in
* cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper
*
* @param message
* The message to send
* @param player
* The player to send it to
*/
public void sendTo(IPacketEio message, EntityPlayerMP player) {
this.channels.get(Side.SERVER).attr(FMLOutboundHandler.FML_MESSAGETARGET).set(FMLOutboundHandler.OutboundTarget.PLAYER);
this.channels.get(Side.SERVER).attr(FMLOutboundHandler.FML_MESSAGETARGETARGS).set(player);
this.channels.get(Side.SERVER).writeAndFlush(message);
}
public void sendTo(Object message, EntityPlayerMP player) {
this.channels.get(Side.SERVER).attr(FMLOutboundHandler.FML_MESSAGETARGET).set(FMLOutboundHandler.OutboundTarget.PLAYER);
this.channels.get(Side.SERVER).attr(FMLOutboundHandler.FML_MESSAGETARGETARGS).set(player);
this.channels.get(Side.SERVER).writeAndFlush(message);
}
/**
* Send this message to everyone within a certain range of a point.
* <p/>
* Adapted from CPW's code in
* cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper
*
* @param message
* The message to send
* @param point
* The
* {@link cpw.mods.fml.common.network.NetworkRegistry.TargetPoint}
* around which to send
*/
public void sendToAllAround(IPacketEio message, NetworkRegistry.TargetPoint point) {
this.channels.get(Side.SERVER).attr(FMLOutboundHandler.FML_MESSAGETARGET).set(FMLOutboundHandler.OutboundTarget.ALLAROUNDPOINT);
this.channels.get(Side.SERVER).attr(FMLOutboundHandler.FML_MESSAGETARGETARGS).set(point);
this.channels.get(Side.SERVER).writeAndFlush(message);
}
public void sendToAllAround(IPacketEio message, TileEntity te, int range) {
sendToAllAround(message, new TargetPoint(te.getWorldObj().provider.dimensionId, te.xCoord, te.yCoord, te.zCoord, range));
}
public void sendToAllAround(IPacketEio message, TileEntity te) {
sendToAllAround(message, te, 16);
}
/**
* Send this message to everyone within the supplied dimension.
* <p/>
* Adapted from CPW's code in
* cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper
*
* @param message
* The message to send
* @param dimensionId
* The dimension id to target
*/
public void sendToDimension(IPacketEio message, int dimensionId) {
this.channels.get(Side.SERVER).attr(FMLOutboundHandler.FML_MESSAGETARGET).set(FMLOutboundHandler.OutboundTarget.DIMENSION);
this.channels.get(Side.SERVER).attr(FMLOutboundHandler.FML_MESSAGETARGETARGS).set(dimensionId);
this.channels.get(Side.SERVER).writeAndFlush(message);
}
/**
* Send this message to the server.
* <p/>
* Adapted from CPW's code in
* cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper
*
* @param message
* The message to send
*/
public void sendToServer(IPacketEio message) {
this.channels.get(Side.CLIENT).attr(FMLOutboundHandler.FML_MESSAGETARGET).set(FMLOutboundHandler.OutboundTarget.TOSERVER);
this.channels.get(Side.CLIENT).writeAndFlush(message);
}
}
@@ -12,12 +12,14 @@ import net.minecraft.util.IIcon;
import net.minecraft.world.World;
import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.common.network.IGuiHandler;
import cpw.mods.fml.relauncher.Side;
import crazypants.enderio.BlockEio;
import crazypants.enderio.Config;
import crazypants.enderio.EnderIO;
import crazypants.enderio.GuiHandler;
import crazypants.enderio.ModObject;
import crazypants.enderio.gui.IResourceTooltipProvider;
import crazypants.enderio.network.PacketHandler;
import crazypants.enderio.teleport.packet.PacketAccessMode;
import crazypants.enderio.teleport.packet.PacketConfigSync;
import crazypants.enderio.teleport.packet.PacketDrainStaff;
@@ -29,11 +31,11 @@ public class BlockTravelAnchor extends BlockEio implements IGuiHandler, ITileEnt
public static BlockTravelAnchor create() {
EnderIO.packetPipeline.registerPacket(PacketAccessMode.class);
EnderIO.packetPipeline.registerPacket(PacketTravelEvent.class);
EnderIO.packetPipeline.registerPacket(PacketDrainStaff.class);
EnderIO.packetPipeline.registerPacket(PacketOpenAuthGui.class);
EnderIO.packetPipeline.registerPacket(PacketConfigSync.class);
PacketHandler.INSTANCE.registerMessage(PacketAccessMode.class, PacketAccessMode.class, PacketHandler.nextID(), Side.SERVER);
PacketHandler.INSTANCE.registerMessage(PacketTravelEvent.class, PacketTravelEvent.class, PacketHandler.nextID(), Side.SERVER);
PacketHandler.INSTANCE.registerMessage(PacketDrainStaff.class, PacketDrainStaff.class, PacketHandler.nextID(), Side.SERVER);
PacketHandler.INSTANCE.registerMessage(PacketOpenAuthGui.class, PacketOpenAuthGui.class, PacketHandler.nextID(), Side.SERVER);
PacketHandler.INSTANCE.registerMessage(PacketConfigSync.class, PacketConfigSync.class, PacketHandler.nextID(), Side.CLIENT);
ConnectionHandler ch = new ConnectionHandler();
FMLCommonHandler.instance().bus().register(ch);
@@ -3,14 +3,14 @@ package crazypants.enderio.teleport;
import net.minecraft.entity.player.EntityPlayerMP;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import cpw.mods.fml.common.gameevent.PlayerEvent.PlayerLoggedInEvent;
import crazypants.enderio.EnderIO;
import crazypants.enderio.network.PacketHandler;
import crazypants.enderio.teleport.packet.PacketConfigSync;
public class ConnectionHandler {
@SubscribeEvent
public void onPlayerLoggon(PlayerLoggedInEvent evt) {
EnderIO.packetPipeline.sendTo(new PacketConfigSync(), (EntityPlayerMP) evt.player);
PacketHandler.INSTANCE.sendTo(new PacketConfigSync(), (EntityPlayerMP) evt.player);
}
}
@@ -12,6 +12,7 @@ import org.lwjgl.opengl.GL11;
import crazypants.enderio.EnderIO;
import crazypants.enderio.gui.CheckBoxEIO;
import crazypants.enderio.network.PacketHandler;
import crazypants.enderio.teleport.TileTravelAnchor.AccessMode;
import crazypants.enderio.teleport.packet.PacketAccessMode;
import crazypants.gui.GuiContainerBase;
@@ -86,7 +87,7 @@ public class GuiTravelAccessable extends GuiContainerBase {
BlockCoord bc = te.getLocation();
PacketAccessMode p = new PacketAccessMode(bc.x, bc.y, bc.z, curMode);
EnderIO.packetPipeline.sendToServer(p);
PacketHandler.INSTANCE.sendToServer(p);
}
@Override
@@ -11,7 +11,8 @@ import net.minecraft.world.World;
import org.lwjgl.opengl.GL11;
import crazypants.enderio.EnderIO;
import crazypants.enderio.network.PacketTileEntityNbt;
import crazypants.enderio.network.PacketHandler;
import crazypants.enderio.network.MessageTileNBT;
import crazypants.gui.GuiContainerBase;
import crazypants.render.ColorUtil;
import crazypants.render.RenderUtil;
@@ -50,7 +51,7 @@ public class GuiTravelAuth extends GuiContainerBase {
ContainerTravelAuth poo = (ContainerTravelAuth) inventorySlots;
if(ta.authoriseUser(player, poo.enteredPassword)) {
TileEntity te = ((TileEntity) ta);
EnderIO.packetPipeline.sendToServer(new PacketTileEntityNbt(te));
PacketHandler.INSTANCE.sendToServer(new MessageTileNBT(te));
this.mc.displayGuiScreen((GuiScreen) null);
this.mc.setIngameFocus();
@@ -24,6 +24,7 @@ import crazypants.enderio.ModObject;
import crazypants.enderio.gui.IResourceTooltipProvider;
import crazypants.enderio.machine.power.PowerDisplayUtil;
import crazypants.enderio.machine.power.PowerDisplayUtil.PowerType;
import crazypants.enderio.network.PacketHandler;
import crazypants.enderio.teleport.packet.PacketOpenAuthGui;
import crazypants.util.BlockCoord;
import crazypants.util.Util;
@@ -158,7 +159,7 @@ public class ItemTravelStaff extends ItemEnergyContainer implements IResourceToo
ITravelAccessable ta = (ITravelAccessable) te;
if(ta.getRequiresPassword(player)) {
PacketOpenAuthGui p = new PacketOpenAuthGui(target.x, target.y, target.z);
EnderIO.packetPipeline.sendToServer(p);
PacketHandler.INSTANCE.sendToServer(p);
return equipped;
}
}
@@ -26,6 +26,7 @@ import crazypants.enderio.Config;
import crazypants.enderio.EnderIO;
import crazypants.enderio.GuiHandler;
import crazypants.enderio.enderface.TileEnderIO;
import crazypants.enderio.network.PacketHandler;
import crazypants.enderio.teleport.packet.PacketDrainStaff;
import crazypants.enderio.teleport.packet.PacketOpenAuthGui;
import crazypants.enderio.teleport.packet.PacketTravelEvent;
@@ -146,7 +147,7 @@ public class TravelController {
ITravelAccessable ta = (ITravelAccessable) te;
if(ta.getRequiresPassword(player)) {
PacketOpenAuthGui p = new PacketOpenAuthGui(target.x, target.y, target.z);
EnderIO.packetPipeline.sendToServer(p);
PacketHandler.INSTANCE.sendToServer(p);
return;
}
}
@@ -180,7 +181,7 @@ public class TravelController {
if(requiredPower <= 0 || requiredPower <= EnderIO.itemTravelStaff.getEnergyStored(equipped)) {
if(requiredPower > 0) {
PacketDrainStaff p = new PacketDrainStaff(requiredPower);
EnderIO.packetPipeline.sendToServer(p);
PacketHandler.INSTANCE.sendToServer(p);
}
player.openGui(EnderIO.instance, GuiHandler.GUI_ID_ENDERFACE, world, target.x,
TravelController.instance.selectedCoord.y, TravelController.instance.selectedCoord.z);
@@ -441,7 +442,7 @@ public class TravelController {
private void sendTravelEvent(BlockCoord bc, TravelSource source, int powerUse) {
PacketTravelEvent p = new PacketTravelEvent(bc.x, bc.y, bc.z, powerUse, source.getConserveMomentum());
EnderIO.packetPipeline.sendToServer(p);
PacketHandler.INSTANCE.sendToServer(p);
}
private BlockCoord getActiveTravelBlock(EntityClientPlayerMP player) {
@@ -1,17 +1,17 @@
package crazypants.enderio.teleport.packet;
import crazypants.enderio.network.IPacketEio;
import crazypants.enderio.teleport.TileTravelAnchor;
import crazypants.enderio.teleport.TileTravelAnchor.AccessMode;
import io.netty.buffer.ByteBuf;
import io.netty.channel.ChannelHandlerContext;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity;
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 crazypants.enderio.teleport.TileTravelAnchor;
/**
* Created by CrazyPants on 27/02/14.
*/
public class PacketAccessMode implements IPacketEio {
public class PacketAccessMode implements IMessage, IMessageHandler<PacketAccessMode, IMessage> {
int x;
int y;
@@ -29,32 +29,29 @@ public class PacketAccessMode implements IPacketEio {
}
@Override
public void encode(ChannelHandlerContext ctx, ByteBuf dos) {
dos.writeInt(x);
dos.writeInt(y);
dos.writeInt(z);
dos.writeShort(mode.ordinal());
public void toBytes(ByteBuf buf) {
buf.writeInt(x);
buf.writeInt(y);
buf.writeInt(z);
buf.writeShort(mode.ordinal());
}
@Override
public void decode(ChannelHandlerContext ctx, ByteBuf data) {
x = data.readInt();
y = data.readInt();
z = data.readInt();
mode = TileTravelAnchor.AccessMode.values()[data.readShort()];
public void fromBytes(ByteBuf buf) {
x = buf.readInt();
y = buf.readInt();
z = buf.readInt();
mode = TileTravelAnchor.AccessMode.values()[buf.readShort()];
}
@Override
public void handleClientSide(EntityPlayer player) {
}
@Override
public void handleServerSide(EntityPlayer player) {
TileEntity te = player.worldObj.getTileEntity(x, y, z);
public IMessage onMessage(PacketAccessMode message, MessageContext ctx) {
EntityPlayer player = ctx.getServerHandler().playerEntity;
TileEntity te = player.worldObj.getTileEntity(x, y, z);
if(te instanceof TileTravelAnchor) {
((TileTravelAnchor) te).setAccessMode(mode);
player.worldObj.markBlockForUpdate(x, y, z);
player.worldObj.markTileEntityChunkModified(x,y,z,te);
}
return null;
}
}
@@ -1,29 +1,29 @@
package crazypants.enderio.teleport.packet;
import io.netty.buffer.ByteBuf;
import io.netty.channel.ChannelHandlerContext;
import net.minecraft.entity.player.EntityPlayer;
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 crazypants.enderio.Config;
import crazypants.enderio.network.IPacketEio;
public class PacketConfigSync implements IPacketEio {
public class PacketConfigSync implements IMessage, IMessageHandler<PacketConfigSync, IMessage> {
@Override
public void encode(ChannelHandlerContext ctx, ByteBuf dos) {
dos.writeBoolean(Config.travelAnchorEnabled);
dos.writeInt(Config.travelAnchorMaxDistance);
dos.writeBoolean(Config.travelStaffEnabled);
dos.writeBoolean(Config.travelStaffBlinkEnabled);
dos.writeBoolean(Config.travelStaffBlinkThroughSolidBlocksEnabled);
dos.writeBoolean(Config.travelStaffBlinkThroughClearBlocksEnabled);
dos.writeInt(Config.travelStaffBlinkPauseTicks);
dos.writeInt(Config.travelStaffMaxDistance);
dos.writeInt(Config.travelStaffMaxBlinkDistance);
dos.writeFloat(Config.travelStaffPowerPerBlockRF);
public void toBytes(ByteBuf buf) {
buf.writeBoolean(Config.travelAnchorEnabled);
buf.writeInt(Config.travelAnchorMaxDistance);
buf.writeBoolean(Config.travelStaffEnabled);
buf.writeBoolean(Config.travelStaffBlinkEnabled);
buf.writeBoolean(Config.travelStaffBlinkThroughSolidBlocksEnabled);
buf.writeBoolean(Config.travelStaffBlinkThroughClearBlocksEnabled);
buf.writeInt(Config.travelStaffBlinkPauseTicks);
buf.writeInt(Config.travelStaffMaxDistance);
buf.writeInt(Config.travelStaffMaxBlinkDistance);
buf.writeFloat(Config.travelStaffPowerPerBlockRF);
}
@Override
public void decode(ChannelHandlerContext ctx, ByteBuf data) {
public void fromBytes(ByteBuf data) {
Config.travelAnchorEnabled = data.readBoolean();
Config.travelAnchorMaxDistance = data.readInt();
Config.travelStaffEnabled = data.readBoolean();
@@ -37,13 +37,8 @@ public class PacketConfigSync implements IPacketEio {
}
@Override
public void handleClientSide(EntityPlayer player) {
public IMessage onMessage(PacketConfigSync message, MessageContext ctx)
{
return null;
}
@Override
public void handleServerSide(EntityPlayer player) {
}
}
@@ -1,13 +1,14 @@
package crazypants.enderio.teleport.packet;
import io.netty.buffer.ByteBuf;
import io.netty.channel.ChannelHandlerContext;
import net.minecraft.entity.player.EntityPlayer;
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 crazypants.enderio.EnderIO;
import crazypants.enderio.network.IPacketEio;
import crazypants.enderio.teleport.ItemTravelStaff;
public class PacketDrainStaff implements IPacketEio {
public class PacketDrainStaff implements IMessage, IMessageHandler<PacketDrainStaff, IMessage> {
int powerUse;
@@ -19,24 +20,23 @@ public class PacketDrainStaff implements IPacketEio {
}
@Override
public void encode(ChannelHandlerContext ctx, ByteBuf buffer) {
buffer.writeInt(powerUse);
public void toBytes(ByteBuf buf) {
buf.writeInt(powerUse);
}
@Override
public void decode(ChannelHandlerContext ctx, ByteBuf buffer) {
public void fromBytes(ByteBuf buffer) {
powerUse = buffer.readInt();
}
@Override
public void handleClientSide(EntityPlayer player) {
}
@Override
public void handleServerSide(EntityPlayer ep) {
public IMessage onMessage(PacketDrainStaff message, MessageContext ctx) {
EntityPlayer ep = ctx.getServerHandler().playerEntity;
if(ItemTravelStaff.isEquipped(ep)) {
EnderIO.itemTravelStaff.extractInternal(ep.getCurrentEquippedItem(), powerUse);
}
return null;
}
}
@@ -1,13 +1,12 @@
package crazypants.enderio.teleport.packet;
import io.netty.buffer.ByteBuf;
import io.netty.channel.ChannelHandlerContext;
import net.minecraft.entity.player.EntityPlayer;
import cpw.mods.fml.common.network.simpleimpl.IMessage;
import cpw.mods.fml.common.network.simpleimpl.IMessageHandler;
import crazypants.enderio.EnderIO;
import crazypants.enderio.GuiHandler;
import crazypants.enderio.network.IPacketEio;
public class PacketOpenAuthGui implements IPacketEio {
public class PacketOpenAuthGui implements IMessage, IMessageHandler<PacketOpenAuthGui, IMessage> {
int x;
int y;
@@ -24,27 +23,21 @@ public class PacketOpenAuthGui implements IPacketEio {
}
@Override
public void encode(ChannelHandlerContext ctx, ByteBuf buffer) {
buffer.writeInt(x);
buffer.writeInt(y);
buffer.writeInt(z);
public void toBytes(ByteBuf buf) {
buf.writeInt(x);
buf.writeInt(y);
buf.writeInt(z);
}
@Override
public void decode(ChannelHandlerContext ctx, ByteBuf buffer) {
public void fromBytes(ByteBuf buffer) {
x = buffer.readInt();
y = buffer.readInt();
z = buffer.readInt();
}
@Override
public void handleClientSide(EntityPlayer player) {
public IMessage onMessage(PacketOpenAuthGui message, cpw.mods.fml.common.network.simpleimpl.MessageContext ctx) {
ctx.getServerHandler().playerEntity.openGui(EnderIO.instance, GuiHandler.GUI_ID_TRAVEL_AUTH, ctx.getServerHandler().playerEntity.worldObj, x, y, z);
return null;
}
@Override
public void handleServerSide(EntityPlayer ep) {
ep.openGui(EnderIO.instance, GuiHandler.GUI_ID_TRAVEL_AUTH, ep.worldObj, x, y, z);
}
}
@@ -1,17 +1,17 @@
package crazypants.enderio.teleport.packet;
import io.netty.buffer.ByteBuf;
import io.netty.channel.ChannelHandlerContext;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.item.ItemStack;
import net.minecraft.network.play.server.S12PacketEntityVelocity;
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 crazypants.enderio.EnderIO;
import crazypants.enderio.network.IPacketEio;
import crazypants.util.Util;
import crazypants.vecmath.Vector3d;
public class PacketTravelEvent implements IPacketEio {
public class PacketTravelEvent implements IMessage, IMessageHandler<PacketTravelEvent, IMessage> {
int x;
int y;
@@ -31,30 +31,27 @@ public class PacketTravelEvent implements IPacketEio {
}
@Override
public void encode(ChannelHandlerContext ctx, ByteBuf buffer) {
buffer.writeInt(x);
buffer.writeInt(y);
buffer.writeInt(z);
buffer.writeInt(powerUse);
buffer.writeBoolean(conserveMotion);
public void toBytes(ByteBuf buf) {
buf.writeInt(x);
buf.writeInt(y);
buf.writeInt(z);
buf.writeInt(powerUse);
buf.writeBoolean(conserveMotion);
}
@Override
public void decode(ChannelHandlerContext ctx, ByteBuf buffer) {
x = buffer.readInt();
y = buffer.readInt();
z = buffer.readInt();
powerUse = buffer.readInt();
conserveMotion = buffer.readBoolean();
public void fromBytes(ByteBuf buf) {
x = buf.readInt();
y = buf.readInt();
z = buf.readInt();
powerUse = buf.readInt();
conserveMotion = buf.readBoolean();
}
@Override
public void handleClientSide(EntityPlayer player) {
}
@Override
public void handleServerSide(EntityPlayer ep) {
public IMessage onMessage(PacketTravelEvent message, MessageContext ctx) {
EntityPlayer ep = ctx.getServerHandler().playerEntity;
ep.worldObj.playSoundEffect(ep.posX, ep.posY, ep.posZ, "mob.endermen.portal", 1.0F, 1.0F);
@@ -69,8 +66,7 @@ public class PacketTravelEvent implements IPacketEio {
Vector3d velocityVex = Util.getLookVecEio(ep);
S12PacketEntityVelocity p = new S12PacketEntityVelocity(ep.getEntityId(), velocityVex.x, velocityVex.y, velocityVex.z);
EnderIO.packetPipeline.sendTo(p, (EntityPlayerMP) ep);
ctx.getServerHandler().sendPacket(p);
}
if(powerUse > 0 && ep.getCurrentEquippedItem() != null && ep.getCurrentEquippedItem().getItem() == EnderIO.itemTravelStaff) {
@@ -79,6 +75,7 @@ public class PacketTravelEvent implements IPacketEio {
ep.setCurrentItemOrArmor(0, item);
}
return null;
}
}