Add default world support

Innectic · Innectic · commit 74c134c03541 · 2018-06-29T18:43:53.000-07:00
diff --git a/API/src/main/java/me/ifydev/dimensify/api/DimensifyConstants.java b/API/src/main/java/me/ifydev/dimensify/api/DimensifyConstants.java
@@ -78,6 +78,9 @@ public class DimensifyConstants {
     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>!";
+    public static final String DEFAULT_WORLD_FORMAT = DIMENSIFY_PREFIX + "&2&lDefault world: <WORLD>";
+    public static final String DEFAULT_WORLD_SET = DIMENSIFY_PREFIX + "&2&lDefault world set to: <WORLD>!";
+    public static final String COULD_NOT_SET_DEFAULT_WORLD = DIMENSIFY_PREFIX + "&2&lCould not set default world.";
 
     // Help response
     // TODO: This should automatically paginate.
@@ -91,7 +94,8 @@ public class DimensifyConstants {
                     "&a&l/dimensify delete <world_name>",
                     "&a&l/dimensify default [world_name]",
                     "&a&l/dimensify list",
-                    "&a&l/dimensify link <source_portal> <destination_dimension>"
+                    "&a&l/dimensify link <source_portal> <destination_dimension>",
+                    "&a&l/dimensify portal <list|link|create|remove> [args...]"
             )
     );
 }
diff --git a/API/src/main/java/me/ifydev/dimensify/api/backend/AbstractDataHandler.java b/API/src/main/java/me/ifydev/dimensify/api/backend/AbstractDataHandler.java
@@ -53,5 +53,7 @@ public abstract class AbstractDataHandler {
 
     public abstract Optional<Dimension> getDimension(String name);
     public abstract Optional<PortalMeta> getPortal(String name);
-    public abstract Optional<String> getDestinationForPortal(String portalName);
+
+    public abstract boolean setDefaultDimension(String name);
+    public abstract String getDefaultDimension(boolean skipCache);
 }
