corrected breaking speed with axe

Author: laz1444

src/MiNET/MiNET/Blocks/Barrel.cs

@@ -42,6 +42,11 @@ public Barrel() : base(458)
 			Hardness = 2.5f;
 		}
 
+		public override bool IsBestTool(Item item)
+		{
+			return item is ItemAxe ? true : false;
+		}
+
 
 		public override bool PlaceBlock(Level world, Player player, BlockCoordinates blockCoordinates, BlockFace face, Vector3 faceCoords)
 		{

src/MiNET/MiNET/Blocks/Block.cs

@@ -129,119 +129,12 @@ public int GetRuntimeId()
 
 		public virtual Item GetItem()
 		{
-			if (!BlockFactory.BlockStates.TryGetValue(GetState(), out BlockStateContainer stateFromPick)) return null;
-
-			if (stateFromPick.ItemInstance != null) return ItemFactory.GetItem(stateFromPick.ItemInstance.Id, stateFromPick.ItemInstance.Metadata);
-
-			// The rest of this code is to search for an state with the proper value. This is caused by blocks that have lots
-			// of states, and no easy way to map 1-1 with meta. Expensive, but rare.
-
-			// Only compare with states that actually have the values we checking for, and have meta.
-			var statesWithMeta = BlockFactory.BlockPalette.Values.Where(b => b.Name == stateFromPick.Name && b.Data != -1).ToList();
-			foreach (IBlockState state in stateFromPick.States.ToArray())
-			{
-				bool remove = true;
-				foreach (BlockStateContainer blockStateContainer in statesWithMeta)
-				{
-					foreach (IBlockState currentState in blockStateContainer.States)
-					{
-						if (currentState.Name != state.Name) continue;
-
-						if (!currentState.Equals(state))
-						{
-							remove = false;
-							break;
-						}
-					}
-				}
-				if (remove) stateFromPick.States.Remove(state);
-			}
-
-			foreach (BlockStateContainer blockStateContainer in statesWithMeta)
-			{
-				bool match = true;
-
-				foreach (IBlockState currentState in blockStateContainer.States)
-				{
-					if (stateFromPick.States.All(s => s.Name != currentState.Name)) continue;
-
-					if (stateFromPick.States.All(state => !state.Equals(currentState)))
-					{
-						Log.Debug($"State: {currentState.Name}, {currentState}");
-
-						match = false;
-						break;
-					}
-				}
-				if (match)
-				{
-					var id = blockStateContainer.Id;
-					var meta = blockStateContainer.Data;
-
-					var statesWithMetaAndItem = statesWithMeta.Where(b => b.ItemInstance != null).ToList();
-					var actualState = statesWithMetaAndItem.FirstOrDefault(s => s.Id == id && s.Data == meta && s.ItemInstance != null);
-					if (actualState == null) break;
-					return ItemFactory.GetItem(actualState.ItemInstance.Id, actualState.ItemInstance.Metadata);
-				}
-			}
-
-			// Ok that didn't give an item. Lets try more stuff.
-
-			// Remove states that repeat. They can not contribute to a meta-variant.
-			//BUG: There might be states that have more than one. Don't know.
-			foreach (BlockStateContainer stateContainer in statesWithMeta)
-			{
-				foreach (var state in stateContainer.States.ToArray())
-				{
-					var states = statesWithMeta.SelectMany(m => m.States).ToList();
-					if (states.Count(s => s.Equals(state)) > 1)
-					{
-						if (stateFromPick.States.FirstOrDefault(s => s.Name == state.Name) != null)
-						{
-							stateFromPick.States.Remove(stateFromPick.States.First(s => s.Name == state.Name));
-						}
-					}
-				}
-			}
-
-			if(stateFromPick.States.Count == 0)
+			var id = Id;
+			if (id > 255)
 			{
-				var stateToPick = statesWithMeta.FirstOrDefault();
-				if (stateToPick?.ItemInstance != null)
-				{
-					return ItemFactory.GetItem(stateToPick.ItemInstance.Id, stateToPick.ItemInstance.Metadata);
-				}
-			}
-
-			foreach (BlockStateContainer blockStateContainer in statesWithMeta)
-			{
-				bool match = true;
-
-				foreach (IBlockState currentState in blockStateContainer.States)
-				{
-					if (stateFromPick.States.All(s => s.Name != currentState.Name)) continue;
-
-					if (stateFromPick.States.All(state => !state.Equals(currentState)))
-					{
-						Log.Debug($"State: {currentState.Name}, {currentState}");
-
-						match = false;
-						break;
-					}
-				}
-				if (match)
-				{
-					var id = blockStateContainer.Id;
-					var meta = blockStateContainer.Data;
-
-					var statesWithMetaAndItem = statesWithMeta.Where(b => b.ItemInstance != null).ToList();
-					var actualState = statesWithMetaAndItem.FirstOrDefault(s => s.Id == id && s.Data == meta && s.ItemInstance != null);
-					if (actualState == null) break;
-					return ItemFactory.GetItem(actualState.ItemInstance.Id, actualState.ItemInstance.Metadata);
-				}
+				id = -(id - 255);
 			}
-
-			return null;
+			return ItemFactory.GetItem((short) id, Metadata, 1);
 		}
 
 		public bool CanPlace(Level world, Player player, BlockCoordinates targetCoordinates, BlockFace face)
@@ -353,6 +246,11 @@ public virtual Item[] GetDrops(Item tool)
 			return new[] {item};
 		}
 
