Fix tests. Revert Paper-specific code.

BentoBoxWorld · Nov 23, 2024 · 14dee15 · 14dee15
1 parent 1fe87fe
commit 14dee15
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 25 deletions.
diff --git a/pom.xml b/pom.xml
@@ -112,14 +112,14 @@
     </profiles>
 
     <repositories>
-        <repository>
-            <id>papermc</id>
-            <url>https://repo.papermc.io/repository/maven-public/</url>
-        </repository>
-        <repository>
+         <repository>
             <id>spigot-repo</id>
             <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots</url>
         </repository>
+       <repository>
+            <id>papermc</id>
+            <url>https://repo.papermc.io/repository/maven-public/</url>
+        </repository>
         <repository>
             <id>bentoboxworld</id>
             <url>https://repo.codemc.org/repository/bentoboxworld/</url>
@@ -144,20 +144,6 @@
     </repositories>
 
     <dependencies>
-        <!-- Paper API -->
-        <dependency>
-            <groupId>io.papermc.paper</groupId>
-            <artifactId>paper-api</artifactId>
-            <version>${paper.version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <!-- PaperLib -->
-        <dependency>
-            <groupId>io.papermc</groupId>
-            <artifactId>paperlib</artifactId>
-            <version>1.0.6</version>
-            <scope>compile</scope>
-        </dependency>
         <!-- Spigot API -->
         <dependency>
             <groupId>org.spigotmc</groupId>

diff --git a/src/main/java/world/bentobox/boxed/AdvancementsManager.java b/src/main/java/world/bentobox/boxed/AdvancementsManager.java
@@ -250,11 +250,9 @@ public int getScore(Advancement a) {
         }
         if (advConfig.getBoolean("settings.automatic-scoring")) {
             if (!a.getKey().getKey().contains("recipes") && a.getDisplay() != null) {
-                int score = 1;
-                while (a.getParent() != null) {
-                    score++;
-                }
-                return score;
+                float x = a.getDisplay().getX();
+                float y = a.getDisplay().getY();
+                return (int) Math.round(Math.sqrt(x * x + y * y));
             } else {
                 return 0;
             }

diff --git a/src/test/java/world/bentobox/boxed/mocks/ServerMocks.java b/src/test/java/world/bentobox/boxed/mocks/ServerMocks.java
@@ -24,6 +24,7 @@
 
 public final class ServerMocks {
 
+    @SuppressWarnings({ "deprecation", "unchecked" })
     public static @NonNull Server newServer() {
         Server mock = mock(Server.class);
 
@@ -66,7 +67,7 @@ public final class ServerMocks {
                     doReturn(key).when(keyed).getKey();
                     return keyed;
                 });
-            }).when(registry).get(notNull());
+            }).when(registry).get((NamespacedKey) notNull());
             return registry;
         })).when(mock).getRegistry(notNull());