1.19 update

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

@@ -46,23 +46,7 @@ public void Pattern_parse_empty_to_air_ok()
 
 			// assert
 			Assert.AreEqual(1, pattern.BlockList.Count);
-			Assert.AreEqual(0, pattern.BlockList[0].Id);
-			Assert.AreEqual(0, pattern.BlockList[0].Metadata);
-			Assert.AreEqual(100, pattern.BlockList[0].Weight);
-			Assert.AreEqual(100, pattern.BlockList[0].Accumulated);
-		}
-
-		[TestMethod]
-		public void Pattern_parse_numeric_to_block_ok()
-		{
-			// setup
-			string inputPattern = "1";
-			var pattern = new Pattern();
-			pattern.Deserialize(null, inputPattern);
-
-			// assert
-			Assert.AreEqual(1, pattern.BlockList.Count);
-			Assert.AreEqual(1, pattern.BlockList[0].Id);
+			Assert.AreEqual("minecraft:air", pattern.BlockList[0].Id);
 			Assert.AreEqual(0, pattern.BlockList[0].Metadata);
 			Assert.AreEqual(100, pattern.BlockList[0].Weight);
 			Assert.AreEqual(100, pattern.BlockList[0].Accumulated);
@@ -72,13 +56,13 @@ public void Pattern_parse_numeric_to_block_ok()
 		public void Pattern_parse_basic_to_block_ok()
 		{
 			// setup
-			string inputPattern = "stone";
+			string inputPattern = "minecraft:stone";
 			var pattern = new Pattern();
 			pattern.Deserialize(null, inputPattern);
 
 			// assert
 			Assert.AreEqual(1, pattern.BlockList.Count);
-			Assert.AreEqual(1, pattern.BlockList[0].Id);
+			Assert.AreEqual("minecraft:stone", pattern.BlockList[0].Id);
 			Assert.AreEqual(0, pattern.BlockList[0].Metadata);
 			Assert.AreEqual(100, pattern.BlockList[0].Weight);
 			Assert.AreEqual(100, pattern.BlockList[0].Accumulated);
@@ -88,13 +72,13 @@ public void Pattern_parse_basic_to_block_ok()
 		public void Pattern_parse_basic_with_meta_to_block_ok()
 		{
 			// setup
-			string inputPattern = "stone:1";
+			string inputPattern = "minecraft:stone:1";
 			var pattern = new Pattern();
 			pattern.Deserialize(null, inputPattern);
 
 			// assert
 			Assert.AreEqual(1, pattern.BlockList.Count);
-			Assert.AreEqual(1, pattern.BlockList[0].Id);
+			Assert.AreEqual("minecraft:stone", pattern.BlockList[0].Id);
 			Assert.AreEqual(1, pattern.BlockList[0].Metadata);
 			Assert.AreEqual(100, pattern.BlockList[0].Weight);
 			Assert.AreEqual(100, pattern.BlockList[0].Accumulated);
@@ -104,19 +88,19 @@ public void Pattern_parse_basic_with_meta_to_block_ok()
 		public void Pattern_parse_multiple_with_meta_to_blocks_ok()
 		{
 			// setup
-			string inputPattern = "stone:1,dirt:1";
+			string inputPattern = "minecraft:stone:1,minecraft:dirt:1";
 			var pattern = new Pattern();
 			pattern.Deserialize(null, inputPattern);
 
 			// assert
 			Assert.AreEqual(2, pattern.BlockList.Count);
 
-			Assert.AreEqual(1, pattern.BlockList[0].Id);
+			Assert.AreEqual("minecraft:stone", pattern.BlockList[0].Id);
 			Assert.AreEqual(1, pattern.BlockList[0].Metadata);
 			Assert.AreEqual(100, pattern.BlockList[0].Weight);
 			Assert.AreEqual(100, pattern.BlockList[0].Accumulated);
 
-			Assert.AreEqual(3, pattern.BlockList[1].Id);
+			Assert.AreEqual("minecraft:dirt", pattern.BlockList[1].Id);
 			Assert.AreEqual(1, pattern.BlockList[1].Metadata);
 			Assert.AreEqual(100, pattern.BlockList[1].Weight);
 			Assert.AreEqual(200, pattern.BlockList[1].Accumulated);
@@ -126,19 +110,19 @@ public void Pattern_parse_multiple_with_meta_to_blocks_ok()
 		public void Pattern_parse_multiple_with_weight_to_blocks_ok()
 		{
 			// setup
-			string inputPattern = "1%stone:1,10%dirt:1";
+			string inputPattern = "1%minecraft:stone:1,10%minecraft:dirt:1";
 			var pattern = new Pattern();
 			pattern.Deserialize(null, inputPattern);
 
 			// assert
 			Assert.AreEqual(2, pattern.BlockList.Count);
 
-			Assert.AreEqual(1, pattern.BlockList[0].Id);
+			Assert.AreEqual("minecraft:stone", pattern.BlockList[0].Id);
 			Assert.AreEqual(1, pattern.BlockList[0].Metadata);
 			Assert.AreEqual(1, pattern.BlockList[0].Weight);
 			Assert.AreEqual(1, pattern.BlockList[0].Accumulated);
 
-			Assert.AreEqual(3, pattern.BlockList[1].Id);
+			Assert.AreEqual("minecraft:dirt", pattern.BlockList[1].Id);
 			Assert.AreEqual(1, pattern.BlockList[1].Metadata);
 			Assert.AreEqual(10, pattern.BlockList[1].Weight);
 			Assert.AreEqual(11, pattern.BlockList[1].Accumulated);
@@ -148,14 +132,14 @@ public void Pattern_parse_multiple_with_weight_to_blocks_ok()
 		public void Pattern_parse_basic_with_blockstate_to_block_ok()
 		{
 			// setup
-			string inputPattern = "stone_button[button_pressed_bit=1,facing_direction=3]";
+			string inputPattern = "minecraft:stone_button[button_pressed_bit=1,facing_direction=3]";
 			var pattern = new Pattern();
 			pattern.Deserialize(null, inputPattern);
 
 			// assert
 			Assert.AreEqual(1, pattern.BlockList.Count);
 
-			Assert.AreEqual(77, pattern.BlockList[0].Id);
+			Assert.AreEqual("minecraft:stone_button", pattern.BlockList[0].Id);
 			Assert.AreEqual(0, pattern.BlockList[0].Metadata);
 			Assert.AreEqual(100, pattern.BlockList[0].Weight);
 			Assert.AreEqual(100, pattern.BlockList[0].Accumulated);
@@ -164,29 +148,29 @@ public void Pattern_parse_basic_with_blockstate_to_block_ok()
 		public void Pattern_parse_multiple_with_blockstate_to_blocks_ok()
 		{
 			// setup
-			string inputPattern = "dirt,stone_button[ button_pressed_bit=1,facing_direction=3] , stone_slab[stone_slab_type=cobblestone,top_slot_bit=1],sand:1";
+			string inputPattern = "minecraft:dirt,minecraft:stone_button[ button_pressed_bit=1,facing_direction=3] , minecraft:stone_slab[stone_slab_type=cobblestone,top_slot_bit=1],minecraft:sand:1";
 			var pattern = new Pattern();
 			pattern.Deserialize(null, inputPattern);
 
 			// assert
 			Assert.AreEqual(4, pattern.BlockList.Count);
 
-			Assert.AreEqual(3, pattern.BlockList[0].Id);
+			Assert.AreEqual("minecraft:dirt", pattern.BlockList[0].Id);
 			Assert.AreEqual(0, pattern.BlockList[0].Metadata);
 			Assert.AreEqual(100, pattern.BlockList[0].Weight);
 			Assert.AreEqual(100, pattern.BlockList[0].Accumulated);
 
-			Assert.AreEqual(77, pattern.BlockList[1].Id);
+			Assert.AreEqual("minecraft:stone_button", pattern.BlockList[1].Id);
 			Assert.AreEqual(0, pattern.BlockList[1].Metadata);
 			Assert.AreEqual(100, pattern.BlockList[1].Weight);
 			Assert.AreEqual(200, pattern.BlockList[1].Accumulated);
 
-			Assert.AreEqual(44, pattern.BlockList[2].Id);
+			Assert.AreEqual("minecraft:stone_slab", pattern.BlockList[2].Id);
 			Assert.AreEqual(0, pattern.BlockList[2].Metadata);
 			Assert.AreEqual(100, pattern.BlockList[2].Weight);
 			Assert.AreEqual(300, pattern.BlockList[2].Accumulated);
 
-			Assert.AreEqual(12, pattern.BlockList[3].Id);
+			Assert.AreEqual("minecraft:sand", pattern.BlockList[3].Id);
 			Assert.AreEqual(1, pattern.BlockList[3].Metadata);
 			Assert.AreEqual(100, pattern.BlockList[3].Weight);
 			Assert.AreEqual(400, pattern.BlockList[3].Accumulated);
@@ -196,54 +180,47 @@ public void Pattern_parse_multiple_with_blockstate_to_blocks_ok()
 		public void Pattern_parse_multiple_all_with_blockstate_to_blocks_ok()
 		{
 			// setup
-			string inputPattern = "log[old_log_type=spruce,pillar_axis=x],log[old_log_type=spruce,pillar_axis=y],log[old_log_type=spruce,pillar_axis=z]";
+			string inputPattern = "minecraft:spruce_log[pillar_axis=x],minecraft:spruce_log[pillar_axis=y],minecraft:spruce_log[pillar_axis=z]";
 			var pattern = new Pattern();
 			pattern.Deserialize(null, inputPattern);
 
 			// assert
 			Assert.AreEqual(3, pattern.BlockList.Count);
 
-			Assert.AreEqual(17, pattern.BlockList[0].Id);
+			Assert.AreEqual("minecraft:spruce_log", pattern.BlockList[0].Id);
 			Assert.AreEqual(0, pattern.BlockList[0].Metadata);
 			Assert.AreEqual(100, pattern.BlockList[0].Weight);
 			Assert.AreEqual(100, pattern.BlockList[0].Accumulated);
 			Assert.IsTrue(pattern.BlockList[0].HasBlockStates);
-			Assert.AreEqual(2, pattern.BlockList[0].BlockStates.Count);
-			Assert.AreEqual("old_log_type", pattern.BlockList[0].BlockStates.First().Name);
-			Assert.AreEqual("spruce", pattern.BlockList[0].BlockStates.First().Value);
 			Assert.AreEqual("pillar_axis", pattern.BlockList[0].BlockStates.Last().Name);
 			Assert.AreEqual("x", pattern.BlockList[0].BlockStates.Last().Value);
 
-			Assert.AreEqual(17, pattern.BlockList[1].Id);
+			Assert.AreEqual("minecraft:spruce_log", pattern.BlockList[1].Id);
 			Assert.AreEqual(0, pattern.BlockList[1].Metadata);
 			Assert.AreEqual(100, pattern.BlockList[1].Weight);
 			Assert.AreEqual(200, pattern.BlockList[1].Accumulated);
 			Assert.IsTrue(pattern.BlockList[1].HasBlockStates);
-			Assert.AreEqual(2, pattern.BlockList[1].BlockStates.Count);
-			Assert.AreEqual("old_log_type", pattern.BlockList[1].BlockStates.First().Name);
 			Assert.AreEqual("pillar_axis", pattern.BlockList[1].BlockStates.Last().Name);
 
-			Assert.AreEqual(17, pattern.BlockList[2].Id);
+			Assert.AreEqual("minecraft:spruce_log", pattern.BlockList[2].Id);
 			Assert.AreEqual(0, pattern.BlockList[2].Metadata);
 			Assert.AreEqual(100, pattern.BlockList[2].Weight);
 			Assert.AreEqual(300, pattern.BlockList[2].Accumulated);
 			Assert.IsTrue(pattern.BlockList[2].HasBlockStates);
-			Assert.AreEqual(2, pattern.BlockList[2].BlockStates.Count);
-			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]
 		public void RegexTest()
 		{
-			//string inputPattern = "trap|stone_button{button_pressed_bit=1|facing_direction=3}|stone_face{button_pressed_bit=1|facing_direction=3}";
+			//string inputPattern = "trap|minecraft:stone_button{button_pressed_bit=1|facing_direction=3}|stone_face{button_pressed_bit=1|facing_direction=3}";
 			//var patternsEx = new Regex(@"\|(?![^{]*})");
-			string inputPattern = "dirt,stone_button[button_pressed_bit=1,facing_direction=3],stone_face[button_pressed_bit=1,facing_direction=3],sand";
+			string inputPattern = "minecraft:dirt,minecraft:stone_button[button_pressed_bit=1,facing_direction=3],minecraft:stone_face[button_pressed_bit=1,facing_direction=3],minecraft:sand";
 			var patternsEx = new Regex(@",(?![^\[]*])");
 			var patterns = patternsEx.Split(inputPattern);
 

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.20 - update (local support for legacy ids only for BuilderBase)
+						//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);
 					}
 				}
 			}