Merge pull request #2550 from BentoBoxWorld/custom_server

Use custom server to handle new enums
BentoBoxWorld · Nov 8, 2024 · c77da07 · c77da07
2 parents cd40d27 + 04ebe61
commit c77da07
Show file tree

Hide file tree

Showing 35 changed files with 249 additions and 161 deletions.
diff --git a/pom.xml b/pom.xml
@@ -52,7 +52,7 @@
     <distributionManagement>
         <repository>
             <id>codemc-releases</id>
-            <url>https://repo.codemc.org/repository/bentoboxworld</url>
+            <url>https://repo.codemc.org/repository/bentoboxworld/</url>
         </repository>
     </distributionManagement>
 

diff --git a/src/main/java/world/bentobox/bentobox/database/json/adapters/BiomeTypeAdapter.java b/src/main/java/world/bentobox/bentobox/database/json/adapters/BiomeTypeAdapter.java
@@ -8,10 +8,10 @@
 
 
 import java.io.IOException;
-import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
 
+import org.bukkit.Registry;
 import org.bukkit.block.Biome;
 
 import com.google.gson.TypeAdapter;
@@ -32,11 +32,12 @@ public  final class BiomeTypeAdapter extends TypeAdapter<Biome>
      */
     final Map<String, Biome> biomeMap;
 
