Allow use of Tags in block ID lists

src/main/java/com/dfsek/terra/config/base/ConfigUtil.java

@@ -6,6 +6,7 @@ import com.dfsek.terra.TerraWorld;
 import com.dfsek.terra.biome.failsafe.FailType;
 import com.dfsek.terra.config.exception.ConfigException;
 import com.dfsek.terra.config.lang.LangUtil;
+import com.dfsek.terra.util.TagUtil;
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import org.bukkit.configuration.InvalidConfigurationException;
@@ -73,9 +74,20 @@ public final class ConfigUtil {
         Set<Material> bl = new HashSet<>();
         for(String s : list) {
             try {
-                if(bl.contains(Bukkit.createBlockData(s).getMaterial()))
+                if(s.startsWith("#")) {
-                    Bukkit.getLogger().warning("Duplicate material in " + phase + " list: " + s);
+                    Debug.info("Loading Tag " + s);
-                bl.add(Bukkit.createBlockData(s).getMaterial());
+                    Set<Material> tag = TagUtil.getTag(s.substring(1));
+                    for(Material m : tag) {
+                        if(bl.contains(m)) {
+                            Bukkit.getLogger().warning("Duplicate material in " + phase + " list: " + m); // Check for duplicates in this tag
+                        }
+                    }
+                    bl.addAll(tag);
+                } else {
+                    if(bl.contains(Bukkit.createBlockData(s).getMaterial()))
+                        Bukkit.getLogger().warning("Duplicate material in " + phase + " list: " + s);
+                    bl.add(Bukkit.createBlockData(s).getMaterial());
+                }
             } catch(NullPointerException | IllegalArgumentException e) {
                 throw new ConfigException("Could not load BlockData data for \"" + s + "\"", id);
             }

src/main/java/com/dfsek/terra/util/TagUtil.java

@@ -0,0 +1,55 @@
+package com.dfsek.terra.util;
+
+import com.dfsek.terra.Debug;
+import org.bukkit.Material;
+import org.bukkit.Tag;
+import org.jetbrains.annotations.NotNull;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+@SuppressWarnings("unchecked")
+public class TagUtil {
+    private static final Map<String, Set<Material>> tagMap;
+
+    static {
+        Debug.info("Loading tags...");
+        tagMap = new HashMap<>();
+
+        Field[] tags = Tag.class.getFields(); // Add Bukkit tags
+        for(Field field : tags) {
+            if(Modifier.isStatic(field.getModifiers())) {
+                try {
+                    Tag<Material> tag = (Tag<Material>) field.get(new Object());
+                    tagMap.put(tag.getKey().toString(), tag.getValues());
+                    Debug.info("Loaded tag: #" + tag.getKey().toString());
+                } catch(IllegalAccessException e) {
+                    e.printStackTrace();
+                } catch(ClassCastException ignore) {
+                }
+            }
+        }
+        putCustomSet("minecraft:base_stone_nether", Material.NETHERRACK, Material.BASALT, Material.BLACKSTONE);
+        putCustomSet("minecraft:base_stone_overworld", Material.STONE, Material.GRANITE, Material.DIORITE, Material.ANDESITE);
+    }
+
+    private static Set<Material> getSet(Material... materials) {
+        return Stream.of(materials).collect(Collectors.toSet());
+    }
+
+    private static void putCustomSet(String key, Material... materials) {
+        tagMap.put(key, getSet(materials));
+        Debug.info("Loaded tag: #" + key);
+    }
+
+    @NotNull
+    public static Set<Material> getTag(String tag) {
+        return Objects.requireNonNull(tagMap.get(tag));
+    }
+}

src/main/resources/default-config/biomes/desert.yml

@@ -26,8 +26,7 @@ flora:
 erodible: true
 
 trees:
-  chance: 100
+  density: 7
-  density: 1
   items:
     CACTUS:
       weight: 1

src/main/resources/default-config/biomes/mesa.yml

@@ -49,8 +49,7 @@ slabs:
     - "minecraft:red_sand": "BLOCK:minecraft:red_sandstone_stairs"
 
 trees:
-  chance: 100
+  density: 7
-  density: 1
   items:
     CACTUS:
       weight: 1

src/main/resources/default-config/ores/deposits/andesite_pocket.yml

@@ -6,4 +6,4 @@ deform: 0.75
 deform-frequency: 0.1
 id: "ANDESITE"
 replace:
-  - "minecraft:stone"
+  - "#minecraft:base_stone_overworld"

src/main/resources/default-config/ores/deposits/diorite_pocket.yml

@@ -6,4 +6,4 @@ deform: 0.75
 deform-frequency: 0.1
 id: "DIORITE"
 replace:
-  - "minecraft:stone"
+  - "#minecraft:base_stone_overworld"

src/main/resources/default-config/ores/deposits/dirt_pocket.yml

@@ -6,4 +6,4 @@ deform: 0.75
 deform-frequency: 0.1
 id: "DIRT"
 replace:
-  - "minecraft:stone"
+  - "#minecraft:base_stone_overworld"

src/main/resources/default-config/ores/deposits/granite_pocket.yml

@@ -6,4 +6,4 @@ deform: 0.75
 deform-frequency: 0.1
 id: "GRANITE"
 replace:
-  - "minecraft:stone"
+  - "#minecraft:base_stone_overworld"

src/main/resources/default-config/ores/deposits/gravel_pocket.yml

@@ -6,4 +6,4 @@ deform: 0.75
 deform-frequency: 0.1
 id: "GRAVEL"
 replace:
-  - "minecraft:stone"
+  - "#minecraft:base_stone_overworld"

src/main/resources/default-config/ores/minerals/coal.yml

@@ -6,4 +6,4 @@ deform: 0.75
 deform-frequency: 0.2
 id: "COAL_ORE"
 replace:
-  - "minecraft:stone"
+  - "#minecraft:base_stone_overworld"

src/main/resources/default-config/ores/minerals/diamond.yml

@@ -6,4 +6,4 @@ deform: 0.75
 deform-frequency: 0.2
 id: "DIAMOND_ORE"
 replace:
-  - "minecraft:stone"
+  - "#minecraft:base_stone_overworld"

src/main/resources/default-config/ores/minerals/gold.yml

@@ -6,4 +6,4 @@ deform: 0.75
 deform-frequency: 0.2
 id: "GOLD_ORE"
 replace:
-  - "minecraft:stone"
+  - "#minecraft:base_stone_overworld"

src/main/resources/default-config/ores/minerals/iron.yml

@@ -6,4 +6,4 @@ deform: 0.75
 deform-frequency: 0.2
 id: "IRON_ORE"
 replace:
-  - "minecraft:stone"
+  - "#minecraft:base_stone_overworld"

src/main/resources/default-config/ores/minerals/lapis.yml

@@ -6,4 +6,4 @@ deform: 0.75
 deform-frequency: 0.2
 id: "LAPIS_ORE"
 replace:
-  - "minecraft:stone"
+  - "#minecraft:base_stone_overworld"

src/main/resources/default-config/ores/minerals/redstone.yml

@@ -6,4 +6,4 @@ deform: 0.75
 deform-frequency: 0.2
 id: "REDSTONE_ORE"
 replace:
-  - "minecraft:stone"
+  - "#minecraft:base_stone_overworld"

src/main/resources/plugin.yml

@@ -1,7 +1,7 @@
 name: "Terra"
 depend: [ "Gaea" ]
 main: "com.dfsek.terra.Terra"
-version: "1.2.0-BETA"
+version: "1.2.1-BETA"
 load: "STARTUP"
 api-version: "1.16"
 softdepend: [ "WorldEdit" ]