Merge pull request #2426 from BentoBoxWorld/develop

Release 2.4.1

pom.xml

@@ -88,7 +88,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.4.0</build.version>
+        <build.version>2.4.1</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/api/addons/Pladdon.java

@@ -32,6 +32,14 @@ public void onLoad() {
         }
     }
 
+    @Override
+    public void onDisable() {
+        Addon addon = getAddon();
+        if (addon != null) {
+            addon.onDisable();
+        }
+    }
+
     protected void moveJar() {
         getLogger().severe(getFile().getName() + " must be in the " + ADDONS_FOLDER + " folder! Trying to move it there...");
         File addons = new File(getFile().getParent(), ADDONS_FOLDER);

src/main/java/world/bentobox/bentobox/database/json/BentoboxTypeAdapterFactory.java

@@ -1,5 +1,7 @@
 package world.bentobox.bentobox.database.json;
 
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
 import java.util.Map;
 
 import org.bukkit.Location;
@@ -25,9 +27,11 @@
 import world.bentobox.bentobox.database.json.adapters.ItemStackTypeAdapter;
 import world.bentobox.bentobox.database.json.adapters.LocationTypeAdapter;
 import world.bentobox.bentobox.database.json.adapters.MaterialTypeAdapter;
+import world.bentobox.bentobox.database.json.adapters.PairTypeAdapter;
 import world.bentobox.bentobox.database.json.adapters.PotionEffectTypeAdapter;
 import world.bentobox.bentobox.database.json.adapters.VectorTypeAdapter;
 import world.bentobox.bentobox.database.json.adapters.WorldTypeAdapter;
+import world.bentobox.bentobox.util.Pair;
 
 
 /**
@@ -74,6 +78,13 @@ public <T> TypeAdapter<T> create(Gson gson, TypeToken<T> type) {
             return (TypeAdapter<T>) new WorldTypeAdapter();
         } else if (Vector.class.isAssignableFrom(rawType)) {
             return (TypeAdapter<T>) new VectorTypeAdapter();
+        } else if (Pair.class.isAssignableFrom(rawType)) {
+            // Add Pair handling here with type safety
+            Type pairType = type.getType();
+            ParameterizedType parameterizedType = (ParameterizedType) pairType;
+            Type xType = parameterizedType.getActualTypeArguments()[0];
+            Type zType = parameterizedType.getActualTypeArguments()[1];
+            return (TypeAdapter<T>) new PairTypeAdapter<>(xType, zType);
         } else if (ConfigurationSerializable.class.isAssignableFrom(rawType)) {
             // This covers a lot of Bukkit objects
             return (TypeAdapter<T>) new BukkitObjectTypeAdapter(gson.getAdapter(Map.class));

src/main/java/world/bentobox/bentobox/database/json/adapters/PairTypeAdapter.java

@@ -0,0 +1,50 @@
+package world.bentobox.bentobox.database.json.adapters;
+
+import java.io.IOException;
+import java.lang.reflect.Type;
+
+import com.google.gson.Gson;
+import com.google.gson.TypeAdapter;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+
+import world.bentobox.bentobox.util.Pair;
+
+public class PairTypeAdapter<X, Z> extends TypeAdapter<Pair<X, Z>> {
+    private final Type xType;
+    private final Type zType;
+
+    public PairTypeAdapter(Type xType, Type zType) {
+        this.xType = xType;
+        this.zType = zType;
+    }
+
+    @Override
+    public void write(JsonWriter out, Pair<X, Z> pair) throws IOException {
+        out.beginObject();
+        out.name("x");
+        Gson gson = new Gson();
+        gson.toJson(pair.getKey(), xType, out);
+        out.name("z");
+        gson.toJson(pair.getValue(), zType, out);
+        out.endObject();
+    }
+
+    @Override
+    public Pair<X, Z> read(JsonReader in) throws IOException {
+        X x = null;
+        Z z = null;
+
+        in.beginObject();
+        while (in.hasNext()) {
+            String name = in.nextName();
+            if (name.equals("x")) {
+                x = new Gson().fromJson(in, xType);
+            } else if (name.equals("z")) {
+                z = new Gson().fromJson(in, zType);
+            }
+        }
+        in.endObject();
+        return new Pair<>(x, z);
+    }
+}

src/main/java/world/bentobox/bentobox/lists/Flags.java

@@ -283,7 +283,7 @@ private Flags() {}
     public static final Flag HURT_ANIMALS = new Flag.Builder("HURT_ANIMALS", Material.STONE_SWORD).listener(new HurtingListener()).mode(Flag.Mode.ADVANCED).build();
     public static final Flag HURT_MONSTERS = new Flag.Builder("HURT_MONSTERS", Material.WOODEN_SWORD).mode(Flag.Mode.BASIC).build();
     public static final Flag HURT_VILLAGERS = new Flag.Builder("HURT_VILLAGERS", Material.GOLDEN_SWORD).mode(Flag.Mode.ADVANCED).build();
-    public static final Flag HURT_TAMED_ANIMALS = new Flag.Builder("HURT_TAMABLE_ENTITIES", Material.DIAMOND_SWORD).mode(Flag.Mode.ADVANCED).build();
+    public static final Flag HURT_TAMED_ANIMALS = new Flag.Builder("HURT_TAMED_ANIMALS", Material.DIAMOND_SWORD).mode(Flag.Mode.ADVANCED).build();
 
     // Leashes
     public static final Flag LEASH = new Flag.Builder("LEASH", Material.LEAD).listener(new LeashListener()).build();

src/main/java/world/bentobox/bentobox/managers/PlayersManager.java

@@ -3,6 +3,7 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
@@ -30,7 +31,7 @@ public class PlayersManager {
     private Database<Players> handler;
     private final Database<Names> names;
     private final Map<UUID, Players> playerCache = new ConcurrentHashMap<>();
-
+    private final @NonNull List<Names> nameCache;
     private final Set<UUID> inTeleport; // this needs databasing
 
     /**
@@ -46,6 +47,7 @@ public PlayersManager(BentoBox plugin){
         handler = new Database<>(plugin, Players.class);
         // Set up the names database
         names = new Database<>(plugin, Names.class);
+        nameCache = names.loadObjects();
         inTeleport = new HashSet<>();
     }
 
@@ -139,7 +141,7 @@ public UUID getUUID(@NonNull String name) {
                 // Not used
             }
         }
-        return names.loadObjects().stream().filter(n -> n.getUniqueId().equalsIgnoreCase(name)).findFirst()
+        return nameCache.stream().filter(n -> n.getUniqueId().equalsIgnoreCase(name)).findFirst()
                 .map(Names::getUuid).orElse(null);
     }
 
@@ -148,10 +150,18 @@ public UUID getUUID(@NonNull String name) {
      * @param user - the User
      */
     public void setPlayerName(@NonNull User user) {
+        // Ignore any bots
+        if (user.getUniqueId() == null) {
+            return;
+        }
         Players player = getPlayer(user.getUniqueId());
         player.setPlayerName(user.getName());
         handler.saveObject(player);
+        // Update names
         Names newName = new Names(user.getName(), user.getUniqueId());
+        // Add to cache
+        nameCache.removeIf(name -> user.getUniqueId().equals(name.getUuid()));
+        nameCache.add(newName);
         // Add to names database
         names.saveObjectAsync(newName);
     }

src/main/java/world/bentobox/bentobox/managers/island/IslandCache.java

@@ -445,7 +445,7 @@ public void setOwner(@NonNull Island island, @Nullable UUID newOwnerUUID) {
     }
 
     /**
-     * Get the island by unique id
+     * Get the island by unique id. The Island will be cached if it is not already.
      * 
      * @param uniqueId unique id of the Island.
      * @return island or null if none found
@@ -479,6 +479,16 @@ public Island getIslandById(@NonNull String uniqueId, boolean cache) {
         return island;
     }
 
+    /**
+     * Removes the island from the cache to ensure it is reloaded from the database next time.
+     * @param uniqueId unique id of the Island.
+     * @return true if the island was in the cache, false otherwise.
+     * @since 2.4.1
+     */
+    public boolean expireIslandById(@NonNull String uniqueId) {
+        return islandsById.containsKey(uniqueId) && islandsById.put(uniqueId, null) != null;
+    }
+
     /**
      * Place the island into the cache map 
      * @param island island
@@ -540,4 +550,13 @@ public boolean isIslandId(String uniqueId) {
         return this.islandsById.containsKey(uniqueId);
     }
 
+    /**
+     * Returns if this island is cached. 
+     * @param uniqueId - unique id of island
+     * @return true if this island is caches, false if not, or if the island is unknown
+     */
+    public boolean isIslandCached(String uniqueId) {
+        return islandsById.get(uniqueId) != null;
+    }
+
 }

