Update hooks and fix UltimateStacker API (#305)

BentoBoxWorld · Apr 19, 2024 · 1bd6219 · 1bd6219
1 parent 2d1f618
commit 1bd6219
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 14 deletions.
diff --git a/pom.xml b/pom.xml
@@ -129,8 +129,8 @@
     <repositories>
         <!--Wild Stacker repo -->
         <repository>
-            <id>jitpack.io</id>
-            <url>https://jitpack.io</url>
+            <id>bg-repo</id>
+            <url>https://repo.bg-software.com/repository/api/</url>
         </repository>
         <!-- RoseStacker repo -->
         <repository>
@@ -139,8 +139,8 @@
         </repository>
         <!-- UltimateStacker repo -->
         <repository>
-            <id>songoda-public</id>
-            <url>https://repo.songoda.com/repository/public/</url>
+            <id>songoda-plugins</id>
+            <url>https://repo.songoda.com/repository/minecraft-plugins/</url>
         </repository>
         <repository>
             <id>spigot-repo</id>
@@ -154,6 +154,10 @@
             <id>codemc-public</id>
             <url>https://repo.codemc.org/repository/maven-public/</url>
         </repository>
+        <repository>
+            <id>jitpack.io</id>
+            <url>https://jitpack.io</url>
+        </repository>
     </repositories>
 
     <dependencies>
@@ -208,9 +212,9 @@
         </dependency>
         <!-- Wild Stacker dependency -->
         <dependency>
-            <groupId>com.github.OmerBenGera</groupId>
+            <groupId>com.bgsoftware</groupId>
             <artifactId>WildStackerAPI</artifactId>
-            <version>b18</version>
+            <version>2023.3</version>
             <scope>provided</scope>
         </dependency>
         <!-- Static analysis -->
@@ -234,10 +238,11 @@
             <version>1.3.0</version>
             <scope>provided</scope>
         </dependency>
+        <!-- Ultimate Stacker dependency -->
         <dependency>
-            <groupId>com.songoda</groupId>
-            <artifactId>UltimateStacker</artifactId>
-            <version>2.4.0</version>
+            <groupId>com.craftaro</groupId>
+            <artifactId>UltimateStacker-API</artifactId>
+            <version>1.0.0-20240329.173606-35</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>

diff --git a/src/main/java/world/bentobox/level/calculators/IslandLevelCalculator.java b/src/main/java/world/bentobox/level/calculators/IslandLevelCalculator.java
@@ -40,9 +40,8 @@
 import com.google.common.collect.Multiset;
 import com.google.common.collect.Multiset.Entry;
 import com.google.common.collect.Multisets;
-import com.songoda.ultimatestacker.UltimateStacker;
-import com.songoda.ultimatestacker.core.compatibility.CompatibleMaterial;
-import com.songoda.ultimatestacker.stackable.block.BlockStack;
+import com.craftaro.ultimatestacker.api.UltimateStackerApi;
+import com.craftaro.ultimatestacker.api.utils.Stackable;
 
 import dev.rosewood.rosestacker.api.RoseStackerAPI;
 import us.lynuxcraft.deadsilenceiv.advancedchests.AdvancedChestsAPI;
@@ -469,8 +468,7 @@ private void scanAsync(ChunkPair cp) {
 
 		    if (addon.isUltimateStackerEnabled()) {
 			if (!blockData.getMaterial().equals(Material.AIR)) {
-			    BlockStack stack = UltimateStacker.getInstance().getBlockStackManager().getBlock(block,
-				    CompatibleMaterial.getMaterial(block));
+			    Stackable stack = UltimateStackerApi.getBlockStackManager().getBlock(block.getLocation());
 			    if (stack != null) {
 				int value = limitCount(blockData.getMaterial());
 				if (belowSeaLevel) {