From bad5172dd6a6bbc2ad31d711ede56fcf5ea44493 Mon Sep 17 00:00:00 2001 From: ProfElements Date: Mon, 23 Sep 2024 17:24:25 -0500 Subject: [PATCH 1/2] Add simple `BlockPosition` based helpers for BlockStorage to help ease the transition between `Location` and `BlockStorage` --- .../me/mrCookieSlime/Slimefun/api/BlockStorage.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/main/java/me/mrCookieSlime/Slimefun/api/BlockStorage.java b/src/main/java/me/mrCookieSlime/Slimefun/api/BlockStorage.java index c2df4fd2c9..d62738ef0c 100644 --- a/src/main/java/me/mrCookieSlime/Slimefun/api/BlockStorage.java +++ b/src/main/java/me/mrCookieSlime/Slimefun/api/BlockStorage.java @@ -513,10 +513,18 @@ public static String getLocationInfo(Location l, String key) { return getLocationInfo(l).getString(key); } + public static String getLocationInfo(BlockPosition l, String key) { + return getLocationInfo(l.toLocation()).getString(key); + } + public static void addBlockInfo(Location l, String key, String value) { addBlockInfo(l, key, value, false); } + public static void addBlockInfo(BlockPosition l, String key, String value) { + addBlockInfo(l.toLocation(), key, value, false); + } + public static void addBlockInfo(Block block, String key, String value) { addBlockInfo(block.getLocation(), key, value); } @@ -525,6 +533,10 @@ public static void addBlockInfo(Block block, String key, String value, boolean u addBlockInfo(block.getLocation(), key, value, updateTicker); } + public static void addBlockInfo(BlockPosition l, String key, String value, boolean updateTicker) { + addBlockInfo(l.toLocation(), key, value, updateTicker); + } + public static void addBlockInfo(Location l, String key, String value, boolean updateTicker) { Config cfg = getLocationInfo(l); From 1b188ad7e7a88cbc27cb670f56a86eb0d76fe8a6 Mon Sep 17 00:00:00 2001 From: ProfElements Date: Mon, 23 Sep 2024 17:29:20 -0500 Subject: [PATCH 2/2] Fix build. --- src/main/java/me/mrCookieSlime/Slimefun/api/BlockStorage.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/me/mrCookieSlime/Slimefun/api/BlockStorage.java b/src/main/java/me/mrCookieSlime/Slimefun/api/BlockStorage.java index d62738ef0c..5bfe8ef9f9 100644 --- a/src/main/java/me/mrCookieSlime/Slimefun/api/BlockStorage.java +++ b/src/main/java/me/mrCookieSlime/Slimefun/api/BlockStorage.java @@ -35,6 +35,7 @@ import com.google.gson.JsonParser; import com.google.gson.stream.JsonWriter; +import io.github.bakedlibs.dough.blocks.BlockPosition; import io.github.bakedlibs.dough.common.CommonPatterns; import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; import io.github.thebusybiscuit.slimefun4.implementation.Slimefun;