Add support of 1.16 blocks

EpiCanard · Oct 2, 2020 · 2a88964 · 2a88964
1 parent 48c046f
commit 2a88964
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/src/main/java/net/gkid117/choptree/ChopTree.java b/src/main/java/net/gkid117/choptree/ChopTree.java
@@ -215,17 +215,17 @@ public void loadConfig()
     leafRadius = config.getInt("LeafRadius", 3);
     config.set("LeafRadius", Integer.valueOf(leafRadius));
 
-    allowedWoodBlocks = filterConfigParams("AllowedWoodBlocks", "LOG");
-    leavesForDecay = filterConfigParams("LeavesForDecay", "LEAVES");
+    allowedWoodBlocks = filterConfigParams("AllowedWoodBlocks", Arrays.asList("LOG", "STEM"));
+    leavesForDecay = filterConfigParams("LeavesForDecay", Arrays.asList("LEAVES", "WART_BLOCK"));
 
     saveConfig();
   }
 
-  private List<String> filterConfigParams(String configVar, String contain) {
+  private List<String> filterConfigParams(String configVar, List<String> contain) {
     final List<String> input = config.getStringList(configVar);
     final List<String> notAllowed = new ArrayList<>();
     final List<String> output = input.stream().filter(block -> {
-      final Boolean ret = block.contains(contain); 
+      final Boolean ret = contain.stream().anyMatch(word -> block.contains(word)); 
       if (!ret)
         notAllowed.add(block);
       return ret;

diff --git a/src/main/ressources/config.yml b/src/main/ressources/config.yml
@@ -38,10 +38,14 @@ AllowedWoodBlocks:
   - JUNGLE_LOG
   - OAK_LOG
   - SPRUCE_LOG
+  - CRIMSON_STEM
+  - WARPED_STEM
 LeavesForDecay:
   - ACACIA_LEAVES
   - BIRCH_LEAVES
   - DARK_OAK_LEAVES
   - JUNGLE_LEAVES
   - OAK_LEAVES
   - SPRUCE_LEAVES
+  - NETHER_WART_BLOCK
+  - WARPED_WART_BLOCK