villager can take farmer job

Author: laz1444

src/MiNET/MiNET/Blocks/Composter.cs

@@ -20,6 +20,12 @@ public override bool Interact(Level level, Player player, BlockCoordinates block
 		{
 			//todo: level add possibility
 			if (!compostableIds.Contains(player.Inventory.GetItemInHand().Id)) { return true; }
+			doInteract(level, blockCoordinates);
+			return true;
+		}
+
+		public void doInteract(Level level, BlockCoordinates blockCoordinates)
+		{
 			if (ComposterFillLevel < 8)
 			{
 				ComposterFillLevel = ComposterFillLevel + 1;
@@ -35,7 +41,6 @@ public override bool Interact(Level level, Player player, BlockCoordinates block
 			}
 			LegacyParticle particle = new VillagerHappy(level) { Position = new Vector3(Coordinates.X + 0.5f, Coordinates.Y + 1, Coordinates.Z + 0.5f) };
 			particle.Spawn();
-			return true;
 		}
 	}
 }

src/MiNET/MiNET/Entities/Behaviors/FollowOwnerBehavior.cs

@@ -124,31 +124,6 @@ public override void OnTick(Entity[] entities)
 			_entity.Controller.LookAt(owner);
 		}
 
-		private bool GetNextTile(out Tile next)
-		{
-			next = null;
-			if (_currentPath.NoPath()) return false;
-
-			next = _currentPath.First();
-
-			BlockCoordinates currPos = (BlockCoordinates) _entity.KnownPosition;
-			if ((int) next.X == currPos.X && (int) next.Y == currPos.Z)
-			{
-				_currentPath.Remove(next);
-
-				if (!GetNextTile(out next)) return false;
-			}
-
-			return true;
-		}
-
-		public double Distance(Player player, Tile tile)
-		{
-			Vector2 pos1 = new Vector2(player.KnownPosition.X, player.KnownPosition.Z);
-			Vector2 pos2 = new Vector2((float) tile.X, (float) tile.Y);
-			return (pos1 - pos2).Length();
-		}
-
 		public override void OnEnd()
 		{
 			_entity.Velocity = Vector3.Zero;

src/MiNET/MiNET/Entities/Behaviors/MobController.cs

@@ -75,6 +75,31 @@ public void LookAt(Entity target)
 			_entity.KnownPosition.Pitch = (float) pitch;
 		}
 