+		public virtual bool IsBestTool(Item item)
+		{
+			return false;
+		}
+
 		public virtual Item GetSmelt()
 		{
 			return null;

src/MiNET/MiNET/Blocks/BlockFactory.cs

@@ -155,7 +155,6 @@ public static Block GetBlockByName(string blockName)
 		public static Block GetBlockById(int blockId, byte metadata)
 		{
 			int runtimeId = (int) GetRuntimeId(blockId, metadata);
-			if (runtimeId < 0 || runtimeId >= BlockPalette.Count) return null;
 			BlockStateContainer blockState = BlockPalette[runtimeId];
 			Block block = GetBlockById(blockState.Id);
 			block.SetState(blockState.States);

src/MiNET/MiNET/Blocks/BookShelf.cs

@@ -23,6 +23,8 @@
 
 #endregion
 
+using MiNET.Items;
+
 namespace MiNET.Blocks
 {
 	public partial class Bookshelf : Block
@@ -34,5 +36,10 @@ public Bookshelf() : base(47)
 			Hardness = 1.5f;
 			IsFlammable = true;
 		}
+
+		public override bool IsBestTool(Item item)
+		{
+			return item is ItemAxe ? true : false;
+		}
 	}
 }

src/MiNET/MiNET/Blocks/Chest.cs

@@ -37,6 +37,11 @@ public Chest() : base(54)
 		{
 		}
 
+		public override bool IsBestTool(Item item)
+		{
+			return item is ItemAxe ? true : false;
+		}
+
 		public override bool PlaceBlock(Level world, Player player, BlockCoordinates blockCoordinates, BlockFace face, Vector3 faceCoords)
 		{
 			FacingDirection = ItemBlock.GetFacingDirectionFromEntity(player);

src/MiNET/MiNET/Blocks/Composter.cs

@@ -16,6 +16,11 @@ public Composter() : base(468)
 			Hardness = 0.5f;
 		}
 
+		public override bool IsBestTool(Item item)
+		{
+			return item is ItemAxe ? true : false;
+		}
+
 		public override bool Interact(Level level, Player player, BlockCoordinates blockCoordinates, BlockFace face, Vector3 faceCoord)
 		{
 			//todo: level add possibility

src/MiNET/MiNET/Blocks/Crops.cs

@@ -52,6 +52,8 @@ public override bool Interact(Level level, Player player, BlockCoordinates block
 			var itemInHand = player.Inventory.GetItemInHand();
 			if (Growth < MaxGrowth && itemInHand is ItemDye && itemInHand.Metadata == 15)
 			{
+				itemInHand.Count--;
+				player.Inventory.SetInventorySlot(player.Inventory.InHandSlot, itemInHand);
 				Growth += (byte) new Random().Next(2, 6);
 				if (Growth > MaxGrowth) Growth = MaxGrowth;
 

src/MiNET/MiNET/Blocks/DaylightDetector.cs

@@ -23,6 +23,8 @@
 
 #endregion
 
+using MiNET.Items;
+
 namespace MiNET.Blocks
 {
 	public partial class DaylightDetector : Block
@@ -33,5 +35,10 @@ public DaylightDetector() : base(151)
 			BlastResistance = 1;
 			Hardness = 0.2f;
 		}
+
+		public override bool IsBestTool(Item item)
+		{
+			return item is ItemAxe ? true : false;
+		}
 	}
 }

src/MiNET/MiNET/Blocks/DoorBase.cs

@@ -25,6 +25,7 @@
 
 using System.Numerics;
 using log4net;
+using MiNET.Items;
 using MiNET.Sounds;
 using MiNET.Utils.Vectors;
 using MiNET.Worlds;
@@ -47,6 +48,7 @@ protected DoorBase(byte id) : base(id)
 			Hardness = 3;
 		}
 
+
 		protected override bool CanPlace(Level world, Player player, BlockCoordinates blockCoordinates, BlockCoordinates targetCoordinates, BlockFace face)
 		{
 			if (fDirection == 1 || fDirection == 3)

src/MiNET/MiNET/Blocks/DoubleWoodenSlab.cs

@@ -36,6 +36,11 @@ public DoubleWoodenSlab() : base(157)
 			IsFlammable = true;
 		}
 
+		public override bool IsBestTool(Item item)
+		{
+			return item is ItemAxe ? true : false;
+		}
+
 		public override Item[] GetDrops(Item tool)
 		{
 			var items = base.GetDrops(tool);