From ed86b67c18d8b2b6a05130b503d28915427a4c71 Mon Sep 17 00:00:00 2001
From: Oth3r <oth3rone@outlook.com>
Date: Sat, 19 Oct 2024 17:40:37 -0500
Subject: [PATCH] changed blacklisted blocks into a customblock list

---
 src/main/java/one/oth3r/sit/file/ServerConfig.java | 8 +++++---
 src/main/java/one/oth3r/sit/utl/Utl.java           | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/main/java/one/oth3r/sit/file/ServerConfig.java b/src/main/java/one/oth3r/sit/file/ServerConfig.java
index 8a8ebd4..d630239 100644
--- a/src/main/java/one/oth3r/sit/file/ServerConfig.java
+++ b/src/main/java/one/oth3r/sit/file/ServerConfig.java
@@ -36,7 +36,7 @@ public class ServerConfig implements CustomFile<ServerConfig> {
     @SerializedName("custom-blocks")
     private ArrayList<SittingBlock> sittingBlocks = FileData.Defaults.SITTING_BLOCKS;
     @SerializedName("blacklisted-blocks")
-    private ArrayList<String> blacklistedBlocks = new ArrayList<>();
+    private ArrayList<CustomBlock> blacklistedBlocks = FileData.Defaults.BLACKLISTED_BLOCKS;
 
     public ServerConfig() {}
 
@@ -51,7 +51,9 @@ public class ServerConfig implements CustomFile<ServerConfig> {
         this.blacklistedBlocks = serverConfig.blacklistedBlocks;
     }
 
-    public ServerConfig(Double version, String lang, boolean keepActive, boolean sitWhileSeated, PresetBlocks presetBlocks, boolean customEnabled, ArrayList<SittingBlock> sittingBlocks, ArrayList<String> blacklistedBlocks) {
+    public ServerConfig(Double version, String lang, boolean keepActive, boolean sitWhileSeated,
+                        PresetBlocks presetBlocks, boolean customEnabled,
+                        ArrayList<SittingBlock> sittingBlocks, ArrayList<CustomBlock> blacklistedBlocks) {
         this.version = version;
         this.lang = lang;
         this.keepActive = keepActive;
@@ -90,7 +92,7 @@ public class ServerConfig implements CustomFile<ServerConfig> {
         return sittingBlocks;
     }
 
-    public ArrayList<String> getBlacklistedBlocks() {
+    public ArrayList<CustomBlock> getBlacklistedBlocks() {
         return blacklistedBlocks;
     }
 
diff --git a/src/main/java/one/oth3r/sit/utl/Utl.java b/src/main/java/one/oth3r/sit/utl/Utl.java
index 7cafc96..2f4fb66 100644
--- a/src/main/java/one/oth3r/sit/utl/Utl.java
+++ b/src/main/java/one/oth3r/sit/utl/Utl.java
@@ -156,7 +156,7 @@ public class Utl {
         // only if custom is enabled
         if (config.isCustomEnabled()) {
             // if the block is on the blacklist, false
-            if (config.getBlacklistedBlocks().contains(getBlockID(blockState))) return null;
+            if (config.getBlacklistedBlocks().stream().anyMatch(c -> c.isValid(blockState))) return null;
 
             for (SittingBlock sittingBlock : config.getSittingBlocks()) {
                 // if the block is valid, true