Release 2.7.1

pom.xml

@@ -50,13 +50,9 @@
     </issueManagement>
 
     <distributionManagement>
-        <snapshotRepository>
-            <id>codemc-snapshots</id>
-            <url>https://repo.codemc.org/repository/maven-snapshots</url>
-        </snapshotRepository>
         <repository>
-            <id>codemc-releases</id>
-            <url>https://repo.codemc.org/repository/maven-releases</url>
+            <id>bentoboxworld</id>
+            <url>https://repo.codemc.org/repository/bentoboxworld/</url>
         </repository>
     </distributionManagement>
 
@@ -88,7 +84,7 @@
         <!-- Do not change unless you want different name for local builds. -->
         <build.number>-LOCAL</build.number>
         <!-- This allows to change between versions. -->
-        <build.version>2.7.0</build.version>
+        <build.version>3.0.0</build.version>
         <sonar.organization>bentobox-world</sonar.organization>
         <sonar.host.url>https://sonarcloud.io</sonar.host.url>
         <server.jars>${project.basedir}/lib</server.jars>

src/main/java/world/bentobox/bentobox/BentoBox.java

@@ -1,5 +1,7 @@
 package world.bentobox.bentobox;
 
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.util.List;
 import java.util.Optional;
 
@@ -464,6 +466,32 @@ public boolean loadSettings() {
             getPluginLoader().disablePlugin(this);
             return false;
         }
+        log("Saving default panels...");
+
+        if (!Files.exists(Path.of(this.getDataFolder().getPath(), "panels", "island_creation_panel.yml"))) {
+            log("Saving default island_creation_panel...");
+            this.saveResource("panels/island_creation_panel.yml", false);
+        }
+
+        if (!Files.exists(Path.of(this.getDataFolder().getPath(), "panels", "language_panel.yml"))) {
+            log("Saving default language_panel...");
+            this.saveResource("panels/language_panel.yml", false);
+        }
+
+        if (!Files.exists(Path.of(this.getDataFolder().getPath(), "panels", "island_homes_panel.yml"))) {
+            log("Saving default island_homes_panel...");
+            this.saveResource("panels/island_homes_panel.yml", false);
+        }
+
+        if (!Files.exists(Path.of(this.getDataFolder().getPath(), "panels", "team_invite_panel.yml"))) {
+            log("Saving default team_invite_panel...");
+            this.saveResource("panels/team_invite_panel.yml", false);
+        }
+
+        if (!Files.exists(Path.of(this.getDataFolder().getPath(), "panels", "team_panel.yml"))) {
+            log("Saving default team_panel...");
+            this.saveResource("panels/team_panel.yml", false);
+        }
 
         return true;
     }

src/main/java/world/bentobox/bentobox/api/commands/admin/AdminUnregisterCommand.java

@@ -15,6 +15,7 @@
 import world.bentobox.bentobox.api.events.island.IslandEvent;
 import world.bentobox.bentobox.api.localization.TextVariables;
 import world.bentobox.bentobox.api.logs.LogEntry;
+import world.bentobox.bentobox.api.logs.LogEntry.LogType;
 import world.bentobox.bentobox.api.user.User;
 import world.bentobox.bentobox.database.objects.Island;
 import world.bentobox.bentobox.managers.RanksManager;