diff --git a/API/src/main/java/me/ifydev/dimensify/api/backend/impl/SQLHandler.java b/API/src/main/java/me/ifydev/dimensify/api/backend/impl/SQLHandler.java
@@ -53,7 +53,6 @@ private Optional<Connection> getConnection() {
     @Override
     public void initialize(String defaultWorld) {
         this.dimensions = new ArrayList<>();
-        this.defaultWorld = defaultWorld;
 
         try {
             Optional<Connection> connection = getConnection();
@@ -83,6 +82,10 @@ public void initialize(String defaultWorld) {
         } catch (SQLException e) {
             e.printStackTrace();
         }
+
+        this.defaultWorld = defaultWorld;
+        String defaultDimension = this.getDefaultDimension(true);
+        if (!defaultDimension.equals("")) this.defaultWorld = defaultDimension;
     }
 
     @Override
@@ -242,8 +245,38 @@ public Optional<PortalMeta> getPortal(String name) {
     }
 
     @Override
-    public Optional<String> getDestinationForPortal(String portalName) {
-        return Optional.ofNullable(this.destinations.getOrDefault(portalName, null));
+    public boolean setDefaultDimension(String name) {
+        this.dimensions.stream().filter(Dimension::isDefault).findFirst().ifPresent(dim -> dim.setDefault(false));
+
+        Optional<Dimension> dimension = dimensions.stream().filter(d -> d.getName().equalsIgnoreCase(name)).findFirst();
+        if (!dimension.isPresent()) return false;
+
+        dimension.get().setDefault(true);
+        this.defaultWorld = dimension.get().getName();
+
+        Optional<Connection> connection = getConnection();
+        if (!connection.isPresent()) return false;
+        try {
+            PreparedStatement removeCurrent = connection.get().prepareStatement("UPDATE dimensions SET `default`=0 WHERE `default`=1");
+            removeCurrent.execute();
+            removeCurrent.close();
+
+            PreparedStatement update = connection.get().prepareStatement("UPDATE dimensions SET `default`=1 WHERE `name`=?");
+            update.setString(1, dimension.get().getName());
+            update.execute();
+            update.close();
+            connection.get().close();
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+        return true;
+    }
+
+    @Override
+    public String getDefaultDimension(boolean skipCache) {
+        if (skipCache)
+            for (Dimension dimension : this.getDimensions()) if (dimension.isDefault()) return dimension.getName();
+        return defaultWorld;
     }
 
     @Override
diff --git a/API/src/main/java/me/ifydev/dimensify/api/dimensions/Dimension.java b/API/src/main/java/me/ifydev/dimensify/api/dimensions/Dimension.java
@@ -2,6 +2,7 @@
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
+import lombok.Setter;
 
 import java.util.Optional;
 
@@ -16,5 +17,5 @@ public class Dimension {
     private String name;
     private String type;
     private Optional<String> meta;
-    private boolean isDefault;
+    @Setter private boolean isDefault;
 }
diff --git a/DimensifySpigot/src/main/java/me/ifydev/dimensifyspigot/DimensifyMain.java b/DimensifySpigot/src/main/java/me/ifydev/dimensifyspigot/DimensifyMain.java
@@ -57,6 +57,7 @@ public class DimensifyMain extends JavaPlugin {
 
     @Getter private boolean allowEntryByDefault = true;
     @Getter private boolean permissionRestrictDimensions = false;
+    @Getter private boolean sendPlayersToDefaultWorldOnLogin = false;
 
     @Override
     public void onEnable() {
@@ -87,6 +88,7 @@ public void onEnable() {
         preloadWorlds = getConfig().getBoolean("preload_worlds", true);
         allowEntryByDefault = getConfig().getBoolean("default_dimension_restriction", true);
         permissionRestrictDimensions= getConfig().getBoolean("permission_restrict_dimensions", false);
+        sendPlayersToDefaultWorldOnLogin = getConfig().getBoolean("send_players_to_default_world_on_login", false);
 
         if (preloadWorlds)
             getConfig().getStringList("world_preload").forEach(name -> worldController.loadWorld(new DimensifyWorld(name, this)));
diff --git a/DimensifySpigot/src/main/java/me/ifydev/dimensifyspigot/backend/SpigotFlatFileHandler.java b/DimensifySpigot/src/main/java/me/ifydev/dimensifyspigot/backend/SpigotFlatFileHandler.java
@@ -47,7 +47,10 @@ private void saveStorage() {
     public void initialize(String defaultWorld) {
         DimensifyMain plugin = DimensifyMain.get();
         File data = plugin.getDataFolder();
+
         this.defaultWorld = defaultWorld;
+        String defaultDimension = this.getDefaultDimension(true);
+        if (!defaultDimension.equals("")) this.defaultWorld = defaultDimension;
 
         // Ensure the files exist
         storageFile = new File(data, plugin.getConfig().getString("connection.file", "storage.yml"));
@@ -239,7 +242,22 @@ public Optional<PortalMeta> getPortal(String name) {
     }
 
     @Override
-    public Optional<String> getDestinationForPortal(String portalName) {
-        return Optional.ofNullable(destinations.getOrDefault(portalName, null));
+    public boolean setDefaultDimension(String name) {
+        this.dimensions.stream().filter(Dimension::isDefault).findFirst().ifPresent(dim -> dim.setDefault(false));
+
+        dimensions.stream().filter(d -> d.getName().equalsIgnoreCase(name)).findFirst().ifPresent(dim -> {
+            dim.setDefault(true);
+            this.defaultWorld = dim.getName();
+
+            storage.set("dimensions." + dim.getName() + ".default", true);
+        });
+        return true;
+    }
+
+    @Override
+    public String getDefaultDimension(boolean skipCache) {
+        if (skipCache)
+            for (Dimension dimension : this.getDimensions()) if (dimension.isDefault()) return dimension.getName();
+        return defaultWorld;
     }
 }
diff --git a/DimensifySpigot/src/main/java/me/ifydev/dimensifyspigot/commands/DimensifyCommand.java b/DimensifySpigot/src/main/java/me/ifydev/dimensifyspigot/commands/DimensifyCommand.java
@@ -17,6 +17,7 @@
 
 import java.util.Collections;
 import java.util.List;
+import java.util.Optional;
 import java.util.stream.Collectors;
 
 /**
@@ -159,6 +160,11 @@ public boolean onCommand(CommandSender sender, Command command, String s, String
                 }
                 response.stream().map(ColorUtil::makeReadable).forEach(sender::sendMessage);
                 return;
+            } else if (args[0].equalsIgnoreCase("default")) {
+                String response = BasicHandler.setOrGetDefaultWorld(args.length >= 2 ? Optional.of(args[1]) :Optional.empty());
+                response = ColorUtil.makeReadable(response);
+                sender.sendMessage(response);
+                return;
             }
             // Send help
             sender.sendMessage(ColorUtil.makeReadable(DimensifyConstants.DIMENSIFY_HELP_HEADER));
diff --git a/DimensifySpigot/src/main/java/me/ifydev/dimensifyspigot/commands/handlers/BasicHandler.java b/DimensifySpigot/src/main/java/me/ifydev/dimensifyspigot/commands/handlers/BasicHandler.java
@@ -144,4 +144,17 @@ public static List<String> listWorlds() {
                 .replace("<DEFAULT>", String.valueOf(dim.isDefault())))
                 .collect(Collectors.toList());
     }
+
+    public static String setOrGetDefaultWorld(Optional<String> world) {
+        DimensifyMain plugin = DimensifyMain.get();
+        Optional<AbstractDataHandler> db = plugin.getApi().getDatabaseHandler();
+        if (!db.isPresent()) return DimensifyConstants.COULD_NOT_CONNECT_TO_DATABASE;
+
+        if (!world.isPresent()) {
+            String defaultDimension = db.get().getDefaultDimension(false);
+            return DimensifyConstants.DEFAULT_WORLD_FORMAT.replace("<WORLD>", defaultDimension);
+        }
+        boolean result = db.get().setDefaultDimension(world.get());
+        return result ? DimensifyConstants.DEFAULT_WORLD_SET.replace("<WORLD>", world.get()) : DimensifyConstants.COULD_NOT_SET_DEFAULT_WORLD;
+    }
 }
diff --git a/DimensifySpigot/src/main/java/me/ifydev/dimensifyspigot/events/PlayerJoin.java b/DimensifySpigot/src/main/java/me/ifydev/dimensifyspigot/events/PlayerJoin.java
@@ -1,5 +1,7 @@
 package me.ifydev.dimensifyspigot.events;
 
+import me.ifydev.dimensifyspigot.DimensifyMain;
+import org.bukkit.World;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
@@ -15,6 +17,15 @@ public class PlayerJoin implements Listener {
     public void onPlayerJoinEvent(PlayerJoinEvent e) {
         Player player = e.getPlayer();
         if (player == null) return;
-        // TODO: Support player home worlds
+
+        DimensifyMain plugin = DimensifyMain.get();
+        if (plugin.isSendPlayersToDefaultWorldOnLogin()) {
+            plugin.getApi().getDatabaseHandler().ifPresent(db -> {
+                String dimension = db.getDefaultDimension(false);
+
+                World world = plugin.getWorldController().getWorld(dimension);
+                player.teleport(world.getSpawnLocation());
+            });
+        }
     }
 }
diff --git a/DimensifySpigot/src/main/resources/config.yml b/DimensifySpigot/src/main/resources/config.yml
@@ -13,6 +13,8 @@ connection:
   password: magicalpassword
   file: dimensify
 
+send_players_to_default_world_on_login: false
+
 # Setting `permission_restrict_dimensions` to `true` will make all dimensions require permissions in
 # the following format: `dimension.<dimension_name>.allow` or `dimension.<dimension_name>.deny`.
 # If the permission is not present on the player, then we'll use the value from `default_dimension_restriction`.

Original file line number	Diff line number	Diff line change
`@@ -53,5 +53,7 @@ public abstract class AbstractDataHandler {`
`53`	`53`
`54`	`54`	`public abstract Optional<Dimension> getDimension(String name);`
`55`	`55`	`public abstract Optional<PortalMeta> getPortal(String name);`
`56`		`- public abstract Optional<String> getDestinationForPortal(String portalName);`
	`56`	`+`
	`57`	`+ public abstract boolean setDefaultDimension(String name);`
	`58`	`+ public abstract String getDefaultDimension(boolean skipCache);`
`57`	`59`	`}`