Merge pull request #9 from ifydev/cleanup/1.0

Cleanup/1.0

Author: Innectic

API/src/main/java/me/ifydev/dimensify/api/DimensifyAPI.java

@@ -44,7 +44,7 @@ public class DimensifyAPI {
 
     @Getter private Optional<AbstractDataHandler> databaseHandler;
 
-    public void initialize(Class<? extends AbstractDataHandler> handler, BackendType backendType, Optional<ConnectionInformation> connectionInformation) throws Exception {
+    public void initialize(String defaultWorld, Class<? extends AbstractDataHandler> handler, BackendType backendType, Optional<ConnectionInformation> connectionInformation) throws Exception {
         api = Optional.of(this);
 
         try {
@@ -57,7 +57,8 @@ public void initialize(Class<? extends AbstractDataHandler> handler, BackendType
         if (!databaseHandler.isPresent()) throw new Exception("No data handler present.");
 
         databaseHandler.ifPresent(h -> {
-            h.initialize();
+            System.out.println("Using " + defaultWorld + " as the default world...");
+            h.initialize(defaultWorld);
             h.reload();
             if (h.connect()) System.out.println("Connected to database!");
             else System.out.println("Unable to connect to database!");

API/src/main/java/me/ifydev/dimensify/api/DimensifyConstants.java

@@ -54,6 +54,7 @@ public class DimensifyConstants {
     public static final String INVALID_DIMENSION_TYPE = DIMENSIFY_PREFIX + "&c&lDimension type '<TYPE>' is invalid.";
     public static final String INVALID_ENVIRONMENT_TYPE = DIMENSIFY_PREFIX + "&c&lEnvironment type '<TYPE>' is invalid.";
     public static final String SEED_NOT_PROVIDED = DIMENSIFY_PREFIX + "&c&lSeed has no value.";
+    public static final String INVALID_SEED = DIMENSIFY_PREFIX + "&c&lInvalid seed value!";
     public static final String ENV_NOT_PROVIDED = DIMENSIFY_PREFIX + "&c&lEnv has no value.";
     public static final String INVALID_PLAYER = DIMENSIFY_PREFIX + "&c&lInvalid player: <PLAYER>";
     public static final String INTERNAL_ERROR = DIMENSIFY_PREFIX + "&c&lAn internal error has occurred. Please check your console for more details";
@@ -62,17 +63,20 @@ public class DimensifyConstants {
     public static final String INVALID_PORTAL = DIMENSIFY_PREFIX + "&c&lInvalid portal!";
     public static final String PORTAL_NAME_ALREADY_USED = DIMENSIFY_PREFIX + "&c&lPortal name '<NAME>' already used!";
     public static final String CANNOT_DELETE_MAIN_WORLD = DIMENSIFY_PREFIX + "&c&lCannot delete the main world!";
+    public static final String COULD_NOT_CONNECT_TO_DATABASE = DIMENSIFY_PREFIX + "&c&lCannot connect to the database!";
 
     // General success
     public static final String CREATING_WORLD = DIMENSIFY_PREFIX + "World '<WORLD>' is being created...";
     public static final String WORLD_CREATED = DIMENSIFY_PREFIX + "World '<WORLD>' created!";
     public static final String WHOOSH = "&a&lWhoosh!";
     public static final String WORLD_DELETED = DIMENSIFY_PREFIX + "World '<WORLD>' has been deleted!";
-    public static final String YOU_HAVE_BEEN_SENT = DIMENSIFY_PREFIX + "You have been sent to <WORLD>!";
     public static final String PLAYER_HAS_BEEN_SENT = DIMENSIFY_PREFIX + "<PLAYER> has been sent to <WORLD>!";
     public static final String PORTALS_LINKED = DIMENSIFY_PREFIX + "Portals have been linked!";
     public static final String PORTAL_CREATED = DIMENSIFY_PREFIX + "Portal '<PORTAL>' created!";
     public static final String PORTAL_DELETED = DIMENSIFY_PREFIX + "Portal '<PORTAL>' has been deleted!";
+    public static final String PORTAL_LIST_FORMAT = "&2&l<NAME> - &9&lX: <X>, Y: <Y>, Z: <Z> - &e&lDimension: <DIMENSION> - &3&lDestination: <DESTINATION>";
+    public static final String DIMENSION_LIST_FORMAT = "&2&l<NAME> - Type: <TYPE> - Default?: <DEFAULT>";
+    public static final String THERE_ARE_NONE = DIMENSIFY_PREFIX + "&2&lThere are no <ITEM>!";
 
     // Help response
     // TODO: This should automatically paginate.

API/src/main/java/me/ifydev/dimensify/api/backend/AbstractDataHandler.java

@@ -22,7 +22,7 @@ public abstract class AbstractDataHandler {
     /**
      * Setup anything that's needed before we can connect.
      */
-    public abstract void initialize();
+    public abstract void initialize(String defaultWorld);
 
     /**
      * Connect to whatever kind of handler we're going for.
@@ -45,7 +45,7 @@ public abstract class AbstractDataHandler {
     public abstract boolean removePortal(String name);
     public abstract List<PortalMeta> getPortals();
 
-    public abstract void setPortalDestination(String portal, String destination);
+    public abstract boolean setPortalDestination(String portal, String destination);
 
     public abstract boolean createDimension(Dimension dimension);
     public abstract boolean removeDimension(String name);

API/src/main/java/me/ifydev/dimensify/api/backend/impl/SQLHandler.java

@@ -18,6 +18,8 @@ public class SQLHandler extends AbstractDataHandler {
     private boolean isUsingSQLite = false;
     private String baseConnectionUrl;
 
+    private String defaultWorld;
+
     public SQLHandler(ConnectionInformation connectionInformation) {
         super(connectionInformation);
 
@@ -49,8 +51,9 @@ private Optional<Connection> getConnection() {
     }
 
     @Override
-    public void initialize() {
+    public void initialize(String defaultWorld) {
         this.dimensions = new ArrayList<>();
+        this.defaultWorld = defaultWorld;
 
         try {
             Optional<Connection> connection = getConnection();
@@ -185,9 +188,9 @@ public List<PortalMeta> getPortals() {
     }
 
     @Override
-    public void setPortalDestination(String portal, String destination) {
+    public boolean setPortalDestination(String portal, String destination) {
         Optional<Connection> connection = getConnection();
-        if (!connection.isPresent()) return;
+        if (!connection.isPresent()) return false;
 
         this.destinations.put(portal, destination);
 
@@ -199,9 +202,11 @@ public void setPortalDestination(String portal, String destination) {
 
             statement.close();
             connection.get().close();
+            return true;
         } catch (SQLException e) {
             e.printStackTrace();
         }
+        return false;
     }
 
     @Override
@@ -227,12 +232,13 @@ public List<Dimension> getDimensions() {
 
     @Override
     public Optional<Dimension> getDimension(String name) {
-        return this.dimensions.stream().filter(d -> d.getName().equals(name)).findFirst();
+        if (name.equalsIgnoreCase(defaultWorld)) return Optional.of(new Dimension(defaultWorld, "", Optional.empty(), false));
+        return this.dimensions.stream().filter(d -> d.getName().equalsIgnoreCase(name)).findFirst();
     }
 
     @Override
     public Optional<PortalMeta> getPortal(String name) {
-        return this.portals.stream().filter(p -> p.getName().equals(name)).findFirst();
+        return this.portals.stream().filter(p -> p.getName().equalsIgnoreCase(name)).findFirst();
     }
 
     @Override
@@ -245,7 +251,7 @@ public boolean createDimension(Dimension dimension) {
         Optional<Connection> connection = getConnection();
         if (!connection.isPresent()) return false;
 
-        if (dimensions.stream().anyMatch(d -> d.getName().equals(dimension.getName()))) return false;
+        if (dimensions.stream().anyMatch(d -> d.getName().equalsIgnoreCase(dimension.getName()))) return false;
         this.dimensions.add(dimension);
 
         try {
@@ -272,7 +278,7 @@ public boolean removeDimension(String name) {
         Optional<Connection> connection = getConnection();
         if (!connection.isPresent()) return false;
 
-        Optional<Dimension> dimension = this.dimensions.stream().filter(d -> d.getName().equals(name)).findFirst();
+        Optional<Dimension> dimension = this.dimensions.stream().filter(d -> d.getName().equalsIgnoreCase(name)).findFirst();
         if (!dimension.isPresent()) return false;
         dimensions.remove(dimension.get());
 

DimensifySpigot/src/main/java/me/ifydev/dimensifyspigot/DimensifyMain.java

@@ -34,6 +34,7 @@
 import me.ifydev.dimensifyspigot.portal.PortalRegistry;
 import me.ifydev.dimensifyspigot.util.Verifier;
 import me.ifydev.dimensifyspigot.world.WorldController;
+import org.bukkit.Bukkit;
 import org.bukkit.plugin.PluginManager;
 import org.bukkit.plugin.java.JavaPlugin;
 
@@ -71,7 +72,7 @@ public void onEnable() {
         getLogger().info("Initializing Dimensify API...");
         api = new DimensifyAPI();
         try {
-            api.initialize(SpigotFlatFileHandler.class, backendType.get(), Verifier.verifyConnectionInformation(backendType.get()));
+            api.initialize(Bukkit.getWorlds().get(0).getName(), SpigotFlatFileHandler.class, backendType.get(), Verifier.verifyConnectionInformation(backendType.get()));
         } catch (Exception e) {
             getLogger().severe("Could not initialize Dimensify API!");
             e.printStackTrace();

DimensifySpigot/src/main/java/me/ifydev/dimensifyspigot/backend/SpigotFlatFileHandler.java

@@ -28,6 +28,8 @@ public class SpigotFlatFileHandler extends AbstractDataHandler {
     private File storageFile;
     private FileConfiguration storage;
 
+    private String defaultWorld;
+
     public SpigotFlatFileHandler(ConnectionInformation connectionInformation) {
         super(connectionInformation);
     }
@@ -42,9 +44,10 @@ private void saveStorage() {
     }
 
     @Override
-    public void initialize() {
+    public void initialize(String defaultWorld) {
         DimensifyMain plugin = DimensifyMain.get();
         File data = plugin.getDataFolder();
+        this.defaultWorld = defaultWorld;
 
         // Ensure the files exist
         storageFile = new File(data, plugin.getConfig().getString("connection.file", "storage.yml"));
@@ -84,7 +87,7 @@ public void drop() {
     @Override
     public boolean createPortal(PortalMeta meta) {
         // Make sure this does not exist in the cache already
-        Optional<PortalMeta> portal = this.portals.stream().filter(m -> m.getName().equals(meta.getName())).findFirst();
+        Optional<PortalMeta> portal = this.portals.stream().filter(m -> m.getName().equalsIgnoreCase(meta.getName())).findFirst();
         if (portal.isPresent()) return false;
         this.portals.add(meta);
 
@@ -111,7 +114,7 @@ public boolean createPortal(PortalMeta meta) {
     @Override
     public boolean removePortal(String name) {
         // Make sure the portal exists in the cache.
-        Optional<PortalMeta> meta = this.portals.stream().filter(m -> m.getName().equals(name)).findFirst();
+        Optional<PortalMeta> meta = this.portals.stream().filter(m -> m.getName().equalsIgnoreCase(name)).findFirst();
         if (!meta.isPresent()) return false;
 
         // Remove the portal from all caches
@@ -164,16 +167,17 @@ public List<PortalMeta> getPortals() {
     }
 
     @Override
-    public void setPortalDestination(String portal, String destination) {
+    public boolean setPortalDestination(String portal, String destination) {
         this.destinations.put(portal, destination);
 
         storage.set("link." + portal, destination);
         saveStorage();
+        return true;
     }
 
     @Override
     public boolean createDimension(Dimension dimension) {
-        Optional<Dimension> d = this.dimensions.stream().filter(dim -> dim.getName().equals(dimension.getName())).findFirst();
+        Optional<Dimension> d = this.dimensions.stream().filter(dim -> dim.getName().equalsIgnoreCase(dimension.getName())).findFirst();
         if (d.isPresent()) return false;
         this.dimensions.add(dimension);
 
@@ -190,7 +194,7 @@ public boolean createDimension(Dimension dimension) {
     @Override
     public boolean removeDimension(String name) {
         // Make sure it's cached
-        Optional<Dimension> dimension = this.dimensions.stream().filter(d -> d.getName().equals(name)).findFirst();
+        Optional<Dimension> dimension = this.dimensions.stream().filter(d -> d.getName().equalsIgnoreCase(name)).findFirst();
         if (!dimension.isPresent()) return false;
 
         // Remove from the cache
@@ -225,16 +229,17 @@ public List<Dimension> getDimensions() {
 
     @Override
     public Optional<Dimension> getDimension(String name) {
-        return Optional.empty();
+        if (name.equalsIgnoreCase(defaultWorld)) return Optional.of(new Dimension(defaultWorld, "", Optional.empty(), false));
+        return this.dimensions.stream().filter(d -> d.getName().equalsIgnoreCase(name)).findFirst();
     }
 
     @Override
     public Optional<PortalMeta> getPortal(String name) {
-        return Optional.empty();
+        return this.portals.stream().filter(d -> d.getName().equalsIgnoreCase(name)).findFirst();
     }
 
     @Override
     public Optional<String> getDestinationForPortal(String portalName) {
-        return Optional.empty();
+        return Optional.ofNullable(destinations.getOrDefault(portalName, null));
     }
 }