Add back support to save by name

Enable it in the config.yml.

Author: rutgerkok

src/main/java/nl/rutgerkok/betterenderchest/BetterEnderChest.java

@@ -309,6 +309,14 @@ public interface BetterEnderChest {
      */
     void severe(String message, Throwable thrown);
 
+    /**
+     * Gets whether UUIDs are used to save chests. If false, the chests will be
+     * saved using player names.
+     * 
+     * @return Whether UUIDs are used to save chests.
+     */
+    boolean useUuidsForSaving();
+
     /**
      * Logs a warning. Message will be prefixed with the plugin name between
      * square brackets.

src/main/java/nl/rutgerkok/betterenderchest/BetterEnderChestPlugin.java

@@ -84,6 +84,7 @@ public static class PublicChest {
     private Registry<ProtectionBridge> protectionBridges = new Registry<ProtectionBridge>();
     private int rankUpgrades;
     private SaveAndLoadError saveAndLoadError;
+    private boolean useUuids;
     private BetterEnderUUIDConverter uuidConverter;
 
     @Override
@@ -272,6 +273,10 @@ public void initConfig() {
         }
         config.set("BetterEnderChest.language", language);
 
+        // UUIDs
+        useUuids = config.getBoolean("BetterEnderChest.useUUIDs", true);
+        config.set("BetterEnderChest.useUUIDs", useUuids);
+
         // Save location
         String defaultSaveLocation = SaveLocation.getDefaultSaveLocation().toString();
         String givenSaveLocation = config.getString("BetterEnderChest.saveFolderLocation", defaultSaveLocation);
@@ -613,6 +618,11 @@ private void unloadIOServices() {
         uuidConverter = null;
     }
 
+    @Override
+    public boolean useUuidsForSaving() {
+        return useUuids;
+    }
+
     @Override
     public void warning(String message) {
         getLogger().warning(message);

src/main/java/nl/rutgerkok/betterenderchest/chestowner/ChestOwners.java

@@ -12,7 +12,6 @@
 import nl.rutgerkok.betterenderchest.uuidconversion.UUIDFetcher;
 
 import org.bukkit.Bukkit;
-import org.bukkit.OfflinePlayer;
 import org.bukkit.entity.Player;
 
 import com.google.common.cache.Cache;
@@ -115,7 +114,13 @@ public void fromInput(final String name, final Consumer<ChestOwner> onSuccess, f
             return;
         }
 
-        // Check online players
+        // Get by name if not using UUIDs
+        if (!plugin.useUuidsForSaving()) {
+            onSuccess.consume(new NamedChestOwner(name));
+            return;
+        }
+
+        // Get from cache or do a web lookup
         Bukkit.getScheduler().runTaskAsynchronously(plugin.getPlugin(), new Runnable() {
 
             @Override
@@ -148,8 +153,12 @@ public void run() {
      *            The player.
      * @return The <code>ChestOwner</code> belonging to the player.
      */
-    public ChestOwner playerChest(OfflinePlayer player) {
-        return new PlayerChestOwner(player.getName(), player.getUniqueId());
+    public ChestOwner playerChest(Player player) {
+        if (plugin.useUuidsForSaving()) {
+            return new UUIDChestOwner(player.getName(), player.getUniqueId());
+        } else {
+            return new NamedChestOwner(player.getName());
+        }
     }
 
     /**
@@ -162,7 +171,11 @@ public ChestOwner playerChest(OfflinePlayer player) {
      * @return The <code>ChestOwner</code> belonging to the player.
      */
     public ChestOwner playerChest(String playerName, UUID uuid) {
-        return new PlayerChestOwner(playerName, uuid);
+        if (plugin.useUuidsForSaving()) {
+            return new UUIDChestOwner(playerName, uuid);
+        } else {
+            return new NamedChestOwner(playerName);
+        }
     }
 
     /**

src/main/java/nl/rutgerkok/betterenderchest/chestowner/NamedChestOwner.java

@@ -0,0 +1,71 @@
+package nl.rutgerkok.betterenderchest.chestowner;
+
+import nl.rutgerkok.betterenderchest.Translations;
+
+import org.apache.commons.lang.Validate;
+import org.bukkit.Bukkit;
+import org.bukkit.OfflinePlayer;
+import org.bukkit.entity.Player;
+
+/**
+ * For chests referenced by name.
+ *
+ */
+class NamedChestOwner implements ChestOwner {
+
+    private final String name;
+
+    NamedChestOwner(String name) {
+        Validate.notNull(name, "Name may not be null");
+        this.name = name;
+    }
+
+    @Override
+    public String getDisplayName() {
+        return name;
+    }
+
+    @Override
+    public String getInventoryTitle() {
+        return Translations.PRIVATE_CHEST_TITLE.toString(name);
+    }
+
+    @SuppressWarnings("deprecation")
+    // ^ The server owner chose to use names, not our problem if something
+    // breaks
+    @Override
+    public Player getPlayer() {
+        return Bukkit.getPlayerExact(name);
+    }
+
+    @Override
+    public String getSaveFileName() {
+        return name.toLowerCase();
+    }
+
+    @Override
+    public boolean isDefaultChest() {
+        return false;
+    }
+
+    @Override
+    public boolean isOwnerOnline() {
+        return getPlayer() != null;
+    }
+
+    @Override
+    public boolean isPlayer(OfflinePlayer player) {
+        return name.equalsIgnoreCase(player.getName());
+    }
+
+    @Override
+    public boolean isPublicChest() {
+        return false;
+    }
+
+    @Override
+    public boolean isSpecialChest() {
+        return false;
+    }
+
+}

src/main/java/nl/rutgerkok/betterenderchest/chestowner/PlayerChestOwner.java renamed to src/main/java/nl/rutgerkok/betterenderchest/chestowner/UUIDChestOwner.java

@@ -13,12 +13,12 @@
  * Implementation of {@link ChestOwner} that represents a normal player.
  *
  */
-final class PlayerChestOwner implements ChestOwner {
+final class UUIDChestOwner implements ChestOwner {
 
     private final String displayName;
     private final UUID uuid;
 
-    PlayerChestOwner(String displayName, UUID uuid) {
+    UUIDChestOwner(String displayName, UUID uuid) {
         Validate.notNull(displayName, "Name may not be null");
         Validate.notNull(uuid, "UUID may not be null");
         this.displayName = displayName;
@@ -27,10 +27,10 @@ final class PlayerChestOwner implements ChestOwner {
 
     @Override
     public boolean equals(Object other) {
-        if (!(other instanceof PlayerChestOwner)) {
+        if (!(other instanceof UUIDChestOwner)) {
             return false;
         }
-        return ((PlayerChestOwner) other).uuid.equals(this.uuid);
+        return ((UUIDChestOwner) other).uuid.equals(this.uuid);
     }
 
     @Override

src/main/java/nl/rutgerkok/betterenderchest/uuidconversion/BetterEnderUUIDConverter.java

@@ -102,11 +102,11 @@ private boolean safeConvertWorldGroups(List<WorldGroup> groups) {
             plugin.severe("Failed to parse JSON", e);
             plugin.disableSaveAndLoad("Failed to parse JSON during UUID conversion", e);
         } catch (IOException e) {
-            plugin.severe("Error during name->UUID conversion process", e);
-            plugin.disableSaveAndLoad("Error during name->UUID conversion process", e);
+            plugin.severe("Error during conversion process", e);
+            plugin.disableSaveAndLoad("Error during conversion process", e);
         } catch (Throwable t) {
-            plugin.severe("Unexpected error during name->UUID conversion process", t);
-            plugin.disableSaveAndLoad("Unexpected error during name->UUID conversion process", t);
+            plugin.severe("Unexpected error during conversion process", t);
+            plugin.disableSaveAndLoad("Unexpected error during conversion process", t);
         }
         return false;
     }
@@ -123,12 +123,16 @@ public final void startConversion() {
         }
 
         // Disable saving and loading for now
-        plugin.log("Converting everything from name to UUID. This process may take a while.");
+        if (plugin.useUuidsForSaving()) {
+            plugin.log("Converting everything from name to UUID. This process may take a while.");
+        } else {
+            plugin.log("Changing save directory. This shouldn't take that long.");
+        }
         plugin.log("The server will still be usable while the Ender Chests are converted, Ender Chests just won't open.");
         Exception convertingException = new Exception("Converting to UUID files, may take a while");
         // No stack trace needed
         convertingException.setStackTrace(new StackTraceElement[0]);
-        plugin.disableSaveAndLoad("Converting to UUID files, may take a while", convertingException);
+        plugin.disableSaveAndLoad("Converting files, may take a while", convertingException);
 
         // Run conversion on another thread
         Bukkit.getScheduler().runTaskAsynchronously(plugin.getPlugin(), new Runnable() {

src/main/java/nl/rutgerkok/betterenderchest/uuidconversion/ConvertDirectoryTask.java

@@ -8,13 +8,13 @@
 import java.util.Map;
 import java.util.Map.Entry;
 
-import com.google.common.io.Files;
-
 import nl.rutgerkok.betterenderchest.BetterEnderChest;
 import nl.rutgerkok.betterenderchest.WorldGroup;
 import nl.rutgerkok.betterenderchest.chestowner.ChestOwner;
 import nl.rutgerkok.betterenderchest.io.BetterEnderFileHandler;
 
+import com.google.common.io.Files;
+
 class ConvertDirectoryTask extends ConvertTask {
 
     private final String extension;

src/main/java/nl/rutgerkok/betterenderchest/uuidconversion/UUIDFetcher.java

@@ -2,10 +2,9 @@
  * UUID fetcher by Nate Mortensen.
  * https://gist.github.com/evilmidget38/df8dcd7855937e9d1e1f
  * 
- * Modified by BetterEnderChest to
- * - throw less generic exceptions
- * - return ChestOwner instead of UUID.
- * - use the new API Mojang provided to avoid getting rate-limited
+ * Modified by BetterEnderChest to throw less generic exceptions, return
+ * ChestOwner instead of UUID, use the new API Mojang provided to avoid getting
+ * rate-limited and to add support to continue using names.
  */
 package nl.rutgerkok.betterenderchest.uuidconversion;
 
@@ -86,8 +85,33 @@ public UUIDFetcher(BetterEnderChest plugin, Collection<String> batch) {
 
     @Override
     public Map<String, ChestOwner> call() throws IOException, ParseException {
+        if (plugin.useUuidsForSaving()) {
+            return callOnline();
+        } else {
+            return callOffline();
+        }
+    }
+
+    private Map<String, ChestOwner> callOffline() {
+        // Converting is easy when not doing web lookups :)
+        Map<String, ChestOwner> results = new HashMap<String, ChestOwner>();
+        for (String name : names) {
+            results.put(name, plugin.getChestOwners().playerChest(name, null));
+        }
+        results.putAll(specialChests);
+        return results;
+    }
+
+    private Map<String, ChestOwner> callOnline() throws IOException, ParseException {
+        if (!plugin.useUuidsForSaving()) {
+            // Should never happen, but it makes reviewing the code easier for
+            // the BukkitDev staff, as they can easily see that all networking
+            // can be blocked
+            throw new IllegalStateException();
+        }
+
         Map<String, ChestOwner> uuidMap = new HashMap<String, ChestOwner>();
-        for(int i = 0; i < names.size(); i+=MAX_SEARCH) {
+        for (int i = 0; i < names.size(); i += MAX_SEARCH) {
             String body = buildBody(names, i);
             HttpURLConnection connection = createConnection();
             writeBody(connection, body);