Fix BlockUtils.getBlockFromNameOrID() not returning null when it should

Author: Alexander01998

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

@@ -21,8 +21,6 @@
 import com.google.gson.JsonPrimitive;
 
 import net.minecraft.block.Block;
-import net.minecraft.registry.Registries;
-import net.minecraft.util.Identifier;
 import net.wurstclient.WurstClient;
 import net.wurstclient.clickgui.Component;
 import net.wurstclient.clickgui.components.BlockListEditButton;
@@ -41,8 +39,7 @@ public BlockListSetting(String name, WText description, String... blocks)
 	{
 		super(name, description);
 
-		Arrays.stream(blocks).parallel()
-			.map(s -> Registries.BLOCK.get(Identifier.of(s)))
+		Arrays.stream(blocks).parallel().map(BlockUtils::getBlockFromNameOrID)
 			.filter(Objects::nonNull).map(BlockUtils::getName).distinct()
 			.sorted().forEachOrdered(s -> blockNames.add(s));
 		defaultNames = blockNames.toArray(new String[0]);
@@ -136,9 +133,9 @@ public void fromJson(JsonElement json)
 
 			// otherwise, load the blocks in the JSON array
 			JsonUtils.getAsArray(json).getAllStrings().parallelStream()
-				.map(s -> Registries.BLOCK.get(Identifier.of(s)))
-				.filter(Objects::nonNull).map(BlockUtils::getName).distinct()
-				.sorted().forEachOrdered(s -> blockNames.add(s));
+				.map(BlockUtils::getBlockFromNameOrID).filter(Objects::nonNull)
+				.map(BlockUtils::getName).distinct().sorted()
+				.forEachOrdered(s -> blockNames.add(s));
 
 		}catch(JsonException e)
 		{

src/main/java/net/wurstclient/util/BlockUtils.java

@@ -98,7 +98,11 @@ public static Block getBlockFromNameOrID(String nameOrId)
 
 		try
 		{
-			return Registries.BLOCK.get(Identifier.of(nameOrId));
+			Identifier id = Identifier.of(nameOrId);
+			if(!Registries.BLOCK.containsId(id))
+				return null;
+			
+			return Registries.BLOCK.get(id);
 
 		}catch(InvalidIdentifierException e)
 		{