PandacubeFr/BungeeCord
1
0
Fork 0
Code Releases Activity

Merge NIO into master. I would not recommend this on a production server at all. Its 1.5 anyway.

Browse Source
This commit is contained in:
md_5
2013-03-11 13:29:17 +11:00
parent f67ad024f5 9fb814003b
commit a3e1493ce1
63 changed files with 1464 additions and 1437 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
protocol/pom.xml
View File

@@ -17,4 +17,14 @@
<name>BungeeCord-Protocol</name>
<description>Minimal implementation of the Minecraft protocol for use in BungeeCord</description>
<dependencies>
<dependency>
<groupId>io.netty</groupId>
<!-- TODO: Fix this -->
<artifactId>netty-all</artifactId>
<version>4.0.0.Beta3-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
</project>

12
protocol/src/main/java/net/md_5/mendax/PacketDefinitions.java → protocol/src/main/java/net/md_5/bungee/protocol/PacketDefinitions.java
View File

@@ -1,14 +1,13 @@
package net.md_5.mendax;
package net.md_5.bungee.protocol;
import static net.md_5.mendax.PacketDefinitions.OpCode.*;
import static net.md_5.bungee.protocol.PacketDefinitions.OpCode.*;
public class PacketDefinitions
{
private static final int MAX_PACKET = 256;
public static final OpCode[][] opCodes = new OpCode[ MAX_PACKET * 2 ][];
public static final OpCode[][] opCodes = new OpCode[ 512 ][];
public static final int VANILLA_PROTOCOL = 0;
public static final int FORGE_PROTOCOL = MAX_PACKET;
public static final int FORGE_PROTOCOL = 256;
public enum OpCode
{
@@ -332,7 +331,8 @@ public class PacketDefinitions
};
opCodes[0xFE] = new OpCode[]
{
}; // Should be byte, screw you too bitchy server admins!
BYTE
};
opCodes[0xFF] = new OpCode[]
{
STRING

8
protocol/src/main/java/net/md_5/mendax/datainput/BulkChunk.java → protocol/src/main/java/net/md_5/bungee/protocol/netty/BulkChunk.java
View File

@@ -1,17 +1,17 @@
package net.md_5.mendax.datainput;
package net.md_5.bungee.protocol.netty;
import java.io.DataInput;
import io.netty.buffer.ByteBuf;
import java.io.IOException;
public class BulkChunk extends Instruction
{
@Override
void read(DataInput in, byte[] buffer) throws IOException
void read(ByteBuf in) throws IOException
{
short count = in.readShort();
int size = in.readInt();
in.readBoolean();
skip( in, buffer, size + count * 12 );
in.skipBytes( size + count * 12 );
}
}

8
protocol/src/main/java/net/md_5/mendax/datainput/ByteHeader.java → protocol/src/main/java/net/md_5/bungee/protocol/netty/ByteHeader.java
View File

@@ -1,6 +1,6 @@
package net.md_5.mendax.datainput;
package net.md_5.bungee.protocol.netty;
import java.io.DataInput;
import io.netty.buffer.ByteBuf;
import java.io.IOException;
class ByteHeader extends Instruction
@@ -14,12 +14,12 @@ class ByteHeader extends Instruction
}
@Override
void read(DataInput in, byte[] buffer) throws IOException
void read(ByteBuf in) throws IOException
{
byte size = in.readByte();
for ( byte b = 0; b < size; b++ )
{
child.read( in, buffer );
child.read( in );
}
}
}

11
protocol/src/main/java/net/md_5/mendax/datainput/Instruction.java → protocol/src/main/java/net/md_5/bungee/protocol/netty/Instruction.java
View File

@@ -1,6 +1,6 @@
package net.md_5.mendax.datainput;
package net.md_5.bungee.protocol.netty;
import java.io.DataInput;
import io.netty.buffer.ByteBuf;
import java.io.IOException;
abstract class Instruction
@@ -30,10 +30,5 @@ abstract class Instruction
// Custom instructions
static final Instruction STRING_ARRAY = new ShortHeader( STRING );
abstract void read(DataInput in, byte[] buffer) throws IOException;
final void skip(DataInput in, byte[] buffer, int len) throws IOException
{
in.readFully( buffer, 0, len );
}
abstract void read(ByteBuf in) throws IOException;
}

8
protocol/src/main/java/net/md_5/mendax/datainput/IntHeader.java → protocol/src/main/java/net/md_5/bungee/protocol/netty/IntHeader.java
View File