+    @SuppressWarnings("deprecation")
     public BiomeTypeAdapter() {
         this.biomeMap = new HashMap<>();
 
         // Put in current values.
-        Arrays.stream(Biome.values()).forEach(biome -> this.biomeMap.put(biome.name(), biome));
+        Registry.BIOME.forEach(biome -> this.biomeMap.put(biome.name(), biome));
 
         // Put in renamed biomes values.
         this.biomeMap.put("TALL_BIRCH_FOREST", Biome.OLD_GROWTH_BIRCH_FOREST);

diff --git a/src/main/java/world/bentobox/bentobox/database/yaml/YamlDatabaseHandler.java b/src/main/java/world/bentobox/bentobox/database/yaml/YamlDatabaseHandler.java
@@ -26,8 +26,13 @@
 import java.util.concurrent.CompletableFuture;
 
 import org.bukkit.Bukkit;
+import org.bukkit.Keyed;
 import org.bukkit.Location;
+import org.bukkit.NamespacedKey;
+import org.bukkit.Registry;
+import org.bukkit.Sound;
 import org.bukkit.World;
+import org.bukkit.block.Biome;
 import org.bukkit.configuration.MemorySection;
 import org.bukkit.configuration.file.YamlConfiguration;
 import org.bukkit.entity.EntityType;
@@ -216,10 +221,24 @@ private void deserializeValue(Method method, T instance, PropertyDescriptor prop
                 try {
                     // Floats need special handling because the database returns them as doubles
                     Type setType = propertyDescriptor.getWriteMethod().getGenericParameterTypes()[0];
+                    BentoBox.getInstance().logDebug("name = " + setType.getTypeName());
+                    plugin.logError("Default setting value will be used: "
+                            + propertyDescriptor.getReadMethod().invoke(instance));
+                    plugin.logError(method.getName());
+                    plugin.logError(propertyDescriptor.getReadMethod().getName());
+                    plugin.logError(instance.toString());
                     if (setType.getTypeName().equals("float")) {
                         double d = (double) setTo;
                         float f = (float)d;
                         method.invoke(instance, f);
+                    } else if (setType.getTypeName().equals("org.bukkit.Sound")) {
+                        Sound s = Registry.SOUNDS
+                                .get(NamespacedKey.fromString(((String) setTo).toLowerCase(Locale.ENGLISH)));
+                        method.invoke(instance, s);
+                    } else if (setType.getTypeName().equals("org.bukkit.block.Biome")) {
+                        Biome b = Registry.BIOME
+                                .get(NamespacedKey.fromString(((String) setTo).toLowerCase(Locale.ENGLISH)));
+                        method.invoke(instance, b);
                     } else {
                         method.invoke(instance, setTo);
                     }
@@ -368,8 +387,9 @@ public CompletableFuture<Boolean> saveObject(T instance) throws IllegalAccessExc
             // Get the read method
             Method method = propertyDescriptor.getReadMethod();
             // Invoke the read method to get the value. We have no idea what type of value it is.
+            BentoBox.getInstance().logDebug("Method is " + method.getName());
             Object value = method.invoke(instance);
-
+            BentoBox.getInstance().logDebug("Value is " + value);
             String storageLocation = field.getName();
 
             // Check if there is an annotation on the field
@@ -395,6 +415,7 @@ public CompletableFuture<Boolean> saveObject(T instance) throws IllegalAccessExc
             }
 
             if (!checkAdapter(field, config, storageLocation, value)) {
+                BentoBox.getInstance().logDebug("No adapter");
                 // Set the filename if it has not be set already
                 if (filename.isEmpty() && method.getName().equals("getUniqueId")) {
                     // Save the name for when the file is saved
@@ -407,6 +428,7 @@ public CompletableFuture<Boolean> saveObject(T instance) throws IllegalAccessExc
                     serializeSet((Set<Object>)value, config, storageLocation);
                 } else {
                     // For all other data that doesn't need special serialization
+                    BentoBox.getInstance().logDebug("For all other data that doesn't need special serializationr");
                     config.set(storageLocation, serialize(value));
                 }
             }
@@ -561,6 +583,7 @@ private void setComment(@NonNull String comment, @NonNull YamlConfiguration conf
     private Object serialize(@Nullable Object object) {
         // Null is a value object and is serialized as the string "null"
         if (object == null) {
+            BentoBox.getInstance().logDebug("Object is null");
             return "null";
         }
         // UUID has it's own serialization, that is not picked up automatically
@@ -575,6 +598,11 @@ private Object serialize(@Nullable Object object) {
         if (object instanceof Location l) {
             return Util.getStringLocation(l);
         }
+        // Keyed interfaces that are replacing enums
+        if (object instanceof Keyed k) {
+            BentoBox.getInstance().logDebug("Object is keyed");
+            return k.getKey().getKey();
+        }
         // Enums
         if (object instanceof Enum<?> e) {
             //Custom enums are a child of the Enum class. Just get the names of each one.

diff --git a/src/main/java/world/bentobox/bentobox/util/Util.java b/src/main/java/world/bentobox/bentobox/util/Util.java
@@ -743,7 +743,6 @@ public static WorldRegenerator getRegenerator() {
                     throw new IllegalStateException("Class " + clazz.getName() + " does not implement WorldRegenerator");
                 }
             } catch (Exception e) {
-                e.printStackTrace();
                 plugin.logWarning("No Regenerator found for " + bukkitVersion + ", falling back to Bukkit API.");
                 handler = new world.bentobox.bentobox.nms.fallback.WorldRegeneratorImpl();
             }
@@ -773,7 +772,6 @@ public static PasteHandler getPasteHandler() {
                     throw new IllegalStateException("Class " + clazz.getName() + " does not implement PasteHandler");
                 }
             } catch (Exception e) {
-                e.printStackTrace();
                 plugin.logWarning("No PasteHandler found for " + bukkitVersion + ", falling back to Bukkit API.");
                 handler = new world.bentobox.bentobox.nms.fallback.PasteHandlerImpl();
             }

diff --git a/src/test/java/world/bentobox/bentobox/AbstractCommonSetup.java b/src/test/java/world/bentobox/bentobox/AbstractCommonSetup.java
@@ -17,6 +17,7 @@
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.Material;
+import org.bukkit.Server;
 import org.bukkit.Tag;
 import org.bukkit.World;
 import org.bukkit.block.Block;
@@ -34,6 +35,7 @@
 import org.bukkit.util.Vector;
 import org.eclipse.jdt.annotation.Nullable;
 import org.junit.After;
+import org.junit.Before;
 import org.junit.runner.RunWith;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
@@ -58,6 +60,7 @@
 import world.bentobox.bentobox.managers.LocalesManager;
 import world.bentobox.bentobox.managers.PlaceholdersManager;
 import world.bentobox.bentobox.managers.PlayersManager;
+import world.bentobox.bentobox.mocks.ServerMocks;
 import world.bentobox.bentobox.util.Util;
 
 /**
@@ -103,9 +106,13 @@ public abstract class AbstractCommonSetup {
     protected FlagsManager fm;
     @Mock
     protected Spigot spigot;
+    protected Server server;
 
 
+    @Before
     public void setUp() throws Exception {
+
+        server = ServerMocks.newServer();
         // Bukkit
         PowerMockito.mockStatic(Bukkit.class, Mockito.RETURNS_MOCKS);
         // Set up plugin
@@ -221,6 +228,7 @@ public void setUp() throws Exception {
      */
     @After
     public void tearDown() throws Exception {
+        ServerMocks.unsetBukkitServer();
         User.clearUsers();
         Mockito.framework().clearInlineMocks();
     }

diff --git a/src/test/java/world/bentobox/bentobox/RanksManagerBeforeClassTest.java b/src/test/java/world/bentobox/bentobox/RanksManagerBeforeClassTest.java
@@ -29,7 +29,6 @@
 import org.powermock.modules.junit4.PowerMockRunner;
 import org.powermock.reflect.Whitebox;
 
-import world.bentobox.bentobox.api.user.User;
 import world.bentobox.bentobox.database.AbstractDatabaseHandler;
 import world.bentobox.bentobox.database.DatabaseSetup;
 import world.bentobox.bentobox.managers.RanksManager;
@@ -126,9 +125,8 @@ public void setUp() throws Exception {
     }
 
     @After
-    public void tearDown() throws IOException {
-        User.clearUsers();
-        Mockito.framework().clearInlineMocks();
+    public void tearDown() throws Exception {
+        super.tearDown();
         deleteAll(new File("database"));
         deleteAll(new File("database_backup"));
     }

diff --git a/src/test/java/world/bentobox/bentobox/api/commands/admin/AdminResetFlagsCommandTest.java b/src/test/java/world/bentobox/bentobox/api/commands/admin/AdminResetFlagsCommandTest.java
@@ -26,7 +26,6 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.Mockito;
 import org.mockito.stubbing.Answer;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
@@ -128,12 +127,9 @@ public void setUp() throws Exception {
 
     }
 
-    /**
-     */
     @After
-    public void tearDown() {
-        User.clearUsers();
-        Mockito.framework().clearInlineMocks();
+    public void tearDown() throws Exception {
+        super.tearDown();
     }
 
     /**

diff --git a/.../world/bentobox/bentobox/api/commands/admin/blueprints/AdminBlueprintLoadCommandTest.java b/.../world/bentobox/bentobox/api/commands/admin/blueprints/AdminBlueprintLoadCommandTest.java
@@ -24,7 +24,7 @@
 import org.bukkit.Bukkit;
 import org.junit.After;
 import org.junit.Before;
-import org.junit.Ignore;
+import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
@@ -43,6 +43,7 @@
 import world.bentobox.bentobox.managers.CommandsManager;
 import world.bentobox.bentobox.managers.HooksManager;
 import world.bentobox.bentobox.managers.LocalesManager;
+import world.bentobox.bentobox.mocks.ServerMocks;
 
 /**
  * @author tastybento
@@ -68,8 +69,11 @@ public class AdminBlueprintLoadCommandTest {
     private Map<String, Blueprint> map;
     private File blueprintsFolder;
 
-    /**
-     */
+    @BeforeClass
+    public static void beforeClass() {
+        ServerMocks.newServer();
+    }
+
     @Before
     public void setUp() throws Exception {
         // Set up plugin
@@ -125,8 +129,6 @@ public void setUp() throws Exception {
         abcc = new AdminBlueprintLoadCommand(ac);
     }
 
-    /**
-     */
     @After
     public void tearDown() throws Exception {
         User.clearUsers();
@@ -181,7 +183,6 @@ public void testExecuteUserStringListOfStringNoLoad() {
      * Test method for {@link world.bentobox.bentobox.api.commands.admin.blueprints.AdminBlueprintLoadCommand#execute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}.
      */
     @Test
-    @Ignore("Enums")
     public void testExecuteUserStringListOfStringSuccessCaps() {
         assertTrue(abcc.execute(user, "", List.of("island")));
         verify(user).sendMessage("general.success");

diff --git a/.../world/bentobox/bentobox/api/commands/admin/blueprints/AdminBlueprintSaveCommandTest.java b/.../world/bentobox/bentobox/api/commands/admin/blueprints/AdminBlueprintSaveCommandTest.java
@@ -25,7 +25,7 @@
 import org.bukkit.util.Vector;
 import org.junit.After;
 import org.junit.Before;
-import org.junit.Ignore;
+import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
@@ -45,6 +45,7 @@
 import world.bentobox.bentobox.managers.CommandsManager;
 import world.bentobox.bentobox.managers.HooksManager;
 import world.bentobox.bentobox.managers.LocalesManager;
+import world.bentobox.bentobox.mocks.ServerMocks;
 
 /**
  * @author tastybento
@@ -68,8 +69,11 @@ public class AdminBlueprintSaveCommandTest {
     private BlueprintsManager bm;
     private Blueprint bp = new Blueprint();
 
-    /**
-     */
+    @BeforeClass
+    public static void beforeClass() {
+        ServerMocks.newServer();
+    }
+
     @Before
     public void setUp() throws Exception {
         // Set up plugin
@@ -200,7 +204,6 @@ public void testCanExecute() {
      * Test method for {@link world.bentobox.bentobox.api.commands.admin.blueprints.AdminBlueprintSaveCommand#execute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}.
      */
     @Test
-    @Ignore("Enums")
     public void testExecuteUserStringListOfString() {
         testCanExecute();
         assertTrue(absc.execute(user, "", List.of("island")));
@@ -212,7 +215,6 @@ public void testExecuteUserStringListOfString() {
      * Test method for {@link world.bentobox.bentobox.api.commands.admin.blueprints.AdminBlueprintSaveCommand#execute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}.
      */
     @Test
-    @Ignore("Enums")
     public void testExecuteUserStringListOfStringFileExists() {
         testCanExecute();
         assertTrue(absc.execute(user, "", List.of("island")));

diff --git a/src/test/java/world/bentobox/bentobox/api/commands/admin/range/AdminRangeCommandTest.java b/src/test/java/world/bentobox/bentobox/api/commands/admin/range/AdminRangeCommandTest.java
@@ -94,9 +94,8 @@ public void setUp() throws Exception {
     }
 
     @After
-    public void tearDown() {
-        User.clearUsers();
-        Mockito.framework().clearInlineMocks();
+    public void tearDown() throws Exception {
+        super.tearDown();
     }
 
     @Test

diff --git a/...est/java/world/bentobox/bentobox/api/commands/admin/range/AdminRangeResetCommandTest.java b/...est/java/world/bentobox/bentobox/api/commands/admin/range/AdminRangeResetCommandTest.java
@@ -117,9 +117,8 @@ public void setUp() throws Exception {
     }
 
     @After
-    public void tearDown() {
-        User.clearUsers();
-        Mockito.framework().clearInlineMocks();
+    public void tearDown() throws Exception {
+        super.tearDown();
     }
 
     /**

diff --git a/src/test/java/world/bentobox/bentobox/api/commands/admin/range/AdminRangeSetCommandTest.java b/src/test/java/world/bentobox/bentobox/api/commands/admin/range/AdminRangeSetCommandTest.java
@@ -119,9 +119,8 @@ public void setUp() throws Exception {
     }
 
     @After
-    public void tearDown() {
-        User.clearUsers();
-        Mockito.framework().clearInlineMocks();
+    public void tearDown() throws Exception {
+        super.tearDown();
     }
 
     /**

diff --git a/...est/java/world/bentobox/bentobox/api/commands/admin/team/AdminTeamDisbandCommandTest.java b/...est/java/world/bentobox/bentobox/api/commands/admin/team/AdminTeamDisbandCommandTest.java
@@ -5,7 +5,6 @@
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.framework;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.times;
@@ -152,9 +151,8 @@ public void setUp() throws Exception {
     }
 
     @After
-    public void tearDown() {
-        User.clearUsers();
-        framework().clearInlineMocks();
+    public void tearDown() throws Exception {
+        super.tearDown();
     }
 
     /**