Update version to 1.18 (#1836)

MinecraftClient/MinecraftClient.csproj

@@ -75,6 +75,7 @@
     <Compile Include="AutoTimeout.cs" />
     <Compile Include="ChatBots\AutoDrop.cs" />
     <Compile Include="ChatBots\Mailer.cs" />
+    <Compile Include="Protocol\Handlers\PacketPalettes\PacketPalette118.cs" />
     <Compile Include="Protocol\MojangAPI.cs" />
     <Compile Include="Mapping\CubeFromWorld.cs" />
     <Compile Include="Mapping\Material2Tool.cs" />

MinecraftClient/Program.cs

@@ -32,7 +32,7 @@ namespace MinecraftClient
 
         public const string Version = MCHighestVersion;
         public const string MCLowestVersion = "1.4.6";
-        public const string MCHighestVersion = "1.17.1";
+        public const string MCHighestVersion = "1.18";
         public static readonly string BuildInfo = null;
 
         private static Thread offlinePrompt = null;

MinecraftClient/Protocol/Handlers/PacketPalettes/PacketPalette118.cs

@@ -0,0 +1,177 @@
+using System.Collections.Generic;
+
+namespace MinecraftClient.Protocol.Handlers.PacketPalettes
+{
+    public class PacketPalette118 : PacketTypePalette
+    {
+        private Dictionary<int, PacketTypesIn> typeIn = new Dictionary<int, PacketTypesIn>()
+        {
+            { 0x00, PacketTypesIn.SpawnEntity },
+            { 0x01, PacketTypesIn.SpawnExperienceOrb },
+            { 0x02, PacketTypesIn.SpawnLivingEntity },
+            { 0x03, PacketTypesIn.SpawnPainting },
+            { 0x04, PacketTypesIn.SpawnPlayer },
+            { 0x05, PacketTypesIn.SkulkVibrationSignal },
+            { 0x06, PacketTypesIn.EntityAnimation },
+            { 0x07, PacketTypesIn.Statistics },
+            { 0x08, PacketTypesIn.AcknowledgePlayerDigging },
+            { 0x09, PacketTypesIn.BlockBreakAnimation },
+            { 0x0A, PacketTypesIn.BlockEntityData },
+            { 0x0B, PacketTypesIn.BlockAction },
+            { 0x0C, PacketTypesIn.BlockChange },
+            { 0x0D, PacketTypesIn.BossBar },
+            { 0x0E, PacketTypesIn.ServerDifficulty },
+            { 0x0F, PacketTypesIn.ChatMessage },
+            { 0x10, PacketTypesIn.ClearTiles },
+            { 0x11, PacketTypesIn.TabComplete },
+            { 0x12, PacketTypesIn.DeclareCommands },
+            { 0x13, PacketTypesIn.CloseWindow },
+            { 0x14, PacketTypesIn.WindowItems },
+            { 0x15, PacketTypesIn.WindowProperty },
+            { 0x16, PacketTypesIn.SetSlot },
+            { 0x17, PacketTypesIn.SetCooldown },
+            { 0x18, PacketTypesIn.PluginMessage },
+            { 0x19, PacketTypesIn.NamedSoundEffect },
+            { 0x1A, PacketTypesIn.Disconnect },
+            { 0x1B, PacketTypesIn.EntityStatus },
+            { 0x1C, PacketTypesIn.Explosion },
+            { 0x1D, PacketTypesIn.UnloadChunk },
+            { 0x1E, PacketTypesIn.ChangeGameState },
+            { 0x1F, PacketTypesIn.OpenHorseWindow },
+            { 0x20, PacketTypesIn.InitializeWorldBorder },
+            { 0x21, PacketTypesIn.KeepAlive },
+            { 0x22, PacketTypesIn.ChunkData },
+            { 0x23, PacketTypesIn.Effect },
+            { 0x24, PacketTypesIn.Particle },
+            { 0x25, PacketTypesIn.UpdateLight },
+            { 0x26, PacketTypesIn.JoinGame },
+            { 0x27, PacketTypesIn.MapData },
+            { 0x28, PacketTypesIn.TradeList },
+            { 0x29, PacketTypesIn.EntityPosition },
+            { 0x2A, PacketTypesIn.EntityPositionAndRotation },
+            { 0x2B, PacketTypesIn.EntityRotation },
+            { 0x2C, PacketTypesIn.VehicleMove },
+            { 0x2D, PacketTypesIn.OpenBook },
+            { 0x2E, PacketTypesIn.OpenWindow },
+            { 0x2F, PacketTypesIn.OpenSignEditor },
+            { 0x30, PacketTypesIn.Ping },
+            { 0x31, PacketTypesIn.CraftRecipeResponse },
+            { 0x32, PacketTypesIn.PlayerAbilities },
+            { 0x33, PacketTypesIn.EndCombatEvent },
+            { 0x34, PacketTypesIn.EnterCombatEvent },
+            { 0x35, PacketTypesIn.DeathCombatEvent },
+            { 0x36, PacketTypesIn.PlayerInfo },
+            { 0x37, PacketTypesIn.FacePlayer },
+            { 0x38, PacketTypesIn.PlayerPositionAndLook },
+            { 0x39, PacketTypesIn.UnlockRecipes },
+            { 0x3A, PacketTypesIn.DestroyEntity },
+            { 0x3B, PacketTypesIn.RemoveEntityEffect },
+            { 0x3C, PacketTypesIn.ResourcePackSend },
+            { 0x3D, PacketTypesIn.Respawn },
+            { 0x3E, PacketTypesIn.EntityHeadLook },
+            { 0x3F, PacketTypesIn.MultiBlockChange },
+            { 0x40, PacketTypesIn.SelectAdvancementTab },
+            { 0x41, PacketTypesIn.ActionBar },
+            { 0x42, PacketTypesIn.WorldBorderCenter },
+            { 0x43, PacketTypesIn.WorldBorderLerpSize },
+            { 0x44, PacketTypesIn.WorldBorderSize },
+            { 0x45, PacketTypesIn.WorldBorderWarningDelay },
+            { 0x46, PacketTypesIn.WorldBorderWarningReach },
+            { 0x47, PacketTypesIn.Camera },
+            { 0x48, PacketTypesIn.HeldItemChange },
+            { 0x49, PacketTypesIn.UpdateViewPosition },
+            { 0x4A, PacketTypesIn.UpdateViewDistance },
+            { 0x4B, PacketTypesIn.SpawnPosition },
+            { 0x4C, PacketTypesIn.DisplayScoreboard },
+            { 0x4D, PacketTypesIn.EntityMetadata },
+            { 0x4E, PacketTypesIn.AttachEntity },
+            { 0x4F, PacketTypesIn.EntityVelocity },
+            { 0x50, PacketTypesIn.EntityEquipment },
+            { 0x51, PacketTypesIn.SetExperience },
+            { 0x52, PacketTypesIn.UpdateHealth },
+            { 0x53, PacketTypesIn.ScoreboardObjective },
+            { 0x54, PacketTypesIn.SetPassengers },
+            { 0x55, PacketTypesIn.Teams },
+            { 0x56, PacketTypesIn.UpdateScore },
+            { 0x57, PacketTypesIn.UpdateSimulationDistance },
+            { 0x58, PacketTypesIn.SetTitleSubTitle },
+            { 0x59, PacketTypesIn.TimeUpdate },
+            { 0x5A, PacketTypesIn.SetTitleText },
+            { 0x5B, PacketTypesIn.SetTitleTime },
+            { 0x5C, PacketTypesIn.EntitySoundEffect },
+            { 0x5D, PacketTypesIn.SoundEffect },
+            { 0x5E, PacketTypesIn.StopSound },
+            { 0x5F, PacketTypesIn.PlayerListHeaderAndFooter },
+            { 0x60, PacketTypesIn.NBTQueryResponse },
+            { 0x61, PacketTypesIn.CollectItem },
+            { 0x62, PacketTypesIn.EntityTeleport },
+            { 0x63, PacketTypesIn.Advancements },
+            { 0x64, PacketTypesIn.EntityProperties },
+            { 0x65, PacketTypesIn.EntityEffect },
+            { 0x66, PacketTypesIn.DeclareRecipes },
+            { 0x67, PacketTypesIn.Tags },
+        };
+
+        private Dictionary<int, PacketTypesOut> typeOut = new Dictionary<int, PacketTypesOut>()
+        {
+            { 0x00, PacketTypesOut.TeleportConfirm },
+            { 0x01, PacketTypesOut.QueryBlockNBT },
+            { 0x02, PacketTypesOut.SetDifficulty },
+            { 0x03, PacketTypesOut.ChatMessage },
+            { 0x04, PacketTypesOut.ClientStatus },
+            { 0x05, PacketTypesOut.ClientSettings },
+            { 0x06, PacketTypesOut.TabComplete },
+            { 0x07, PacketTypesOut.ClickWindowButton },
+            { 0x08, PacketTypesOut.ClickWindow },
+            { 0x09, PacketTypesOut.CloseWindow },
+            { 0x0A, PacketTypesOut.PluginMessage },
+            { 0x0B, PacketTypesOut.EditBook },
+            { 0x0C, PacketTypesOut.EntityNBTRequest },
+            { 0x0D, PacketTypesOut.InteractEntity },
+            { 0x0E, PacketTypesOut.GenerateStructure },
+            { 0x0F, PacketTypesOut.KeepAlive },
+            { 0x10, PacketTypesOut.LockDifficulty },
+            { 0x11, PacketTypesOut.PlayerPosition },
+            { 0x12, PacketTypesOut.PlayerPositionAndRotation },
+            { 0x13, PacketTypesOut.PlayerRotation },
+            { 0x14, PacketTypesOut.PlayerMovement },
+            { 0x15, PacketTypesOut.VehicleMove },
+            { 0x16, PacketTypesOut.SteerBoat },
+            { 0x17, PacketTypesOut.PickItem },
+            { 0x18, PacketTypesOut.CraftRecipeRequest },
+            { 0x19, PacketTypesOut.PlayerAbilities },
+            { 0x1A, PacketTypesOut.PlayerDigging },
+            { 0x1B, PacketTypesOut.EntityAction },
+            { 0x1C, PacketTypesOut.SteerVehicle },
+            { 0x1D, PacketTypesOut.Pong },
+            { 0x1E, PacketTypesOut.SetDisplayedRecipe },
+            { 0x1F, PacketTypesOut.SetRecipeBookState },
+            { 0x20, PacketTypesOut.NameItem },
+            { 0x21, PacketTypesOut.ResourcePackStatus },
+            { 0x22, PacketTypesOut.AdvancementTab },
+            { 0x23, PacketTypesOut.SelectTrade },
+            { 0x24, PacketTypesOut.SetBeaconEffect },
+            { 0x25, PacketTypesOut.HeldItemChange },
+            { 0x26, PacketTypesOut.UpdateCommandBlock },
+            { 0x27, PacketTypesOut.UpdateCommandBlockMinecart },
+            { 0x28, PacketTypesOut.CreativeInventoryAction },
+            { 0x29, PacketTypesOut.UpdateJigsawBlock },
+            { 0x2A, PacketTypesOut.UpdateStructureBlock },
+            { 0x2B, PacketTypesOut.UpdateSign },
+            { 0x2C, PacketTypesOut.Animation },
+            { 0x2D, PacketTypesOut.Spectate },
+            { 0x2E, PacketTypesOut.PlayerBlockPlacement },
+            { 0x2F, PacketTypesOut.UseItem },
+        };
+
+        protected override Dictionary<int, PacketTypesIn> GetListIn()
+        {
+            return typeIn;
+        }
+
+        protected override Dictionary<int, PacketTypesOut> GetListOut()
+        {
+            return typeOut;
+        }
+    }
+}

MinecraftClient/Protocol/Handlers/PacketType18Handler.cs

@@ -51,7 +51,7 @@ namespace MinecraftClient.Protocol.Handlers
         public PacketTypePalette GetTypeHandler(int protocol)
         {
             PacketTypePalette p;
-            if (protocol > Protocol18Handler.MC1171Version)
+            if (protocol > Protocol18Handler.MC118Version)
                 throw new NotImplementedException(Translations.Get("exception.palette.packet"));
             if (protocol <= Protocol18Handler.MC18Version)
                 p = new PacketPalette17();
@@ -71,8 +71,10 @@ namespace MinecraftClient.Protocol.Handlers
                 p = new PacketPalette116();
             else if (protocol <= Protocol18Handler.MC1165Version)
                 p = new PacketPalette1162();
-            else
+            else if (protocol <= Protocol18Handler.MC1171Version)
                 p = new PacketPalette117();
+            else
+                p = new PacketPalette118();
 
             p.SetForgeEnabled(this.forgeEnabled);
             return p;

MinecraftClient/Protocol/Handlers/PacketTypesIn.cs

@@ -126,5 +126,6 @@ namespace MinecraftClient.Protocol.Handlers
         UpdateSign, // For 1.8 or below
         UpdateEntityNBT, // For 1.8 or below
         Unknown, // For old version packet that have been removed and not used by mcc 
+        UpdateSimulationDistance,
     }
 }