@@ -1,6 +1,6 @@
package net.md_5.mendax.datainput;
package net.md_5.bungee.protocol.netty;
import java.io.DataInput;
import io.netty.buffer.ByteBuf;
import java.io.IOException;
class IntHeader extends Instruction
@@ -14,12 +14,12 @@ class IntHeader extends Instruction
}
@Override
void read(DataInput in, byte[] buffer) throws IOException
void read(ByteBuf in) throws IOException
{
int size = in.readInt();
for ( int i = 0; i < size; i++ )
{
child.read( in, buffer );
child.read( in );
}
}
}

19
protocol/src/main/java/net/md_5/bungee/protocol/netty/Item.java Normal file
View File

@@ -0,0 +1,19 @@
package net.md_5.bungee.protocol.netty;
import io.netty.buffer.ByteBuf;
import java.io.IOException;
class Item extends Instruction
{
@Override
void read(ByteBuf in) throws IOException
{
short type = in.readShort();
if ( type >= 0 )
{
in.skipBytes( 3 );
SHORT_BYTE.read( in );
}
}
}

8
protocol/src/main/java/net/md_5/mendax/datainput/Jump.java → protocol/src/main/java/net/md_5/bungee/protocol/netty/Jump.java
View File

@@ -1,6 +1,6 @@
package net.md_5.mendax.datainput;
package net.md_5.bungee.protocol.netty;
import java.io.DataInput;
import io.netty.buffer.ByteBuf;
import java.io.IOException;
class Jump extends Instruction
@@ -18,8 +18,8 @@ class Jump extends Instruction
}
@Override
void read(DataInput in, byte[] buffer) throws IOException
void read(ByteBuf in) throws IOException
{
skip( in, buffer, len );
in.skipBytes( len );
}
}

20
protocol/src/main/java/net/md_5/mendax/datainput/MetaData.java → protocol/src/main/java/net/md_5/bungee/protocol/netty/MetaData.java
View File

@@ -1,13 +1,13 @@
package net.md_5.mendax.datainput;
package net.md_5.bungee.protocol.netty;
import java.io.DataInput;
import io.netty.buffer.ByteBuf;
import java.io.IOException;
class MetaData extends Instruction
{
@Override
void read(DataInput in, byte[] buffer) throws IOException
void read(ByteBuf in) throws IOException
{
int x = in.readUnsignedByte();
while ( x != 127 )
@@ -16,25 +16,25 @@ class MetaData extends Instruction
switch ( type )
{
case 0:
BYTE.read( in, buffer );
BYTE.read( in );
break;
case 1:
SHORT.read( in, buffer );
SHORT.read( in );
break;
case 2:
INT.read( in, buffer );
INT.read( in );
break;
case 3:
FLOAT.read( in, buffer );
FLOAT.read( in );
break;
case 4:
STRING.read( in, buffer );
STRING.read( in );
break;
case 5:
ITEM.read( in, buffer );
ITEM.read( in );
break;
case 6:
skip( in, buffer, 12 ); // int, int, int
in.skipBytes( 12 ); // int, int, int
break;
default:
throw new IllegalArgumentException( "Unknown metadata type " + type );

18
protocol/src/main/java/net/md_5/bungee/protocol/netty/OptionalMotion.java Normal file
View File

@@ -0,0 +1,18 @@
package net.md_5.bungee.protocol.netty;
import io.netty.buffer.ByteBuf;
import java.io.IOException;
class OptionalMotion extends Instruction
{
@Override
void read(ByteBuf in) throws IOException
{
int data = in.readInt();
if ( data > 0 )
{
in.skipBytes( 6 );
}
}
}

22
protocol/src/main/java/net/md_5/mendax/datainput/DataInputPacketReader.java → protocol/src/main/java/net/md_5/bungee/protocol/netty/PacketReader.java
View File

@@ -1,16 +1,16 @@
package net.md_5.mendax.datainput;
package net.md_5.bungee.protocol.netty;
import java.io.DataInput;
import io.netty.buffer.ByteBuf;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import net.md_5.mendax.PacketDefinitions;
import net.md_5.mendax.PacketDefinitions.OpCode;
import net.md_5.bungee.protocol.PacketDefinitions;
import net.md_5.bungee.protocol.PacketDefinitions.OpCode;
public class DataInputPacketReader
public class PacketReader
{
private static final Instruction[][] instructions = new Instruction[ 256 ][];
private static final Instruction[][] instructions = new Instruction[ PacketDefinitions.opCodes.length ][];
static
{
@@ -59,7 +59,7 @@ public class DataInputPacketReader
}
}
private static void readPacket(int packetId, DataInput in, byte[] buffer, int protocol) throws IOException
private static void readPacket(int packetId, ByteBuf in, int protocol) throws IOException
{
Instruction[] packetDef = null;
if ( packetId + protocol < instructions.length )
@@ -74,20 +74,20 @@ public class DataInputPacketReader
throw new IOException( "Unknown packet id " + packetId );
} else
{
readPacket( packetId, in, buffer, PacketDefinitions.VANILLA_PROTOCOL );
readPacket( packetId, in, PacketDefinitions.VANILLA_PROTOCOL );
return;
}
}
for ( Instruction instruction : packetDef )
{
instruction.read( in, buffer );
instruction.read( in );
}
}
public static void readPacket(DataInput in, byte[] buffer, int protocol) throws IOException
public static void readPacket(ByteBuf in, int protocol) throws IOException
{
int packetId = in.readUnsignedByte();
readPacket( packetId, in, buffer, protocol );
readPacket( packetId, in, protocol );
}
}