+		public void LookAt(PlayerLocation location)
+		{
+			Vector3 targetPos = location + new Vector3(0, 1, 0);
+			Vector3 entityPos = _entity.KnownPosition + new Vector3(0, (float) _entity.Height, 0) + _entity.GetHorizDir() * (float) _entity.Length / 2f;
+			var d = Vector3.Normalize(targetPos - entityPos);
+
+			var dx = d.X;
+			var dy = d.Y;
+			var dz = d.Z;
+
+			double tanOutput = 90 - RadianToDegree(Math.Atan(dx / (dz)));
+			double thetaOffset = 270d;
+			if (dz < 0)
+			{
+				thetaOffset = 90;
+			}
+			var yaw = /*ClampDegrees*/ (thetaOffset + tanOutput);
+
+			double pitch = RadianToDegree(-Math.Asin(dy));
+
+			_entity.KnownPosition.Yaw = (float) yaw;
+			_entity.KnownPosition.HeadYaw = (float) yaw;
+			_entity.KnownPosition.Pitch = (float) pitch;
+		}
+
 		public void RotateTowards(Vector3 targetPosition)
 		{
 			Vector3 entityPosition = _entity.KnownPosition;

src/MiNET/MiNET/Entities/Behaviors/villager/FindJobBlockBehaviour.cs

@@ -0,0 +1,145 @@
+#region LICENSE
+
+// The contents of this file are subject to the Common Public Attribution
+// License Version 1.0. (the "License"); you may not use this file except in
+// compliance with the License. You may obtain a copy of the License at
+// https://github.com/NiclasOlofsson/MiNET/blob/master/LICENSE. 
+// The License is based on the Mozilla Public License Version 1.1, but Sections 14 
+// and 15 have been added to cover use of software over a computer network and 
+// provide for limited attribution for the Original Developer. In addition, Exhibit A has 
+// been modified to be consistent with Exhibit B.
+// 
+// Software distributed under the License is distributed on an "AS IS" basis,
+// WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
+// the specific language governing rights and limitations under the License.
+// 
+// The Original Code is MiNET.
+// 
+// The Original Developer is the Initial Developer.  The Initial Developer of
+// the Original Code is Niclas Olofsson.
+// 
+// All portions of the code written by Niclas Olofsson are Copyright (c) 2014-2018 Niclas Olofsson. 
+// All Rights Reserved.
+
+#endregion
+
+using System.Numerics;
+using MiNET.Blocks;
+using MiNET.Entities.Passive;
+using MiNET.Utils.Vectors;
+
+namespace MiNET.Entities.Behaviors
+{
+	public class FindJobBlockBehaviour : BehaviorBase
+	{
+		private readonly Villager _entity;
+		private Path _currentPath;
+		private BlockCoordinates? blockPosition;
+
+		public FindJobBlockBehaviour(Villager entity)
+		{
+			_entity = entity;
+		}
+
+		public override bool ShouldStart()
+		{
+			if (_entity.Variant != 0) return false;
+
+			blockPosition = FindTargetBlock(_entity, 8, 3);
+
+			if (!blockPosition.HasValue) return false;
+
+			var pathfinder = new Pathfinder();
+			_currentPath = pathfinder.FindPath(_entity, blockPosition.Value, blockPosition.Value.DistanceTo((BlockCoordinates) _entity.KnownPosition) + 2);
+
+			return _currentPath.HavePath();
+		}
+
+		private BlockCoordinates _lastPosition;
+		private int _stallTime = 0;
+
+		public override bool CanContinue()
+		{
+			var currPos = (BlockCoordinates) _entity.KnownPosition;
+			if (currPos == _lastPosition)
+			{
+				if (_stallTime++ > 200)
+					return true;
+			}
+			else
+			{
+				_stallTime = 0;
+				_lastPosition = currPos;
+			}
+
+			return _currentPath.HavePath();
+		}
+
+		public override void OnTick(Entity[] entities)
+		{
+			if (_currentPath.HavePath())
+			{
+				if (!_currentPath.GetNextTile(_entity, out var next))
+				{
+					return;
+				}
+
+				_entity.Controller.RotateTowards(new Vector3((float) next.X + 0.5f, _entity.KnownPosition.Y, (float) next.Y + 0.5f));
+				_entity.EntityDirection = Mob.ClampDegrees(_entity.EntityDirection);
+				_entity.KnownPosition.HeadYaw = (float) _entity.EntityDirection;
+				_entity.KnownPosition.Yaw = (float) _entity.EntityDirection;
+				_entity.Controller.MoveForward(1, entities);
+
+				if (_lastPosition.DistanceTo((BlockCoordinates) blockPosition) < 3)
+				{
+					var block = _entity.Level.GetBlock(blockPosition);
+					if (block is Composter composter && _entity.Variant == 0)
+					{
+						composter.doInteract(_entity.Level, (BlockCoordinates) blockPosition);
+					}
+
+					_entity.Variant = 1;
+					_entity.BroadcastSetEntityData();
+					_entity.Controller.LookAt(blockPosition);
+				}
+			}
+			else
+			{
+				return;
+			}
+		}
+
+		public override void OnEnd()
+		{
+			_entity.Velocity = Vector3.Zero;
+			_entity.KnownPosition.Pitch = 0;
+			_currentPath = null;
+		}
+
+
+		protected static BlockCoordinates? FindTargetBlock(Entity entity, int dxz, int dy)
+		{
+			BlockCoordinates coords = (BlockCoordinates) entity.KnownPosition;
+			Block currentBlock = null;
+			for (int x = -dxz; x <= dxz; x++)
+			{
+				for (int y = -dy; y <= dy; y++)
+				{
+					for (int z = -dxz; z <= dxz; z++)
+					{
+						var blockCoordinates = new BlockCoordinates(x, y, z) + coords;
+						var block = entity.Level.GetBlock(blockCoordinates);
+
+						if (block is Composter composter)
+						{
+							currentBlock = composter;
+
+							return currentBlock.Coordinates;
+						}
+					}
+				}
+			}
+			return null;
+		}
+	}
+}

src/MiNET/MiNET/Entities/EntityType.cs

@@ -112,7 +112,7 @@ public enum EntityType
 		Pig = 12,
 		Sheep = 13,
 		Wolf = 14,
-		Villager = 15,
+		Villager = 115,
 		MushroomCow = 16,
 		Squid = 17,
 		Rabbit = 18,
@@ -183,7 +183,7 @@ public static class EntityHelpers
 			{ EntityType.Panda, "minecraft:panda" },
 			{ EntityType.Salmon, "minecraft:salmon" },
 			{ EntityType.Pig, "minecraft:pig" },
-			{ EntityType.Villager, "minecraft:villager" },
+			{ EntityType.Villager, "minecraft:villager_v2" },
 			{ EntityType.Fish, "minecraft:cod" },
 			{ EntityType.Pufferfish, "minecraft:pufferfish" },
 			{ EntityType.Cow, "minecraft:cow" },

src/MiNET/MiNET/Entities/Passive/Villager.cs

@@ -23,16 +23,43 @@
 
 #endregion
 
+using MiNET.Entities.Behaviors;
+using MiNET.Utils.Metadata;
 using MiNET.Worlds;
 
 namespace MiNET.Entities.Passive
 {
 	public class Villager : PassiveMob
 	{
+		public int Variant { get; set; }
 		public Villager(Level level) : base(EntityType.Villager, level)
 		{
 			Width = Length = 0.6;
-			Height = 1.8;
+			Height = 1.9;
+			HealthManager.MaxHealth = 200;
+			HealthManager.ResetHealth();
+			Speed = 0.3;
+			IsInLove = false;
+
+			Behaviors.Add(new PanicBehavior(this, 60, Speed, 1.4));
+
+			Behaviors.Add(new WanderBehavior(this, 1.0, 40));
+			Behaviors.Add(new LookAtEntityBehavior(this, 4, 20));
+			Behaviors.Add(new LookAtPlayerBehavior(this, 4, 10));
+			Behaviors.Add(new RandomLookaroundBehavior(this, 40));
+			Behaviors.Add(new FindJobBlockBehaviour(this));
+		}
+
+		public override MetadataDictionary GetMetadata()
+		{
+			Scale = IsBaby ? 0.50f : 1.0;
+			MetadataDictionary metadata = base.GetMetadata();
+			metadata[(int) MetadataFlags.Variant] = new MetadataInt(Variant);
+			metadata[(int) MetadataFlags.ContainerType] = new MetadataShort(247);
+			metadata[(int) MetadataFlags.ContainerSize] = new MetadataByte(8);
+			metadata[(int) MetadataFlags.MaxTradeTier] = new MetadataInt(4);
+
+			return metadata;
 		}
 	}
 }

src/MiNET/MiNET/Player.cs

@@ -3283,15 +3283,16 @@ public void SendStartGame()
 			levelSettings.permissionLevel = (byte) PermissionLevel;
 			levelSettings.gameVersion = "";
 			levelSettings.hasEduFeaturesEnabled = true;
-			
+			levelSettings.onlySpawnV1Villagers = false;
+
 			var startGame = McpeStartGame.CreateObject();
 			startGame.levelSettings = levelSettings;
 			startGame.entityIdSelf = EntityId;
 			startGame.runtimeEntityId = EntityManager.EntityIdSelf;
 			startGame.playerGamemode = (int) GameMode;
 			startGame.spawn = SpawnPosition;
 			startGame.rotation = new Vector2(KnownPosition.HeadYaw, KnownPosition.Pitch);
-			
+
 			startGame.levelId = "1m0AAMIFIgA=";
 			startGame.worldName = Level.LevelName;
 			startGame.premiumWorldTemplateId = "";