Advancing further in the login process.
This commit is contained in:
parent
8a96555cc7
commit
bcaafc206f
@ -12,6 +12,6 @@ public class BulkChunk extends Instruction
|
||||
short count = in.readShort();
|
||||
int size = in.readInt();
|
||||
in.readBoolean();
|
||||
skip( in, size + count * 12 );
|
||||
in.skipBytes( size + count * 12 );
|
||||
}
|
||||
}
|
||||
|
@ -28,9 +28,4 @@ abstract class Instruction
|
||||
static final Instruction BYTE_INT = new ByteHeader( INT );
|
||||
|
||||
abstract void read(ByteBuf in) throws IOException;
|
||||
|
||||
final void skip(ByteBuf in, int len) throws IOException
|
||||
{
|
||||
in.readerIndex( in.readerIndex() + len );
|
||||
}
|
||||
}
|
||||
|
@ -12,7 +12,7 @@ class Item extends Instruction
|
||||
short type = in.readShort();
|
||||
if ( type >= 0 )
|
||||
{
|
||||
skip( in, 3 );
|
||||
in.skipBytes( 3 );
|
||||
SHORT_BYTE.read( in );
|
||||
}
|
||||
}
|
||||
|
@ -20,6 +20,6 @@ class Jump extends Instruction
|
||||
@Override
|
||||
void read(ByteBuf in) throws IOException
|
||||
{
|
||||
skip( in, len );
|
||||
in.skipBytes( len );
|
||||
}
|
||||
}
|
||||
|
@ -34,7 +34,7 @@ class MetaData extends Instruction
|
||||
ITEM.read( in );
|
||||
break;
|
||||
case 6:
|
||||
skip( in, 12 ); // int, int, int
|
||||
in.skipBytes( 12 ); // int, int, int
|
||||
break;
|
||||
default:
|
||||
throw new IllegalArgumentException( "Unknown metadata type " + type );
|
||||
|
@ -12,7 +12,7 @@ class OptionalMotion extends Instruction
|
||||
int data = in.readInt();
|
||||
if ( data > 0 )
|
||||
{
|
||||
skip( in, 6 );
|
||||
in.skipBytes( 6 );
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -10,6 +10,6 @@ class UnsignedShortByte extends Instruction
|
||||
void read(ByteBuf in) throws IOException
|
||||
{
|
||||
int size = in.readUnsignedShort();
|
||||
skip( in, size );
|
||||
in.skipBytes( size );
|
||||
}
|
||||
}
|
||||
|
@ -179,8 +179,8 @@ public class InitialHandler extends PacketHandler implements PendingConnection
|
||||
|
||||
ch.write( new PacketFCEncryptionResponse() );
|
||||
|
||||
Cipher decrypt = EncryptionUtil.getCipher( Cipher.DECRYPT_MODE, shared );
|
||||
Cipher encrypt = EncryptionUtil.getCipher( Cipher.ENCRYPT_MODE, shared );
|
||||
Cipher decrypt = EncryptionUtil.getCipher( Cipher.DECRYPT_MODE, shared );
|
||||
ch.pipeline().addBefore( "decoder", "cipher", new CipherCodec( encrypt, decrypt ) );
|
||||
|
||||
thisState = InitialHandler.State.LOGIN;
|
||||
|
@ -60,7 +60,7 @@ public class HandlerBoss extends ChannelInboundMessageHandlerAdapter<ByteBuf>
|
||||
@Override
|
||||
public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception
|
||||
{
|
||||
super.exceptionCaught( ctx, cause );
|
||||
cause.printStackTrace();
|
||||
if ( ctx.channel().isActive() )
|
||||
{
|
||||
ctx.close();
|
||||
|
@ -3,9 +3,11 @@ package net.md_5.bungee.netty;
|
||||
import io.netty.buffer.ByteBuf;
|
||||
import io.netty.channel.ChannelHandlerContext;
|
||||
import io.netty.handler.codec.ReplayingDecoder;
|
||||
import java.io.IOException;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
import net.md_5.bungee.Util;
|
||||
import net.md_5.bungee.protocol.netty.PacketReader;
|
||||
|
||||
/**
|
||||
@ -28,9 +30,10 @@ public class PacketDecoder extends ReplayingDecoder<ByteBuf>
|
||||
protected ByteBuf decode(ChannelHandlerContext ctx, ByteBuf in) throws Exception
|
||||
{
|
||||
int startIndex = in.readerIndex();
|
||||
|
||||
PacketReader.readPacket( in, protocol );
|
||||
ByteBuf readPacket = in.copy( startIndex, in.readerIndex() - startIndex );
|
||||
System.out.println( readPacket );
|
||||
return readPacket;
|
||||
|
||||
System.out.println( Util.hex( in.getUnsignedByte( 0 ) ) );
|
||||
return in.copy( startIndex, in.readerIndex() - startIndex );
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user