Allow dimensions to be permission restricted

Author: Innectic

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

@@ -64,6 +64,7 @@ public class DimensifyConstants {
     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!";
+    public static final String CANNOT_ENTER_THIS_DIMENSION = DIMENSIFY_PREFIX + "&c&lYou don't have permission to enter this domain!";
 
     // General success
     public static final String CREATING_WORLD = DIMENSIFY_PREFIX + "World '<WORLD>' is being created...";

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

@@ -33,6 +33,7 @@
 import me.ifydev.dimensifyspigot.events.PlayerPortal;
 import me.ifydev.dimensifyspigot.portal.PortalRegistry;
 import me.ifydev.dimensifyspigot.util.Verifier;
+import me.ifydev.dimensifyspigot.world.DimensifyWorld;
 import me.ifydev.dimensifyspigot.world.WorldController;
 import org.bukkit.Bukkit;
 import org.bukkit.plugin.PluginManager;
@@ -84,8 +85,11 @@ public void onEnable() {
         portalRegistry = new PortalRegistry();
 
         preloadWorlds = getConfig().getBoolean("preload_worlds", true);
+        allowEntryByDefault = getConfig().getBoolean("default_dimension_restriction", true);
+        permissionRestrictDimensions= getConfig().getBoolean("permission_restrict_dimensions", false);
 
-//        if (preloadWorlds) worldController.loadAllWorlds(allWorlds, this);
+        if (preloadWorlds)
+            getConfig().getStringList("world_preload").forEach(name -> worldController.loadWorld(new DimensifyWorld(name, this)));
 
         registerListeners();
         registerCommands();

DimensifySpigot/src/main/java/me/ifydev/dimensifyspigot/commands/handlers/BasicHandler.java

@@ -9,6 +9,7 @@
 import me.ifydev.dimensifyspigot.util.ColorUtil;
 import me.ifydev.dimensifyspigot.util.MiscUtil;
 import me.ifydev.dimensifyspigot.world.DimensifyWorld;
+import me.ifydev.dimensifyspigot.world.WorldController;
 import net.md_5.bungee.api.ChatMessageType;
 import net.md_5.bungee.api.chat.TextComponent;
 import org.bukkit.Bukkit;
@@ -95,11 +96,7 @@ public static String goToDimension(Player player, String dimension) {
         // Make sure this dimension actually exists
         if (!plugin.getApi().getDatabaseHandler().map(db -> db.getDimension(dimension).isPresent()).orElse(false))
             return DimensifyConstants.INVALID_WORLD.replace("<WORLD>", dimension);
-        World destination = plugin.getWorldController().getWorld(dimension);
-        player.teleport(destination.getSpawnLocation());
-
-        // Send the really cool whoosh message
-        player.spigot().sendMessage(ChatMessageType.ACTION_BAR, new TextComponent(ColorUtil.makeReadable(DimensifyConstants.WHOOSH)));
+        WorldController.enterDimension(player, dimension);
         return "";
     }
 

DimensifySpigot/src/main/java/me/ifydev/dimensifyspigot/events/PlayerPortal.java

@@ -4,6 +4,7 @@
 import me.ifydev.dimensifyspigot.DimensifyMain;
 import me.ifydev.dimensifyspigot.util.ColorUtil;
 import me.ifydev.dimensifyspigot.world.DimensifyWorld;
+import me.ifydev.dimensifyspigot.world.WorldController;
 import net.md_5.bungee.api.ChatMessageType;
 import net.md_5.bungee.api.chat.TextComponent;
 import org.bukkit.Bukkit;
@@ -36,10 +37,7 @@ public void onPlayerAboutToTeleportEvent(PlayerPortalEvent e) {
                     // Load the world, since it's not here
                     plugin.getWorldController().loadWorld(new DimensifyWorld(link, plugin));
                 }
-
-                World world = Bukkit.getWorld(link);
-                player.teleport(world.getSpawnLocation());
-                player.spigot().sendMessage(ChatMessageType.ACTION_BAR, new TextComponent(ColorUtil.makeReadable(DimensifyConstants.WHOOSH)));
+                WorldController.enterDimension(player, link);
             });
         });
     }

DimensifySpigot/src/main/java/me/ifydev/dimensifyspigot/world/WorldController.java

@@ -1,10 +1,15 @@
 package me.ifydev.dimensifyspigot.world;
 
+import me.ifydev.dimensify.api.DimensifyConstants;
 import me.ifydev.dimensify.api.dimensions.Dimension;
 import me.ifydev.dimensifyspigot.DimensifyMain;
+import me.ifydev.dimensifyspigot.util.ColorUtil;
+import net.md_5.bungee.api.ChatMessageType;
+import net.md_5.bungee.api.chat.TextComponent;
 import org.apache.commons.io.FileUtils;
 import org.bukkit.Bukkit;
 import org.bukkit.World;
+import org.bukkit.entity.Player;
 
 import java.io.File;
 import java.io.IOException;
@@ -65,4 +70,20 @@ public boolean deleteWorld(String dimensionName) {
         }
         return true;
     }
+
+    public static void enterDimension(Player player, String dimension) {
+        DimensifyMain plugin = DimensifyMain.get();
+
+        if (plugin.isPermissionRestrictDimensions()) {
+            boolean playerIsAllowedToEnterDimension = player.hasPermission("dimension." + dimension + ".allow") || plugin.isAllowEntryByDefault();
+            if (!playerIsAllowedToEnterDimension) {
+                player.sendMessage(ColorUtil.makeReadable(DimensifyConstants.CANNOT_ENTER_THIS_DIMENSION));
+                return;
+            }
+        }
+
+        World world = plugin.getWorldController().getWorld(dimension);
+        player.teleport(world.getSpawnLocation());
+        player.spigot().sendMessage(ChatMessageType.ACTION_BAR, new TextComponent(ColorUtil.makeReadable(DimensifyConstants.WHOOSH)));
+    }
 }

DimensifySpigot/src/main/resources/config.yml

@@ -16,6 +16,7 @@ connection:
 # 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`.
+# Please note, permission restrictions do not take effect when a player is sent to the dimension.
 permission_restrict_dimensions: false
 # `true` allows entry by default, `false` denies entry by default.
 default_dimension_restriction: true