8
protocol/src/main/java/net/md_5/mendax/datainput/ShortHeader.java → protocol/src/main/java/net/md_5/bungee/protocol/netty/ShortHeader.java
View File

@@ -1,6 +1,6 @@
package net.md_5.mendax.datainput;
package net.md_5.bungee.protocol.netty;
import java.io.DataInput;
import io.netty.buffer.ByteBuf;
import java.io.IOException;
class ShortHeader extends Instruction
@@ -14,12 +14,12 @@ class ShortHeader extends Instruction
}
@Override
void read(DataInput in, byte[] buffer) throws IOException
void read(ByteBuf in) throws IOException
{
short size = in.readShort();
for ( short s = 0; s < size; s++ )
{
child.read( in, buffer );
child.read( in );
}
}
}

26
protocol/src/main/java/net/md_5/bungee/protocol/netty/Team.java Normal file
View File

@@ -0,0 +1,26 @@
package net.md_5.bungee.protocol.netty;
import io.netty.buffer.ByteBuf;
import java.io.IOException;
class Team extends Instruction
{
@Override
void read(ByteBuf in) throws IOException
{
STRING.read( in );
byte mode = in.readByte();
if ( mode == 0 || mode == 2 )
{
STRING.read( in );
STRING.read( in );
STRING.read( in );
BYTE.read( in );
}
if ( mode == 0 || mode == 3 || mode == 4 )
{
STRING_ARRAY.read( in );
}
}
}

15
protocol/src/main/java/net/md_5/bungee/protocol/netty/UnsignedShortByte.java Normal file
View File

@@ -0,0 +1,15 @@
package net.md_5.bungee.protocol.netty;
import io.netty.buffer.ByteBuf;
import java.io.IOException;
class UnsignedShortByte extends Instruction
{
@Override
void read(ByteBuf in) throws IOException
{
int size = in.readUnsignedShort();
in.skipBytes( size );
}
}

19
protocol/src/main/java/net/md_5/mendax/datainput/Item.java
View File

@@ -1,19 +0,0 @@
package net.md_5.mendax.datainput;
import java.io.DataInput;
import java.io.IOException;
class Item extends Instruction
{
@Override
void read(DataInput in, byte[] buffer) throws IOException
{
short type = in.readShort();
if ( type >= 0 )
{
skip( in, buffer, 3 );
SHORT_BYTE.read( in, buffer );
}
}
}

18
protocol/src/main/java/net/md_5/mendax/datainput/OptionalMotion.java
View File

@@ -1,18 +0,0 @@
package net.md_5.mendax.datainput;
import java.io.DataInput;
import java.io.IOException;
public class OptionalMotion extends Instruction
{
@Override
void read(DataInput in, byte[] buffer) throws IOException
{
int data = in.readInt();
if ( data > 0 )
{
skip( in, buffer, 6 );
}
}
}

26
protocol/src/main/java/net/md_5/mendax/datainput/Team.java
View File

@@ -1,26 +0,0 @@
package net.md_5.mendax.datainput;
import java.io.DataInput;
import java.io.IOException;
class Team extends Instruction
{
@Override
void read(DataInput in, byte[] buffer) throws IOException
{
STRING.read( in, buffer );
byte mode = in.readByte();
if ( mode == 0 || mode == 2 )
{
STRING.read( in, buffer );
STRING.read( in, buffer );
STRING.read( in, buffer );
BYTE.read( in, buffer );
}
if ( mode == 0 || mode == 3 || mode == 4 )
{
STRING_ARRAY.read( in, buffer );
}
}
}

15
protocol/src/main/java/net/md_5/mendax/datainput/UnsignedShortByte.java
View File

@@ -1,15 +0,0 @@
package net.md_5.mendax.datainput;
import java.io.DataInput;
import java.io.IOException;
public class UnsignedShortByte extends Instruction
{
@Override
void read(DataInput in, byte[] buffer) throws IOException
{
int size = in.readUnsignedShort();
skip( in, buffer, size );
}
}