Fix indenting in Protocol18.cs

This commit is contained in:
ORelio 2020-06-30 23:05:00 +02:00
parent 9568aef0c0
commit 8b208c5520

View file

@ -369,74 +369,74 @@ namespace MinecraftClient.Protocol.Handlers
} }
break; break;
case PacketIncomingType.MapData: case PacketIncomingType.MapData:
int mapid = dataTypes.ReadNextVarInt(packetData); int mapid = dataTypes.ReadNextVarInt(packetData);
byte scale = dataTypes.ReadNextByte(packetData); byte scale = dataTypes.ReadNextByte(packetData);
bool trackingposition = dataTypes.ReadNextBool(packetData); bool trackingposition = dataTypes.ReadNextBool(packetData);
bool locked = false; bool locked = false;
if (protocolversion >= MC114Version) if (protocolversion >= MC114Version)
{ {
locked = dataTypes.ReadNextBool(packetData); locked = dataTypes.ReadNextBool(packetData);
} }
int iconcount = dataTypes.ReadNextVarInt(packetData); int iconcount = dataTypes.ReadNextVarInt(packetData);
handler.OnMapData(mapid, scale, trackingposition, locked, iconcount); handler.OnMapData(mapid, scale, trackingposition, locked, iconcount);
break; break;
case PacketIncomingType.Title: case PacketIncomingType.Title:
if (protocolversion >= MC18Version) if (protocolversion >= MC18Version)
{
int action2 = dataTypes.ReadNextVarInt(packetData);
string titletext = String.Empty;
string subtitletext = String.Empty;
string actionbartext = String.Empty;
string json = String.Empty;
int fadein = -1;
int stay = -1;
int fadeout = -1;
if (protocolversion >= MC110Version)
{ {
int action2 = dataTypes.ReadNextVarInt(packetData); if (action2 == 0)
string titletext = String.Empty;
string subtitletext = String.Empty;
string actionbartext = String.Empty;
string json = String.Empty;
int fadein = -1;
int stay = -1;
int fadeout = -1;
if (protocolversion >= MC110Version)
{ {
if (action2 == 0) json = titletext;
{ titletext = ChatParser.ParseText(dataTypes.ReadNextString(packetData));
json = titletext;
titletext = ChatParser.ParseText(dataTypes.ReadNextString(packetData));
}
else if (action2 == 1)
{
json = subtitletext;
subtitletext = ChatParser.ParseText(dataTypes.ReadNextString(packetData));
}
else if (action2 == 2)
{
json = actionbartext;
actionbartext = ChatParser.ParseText(dataTypes.ReadNextString(packetData));
}
else if (action2 == 3)
{
fadein = dataTypes.ReadNextInt(packetData);
stay = dataTypes.ReadNextInt(packetData);
fadeout = dataTypes.ReadNextInt(packetData);
}
} }
else else if (action2 == 1)
{ {
if (action2 == 0) json = subtitletext;
{ subtitletext = ChatParser.ParseText(dataTypes.ReadNextString(packetData));
json = titletext; }
titletext = ChatParser.ParseText(dataTypes.ReadNextString(packetData)); else if (action2 == 2)
} {
else if (action2 == 1) json = actionbartext;
{ actionbartext = ChatParser.ParseText(dataTypes.ReadNextString(packetData));
json = subtitletext; }
subtitletext = ChatParser.ParseText(dataTypes.ReadNextString(packetData)); else if (action2 == 3)
} {
else if (action2 == 2) fadein = dataTypes.ReadNextInt(packetData);
{ stay = dataTypes.ReadNextInt(packetData);
fadein = dataTypes.ReadNextInt(packetData); fadeout = dataTypes.ReadNextInt(packetData);
stay = dataTypes.ReadNextInt(packetData);
fadeout = dataTypes.ReadNextInt(packetData);
}
} }
handler.OnTitle(action2, titletext, subtitletext, actionbartext, fadein, stay, fadeout, json);
} }
break; else
{
if (action2 == 0)
{
json = titletext;
titletext = ChatParser.ParseText(dataTypes.ReadNextString(packetData));
}
else if (action2 == 1)
{
json = subtitletext;
subtitletext = ChatParser.ParseText(dataTypes.ReadNextString(packetData));
}
else if (action2 == 2)
{
fadein = dataTypes.ReadNextInt(packetData);
stay = dataTypes.ReadNextInt(packetData);
fadeout = dataTypes.ReadNextInt(packetData);
}
}
handler.OnTitle(action2, titletext, subtitletext, actionbartext, fadein, stay, fadeout, json);
}
break;
case PacketIncomingType.MultiBlockChange: case PacketIncomingType.MultiBlockChange:
if (handler.GetTerrainEnabled()) if (handler.GetTerrainEnabled())
{ {
@ -711,14 +711,14 @@ namespace MinecraftClient.Protocol.Handlers
} }
break; break;
case PacketIncomingType.EntityEquipment: case PacketIncomingType.EntityEquipment:
if (handler.GetEntityHandlingEnabled()) if (handler.GetEntityHandlingEnabled())
{ {
int entityid = dataTypes.ReadNextVarInt(packetData); int entityid = dataTypes.ReadNextVarInt(packetData);
int slot2 = dataTypes.ReadNextVarInt(packetData); int slot2 = dataTypes.ReadNextVarInt(packetData);
Item item = dataTypes.ReadNextItemSlot(packetData); Item item = dataTypes.ReadNextItemSlot(packetData);
handler.OnEntityEquipment(entityid, slot2, item); handler.OnEntityEquipment(entityid, slot2, item);
} }
break; break;
case PacketIncomingType.SpawnLivingEntity: case PacketIncomingType.SpawnLivingEntity:
if (handler.GetEntityHandlingEnabled()) if (handler.GetEntityHandlingEnabled())
{ {