MinecraftClient/Protocol/Handlers/Protocol18.cs

@@ -52,6 +52,7 @@ namespace MinecraftClient.Protocol.Handlers
         internal const int MC1165Version = 754;
         internal const int MC117Version = 755;
         internal const int MC1171Version = 756;
+        internal const int MC118Version = 757;
 
         private int compression_treshold = 0;
         private bool autocomplete_received = false;
@@ -325,6 +326,8 @@ namespace MinecraftClient.Protocol.Handlers
                             dataTypes.ReadNextString(packetData);         // Level Type - 1.15 and below
                         if (protocolversion >= MC114Version)
                             dataTypes.ReadNextVarInt(packetData);         // View distance - 1.14 and above
+                        if (protocolversion >= MC118Version)
+                            dataTypes.ReadNextVarInt(packetData);         // Simulation Distance - 1.18 and above
                         if (protocolversion >= MC18Version)
                             dataTypes.ReadNextBool(packetData);           // Reduced debug info - 1.8 and above
                         if (protocolversion >= MC115Version)
@@ -1609,7 +1612,9 @@ namespace MinecraftClient.Protocol.Handlers
                 if (protocolversion >= MC19Version)
                     fields.AddRange(dataTypes.GetVarInt(mainHand));
                 if (protocolversion >= MC117Version)
