Fix Block/BlockList validation of modded blocks

Fixes https://wurstforum.net/d/1289

Author: Alexander01998

src/main/java/net/wurstclient/settings/BlockListSetting.java

@@ -21,6 +21,7 @@
 import com.google.gson.JsonPrimitive;
 
 import net.minecraft.block.Block;
+import net.minecraft.util.Identifier;
 import net.wurstclient.WurstClient;
 import net.wurstclient.clickgui.Component;
 import net.wurstclient.clickgui.components.BlockListEditButton;
@@ -132,10 +133,27 @@ public void fromJson(JsonElement json)
 			}
 
 			// otherwise, load the blocks in the JSON array
-			JsonUtils.getAsArray(json).getAllStrings().parallelStream()
-				.map(BlockUtils::getBlockFromNameOrID).filter(Objects::nonNull)
-				.map(BlockUtils::getName).distinct().sorted()
-				.forEachOrdered(s -> blockNames.add(s));
+			for(String rawName : JsonUtils.getAsArray(json).getAllStrings())
+			{
+				Identifier id = Identifier.tryParse(rawName);
+				if(id == null)
+				{
+					System.out.println("Discarding BlockList entry \"" + rawName
+						+ "\" as it is not a valid identifier");
+					continue;
+				}
+				
+				String name = id.toString();
+				if(blockNames.contains(name))
+				{
+					System.out.println("Discarding BlockList entry \"" + rawName
+						+ "\" as \"" + name + "\" is already in the list");
+					continue;
+				}
+				
+				blockNames.add(name);
+			}
+			blockNames.sort(null);
 
 		}catch(JsonException e)
 		{

src/main/java/net/wurstclient/settings/BlockSetting.java

@@ -17,6 +17,7 @@
 
 import net.minecraft.block.AirBlock;
 import net.minecraft.block.Block;
+import net.minecraft.util.Identifier;
 import net.wurstclient.WurstClient;
 import net.wurstclient.clickgui.Component;
 import net.wurstclient.clickgui.components.BlockComponent;
@@ -116,16 +117,19 @@ public void fromJson(JsonElement json)
 	{
 		try
 		{
-			String newName = JsonUtils.getAsString(json);
+			String rawName = JsonUtils.getAsString(json);
 
-			Block newBlock = BlockUtils.getBlockFromNameOrID(newName);
-			if(newBlock == null)
-				throw new JsonException();
+			Identifier id = Identifier.tryParse(rawName);
+			if(id == null)
+				throw new JsonException("Discarding Block \"" + rawName
+					+ "\" as it is not a valid identifier");
 
-			if(!allowAir && newBlock instanceof AirBlock)
-				throw new JsonException();
+			String name = id.toString();
+			if(!allowAir && "minecraft:air".equals(name))
+				throw new JsonException("Discarding Block \"" + rawName
+					+ "\" as this setting does not allow air blocks");
 
-			blockName = BlockUtils.getName(newBlock);
+			blockName = name;
 
 		}catch(JsonException e)
 		{