src/main/java/world/bentobox/bentobox/managers/island/IslandGrid.java

@@ -1,6 +1,7 @@
 package world.bentobox.bentobox.managers.island;
 
 import java.util.Map.Entry;
+
 import java.util.TreeMap;
 
 import world.bentobox.bentobox.database.objects.Island;
@@ -33,8 +34,10 @@ public boolean addToGrid(Island island) {
             TreeMap<Integer, String> zEntry = grid.get(island.getMinX());
             if (zEntry.containsKey(island.getMinZ())) {
                 if (island.getUniqueId().equals(zEntry.get(island.getMinZ()))) {
+                    // If it is the same island then it's okay
                     return true;
                 }
+                // Island overlap, report error
                 return false;
             } else {
                 // Add island

src/main/java/world/bentobox/bentobox/util/UUIDFetcher.java

@@ -0,0 +1,65 @@
+package world.bentobox.bentobox.util;
+
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.net.HttpURLConnection;
+import java.net.URI;
+import java.util.UUID;
+
+import org.eclipse.jdt.annotation.Nullable;
+import org.jetbrains.annotations.NotNull;
+
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+
+/**
+ * Fetches UUID for a player name from the Internet
+ * @since 1.24.1
+ */
+public class UUIDFetcher {
+    private static final String API_URL = "https://playerdb.co/api/player/minecraft/%s";
+
+    @Nullable
+    public static UUID getUUID(@NotNull String name) {
+        name = name.toLowerCase(); // Had some issues with upper-case letters in the username, so I added this to make sure that doesn't happen.
+
+        try {
+            HttpURLConnection connection = (HttpURLConnection) URI.create(String.format(API_URL, name)).toURL()
+                    .openConnection();
+
+            connection.setUseCaches(false);
+            connection.setDefaultUseCaches(false);
+            connection.addRequestProperty("User-Agent", "Mozilla/5.0");
+            connection.addRequestProperty("Cache-Control", "no-cache, no-store, must-revalidate");
+            connection.addRequestProperty("Pragma", "no-cache");
+            connection.setReadTimeout(5000);
+
+            // These connection parameters need to be set or the API won't accept the connection.
+
+            try (BufferedReader bufferedReader = new BufferedReader(
+                    new InputStreamReader(connection.getInputStream()))) {
+                StringBuilder response = new StringBuilder();
+                String line;
+
+                while ((line = bufferedReader.readLine()) != null)
+                    response.append(line);
+
+                final JsonElement parsed = JsonParser.parseString(response.toString());
+
+                if (parsed == null || !parsed.isJsonObject()) {
+                    return null;
+                }
+
+                JsonObject data = parsed.getAsJsonObject(); // Read the returned JSON data.
+
+                return UUID.fromString(data.get("data").getAsJsonObject().get("player").getAsJsonObject().get("id") // Grab the UUID.
+                        .getAsString());
+            }
+        } catch (Exception ignored) {
+            // Ignoring exception since this is usually caused by non-existent usernames.
+        }
+
+        return null;
+    }
+}

src/main/java/world/bentobox/bentobox/util/Util.java

@@ -63,11 +63,6 @@ public class Util {
     private static PasteHandler pasteHandler = null;
     private static WorldRegenerator regenerator = null;
 
-    // Bukkit method that was added in 2011
-    // Example value: 1.20.4-R0.1-SNAPSHOT
-    private static final String bukkitVersion = "v" + Bukkit.getBukkitVersion().replace('.', '_').replace('-', '_');
-    private static final String pluginPackageName = plugin.getClass().getPackage().getName();
-
     private Util() {}
 
     /**
@@ -721,6 +716,10 @@ public static void setRegenerator(WorldRegenerator regenerator) {
      */
     public static WorldRegenerator getRegenerator() {
         if (regenerator == null) {
+            // Bukkit method that was added in 2011
+            // Example value: 1.20.4-R0.1-SNAPSHOT
+            final String bukkitVersion = "v" + Bukkit.getBukkitVersion().replace('.', '_').replace('-', '_');
+            final String pluginPackageName = plugin.getClass().getPackage().getName();
             WorldRegenerator handler;
             try {
                 Class<?> clazz = Class.forName(pluginPackageName + ".nms." + bukkitVersion + ".WorldRegeneratorImpl");