Fixed fetching prices before they are loaded by ShopGUIPlus (#1560)

BG-Software-LLC · Jan 20, 2023 · 479cc27 · 479cc27
1 parent ef2b147
commit 479cc27
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 3 deletions.
diff --git a/API/src/main/java/com/bgsoftware/superiorskyblock/api/hooks/PricesProvider.java b/API/src/main/java/com/bgsoftware/superiorskyblock/api/hooks/PricesProvider.java
@@ -4,6 +4,7 @@
 
 import javax.annotation.Nullable;
 import java.math.BigDecimal;
+import java.util.concurrent.CompletableFuture;
 
 public interface PricesProvider {
 
@@ -25,4 +26,11 @@ public interface PricesProvider {
     @Nullable
     Key getBlockKey(Key blockKey);
 
+    /**
+     * Get a CompletableFuture that is completed when all prices and data of this provider are ready.
+     */
+    default CompletableFuture<Void> getWhenPricesAreReady() {
+        return CompletableFuture.completedFuture(null);
+    }
+
 }
diff --git a/...in/java/com/bgsoftware/superiorskyblock/external/prices/PricesProvider_ShopGUIPlus78.java b/...in/java/com/bgsoftware/superiorskyblock/external/prices/PricesProvider_ShopGUIPlus78.java
@@ -6,21 +6,33 @@
 import com.bgsoftware.superiorskyblock.api.key.KeyMap;
 import com.bgsoftware.superiorskyblock.core.logging.Log;
 import net.brcdev.shopgui.ShopGuiPlugin;
+import net.brcdev.shopgui.event.ShopGUIPlusPostEnableEvent;
 import net.brcdev.shopgui.shop.Shop;
 import net.brcdev.shopgui.shop.item.ShopItem;
+import org.bukkit.Bukkit;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
 
 import java.math.BigDecimal;
+import java.util.concurrent.CompletableFuture;
 
 public class PricesProvider_ShopGUIPlus78 implements PricesProvider {
 
     private final ShopGuiPlugin shopPlugin = ShopGuiPlugin.getInstance();
     private final KeyMap<Double> cachedPrices = KeyMap.createConcurrentKeyMap();
+    private final CompletableFuture<Void> readyFuture = new CompletableFuture<>();
 
     private final SuperiorSkyblockPlugin plugin;
 
     public PricesProvider_ShopGUIPlus78(SuperiorSkyblockPlugin plugin) {
         this.plugin = plugin;
         Log.info("Using ShopGUIPlus as a prices provider.");
+        Bukkit.getPluginManager().registerEvents(new Listener() {
+            @EventHandler
+            public void onShopsLoaded(ShopGUIPlusPostEnableEvent event) {
+                readyFuture.complete(null);
+            }
+        }, plugin);
     }
 
     @Override
@@ -62,4 +74,9 @@ public Key getBlockKey(Key blockKey) {
         return cachedPrices.getKey(blockKey, null);
     }
 
+    @Override
+    public CompletableFuture<Void> getWhenPricesAreReady() {
+        return this.readyFuture;
+    }
+
 }
diff --git a/src/main/java/com/bgsoftware/superiorskyblock/external/ProvidersManagerImpl.java b/src/main/java/com/bgsoftware/superiorskyblock/external/ProvidersManagerImpl.java
@@ -63,6 +63,7 @@ public class ProvidersManagerImpl extends Manager implements ProvidersManager {
     private static final BigDecimal MAX_DOUBLE = BigDecimal.valueOf(Double.MAX_VALUE);
 
     private final List<AFKProvider> AFKProvidersList = new LinkedList<>();
+    private List<Runnable> pricesLoadCallbacks = new LinkedList<>();
     private SpawnersProvider spawnersProvider = new SpawnersProvider_Default();
     private StackedBlocksProvider stackedBlocksProvider = new StackedBlocksProvider_Default();
     private EconomyProvider economyProvider = new EconomyProvider_Default();
@@ -209,6 +210,10 @@ public PricesProvider getPricesProvider() {
     @Override
     public void setPricesProvider(PricesProvider pricesProvider) {
         this.pricesProvider = pricesProvider;
+        this.pricesProvider.getWhenPricesAreReady().whenComplete((result, error) -> {
+            this.pricesLoadCallbacks.forEach(Runnable::run);
+            this.pricesLoadCallbacks = null;
+        });
     }
 
     @Override
@@ -246,6 +251,14 @@ public void unregisterStackedBlocksListener(IStackedBlocksListener stackedBlocks
         this.stackedBlocksListeners.remove(stackedBlocksListener);
     }
 
+    public void addPricesLoadCallback(Runnable callback) {
+        if (this.pricesLoadCallbacks == null) {
+            callback.run();
+        } else {
+            this.pricesLoadCallbacks.add(callback);
+        }
+    }
+
     public void notifyStackedBlocksListeners(OfflinePlayer offlinePlayer, Block block,
                                              IStackedBlocksListener.Action action) {
         this.stackedBlocksListeners.forEach(stackedBlocksListener ->

diff --git a/src/main/java/com/bgsoftware/superiorskyblock/island/SIsland.java b/src/main/java/com/bgsoftware/superiorskyblock/island/SIsland.java
@@ -296,9 +296,8 @@ public SIsland(IslandBuilderImpl builder) {
             }
         });
         if (!builder.blockCounts.isEmpty()) {
-            BukkitExecutor.sync(() -> builder.blockCounts.forEach((block, count) ->
-                    handleBlockPlace(block, count, false, false)
-            ), 20L);
+            plugin.getProviders().addPricesLoadCallback(() -> builder.blockCounts.forEach((block, count) ->
+                    handleBlockPlace(block, count, false, false)));
         }
 
         builder.warpCategories.forEach(warpCategoryRecord -> {