MC 1.17/1.18 Terrain/Entity/Inventory (#1943)

Merge branch 'master' of github.com:milutinke/Minecraft-Console-Client into milutinke-master

Manually fix merge conflicts
Additional changes:
 - WindowItems: Fix data type for "elements" below 1.17
 - DestroyEntities: Fix packet palettes and remove DestroyEntity
 - EntityMetadata: Throw exception if health field mapping is not updated

Co-authored-by: Milutinke <[email protected]>
Co-authored-by: BruceChen <[email protected]>

Author: 3 people

MinecraftClient/ChatBots/AutoAttack.cs

@@ -103,11 +103,15 @@ public override void Update()
                                 }
                             }
                         }
-                        // check entity distance and health again
-                        if (shouldAttackEntity(entitiesToAttack[priorityEntity]))
+
+                        if (entitiesToAttack.ContainsKey(priorityEntity))
                         {
-                            InteractEntity(priorityEntity, interactMode); // hit the entity!
-                            SendAnimation(Inventory.Hand.MainHand); // Arm animation
+                            // check entity distance and health again
+                            if (shouldAttackEntity(entitiesToAttack[priorityEntity]))
+                            {
+                                InteractEntity(priorityEntity, interactMode); // hit the entity!
+                                SendAnimation(Inventory.Hand.MainHand); // Arm animation
+                            }
                         }
                     }
                     else
@@ -143,6 +147,22 @@ public override void OnEntityDespawn(Entity entity)
             }
         }
 
+        public override void OnEntityHealth(Entity entity, float health)
+        {
+            if (!entity.Type.IsHostile())
+                return;
+
+            if (entitiesToAttack.ContainsKey(entity.ID))
+            {
+                entitiesToAttack[entity.ID].Health = health;
+
+                if (entitiesToAttack[entity.ID].Health <= 0)
+                {
+                    entitiesToAttack.Remove(entity.ID);
+                }
+            }
+        }
+
         public override void OnEntityMove(Entity entity)
         {
             shouldAttackEntity(entity);

MinecraftClient/Commands/Move.cs

@@ -8,7 +8,7 @@ namespace MinecraftClient.Commands
     public class Move : Command
     {
         public override string CmdName { get { return "move"; } }
-        public override string CmdUsage { get { return "move <on|off|get|up|down|east|west|north|south|x y z|gravity [on|off]> [-f]"; } }
+        public override string CmdUsage { get { return "move <on|off|get|up|down|east|west|north|south|center|x y z|gravity [on|off]> [-f]"; } }
         public override string CmdDesc { get { return "walk or start walking. \"-f\": force unsafe movements like falling or touching fire"; } }
 
         public override string Run(McClient handler, string command, Dictionary<string, object> localVars)
@@ -17,7 +17,14 @@ public override string Run(McClient handler, string command, Dictionary<string,
             bool takeRisk = false;
 
             if (args.Count < 1)
-                return GetCmdDescTranslated();
+            {
+                string desc = GetCmdDescTranslated();
+
+                if (handler.GetTerrainEnabled())
+                    handler.Log.Info(getChunkLoadingStatus(handler.GetWorld()));
+
+                return desc;
+            }
 
             if (args.Contains("-f"))
             {
@@ -56,6 +63,11 @@ public override string Run(McClient handler, string command, Dictionary<string,
                         case "west": direction = Direction.West; break;
                         case "north": direction = Direction.North; break;
                         case "south": direction = Direction.South; break;
+                        case "center":
+                            Location current = handler.GetCurrentLocation();
+                            Location currentCenter = new Location(Math.Floor(current.X) + 0.5, current.Y, Math.Floor(current.Z) + 0.5);
+                            handler.MoveTo(currentCenter, allowDirectTeleport: true);
+                            return Translations.Get("cmd.move.walk", currentCenter, current);
                         case "get": return handler.GetCurrentLocation().ToString();
                         default: return Translations.Get("cmd.look.unknown", args[0]);
                     }
@@ -76,8 +88,15 @@ public override string Run(McClient handler, string command, Dictionary<string,
                         int z = int.Parse(args[2]);
                         Location goal = new Location(x, y, z);
 
+                        if (handler.GetWorld().GetChunkColumn(goal) == null || handler.GetWorld().GetChunkColumn(goal).FullyLoaded == false)
+                            return Translations.Get("cmd.move.chunk_not_loaded");
+
+                        Location current = handler.GetCurrentLocation();
+                        Location currentCenter = new Location(Math.Floor(current.X) + 0.5, current.Y, Math.Floor(current.Z) + 0.5);
+                        handler.MoveTo(currentCenter, allowDirectTeleport: true);
+
                         if (handler.MoveTo(goal, allowUnsafe: takeRisk))
-                            return Translations.Get("cmd.move.walk", goal);
+                            return Translations.Get("cmd.move.walk", goal, current);
                         else return takeRisk ? Translations.Get("cmd.move.fail", goal) : Translations.Get("cmd.move.suggestforce", goal);
                     }
                     catch (FormatException) { return GetCmdDescTranslated(); }
@@ -86,5 +105,19 @@ public override string Run(McClient handler, string command, Dictionary<string,
             }
             else return Translations.Get("extra.terrainandmovement_required");
         }
+
+        private string getChunkLoadingStatus(World world)
+        {
+            double chunkLoadedRatio;
+            if (world.chunkCnt == 0)
+                chunkLoadedRatio = 0;
+            else
+                chunkLoadedRatio = (world.chunkCnt - world.chunkLoadNotCompleted) / (double)world.chunkCnt;
+
+            string status = Translations.Get("cmd.move.chunk_loading_status",
+                    chunkLoadedRatio, world.chunkCnt - world.chunkLoadNotCompleted, world.chunkCnt);
+
+            return status;
+        }
     }
 }

MinecraftClient/Inventory/Container.cs

@@ -25,6 +25,11 @@ public class Container
         /// </summary>
         public string Title;
 
+        /// <summary>
+        /// state of container
+        /// </summary>
+        public int StateID;
+
         /// <summary>
         /// Container Items
         /// </summary>