AstralTransRocketries/ClassiCube
1
0
Fork 0
mirror of https://github.com/ClassiCube/ClassiCube.git synced 2025-09-13 01:26:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

Start work on CpeExtPlayerList version 2, remove useless comments in packet size array initialiser.

Browse Source
This commit is contained in:
UnknownShadow200 2015-05-13 06:39:30 +10:00
parent 55f23831e1
commit 12bcf5d335
2 changed files with 32 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Network/Enums.cs
View File

@ -37,6 +37,7 @@ namespace ClassicalSharp {
CpeEnvSetMapApperance = 30, CpeEnvSetMapApperance = 30,
CpeEnvWeatherType = 31, CpeEnvWeatherType = 31,
CpeHackControl = 32, CpeHackControl = 32,
CpeExtAddEntity2 = 33,
} }
public enum CpeMessageType { public enum CpeMessageType {

80
Network/NetworkProcessor.cs
View File

@ -109,39 +109,9 @@ namespace ClassicalSharp {
} }
readonly int[] packetSizes = new int[] { readonly int[] packetSizes = new int[] {
131, // server identification (1 + 1 + 64 + 64 + 1) 131, 1, 1, 1028, 7, 9, 8, 74, 10, 7, 5, 4, 2,
1, // ping (1) 66, 65, 2, 67, 69, 3, 2, 3, 134, 196, 130, 3,
1, // level initialise (1) 8, 86, 2, 4, 66, 69, 2, 8, 138,
1028, // level data chunk (1 + 2 + 1024 + 1)
7, // level finalise (1 + 3(2))
9, // set block client (1 + 3(2) + 1 + 1)
8, // set block (1 + 3(2) + 1)
74, // spawn player (1 + 1 + 64 + 3(2) + 2(1))
10, // player teleport (1 + 1 + 3(2) + 2(1))
7, // relative pos and orientation update (1 + 1 + 3(1) + 2(1))
5, // relative pos update (1 + 1 + 3(1))
4, // relative orientation update (1 + 1 + 2(1))
2, // despawn player (1 + 1)
66, // message (1 + 1 + 64)
65, // disconnect (1 + 64)
2, // set permission (1 + 1)
67, // extension info (1 + 64 + 2)
69, // extension entry (1 + 64 + 4)
3, // set click distance (1 + 2)
2, // custom blocks (1 + 1)
3, // held block (1 + 2)
134, // text hotkey (1 + 64 + 64 + 4 + 1)
196, // extended add player name (1 + 2 + 64 + 64 + 64 + 1),
130, // extended add entity (1 + 1 + 64 + 64)
3, // extended remove player name (1 + 2)
8, // env set colours (1 + 1 + 3(2))
86, // selection cuboid (1 + 1 + 64 + 6(2) + 4(2))
2, // remove selection (1 + 1)
4, // block permissions (1 + 1 + 1 + 1)
66, // change model(1 + 1 + 64)
69, // env map appearance (1 + 64 + 1 + 1 + 2)
2, // env weather type (1 + 1)
8, // hack control (1 + 1 + 1 + 1 + 1 + 1 + 2)
}; };
// TODO: Finish implementing CPE // TODO: Finish implementing CPE
@ -247,7 +217,7 @@ namespace ClassicalSharp {
void WritePacket( int packetLength ) { void WritePacket( int packetLength ) {
outIndex = 0; outIndex = 0;
if( Disconnected ) return; if( Disconnected ) return;
#if NET_DEBUG #if NET_DEBUG
Utils.LogDebug( "writing {0} bytes ({1})", packetLength, (PacketId)outBuffer[0] ); Utils.LogDebug( "writing {0} bytes ({1})", packetLength, (PacketId)outBuffer[0] );
@ -383,21 +353,7 @@ namespace ClassicalSharp {
{ {
byte entityId = reader.ReadUInt8(); byte entityId = reader.ReadUInt8();
string name = reader.ReadString(); string name = reader.ReadString();
if( entityId != 0xFF ) { AddEntity( entityId, name, name );
Window.AsyncDownloader.DownloadSkin( name );
// This shouldn't usually happen, but just in case..
Player oldPlayer = Window.NetPlayers[entityId];
if( oldPlayer != null ) {
Window.RaiseEntityRemoved( entityId );
oldPlayer.Despawn();
}
Window.NetPlayers[entityId] = new NetPlayer( entityId, name, name, Window );
Window.RaiseEntityAdded( entityId );
}
ReadAbsoluteLocation( entityId, false );
if( entityId == 0xFF ) {
Window.LocalPlayer.SpawnPoint = Window.LocalPlayer.Position;
}
} break; } break;
case PacketId.EntityTeleport: case PacketId.EntityTeleport:
@ -670,11 +626,37 @@ namespace ClassicalSharp {
Window.LocalPlayer.CalculateJumpVelocity( jumpHeight ); Window.LocalPlayer.CalculateJumpVelocity( jumpHeight );
} break; } break;
case PacketId.CpeExtAddEntity2:
{
byte entityId = reader.ReadUInt8();
string displayName = reader.ReadString();
string skinName = reader.ReadString();
AddEntity( entityId, displayName, skinName );
} break;
default: default:
throw new NotImplementedException( "Unsupported packet:" + (PacketId)opcode ); throw new NotImplementedException( "Unsupported packet:" + (PacketId)opcode );
} }
} }
void AddEntity( byte entityId, string displayName, string skinName ) {
if( entityId != 0xFF ) {
Window.AsyncDownloader.DownloadSkin( skinName );
// This shouldn't usually happen, but just in case..
Player oldPlayer = Window.NetPlayers[entityId];
if( oldPlayer != null ) {
Window.RaiseEntityRemoved( entityId );
oldPlayer.Despawn();
}
Window.NetPlayers[entityId] = new NetPlayer( entityId, displayName, skinName, Window );
Window.RaiseEntityAdded( entityId );
}
ReadAbsoluteLocation( entityId, false );
if( entityId == 0xFF ) {
Window.LocalPlayer.SpawnPoint = Window.LocalPlayer.Position;
}
}
void ReadRelativeLocation() { void ReadRelativeLocation() {
byte playerId = reader.ReadUInt8(); byte playerId = reader.ReadUInt8();
float x = reader.ReadInt8() / 32f; float x = reader.ReadInt8() / 32f;