helpy4/Minecraft-Console-Client
1
0
Fork 0
mirror of https://github.com/MCCTeam/Minecraft-Console-Client synced 2025-10-14 21:22:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix compatability with Feed The Beast servers

Browse source 
More percisely, use varshorts for the length of the 3F packet,
as forge makes it longer.  Only really matters if a bazillion
mods are installed, which they are with FTB.
This commit is contained in:
Pokechu22 2015-10-25 11:51:53 -07:00
parent b746b5612b
commit fb87de1ff5
1 changed files with 46 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

43
MinecraftClient/Protocol/Handlers/Protocol18.cs
View file

@ -213,11 +213,19 @@ namespace MinecraftClient.Protocol.Handlers
case 0x3F: //Plugin message.
String channel = readNextString(ref packetData);
if (protocolversion < MC18Version)
{
if (forgeInfo == null)
{
// 1.7 and lower prefix plugin channel packets with the length.
// We can skip it, though.
readNextShort(ref packetData);
}
else
{
// Forge does something even weirder with the length.
readNextVarShort(ref packetData);
}
}
if (forgeInfo != null)
{
if (channel == "FML|HS")
@ -269,9 +277,12 @@ namespace MinecraftClient.Protocol.Handlers
if (discriminator != FMLHandshakeDiscriminator.ModList)
return false;
Thread.Sleep(2000);
ConsoleIO.WriteLineFormatted("§8Accepting server mod list...");
// Tell the server that yes, we are OK with the mods it has
// even though we don't actually care what mods it has.
SendForgeHandshakePacket(FMLHandshakeDiscriminator.HandshakeAck,
new byte[] { (byte)FMLHandshakeClientState.WAITINGSERVERDATA });
@ -461,6 +472,18 @@ namespace MinecraftClient.Protocol.Handlers
return BitConverter.ToInt16(rawValue, 0);
}
/// <summary>
/// Read an unsigned short integer from a cache of bytes and remove it from the cache
/// </summary>
/// <returns>The unsigned short integer value</returns>
private static ushort readNextUShort(ref byte[] cache)
{
byte[] rawValue = readData(2, ref cache);
Array.Reverse(rawValue); //Endianness
return BitConverter.ToUInt16(rawValue, 0);
}
/// <summary>
/// Read a uuid from a cache of bytes and remove it from the cache
/// </summary>
@ -531,6 +554,26 @@ namespace MinecraftClient.Protocol.Handlers
return i;
}
/// <summary>
/// Read an "extended short", which is actually an int of some kind, from the cache of bytes.
/// This is only done with forge. It looks like it's a normal short, except that if the high
/// bit is set, it has an extra byte.
/// </summary>
/// <param name="cache">Cache of bytes to read from</param>
/// <returns>The int</returns>
private static int readNextVarShort(ref byte[] cache)
{
ushort low = readNextUShort(ref cache);
byte high = 0;
if ((low & 0x8000) != 0)
{
low &= 0x7FFF;
high = readNextByte(ref cache);
}
return ((high & 0xFF) << 15) | low;
}
/// <summary>
/// Read a single byte from a cache of bytes and remove it from the cache
/// </summary>