-                    fields.Add(1);
+                    fields.Add(0); // Enables text filtering. Always false
+                if (protocolversion >= MC118Version)
+                    fields.Add(1); // 1.18 and above - Allow server listings
                 SendPacket(PacketTypesOut.ClientSettings, fields);
             }
             catch (SocketException) { }

MinecraftClient/Protocol/ProtocolHandler.cs

@@ -127,7 +127,7 @@ namespace MinecraftClient.Protocol
             int[] supportedVersions_Protocol16 = { 51, 60, 61, 72, 73, 74, 78 };
             if (Array.IndexOf(supportedVersions_Protocol16, ProtocolVersion) > -1)
                 return new Protocol16Handler(Client, ProtocolVersion, Handler);
-            int[] supportedVersions_Protocol18 = { 4, 5, 47, 107, 108, 109, 110, 210, 315, 316, 335, 338, 340, 393, 401, 404, 477, 480, 485, 490, 498, 573, 575, 578, 735, 736, 751, 753, 754, 755, 756 };
+            int[] supportedVersions_Protocol18 = { 4, 5, 47, 107, 108, 109, 110, 210, 315, 316, 335, 338, 340, 393, 401, 404, 477, 480, 485, 490, 498, 573, 575, 578, 735, 736, 751, 753, 754, 755, 756, 757 };
             if (Array.IndexOf(supportedVersions_Protocol18, ProtocolVersion) > -1)
                 return new Protocol18Handler(Client, ProtocolVersion, Handler, forgeInfo);
             throw new NotSupportedException(Translations.Get("exception.version_unsupport", ProtocolVersion));
@@ -250,6 +250,8 @@ namespace MinecraftClient.Protocol
                         return 755;
                     case "1.17.1":
                         return 756;
+                    case "1.18":
+                        return 757;
                     default:
                         return 0;
                 }
@@ -313,6 +315,7 @@ namespace MinecraftClient.Protocol
                 case 754: return "1.16.5";
                 case 755: return "1.17";
                 case 756: return "1.17.1";
+                case 757: return "1.18";
                 default: return "0.0";
             }
         }