From 6c7b8fd9da247e4aa37f845edf44eb631c5d2e84 Mon Sep 17 00:00:00 2001
From: Daniel Walsh <walshydev@gmail.com>
Date: Tue, 26 Jan 2021 07:30:42 +0000
Subject: [PATCH 1/4] Add a way to retrieve the raw storage

---
 .../Slimefun/api/BlockStorage.java              | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/src/main/java/me/mrCookieSlime/Slimefun/api/BlockStorage.java b/src/main/java/me/mrCookieSlime/Slimefun/api/BlockStorage.java
index 8870e9534..b5f223e41 100644
--- a/src/main/java/me/mrCookieSlime/Slimefun/api/BlockStorage.java
+++ b/src/main/java/me/mrCookieSlime/Slimefun/api/BlockStorage.java
@@ -360,6 +360,23 @@ public class BlockStorage {
         }
     }
 
+    @Nonnull
+    public Map<Location, String> getStorage() {
+        return this.storage;
+    }
+
+    @Nullable
+    public static Map<Location, String> getStorage(@Nonnull World world) {
+        Validate.notNull(world, "World cannot be null!");
+
+        BlockStorage storage = getStorage(world);
+        if (storage != null) {
+            return storage.getStorage();
+        } else {
+            return null;
+        }
+    }
+
     public static void store(Block block, ItemStack item) {
         SlimefunItem sfitem = SlimefunItem.getByItem(item);
 

From fd4073768249119c9d79c52362e83083406a522e Mon Sep 17 00:00:00 2001
From: Daniel Walsh <walshydev@gmail.com>
Date: Tue, 26 Jan 2021 07:40:37 +0000
Subject: [PATCH 2/4] Oops

---
 .../java/me/mrCookieSlime/Slimefun/api/BlockStorage.java    | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/me/mrCookieSlime/Slimefun/api/BlockStorage.java b/src/main/java/me/mrCookieSlime/Slimefun/api/BlockStorage.java
index b5f223e41..6a8dfaa5a 100644
--- a/src/main/java/me/mrCookieSlime/Slimefun/api/BlockStorage.java
+++ b/src/main/java/me/mrCookieSlime/Slimefun/api/BlockStorage.java
@@ -27,6 +27,8 @@ import org.bukkit.configuration.file.YamlConfiguration;
 import org.bukkit.entity.HumanEntity;
 import org.bukkit.inventory.ItemStack;
 
+import org.apache.commons.lang.Validate;
+
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
@@ -361,12 +363,12 @@ public class BlockStorage {
     }
 
     @Nonnull
-    public Map<Location, String> getStorage() {
+    public Map<Location, Config> getStorage() {
         return this.storage;
     }
 
     @Nullable
-    public static Map<Location, String> getStorage(@Nonnull World world) {
+    public static Map<Location, Config> getStorage(@Nonnull World world) {
         Validate.notNull(world, "World cannot be null!");
 
         BlockStorage storage = getStorage(world);

From d0e0aa3c657aeffe401813890644e3b02d7ccf5b Mon Sep 17 00:00:00 2001
From: Daniel Walsh <walshydev@gmail.com>
Date: Tue, 26 Jan 2021 07:44:04 +0000
Subject: [PATCH 3/4] getStorage -> getRawStorage

---
 src/main/java/me/mrCookieSlime/Slimefun/api/BlockStorage.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/me/mrCookieSlime/Slimefun/api/BlockStorage.java b/src/main/java/me/mrCookieSlime/Slimefun/api/BlockStorage.java
index 6a8dfaa5a..1a54e08b4 100644
--- a/src/main/java/me/mrCookieSlime/Slimefun/api/BlockStorage.java
+++ b/src/main/java/me/mrCookieSlime/Slimefun/api/BlockStorage.java
@@ -363,12 +363,12 @@ public class BlockStorage {
     }
 
     @Nonnull
-    public Map<Location, Config> getStorage() {
+    public Map<Location, Config> getRawStorage() {
         return this.storage;
     }
 
     @Nullable
-    public static Map<Location, Config> getStorage(@Nonnull World world) {
+    public static Map<Location, Config> getRawStorage(@Nonnull World world) {
         Validate.notNull(world, "World cannot be null!");
 
         BlockStorage storage = getStorage(world);

From 986eb38e814a8ce6b4baa3d3ef72ee65d67c7e5b Mon Sep 17 00:00:00 2001
From: Daniel Walsh <walshydev@gmail.com>
Date: Tue, 26 Jan 2021 07:47:41 +0000
Subject: [PATCH 4/4] Whoops forgot to change this one

---
 src/main/java/me/mrCookieSlime/Slimefun/api/BlockStorage.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/me/mrCookieSlime/Slimefun/api/BlockStorage.java b/src/main/java/me/mrCookieSlime/Slimefun/api/BlockStorage.java
index 1a54e08b4..20f9a04e4 100644
--- a/src/main/java/me/mrCookieSlime/Slimefun/api/BlockStorage.java
+++ b/src/main/java/me/mrCookieSlime/Slimefun/api/BlockStorage.java
@@ -373,7 +373,7 @@ public class BlockStorage {
 
         BlockStorage storage = getStorage(world);
         if (storage != null) {
-            return storage.getStorage();
+            return storage.getRawStorage();
         } else {
             return null;
         }