From 37a26f25bb1376f333de38cf30c135f6add47bb5 Mon Sep 17 00:00:00 2001
From: Frank <developer@ambertation.de>
Date: Thu, 30 Jun 2022 23:15:26 +0200
Subject: [PATCH] [Change] Basalt no longer counts as terrain

---
 .../features/blockpredicates/BlockPredicates.java    |  4 ++++
 .../worlds/together/tag/v3/CommonBlockTags.java      | 12 +++++++++---
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/betterx/bclib/api/v3/levelgen/features/blockpredicates/BlockPredicates.java b/src/main/java/org/betterx/bclib/api/v3/levelgen/features/blockpredicates/BlockPredicates.java
index cb3df9f7..28cd01fa 100644
--- a/src/main/java/org/betterx/bclib/api/v3/levelgen/features/blockpredicates/BlockPredicates.java
+++ b/src/main/java/org/betterx/bclib/api/v3/levelgen/features/blockpredicates/BlockPredicates.java
@@ -22,6 +22,10 @@ public class BlockPredicates {
     );
     public static final BlockPredicate ONLY_SOUL_GROUND = BlockPredicate.matchesTag(CommonBlockTags.SOUL_GROUND);
     public static final BlockPredicate ONLY_NETHER_GROUND = BlockPredicate.matchesTag(CommonBlockTags.NETHER_TERRAIN);
+    public static final BlockPredicate ONLY_NETHER_GROUND_AND_BASALT = BlockPredicate.anyOf(
+            ONLY_NETHER_GROUND,
+            BlockPredicate.matchesBlocks(Blocks.BASALT)
+    );
     public static final BlockPredicate ONLY_GROUND = BlockPredicate.matchesTag(CommonBlockTags.TERRAIN);
 
     public static final BlockPredicate ONLY_LAVA = BlockPredicate.matchesFluids(Fluids.LAVA);
diff --git a/src/main/java/org/betterx/worlds/together/tag/v3/CommonBlockTags.java b/src/main/java/org/betterx/worlds/together/tag/v3/CommonBlockTags.java
index fce9a26b..9f2ee4aa 100644
--- a/src/main/java/org/betterx/worlds/together/tag/v3/CommonBlockTags.java
+++ b/src/main/java/org/betterx/worlds/together/tag/v3/CommonBlockTags.java
@@ -86,13 +86,13 @@ public class CommonBlockTags {
                 Blocks.GRAVEL,
                 Blocks.RED_SAND,
                 Blocks.GLOWSTONE,
-                Blocks.BONE_BLOCK
+                Blocks.BONE_BLOCK,
+                Blocks.BLACKSTONE
         );
         TagManager.BLOCKS.addOtherTags(
                 NETHER_TERRAIN,
                 NETHERRACK,
                 BlockTags.NYLIUM,
-                NETHER_STONES,
                 NETHER_ORES,
                 SOUL_GROUND,
                 NETHER_MYCELIUM
@@ -101,7 +101,13 @@ public class CommonBlockTags {
         TagManager.BLOCKS.add(CommonBlockTags.BOOKSHELVES, Blocks.BOOKSHELF);
         TagManager.BLOCKS.add(CommonBlockTags.CHEST, Blocks.CHEST);
 
-        TagManager.BLOCKS.add(BlockTags.NETHER_CARVER_REPLACEABLES, Blocks.RED_SAND, Blocks.MAGMA_BLOCK, Blocks.SCULK);
+        TagManager.BLOCKS.add(
+                BlockTags.NETHER_CARVER_REPLACEABLES,
+                Blocks.BASALT,
+                Blocks.RED_SAND,
+                Blocks.MAGMA_BLOCK,
+                Blocks.SCULK
+        );
         TagManager.BLOCKS.addOtherTags(
                 BlockTags.NETHER_CARVER_REPLACEABLES,
                 CommonBlockTags.NETHER_STONES,