1.19 update

.github/workflows/dotnetcore.yml

@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - master
+      - 1.19-update
 
 jobs:
   nuget:

src/MiNET/MiNET.BuilderBase.Tests/Patterns/PatternTests.cs

@@ -232,10 +232,10 @@ public void Pattern_parse_multiple_all_with_blockstate_to_blocks_ok()
 			Assert.AreEqual("old_log_type", pattern.BlockList[2].BlockStates.First().Name);
 			Assert.AreEqual("pillar_axis", pattern.BlockList[2].BlockStates.Last().Name);
 
-			Log block = pattern.Next(BlockCoordinates.North) as Log;
+			LogBase block = pattern.Next(BlockCoordinates.North) as LogBase;
 			Assert.IsNotNull(block);
-			Assert.IsInstanceOfType(block, typeof(Log));
-			Assert.AreEqual("spruce", block.OldLogType);
+			Assert.IsInstanceOfType(block, typeof(LogBase));
+			//Assert.AreEqual("spruce", block.OldLogType);
 		}
 
 		[TestMethod]

src/MiNET/MiNET.BuilderBase/BuilderBaseItemFactory.cs

@@ -1,12 +1,12 @@
-using fNbt;
+using fNbt;
 using MiNET.BuilderBase.Tools;
 using MiNET.Items;
 
 namespace MiNET.BuilderBase
 {
 	public class BuilderBaseItemFactory : ICustomItemFactory
 	{
-		public Item GetItem(short id, short metadata, int count)
+		public Item GetItem(string id, short metadata, int count)
 		{
 			if (id == new BrushTool().Id)
 			{

src/MiNET/MiNET.BuilderBase/Commands/ClipboardCommands.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Numerics;
 using System.Threading.Tasks;
 using log4net;
@@ -30,7 +30,7 @@ public void Copy(Player player)
 		}
 
 		[Command(Description = "Cut the selection to the clipboard")]
-		public void Cut(Player player, int leaveId = 0, int leaveData = 0)
+		public void Cut(Player player, string leaveId = "", int leaveData = 0)
 		{
 			RegionSelector selector = RegionSelector.GetSelector(player);
 
@@ -40,7 +40,7 @@ public void Cut(Player player, int leaveId = 0, int leaveData = 0)
 			clipboard.SourceMask = new AnyBlockMask();
 			clipboard.SourceFuncion = coordinates =>
 			{
-				var block = BlockFactory.GetBlockById((byte) leaveId);
+				var block = BlockFactory.GetBlockById(leaveId);
 				block.Metadata = (byte) leaveData;
 				block.Coordinates = coordinates;
 				EditSession.SetBlock(block);

src/MiNET/MiNET.BuilderBase/Commands/MiscCommands.cs

@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using log4net;
 using MiNET.Blocks;
 using MiNET.BuilderBase.Masks;
@@ -27,7 +27,7 @@ public void Fill(Player player, Pattern pattern, int radius, int depth = -1)
 		public void Drain(Player player, int radius)
 		{
 			EditSession.Fill((BlockCoordinates) player.KnownPosition,
-				new Pattern(0, 0),
+				new Pattern(BlockFactory.GetIdByType<Air>(), 0),
 				new Mask(player.Level, new List<Block> {new FlowingWater(), new Water(), new Lava(), new FlowingLava()}, true),
 				radius,
 				-1, true);

src/MiNET/MiNET.BuilderBase/Commands/RegionCommands.cs

@@ -1,4 +1,4 @@
-#region LICENSE
+#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
@@ -42,12 +42,11 @@ public class RegionCommands : UndoableCommand
 		[Command(Description = "Set all blocks within selection")]
 		public void SetBlock(Player player, BlockTypeEnum tileName, int tileData = 0)
 		{
-			var id = BlockFactory.GetBlockIdByName(tileName.Value);
-			Set(player, id, tileData);
+			Set(player, tileName.Value, tileData);
 		}
 
 		[Command(Description = "Set all blocks within selection")]
-		public void Set(Player player, int tileId, int tileData = 0)
+		public void Set(Player player, string tileId, int tileData = 0)
 		{
 			var pattern = new Pattern(tileId, tileData);
 			EditSession.SetBlocks(Selector, pattern);
@@ -62,12 +61,11 @@ public void Set(Player player, Pattern pattern)
 		[Command(Description = "Draws a line segment between cuboid selection corners")]
 		public void Line(Player player, BlockTypeEnum tileName, int tileData = 0, int thickness = 1, bool shell = false)
 		{
-			var id = BlockFactory.GetBlockIdByName(tileName.Value);
-			Line(player, id, tileData, thickness, shell);
+			Line(player, tileName.Value, tileData, thickness, shell);
 		}
 
 		[Command(Description = "Draws a line segment between cuboid selection corners")]
-		public void Line(Player player, int tileId, int tileData = 0, int thickness = 0, bool shell = false)
+		public void Line(Player player, string tileId, int tileData = 0, int thickness = 0, bool shell = false)
 		{
 			var pattern = new Pattern(tileId, tileData);
 			EditSession.DrawLine(Selector, pattern, Selector.Position1, Selector.Position2, thickness, !shell);
@@ -80,7 +78,7 @@ public void Replace(Player player, Mask mask, Pattern pattern)
 		}
 
 		[Command(Description = "Set the center block(s)")]
-		public void Center(Player player, int tileId = 1, int tileData = 0)
+		public void Center(Player player, string tileId = "stone", int tileData = 0)
 		{
 			var pattern = new Pattern(tileId, tileData);
 

src/MiNET/MiNET.BuilderBase/Commands/SchematicsCommands.cs

@@ -75,41 +75,42 @@ public string Load(Player player, string schematicFile)
 				{
 					for (int z = 0; z < length; ++z)
 					{
-						int index = y*width*length + z*width + x;
-						BlockCoordinates coord = new BlockCoordinates(x, y, z);
-
-						if (blocks[index] == 0) continue;
-
-						int blockId = blocks[index];
-						byte data = blockData[index];
-
-						Func<int, byte, byte> dataConverter = (i, b) => b; // Default no-op converter
-						if (AnvilWorldProvider.Convert.ContainsKey(blockId))
-						{
-							dataConverter = AnvilWorldProvider.Convert[blockId].Item2;
-							blockId = AnvilWorldProvider.Convert[blockId].Item1;
-						}
-						else
-						{
-							if (BlockFactory.GetBlockById((byte) blockId).GetType() == typeof (Block))
-							{
-								Log.Warn($"No block implemented for block ID={blockId}, Meta={data}");
-								//blockId = 57;
-							}
-						}
-
-						if (blockId > 255)
-						{
-							Log.Warn($"Failed mapping for block ID={blockId}, Meta={data}");
-							blockId = 41;
-						}
-
-						var metadata = dataConverter(blockId, data);
-
-						Block block = BlockFactory.GetBlockById((byte) blockId);
-						block.Coordinates = coord;
-						block.Metadata = metadata;
-						buffer.Add(block);
+						// TODO - 1.19 - update
+						//int index = y*width*length + z*width + x;
+						//BlockCoordinates coord = new BlockCoordinates(x, y, z);
+
+						//if (blocks[index] == 0) continue;
+
+						//int blockId = blocks[index];
+						//byte data = blockData[index];
+
+						//Func<int, byte, byte> dataConverter = (i, b) => b; // Default no-op converter
+						//if (AnvilWorldProvider.Convert.ContainsKey(blockId))
+						//{
+						//	dataConverter = AnvilWorldProvider.Convert[blockId].Item2;
+						//	blockId = AnvilWorldProvider.Convert[blockId].Item1;
+						//}
+						//else
+						//{
+						//	if (BlockFactory.GetBlockById((byte) blockId).GetType() == typeof (Block))
+						//	{
+						//		Log.Warn($"No block implemented for block ID={blockId}, Meta={data}");
+						//		//blockId = 57;
+						//	}
+						//}
+
+						//if (blockId > 255)
+						//{
+						//	Log.Warn($"Failed mapping for block ID={blockId}, Meta={data}");
+						//	blockId = 41;
+						//}
+
+						//var metadata = dataConverter(blockId, data);
+
+						//Block block = BlockFactory.GetBlockById((byte) blockId);
+						//block.Coordinates = coord;
+						//block.Metadata = metadata;
+						//buffer.Add(block);
 					}
 				}
 			}

src/MiNET/MiNET.BuilderBase/Commands/SelectionCommands.cs

@@ -416,7 +416,7 @@ public void Size(Player player)
 		}
 
 		[Command(Description = "Counts the number of a certain type of block")]
-		public void Count(Player player, int tileId, int tileData = 0, bool separateByData = false)
+		public void Count(Player player, string tileId, int tileData = 0, bool separateByData = false)
 		{
 			var selector = RegionSelector.GetSelector(player);
 
@@ -435,10 +435,10 @@ public void Distribution(Player player, bool separateByData = false)
 			var selector = RegionSelector.GetSelector(player);
 
 			var selection = selector.GetSelectedBlocks().Select(coord => player.Level.GetBlock(coord)).ToArray();
-			Dictionary<Tuple<int, int>, int> dist = new Dictionary<Tuple<int, int>, int>();
+			Dictionary<Tuple<string, int>, int> dist = new Dictionary<Tuple<string, int>, int>();
 			foreach (var block in selection)
 			{
-				Tuple<int, int> tuple = Tuple.Create(block.Id, separateByData ? block.Metadata : 0);
+				Tuple<string, int> tuple = Tuple.Create(block.Id, separateByData ? block.Metadata : 0);
 				if (dist.ContainsKey(tuple)) dist[tuple] = dist[tuple] + 1;
 				else dist.Add(tuple, 1);
 			}

src/MiNET/MiNET.BuilderBase/Masks/Mask.cs

@@ -39,7 +39,7 @@ public class Mask : IParameterSerializer
 
 		private class BlockDataEntry
 		{
-			public int Id { get; set; }
+			public string Id { get; set; }
 			public byte Metadata { get; set; }
 			public bool IgnoreMetadata { get; set; } = true;
 		}
@@ -159,15 +159,7 @@ public virtual void Deserialize(Player player, string input)
 
 					var dataEntry = new BlockDataEntry();
 
-					int id;
-
-					string binfo = blockInfos[0];
-					if (!int.TryParse(binfo, out id))
-					{
-						id = BlockFactory.GetBlockIdByName(binfo);
-					}
-
-					dataEntry.Id = id;
+					dataEntry.Id = blockInfos[0];
 
 					if (blockInfos.Length == 2)
 					{

src/MiNET/MiNET.BuilderBase/Patterns/Pattern.cs

@@ -48,7 +48,7 @@ public BlockDataEntry()
 			{
 			}
 
-			public int Id { get; set; }
+			public string Id { get; set; }
 			public byte Metadata { get; set; }
 			public bool HasMetadata { get; set; }
 			public int Weight { get; set; } = 100;
@@ -73,11 +73,11 @@ public Pattern()
 			_random = new Random();
 		}
 
-		public Pattern(int blockId, int metadata)
+		public Pattern(string blockId, int metadata)
 		{
 			BlockList.Add(new BlockDataEntry()
 			{
-				Id = (byte) blockId,
+				Id = blockId,
 				Metadata = (byte) metadata,
 				HasMetadata = true
 			});
@@ -182,12 +182,12 @@ public virtual void Deserialize(Player player, string currentPattern)
 						else if (matchGroup.Name == "blockName" && matchGroup.Success)
 						{
 							Log.Debug($"Matched blockName group {matchGroup.Value}");
-							blockDataEntry.Id = BlockFactory.GetBlockIdByName(matchGroup.Value.Trim());
+							blockDataEntry.Id = matchGroup.Value.Trim();
 						}
 						if (matchGroup.Name == "blockId" && matchGroup.Success)
 						{
 							Log.Debug($"Matched blockId group {matchGroup.Value}");
-							if (int.TryParse(matchGroup.Value.Trim(), out int id)) blockDataEntry.Id = id;
+							throw new InvalidOperationException("blockId now is string id. Replace blockName to blockId needed.");
 						}
 						else if (matchGroup.Name == "meta" && matchGroup.Success)
 						{

src/MiNET/MiNET.BuilderBase/Tools/BrushTool.cs

@@ -48,7 +48,7 @@ public class BrushTool : ItemIronShovel
 		public int Height { get; set; } = 1;
 		public int Range { get; set; } = 300;
 		[JsonIgnore]
-		public Pattern Pattern { get; set; } = new Pattern(1, 0);
+		public Pattern Pattern { get; set; } = new Pattern("minecraft:stone", 0);
 		[JsonIgnore]
 		public Mask Mask { get; set; } = new AnyBlockMask();
 		public bool Filled { get; set; } = true;
@@ -110,9 +110,10 @@ public void UpdateDisplay(Player player)
 			player.Inventory.SendSetSlot(player.Inventory.InHandSlot);
 		}
 
-		public override void PlaceBlock(Level world, Player player, BlockCoordinates blockCoordinates, BlockFace face, Vector3 faceCoords)
+		public override bool PlaceBlock(Level world, Player player, BlockCoordinates blockCoordinates, BlockFace face, Vector3 faceCoords)
 		{
 			player.Inventory.SendSetSlot(player.Inventory.InHandSlot);
+			return true;
 		}
 
 		public override void UseItem(Level world, Player player, BlockCoordinates blockCoordinates)
@@ -297,7 +298,7 @@ private void FillIteration(int inbrushSize, int fillFaces, BlockBuffer current,
 		{
 			double brushSizeSquared = inbrushSize*inbrushSize;
 			int brushSize = inbrushSize + 1;
-			Dictionary<int, int> frequency = new Dictionary<int, int>();
+			Dictionary<string, int> frequency = new Dictionary<string, int>();
 
 			for (int x = -brushSize; x <= brushSize; x++)
 			{
@@ -364,7 +365,7 @@ private void ErosionIteration(int inbrushSize, int erodeFaces, BlockBuffer curre
 		{
 			double brushSizeSquared = inbrushSize*inbrushSize;
 			int brushSize = inbrushSize + 1;
-			Dictionary<int, int> frequency = new Dictionary<int, int>();
+			Dictionary<string, int> frequency = new Dictionary<string, int>();
 
 			for (int x = -brushSize; x <= brushSize; x++)
 			{
@@ -386,7 +387,7 @@ private void ErosionIteration(int inbrushSize, int erodeFaces, BlockBuffer curre
 						}
 						int total = 0;
 						int highest = 1;
-						int highestState = state.Id;
+						var highestState = state.Id;
 						frequency.Clear();
 						foreach (var offs in FACES_TO_CHECK)
 						{

src/MiNET/MiNET.BuilderBase/Tools/DistanceWand.cs

@@ -71,9 +71,10 @@ private void UpdateExtraData(Player player = null)
 		}
 
 
-		public override void PlaceBlock(Level world, Player player, BlockCoordinates blockCoordinates, BlockFace face, Vector3 faceCoords)
+		public override bool PlaceBlock(Level world, Player player, BlockCoordinates blockCoordinates, BlockFace face, Vector3 faceCoords)
 		{
 			SetPosition2(player, blockCoordinates);
+			return true;
 		}
 
 		public override void UseItem(Level world, Player player, BlockCoordinates blockCoordinates)

src/MiNET/MiNET.BuilderBase/Tools/TeleportTool.cs

@@ -69,9 +69,10 @@ private void UpdateExtraData()
 			};
 		}
 
-		public override void PlaceBlock(Level world, Player player, BlockCoordinates blockCoordinates, BlockFace face, Vector3 faceCoords)
+		public override bool PlaceBlock(Level world, Player player, BlockCoordinates blockCoordinates, BlockFace face, Vector3 faceCoords)
 		{
 			Teleport(player, true);
+			return true;
 		}
 
 		public override void UseItem(Level world, Player player, BlockCoordinates blockCoordinates)