@@ -115,10 +116,10 @@ void unregisterIsland(User user) {
         // Remove all island players that reference this island
         targetIsland.getMembers().clear();
         if (user.isPlayer()) {
-            targetIsland.log(new LogEntry.Builder("UNREGISTER").data("player", targetUUID.toString())
+            targetIsland.log(new LogEntry.Builder(LogType.UNREGISTER).data("player", targetUUID.toString())
                     .data("admin", user.getUniqueId().toString()).build());
         } else {
-            targetIsland.log(new LogEntry.Builder("UNREGISTER").data("player", targetUUID.toString())
+            targetIsland.log(new LogEntry.Builder(LogType.UNREGISTER).data("player", targetUUID.toString())
                     .data("admin", "console").build());
         }
         user.sendMessage("commands.admin.unregister.unregistered-island", TextVariables.XYZ, Util.xyz(targetIsland.getCenter().toVector()),

src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamInviteAcceptCommand.java

@@ -9,6 +9,8 @@
 import world.bentobox.bentobox.api.events.island.IslandEvent;
 import world.bentobox.bentobox.api.events.team.TeamEvent;
 import world.bentobox.bentobox.api.localization.TextVariables;
+import world.bentobox.bentobox.api.logs.LogEntry;
+import world.bentobox.bentobox.api.logs.LogEntry.LogType;
 import world.bentobox.bentobox.api.user.User;
 import world.bentobox.bentobox.database.objects.Island;
 import world.bentobox.bentobox.database.objects.TeamInvite;
@@ -120,6 +122,9 @@ void acceptTrustInvite(User user, TeamInvite invite) {
                 user.sendMessage("commands.island.team.trust.you-are-trusted", TextVariables.NAME, inviter.getName(),
                         TextVariables.DISPLAY_NAME, inviter.getDisplayName());
             }
+            // Add historu record
+            island.log(new LogEntry.Builder(LogType.TRUSTED).data(user.getUniqueId().toString(), "trusted")
+                    .data(invite.getInviter().toString(), "trusted by").build());
         }
     }
 

src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamSetownerCommand.java

@@ -12,6 +12,8 @@
 import world.bentobox.bentobox.api.events.island.IslandEvent;
 import world.bentobox.bentobox.api.events.team.TeamEvent;
 import world.bentobox.bentobox.api.localization.TextVariables;
+import world.bentobox.bentobox.api.logs.LogEntry;
+import world.bentobox.bentobox.api.logs.LogEntry.LogType;
 import world.bentobox.bentobox.api.user.User;
 import world.bentobox.bentobox.database.objects.Island;
 import world.bentobox.bentobox.managers.RanksManager;
@@ -91,6 +93,9 @@ protected boolean setOwner(User user, @NonNull UUID targetUUID2) {
         IslandEvent.builder().island(island).involvedPlayer(user.getUniqueId()).admin(false)
                 .reason(IslandEvent.Reason.RANK_CHANGE).rankChange(RanksManager.OWNER_RANK, RanksManager.SUB_OWNER_RANK)
                 .build();
+        // Add historu record
+        island.log(new LogEntry.Builder(LogType.NEWOWNER).data(targetUUID2.toString(), "new owner")
+                .data(user.getUniqueId().toString(), "old owner").build());
         return true;
     }
 

src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamTrustCommand.java

@@ -9,6 +9,8 @@
 
 import world.bentobox.bentobox.api.commands.CompositeCommand;
 import world.bentobox.bentobox.api.localization.TextVariables;
+import world.bentobox.bentobox.api.logs.LogEntry;
+import world.bentobox.bentobox.api.logs.LogEntry.LogType;
 import world.bentobox.bentobox.api.user.User;
 import world.bentobox.bentobox.database.objects.Island;
 import world.bentobox.bentobox.database.objects.TeamInvite.Type;
@@ -110,6 +112,10 @@ public boolean execute(User user, String label, List<String> args) {
                 island.setRank(target, RanksManager.TRUSTED_RANK);
                 user.sendMessage("commands.island.team.trust.success", TextVariables.NAME, target.getName(), TextVariables.DISPLAY_NAME, target.getDisplayName());
                 target.sendMessage("commands.island.team.trust.you-are-trusted", TextVariables.NAME, user.getName(), TextVariables.DISPLAY_NAME, user.getDisplayName());
+                // Add historu record
+                island.log(new LogEntry.Builder(LogType.TRUSTED).data(targetUUID.toString(), "trusted")
+                        .data(user.getUniqueId().toString(), "trusted by").build());
+
             }
             return true;
         } else {

src/main/java/world/bentobox/bentobox/api/configuration/Config.java

@@ -6,7 +6,6 @@
 import java.util.List;
 import java.util.logging.Logger;
 
-import org.apache.commons.lang.exception.ExceptionUtils;
 import org.eclipse.jdt.annotation.Nullable;
 
 import world.bentobox.bentobox.BentoBox;
@@ -64,9 +63,9 @@ public T loadConfigObject(String uniqueId) {
             return handler.loadObject(uniqueId);
         } catch (InstantiationException | IllegalAccessException | IllegalArgumentException | InvocationTargetException
                 | ClassNotFoundException | IntrospectionException | NoSuchMethodException | SecurityException e) {
-            logger.severe(() -> "Could not load config object! " + e.getMessage());
+            BentoBox.getInstance().logError("Could not load config object! " + e.getMessage());
             // Required for debugging
-            logger.severe(ExceptionUtils.getStackTrace(e));
+            e.printStackTrace();
         }
 
         return null;

src/main/java/world/bentobox/bentobox/api/logs/LogEntry.java

@@ -15,16 +15,21 @@
  * An {@link world.bentobox.bentobox.database.objects.adapters.AdapterInterface AdapterInterface} is provided to be able to save/retrieve
  * a list of instances of this object to/from the database: {@link world.bentobox.bentobox.database.objects.adapters.LogEntryListAdapter LogEntryListAdapter}.
  *
- * @author Poslovitch
+ * @author Poslovitch, tastybento
+ * 
  */
 public class LogEntry {
     @Expose
     private final long timestamp;
     @Expose
-    private final String type;
+    private final LogType type;
     @Expose
     private final Map<String, String> data;
 
+    public enum LogType {
+        REMOVE, ADD, UNREGISTER, BAN, UNOWNED, SPAWN, UNBAN, JOINED, NEWOWNER, TRUSTED, UNKNOWN
+    }
+
     private LogEntry(@NonNull Builder builder) {
         this.timestamp = builder.timestamp;
         this.type = builder.type;
@@ -36,7 +41,7 @@ public long getTimestamp() {
     }
 
     @NonNull
-    public String getType() {
+    public LogType getType() {
         return type;
     }
 
@@ -47,12 +52,12 @@ public Map<String, String> getData() {
 
     public static class Builder {
         private long timestamp;
-        private final String type;
+        private final LogType type;
         private Map<String, String> data;
 
-        public Builder(@NonNull String type) {
+        public Builder(LogType type) {
             this.timestamp = System.currentTimeMillis();
-            this.type = type.toUpperCase(Locale.ENGLISH);
+            this.type = type;
             this.data = new LinkedHashMap<>();
         }
 

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);

src/main/java/world/bentobox/bentobox/database/objects/Island.java

@@ -37,6 +37,7 @@
 import world.bentobox.bentobox.api.configuration.WorldSettings;
 import world.bentobox.bentobox.api.flags.Flag;
 import world.bentobox.bentobox.api.logs.LogEntry;
+import world.bentobox.bentobox.api.logs.LogEntry.LogType;
 import world.bentobox.bentobox.api.metadata.MetaDataAble;
 import world.bentobox.bentobox.api.metadata.MetaDataValue;
 import world.bentobox.bentobox.api.user.User;
@@ -327,7 +328,7 @@ public void addMember(@NonNull UUID playerUUID) {
     public boolean ban(@NonNull UUID issuer, @NonNull UUID target) {
         if (getRank(target) != RanksManager.BANNED_RANK) {
             setRank(target, RanksManager.BANNED_RANK);
-            log(new LogEntry.Builder("BAN").data("player", target.toString()).data("issuer", issuer.toString())
+            log(new LogEntry.Builder(LogType.BAN).data("player", target.toString()).data("issuer", issuer.toString())
                     .build());
             setChanged();
         }
@@ -360,7 +361,7 @@ public Set<UUID> getBanned() {
      */
     public boolean unban(@NonNull UUID issuer, @NonNull UUID target) {
         if (members.remove(target) != null) {
-            log(new LogEntry.Builder("UNBAN").data("player", target.toString()).data("issuer", issuer.toString())
+            log(new LogEntry.Builder(LogType.UNBAN).data("player", target.toString()).data("issuer", issuer.toString())
                     .build());
             return true;
         }
@@ -1132,7 +1133,7 @@ public void setOwner(@Nullable UUID owner) {
 
         this.owner = owner;
         if (owner == null) {
-            log(new LogEntry.Builder("UNOWNED").build());
+            log(new LogEntry.Builder(LogType.UNOWNED).build());
             return;
         }
         // Defensive code: demote any previous owner
@@ -1281,7 +1282,7 @@ public void setSpawn(boolean isSpawn) {
             setFlagsDefaults();
             setFlag(Flags.LOCK, RanksManager.VISITOR_RANK);
         }
-        log(new LogEntry.Builder("SPAWN").data("value", String.valueOf(isSpawn)).build());
+        log(new LogEntry.Builder(LogType.SPAWN).data("value", String.valueOf(isSpawn)).build());
         setChanged();
     }
 

src/main/java/world/bentobox/bentobox/database/objects/adapters/AdapterInterface.java

@@ -11,16 +11,16 @@
 public interface AdapterInterface<S,V> {
 
     /**
-     * Serialize object
-     * @param object - object to serialize
-     * @return serialized object
+     * Deserialize object
+     * @param object - object to deserialize
+     * @return deserialized object
      */
     S deserialize(Object object);
 
     /**
-     * Deserialize object
-     * @param object - object to deserialize
-     * @return deserialized object
+     * Serialize object
+     * @param object - object to serialize
+     * @return serialized object
      */
     V serialize(Object object);
 }

src/main/java/world/bentobox/bentobox/database/objects/adapters/LogEntryListAdapter.java

@@ -5,7 +5,10 @@
 import java.util.List;
 import java.util.Map;
 
+import com.google.common.base.Enums;
+
 import world.bentobox.bentobox.api.logs.LogEntry;
+import world.bentobox.bentobox.api.logs.LogEntry.LogType;
 
 /**
  * @author Poslovitch
@@ -41,7 +44,7 @@ public List<LogEntry> deserialize(Object object) {
         List<Map<String, Object>> serialized = (List<Map<String, Object>>) object;
         for (Map<String, Object> entry : serialized) {
             long timestamp = (long) entry.get(TIMESTAMP);
-            String type = (String) entry.get(TYPE);
+            LogType type = Enums.getIfPresent(LogType.class, (String) entry.get(TYPE)).or(LogType.UNKNOWN);
             Map<String, String> data = (Map<String, String>) entry.get(DATA);
 
             result.add(new LogEntry.Builder(type).timestamp(timestamp).data(data).build());
@@ -62,7 +65,7 @@ public List<Map<String, Object>> serialize(Object object) {
         history.forEach(logEntry -> {
             Map<String, Object> value = new LinkedHashMap<>();
             value.put(TIMESTAMP, logEntry.getTimestamp());
-            value.put(TYPE, logEntry.getType());
+            value.put(TYPE, logEntry.getType().name());
 
             if (logEntry.getData() != null) {
                 value.put(DATA, logEntry.getData());

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;
@@ -220,6 +225,14 @@ private void deserializeValue(Method method, T instance, PropertyDescriptor prop
                         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);
                     }
@@ -369,7 +382,6 @@ public CompletableFuture<Boolean> saveObject(T instance) throws IllegalAccessExc
             Method method = propertyDescriptor.getReadMethod();
             // Invoke the read method to get the value. We have no idea what type of value it is.
             Object value = method.invoke(instance);
-
             String storageLocation = field.getName();
 
             // Check if there is an annotation on the field
@@ -575,6 +587,10 @@ 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) {
+            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.