Updates version to 0.9.1.0, updates README and adds a permission for changing config values

Adds the stargate.admin.config permission, which is required to use /sg config

README.md

@@ -10,9 +10,11 @@ can share a network or be split into clusters; they can be hidden on a network o
 - Multiple built-in languages (de, en, es, fr, hu, it, nb-no, nl, nn-no, pt-br, ru)
 - Teleport across worlds or servers (BungeeCord supported)
 - Vehicle teleportation -- teleport minecarts, boats, horses, pigs and striders
+- Leashed teleportation -- teleport any creature in a leash with the player
 - Underwater portals -- portals can be placed underwater as long as a waterproof button is used
 - API available -- using the API, a lot of behavior can be changed
 - Button customization -- a large amount of materials usable as buttons (buttons, wall corals, shulkers, chests)
+- Config commands -- All main config values can be changed from the commandline
 
 ## Background
 
@@ -58,7 +60,9 @@ stargate.option -- Allow use of all options
   stargate.option.backwards -- Allow use of 'B'ackwards
   stargate.option.show -- Allow use of 'S'how
   stargate.option.nonetwork -- Allow use of 'N'oNetwork
-  stargate.option.random -- Allow use of 'Random' stargates
+  stargate.option.random -- Allow use of 'R'andom stargates
+  stargate.option.silent -- Allow use of S'i'lent stargates
+  stargate.option.nosign -- Allow use of 'E' (No sign)
   
 stargate.create -- Allow creating Stargates on any network (Override all create permissions)
   stargate.create.personal -- Allow creating Stargates on network {playername}
@@ -77,11 +81,12 @@ stargate.free -- Allow free use/creation/destruction of Stargates
   stargate.free.create -- Allow free creation of Stargates
   stargate.free.destroy -- Allow free destruction of Stargates
   
-stargate.admin -- Allow all admin features (Hidden/Private only so far)
+stargate.admin -- Allow all admin features (Hidden/Private bypass, BungeeCord, Reload, Config)
   stargate.admin.private -- Allow use of Private gates not owned by user
   stargate.admin.hidden -- Allow access to Hidden gates not ownerd by user
   stargate.admin.bungee -- Allow the creation of BungeeCord stargates (U option)
   stargate.admin.reload -- Allow use of the reload command
+  stargate.admin.config -- Allows the player to change config values from the chat
 ```
 
 ## Default Permissions
@@ -126,8 +131,10 @@ section). See the Custom Gate Layout section to learn how to add custom gates.
     - 'S' is for showing an always-on gate in the network list
     - 'N' is for hiding the network name
     - 'R' is for random gates. These follow standard permissions of gates, but have a random exit location every time a
-      player enters.
-    - 'U' is for a gate connecting to another through bungee
+      player enters. (Implicitly always on)
+    - 'U' is for a gate connecting to another through bungee (Implicitly always on)
+    - 'I' is for a silent gate, which does not output anything to the chat while teleporting. Increases immersion
+    - 'E' is for gate without a sign. Only for fixed stargates
 
 The options are the single letter, not the word. So to make a private hidden gate, your 4th line would be 'PH'.
 
@@ -199,7 +206,11 @@ The key `button` is used to define the type of button that is generated for this
 a type of wall coral (dead or alive), a type of shulker box or a chest.
 
 `X` and `-` are used to define block types for the layout (Any single-character can be used, such as `#`).  
-In the gate format, you can see we use `X` to show where obsidian must be, `-` where the controls (Button/sign) are.  
+In the gate format, you can see we use `X` to show where obsidian must be, `-` where the controls (Button/sign) are.
+
+For more complex gate designs, it is possible to add more materials. If you add something like a=GLOWSTONE, `a` can then
+be used in the gate layout, just as `X` is used. See the `squarenetherglowstonegate.gate` file for an example.
+
 You will also notice a `*` in the gate layout, this is the "exit point" of the gate, the block at which the player will
 teleport in front of.
 
@@ -301,6 +312,9 @@ gates:
   functionality:
     enableBungee - Enable this for BungeeCord support. This allows portals across Bungee servers.
     handleVehicles - Whether or not to handle vehicles going through gates. Set to false to disallow vehicles (Manned or not) going through gates.
+    handleEmptyVehicles - Whether or not to handle empty vehicles going through gates (chest/hopper/tnt/furnace minecarts included).
+    handleCreatureTransportation - Whether or not to handle players that transport creatures by sending vehicles (minecarts, boats) through gates.
+    handleNonPlayerVehicles - Whether or not to handle vehicles with a passenger which is not a player going through gates (pigs, horses, villagers, creepers, etc.). handleCreatureTransportation must be enabled.
     handleLeashedCreatures - Whether or not to handle creatures leashed by a player going through gates. Set to false to disallow leashed creatures going through gates.
 economy:
   useEconomy - Whether or not to enable Economy using Vault (must have the Vault plugin)
@@ -364,10 +378,48 @@ bungeeDisabled=BungeeCord support is disabled.
 bungeeDeny=You do not have permission to create BungeeCord gates.
 bungeeEmpty=BungeeCord gates require both a destination and network.
 bungeeSign=Teleport to
+
+portalInfoTitle=[STARGATE INFO]
+portalInfoName=Name: %name%
+portalInfoDestination=Destination: %destination%
+portalInfoNetwork=Network: %network%
+portalInfoServer=Server: %server%
 ```
 
 # Changes
 
+#### \[Version 0.9.1.0] EpicKnarvik97 fork
+
+- Rewrites config loading as a part of the changes required to implement config commands
+- This update adds commands to change all config values from the chat or the console, complete with tab completion
+- Adds a new permission "stargate.admin.config" which is required to edit config values from the chat
+
+#### \[Version 0.9.0.7] EpicKnarvik97 fork
+
+- Stops registering the sign as a lookup block for stargates without a sign
+- Only removes a stargate's button if it's actually a button-compatible block
+- Only displays portal info if not placing a block
+
+#### \[Version 0.9.0.6] EpicKnarvik97 fork
+
+- Makes containers no longer open when used as buttons
+- Validates and updates stargate buttons when the plugin is loaded or reloaded
+- Adds an option to make a stargate silent (no text in chat when teleporting) for better immersion on RP servers
+- Makes buttons update and/or remove themselves when their location or material changes
+- Adds another default gate to show that it's possible to use any number of materials for a stargate's border
+- Adds an option for stargates without a sign. Right-clicking such a stargate will display gate information
+- Fixes a bug causing signs to be re-drawn after they're broken
+- Makes buttons and signs be replaced by water instead of air when underwater
+- Makes portal info shown when right-clicking a stargate fully customizable
+
+#### \[Version 0.9.0.5] EpicKnarvik97 fork
+
+- Adds an option to stargate functionality to disable all teleportation of creatures
+- Adds an option to stargate functionality to disable all teleportation of empty minecarts
+- Adds an option to stargate functionality to disable teleportation of creatures if no player is present in the vehicle
+- Prevents a player in a vehicle from teleporting without the vehicle if vehicle teleportation is disabled
+- Prevents an infinite number of teleportation messages if vehicle teleportation is detected but denied
+
 #### \[Version 0.9.0.4] EpicKnarvik97 fork
 
 - Adds teleportation of leashed creatures. By default, any creature connected to a player by a lead will be teleported

pom.xml

@@ -4,7 +4,7 @@
 
     <groupId>net.knarcraft</groupId>
     <artifactId>Stargate</artifactId>
-    <version>0.9.0.4</version>
+    <version>0.9.1.0</version>
 
     <licenses>
         <license>

src/main/java/net/knarcraft/stargate/command/CommandConfig.java

@@ -0,0 +1,144 @@
+package net.knarcraft.stargate.command;
+
+import net.knarcraft.stargate.Stargate;
+import net.knarcraft.stargate.config.ConfigOption;
+import org.bukkit.ChatColor;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.configuration.file.FileConfiguration;
+import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * This command represents the config command for changing config values
+ */
+public class CommandConfig implements CommandExecutor {
+
+    @Override
+    public boolean onCommand(@NotNull CommandSender commandSender, @NotNull Command command, @NotNull String s,
+                             @NotNull String[] args) {
+        if (commandSender instanceof Player player) {
+            if (!player.hasPermission("stargate.admin.config")) {
+                Stargate.getMessageSender().sendErrorMessage(commandSender, "Permission Denied");
+                return true;
+            }
+        }
+
+        if (args.length > 0) {
+            ConfigOption selectedOption = ConfigOption.getByName(args[0]);
+            if (selectedOption == null) {
+                return false;
+            }
+            if (args.length > 1) {
+                updateConfigValue(selectedOption, commandSender, args[1]);
+            } else {
+                //Display info and the current value of the given config value
+                printConfigOptionValue(commandSender, selectedOption);
+            }
+            return true;
+        } else {
+            //Display all config options
+            displayConfigValues(commandSender);
+        }
+        return true;
+    }
+
+    /**
+     * Updates a config value
+     *
+     * @param selectedOption <p>The option which should be updated</p>
+     * @param commandSender  <p>The command sender that changed the value</p>
+     * @param value          <p>The new value of the config option</p>
+     */
+    private void updateConfigValue(ConfigOption selectedOption, CommandSender commandSender, String value) {
+        FileConfiguration configuration = Stargate.getInstance().getConfig();
+
+        //Validate any sign colors
+        if (selectedOption == ConfigOption.MAIN_SIGN_COLOR || selectedOption == ConfigOption.HIGHLIGHT_SIGN_COLOR) {
+            try {
+                ChatColor.valueOf(value.toUpperCase());
+            } catch (IllegalArgumentException | NullPointerException ignored) {
+                commandSender.sendMessage(ChatColor.RED + "Invalid color given");
+                return;
+            }
+        }
+
+        //Store the config values, accounting for the data type
+        switch (selectedOption.getDataType()) {
+            case BOOLEAN -> configuration.set(selectedOption.getConfigNode(), Boolean.parseBoolean(value));
+            case INTEGER -> {
+                try {
+                    configuration.set(selectedOption.getConfigNode(), Integer.parseInt(value));
+                } catch (NumberFormatException exception) {
+                    commandSender.sendMessage(ChatColor.RED + "Invalid number given");
+                    return;
+                }
+            }
+            case STRING -> {
+                if (selectedOption == ConfigOption.GATE_FOLDER || selectedOption == ConfigOption.PORTAL_FOLDER ||
+                        selectedOption == ConfigOption.DEFAULT_GATE_NETWORK) {
+                    if (value.contains("../") || value.contains("..\\")) {
+                        commandSender.sendMessage(ChatColor.RED + "Path traversal characters cannot be used");
+                        return;
+                    }
+                }
+                configuration.set(selectedOption.getConfigNode(), value);
+            }
+            default -> configuration.set(selectedOption.getConfigNode(), value);
+        }
+
+        //Save the config file and reload if necessary
+        Stargate.getInstance().saveConfig();
+        reloadIfNecessary(commandSender);
+    }
+
+    /**
+     * Reloads the config if necessary
+     *
+     * @param commandSender <p>The command sender initiating the reload</p>
+     */
+    private void reloadIfNecessary(CommandSender commandSender) {
+        //TODO: Only update the config values which have changed and do the least amount of work necessary to load the 
+        // changes. Only do a full reload if absolutely necessary, or when the partial reloading would be as 
+        // inefficient as a full reload.
+        Stargate.getStargateConfig().reload(commandSender);
+    }
+
+    /**
+     * Prints information about a config option and its current value
+     *
+     * @param sender <p>The command sender that sent the command</p>
+     * @param option <p>The config option to print information about</p>
+     */
+    private void printConfigOptionValue(CommandSender sender, ConfigOption option) {
+        Object value = Stargate.getStargateConfig().getConfigOptions().get(option);
+        sender.sendMessage(getOptionDescription(option));
+        sender.sendMessage(ChatColor.GREEN + "Current value: " + ChatColor.GOLD + value);
+    }
+
+    /**
+     * Displays the name and a small description of every config value
+     *
+     * @param sender <p>The command sender to display the config list to</p>
+     */
+    private void displayConfigValues(CommandSender sender) {
+        sender.sendMessage(ChatColor.GREEN + Stargate.getBackupString("prefix") + ChatColor.GOLD +
+                "Config values:");
+        for (ConfigOption option : ConfigOption.values()) {
+            sender.sendMessage(getOptionDescription(option));
+        }
+    }
+
+    /**
+     * Gets the description of a single config option
+     *
+     * @param option <p>The option to describe</p>
+     * @return <p>A string describing the config option</p>
+     */
+    private String getOptionDescription(ConfigOption option) {
+        return ChatColor.GOLD + option.getName() + ChatColor.WHITE + " - " + ChatColor.GREEN + option.getDescription() +
+                ChatColor.DARK_GRAY + " (Default: " + ChatColor.GRAY + option.getDefaultValue() + ChatColor.DARK_GRAY + ")";
+    }
+
+}

src/main/java/net/knarcraft/stargate/command/CommandStarGate.java

@@ -1,6 +1,7 @@
 package net.knarcraft.stargate.command;
 
 import net.knarcraft.stargate.Stargate;
+import org.apache.commons.lang.ArrayUtils;
 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
@@ -23,6 +24,9 @@ public class CommandStarGate implements CommandExecutor {
                 return new CommandAbout().onCommand(commandSender, command, s, args);
             } else if (args[0].equalsIgnoreCase("reload")) {
                 return new CommandReload().onCommand(commandSender, command, s, args);
+            } else if (args[0].equalsIgnoreCase("config")) {
+                String[] subArgs = (String[]) ArrayUtils.remove(args, 0);
+                return new CommandConfig().onCommand(commandSender, command, s, subArgs);
             }
             return false;
         } else {

src/main/java/net/knarcraft/stargate/command/ConfigTabCompleter.java

@@ -0,0 +1,182 @@
+package net.knarcraft.stargate.command;
+
+import net.knarcraft.stargate.config.ConfigOption;
+import net.knarcraft.stargate.config.OptionDataType;
+import org.bukkit.ChatColor;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.command.TabCompleter;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * This is the completer for stargates config sub-command (/sg config)
+ */
+public class ConfigTabCompleter implements TabCompleter {
+
+    @Nullable
+    @Override
+    public List<String> onTabComplete(@NotNull CommandSender commandSender, @NotNull Command command, @NotNull String s,
+                                      @NotNull String[] args) {
+
+        if (args.length > 1) {
+            ConfigOption selectedOption = ConfigOption.getByName(args[0]);
+            if (selectedOption == null) {
+                return new ArrayList<>();
+            } else {
+                return getPossibleOptionValues(selectedOption, args[1]);
+            }
+        } else {
+            List<String> configOptionNames = new ArrayList<>();
+            for (ConfigOption option : ConfigOption.values()) {
+                configOptionNames.add(option.getName());
+            }
+            return filterMatching(configOptionNames, args[0]);
+        }
+    }
+
+    /**
+     * Find completable strings which match the text typed by the command's sender
+     *
+     * @param values    <p>The values to filter</p>
+     * @param typedText <p>The text the player has started typing</p>
+     * @return <p>The given string values which start with the player's typed text</p>
+     */
+    private List<String> filterMatching(List<String> values, String typedText) {
+        List<String> configValues = new ArrayList<>();
+        for (String value : values) {
+            if (value.toLowerCase().startsWith(typedText.toLowerCase())) {
+                configValues.add(value);
+            }
+        }
+        return configValues;
+    }
+
+    /**
+     * Get possible values for the selected option
+     *
+     * @param selectedOption <p>The selected option</p>
+     * @param typedText      <p>The beginning of the typed text, for filtering matching results</p>
+     * @return <p>Some or all of the valid values for the option</p>
+     */
+    private List<String> getPossibleOptionValues(ConfigOption selectedOption, String typedText) {
+        List<String> booleans = new ArrayList<>();
+        booleans.add("true");
+        booleans.add("false");
+
+        List<String> numbers = new ArrayList<>();
+        numbers.add("0");
+        numbers.add("5");
+
+        switch (selectedOption) {
+            case LANGUAGE:
+                //Return available languages
+                return filterMatching(getLanguages(), typedText);
+            case GATE_FOLDER:
+            case PORTAL_FOLDER:
+            case DEFAULT_GATE_NETWORK:
+                //Just return the default value as most values should be possible
+                if (typedText.trim().isEmpty()) {
+                    return putStringInList((String) selectedOption.getDefaultValue());
+                } else {
+                    return new ArrayList<>();
+                }
+            case MAIN_SIGN_COLOR:
+            case HIGHLIGHT_SIGN_COLOR:
+                //Return all colors
+                return filterMatching(getColors(), typedText);
+        }
+
+        //If the config value is a boolean, show the two boolean values
+        if (selectedOption.getDataType() == OptionDataType.BOOLEAN) {
+            return filterMatching(booleans, typedText);
+        }
+
+        //If the config value is an integer, display some valid numbers
+        if (selectedOption.getDataType() == OptionDataType.INTEGER) {
+            if (typedText.trim().isEmpty()) {
+                return numbers;
+            } else {
+                return new ArrayList<>();
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * Gets all available languages
+     *
+     * @return <p>The available languages</p>
+     */
+    private List<String> getLanguages() {
+        List<String> languages = new ArrayList<>();
+        languages.add("de");
+        languages.add("en");
+        languages.add("es");
+        languages.add("fr");
+        languages.add("hu");
+        languages.add("it");
+        languages.add("nb-no");
+        languages.add("nl");
+        languages.add("nn-no");
+        languages.add("pt-br");
+        languages.add("ru");
+        return languages;
+    }
+
+    /**
+     * Gets all available colors
+     *
+     * @return <p>All available colors</p>
+     */
+    private List<String> getColors() {
+        List<String> colors = new ArrayList<>();
+        for (ChatColor color : getChatColors()) {
+            colors.add(color.name());
+        }
+        return colors;
+    }
+
+    /**
+     * Gets a list of all available chat colors
+     *
+     * @return <p>A list of chat colors</p>
+     */
+    private List<ChatColor> getChatColors() {
+        List<ChatColor> chatColors = new ArrayList<>();
+        chatColors.add(ChatColor.WHITE);
+        chatColors.add(ChatColor.BLUE);
+        chatColors.add(ChatColor.DARK_BLUE);
+        chatColors.add(ChatColor.DARK_PURPLE);
+        chatColors.add(ChatColor.LIGHT_PURPLE);
+        chatColors.add(ChatColor.GOLD);
+        chatColors.add(ChatColor.GREEN);
+        chatColors.add(ChatColor.BLACK);
+        chatColors.add(ChatColor.DARK_GREEN);
+        chatColors.add(ChatColor.DARK_RED);
+        chatColors.add(ChatColor.RED);
+        chatColors.add(ChatColor.AQUA);
+        chatColors.add(ChatColor.DARK_AQUA);
+        chatColors.add(ChatColor.DARK_GRAY);
+        chatColors.add(ChatColor.GRAY);
+        chatColors.add(ChatColor.YELLOW);
+        return chatColors;
+    }
+
+    /**
+     * Puts a single string value into a string list
+     *
+     * @param value <p>The string to make into a list</p>
+     * @return <p>A list containing the string value</p>
+     */
+    private List<String> putStringInList(String value) {
+        List<String> list = new ArrayList<>();
+        list.add(value);
+        return list;
+    }
+
+}

src/main/java/net/knarcraft/stargate/command/StarGateTabCompleter.java

@@ -1,8 +1,10 @@
 package net.knarcraft.stargate.command;
 
+import org.apache.commons.lang.ArrayUtils;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.TabCompleter;
+import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -17,15 +19,39 @@ public class StarGateTabCompleter implements TabCompleter {
     @Override
     public @Nullable List<String> onTabComplete(@NotNull CommandSender commandSender, @NotNull Command command,
                                                 @NotNull String s, @NotNull String[] args) {
-        List<String> commands = new ArrayList<>();
-        commands.add("about");
-        commands.add("reload");
-
         if (args.length == 1) {
-            return commands;
+            List<String> commands = getAvailableCommands(commandSender);
+            List<String> matchingCommands = new ArrayList<>();
+            for (String availableCommand : commands) {
+                if (availableCommand.startsWith(args[0])) {
+                    matchingCommands.add(availableCommand);
+                }
+            }
+            return matchingCommands;
+        } else if (args.length > 1 && args[0].equalsIgnoreCase("config")) {
+            String[] subArgs = (String[]) ArrayUtils.remove(args, 0);
+            return new ConfigTabCompleter().onTabComplete(commandSender, command, s, subArgs);
         } else {
             return new ArrayList<>();
         }
     }
 
+    /**
+     * Gets the available commands
+     *
+     * @param commandSender <p>The command sender to get available commands for</p>
+     * @return <p>The commands available to the command sender</p>
+     */
+    private List<String> getAvailableCommands(CommandSender commandSender) {
+        List<String> commands = new ArrayList<>();
+        commands.add("about");
+        if (!(commandSender instanceof Player player) || player.hasPermission("stargate.admin.reload")) {
+            commands.add("reload");
+        }
+        if (!(commandSender instanceof Player player) || player.hasPermission("stargate.admin.config")) {
+            commands.add("config");
+        }
+        return commands;
+    }
+
 }

src/main/java/net/knarcraft/stargate/config/ConfigOption.java

@@ -0,0 +1,187 @@
+package net.knarcraft.stargate.config;
+
+/**
+ * A ConfigOption represents one of the available config options
+ */
+public enum ConfigOption {
+
+    /**
+     * The language used for player-interface text
+     */
+    LANGUAGE("language", "The language used for all signs and all messages to players", "en"),
+    /**
+     * The folder for portal files
+     */
+    PORTAL_FOLDER("folders.portalFolder", "The folder containing the portal databases", "plugins/Stargate/portals/"),
+    /**
+     * The folder for gate files
+     */
+    GATE_FOLDER("folders.gateFolder", "The folder containing all gate files", "plugins/Stargate/gates/"),
+    /**
+     * The max number of portals on a single network
+     */
+    MAX_GATES_EACH_NETWORK("gates.maxGatesEachNetwork", "The max number of stargates in a single network", 0),
+    /**
+     * The network used if not specified
+     */
+    DEFAULT_GATE_NETWORK("gates.defaultGateNetwork", "The network used when no network is specified", "central"),
+    /**
+     * Whether to remember the lastly used destination
+     */
+    REMEMBER_DESTINATION("gates.cosmetic.rememberDestination", "Whether to remember the last destination used", false),
+    /**
+     * Whether to sort the network destinations
+     */
+    SORT_NETWORK_DESTINATIONS("gates.cosmetic.sortNetworkDestinations", "Whether to sort destinations by name", false),
+    /**
+     * The main color to use for all signs
+     */
+    MAIN_SIGN_COLOR("gates.cosmetic.mainSignColor", "The main text color of all stargate signs", "BLACK"),
+    /**
+     * The color to use for highlighting sign text
+     */
+    HIGHLIGHT_SIGN_COLOR("gates.cosmetic.highlightSignColor", "The text color used for highlighting stargate signs", "WHITE"),
+    /**
+     * Whether to destroy portals when any blocks are broken by explosions
+     */
+    DESTROYED_BY_EXPLOSION("gates.integrity.destroyedByExplosion", "Whether stargates should be destroyed by explosions", false),
+    /**
+     * Whether to verify each portal's gate layout after each load
+     */
+    VERIFY_PORTALS("gates.integrity.verifyPortals", "Whether to verify that portals match their gate layout on load", false),
+    /**
+     * Whether to protect the entrance of portals
+     */
+    PROTECT_ENTRANCE("gates.integrity.protectEntrance", "Whether to protect stargates' entrances", false),
+    /**
+     * Whether to enable BungeeCord support
+     */
+    ENABLE_BUNGEE("gates.functionality.enableBungee", "Whether to enable BungeeCord support", false),
+    /**
+     * Whether to enable vehicle teleportation
+     */
+    HANDLE_VEHICLES("gates.functionality.handleVehicles", "Whether to enable vehicle teleportation", true),
+    /**
+     * Whether to enable teleportation of empty vehicles
+     */
+    HANDLE_EMPTY_VEHICLES("gates.functionality.handleEmptyVehicles", "Whether to enable teleportation of empty vehicles", true),
+    /**
+     * Whether to enable teleportation of creatures using vehicles
+     */
+    HANDLE_CREATURE_TRANSPORTATION("gates.functionality.handleCreatureTransportation",
+            "Whether to enable teleportation of vehicles containing non-player creatures", true),
+    /**
+     * Whether to allow creatures to teleport alone, bypassing any access restrictions
+     */
+    HANDLE_NON_PLAYER_VEHICLES("gates.functionality.handleNonPlayerVehicles",
+            "Whether to enable teleportation of non-empty vehicles without a player", true),
+    /**
+     * Whether to enable teleportations of creatures on a leash
+     */
+    HANDLE_LEASHED_CREATURES("gates.functionality.handleLeashedCreatures",
+            "Whether to enable players to teleport a creature on a leash", true),
+    USE_ECONOMY("economy.useEconomy", "Whether to use economy to incur fees when stargates are used, created or destroyed", false),
+    CREATE_COST("economy.createCost", "The cost of creating a new stargate", 0),
+    DESTROY_COST("economy.destroyCost", "The cost of destroying a stargate. Negative to refund", 0),
+    USE_COST("economy.useCost", "The cost of using (teleporting through) a stargate", 0),
+    TO_OWNER("economy.toOwner", "Whether any teleportation fees should go to the owner of the used stargate", false),
+    CHARGE_FREE_DESTINATION("economy.chargeFreeDestination",
+            "Whether to require payment if the destination is free, but the entrance stargate is not", true),
+    FREE_GATES_GREEN("economy.freeGatesGreen", "Whether to use green coloring to mark all free stargates", false),
+    DEBUG("debugging.debug", "Whether to enable debugging output", false),
+    PERMISSION_DEBUG("debugging.permissionDebug", "Whether to enable permission debugging output", false);
+
+
+    private final String configNode;
+    private final String description;
+    private final Object defaultValue;
+    private final OptionDataType dataType;
+
+    /**
+     * Instantiates a new config option
+     *
+     * @param configNode   <p>The full path of this config option's config node</p>
+     * @param description  <p>The description of what this config option does</p>
+     * @param defaultValue <p>The default value of this config option</p>
+     */
+    ConfigOption(String configNode, String description, Object defaultValue) {
+        this.configNode = configNode;
+        this.description = description;
+        this.defaultValue = defaultValue;
+
+        if (defaultValue instanceof String) {
+            this.dataType = OptionDataType.STRING;
+        } else if (defaultValue instanceof Boolean) {
+            this.dataType = OptionDataType.BOOLEAN;
+        } else if (defaultValue instanceof Integer) {
+            this.dataType = OptionDataType.INTEGER;
+        } else {
+            throw new IllegalArgumentException("Unknown config data type encountered.");
+        }
+    }
+
+    /**
+     * Gets a config option given its name
+     *
+     * @param name <p>The name of the config option to get</p>
+     * @return <p>The corresponding config option, or null if the name is invalid</p>
+     */
+    public static ConfigOption getByName(String name) {
+        for (ConfigOption option : ConfigOption.values()) {
+            if (option.getName().equalsIgnoreCase(name)) {
+                return option;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Gets the name of this config option
+     *
+     * @return <p>The name of this config option</p>
+     */
+    public String getName() {
+        if (!this.configNode.contains(".")) {
+            return this.configNode;
+        }
+        String[] pathParts = this.configNode.split("\\.");
+        return pathParts[pathParts.length - 1];
+    }
+
+    /**
+     * Gets the data type used for storing this config option
+     *
+     * @return <p>The data type used</p>
+     */
+    public OptionDataType getDataType() {
+        return this.dataType;
+    }
+
+    /**
+     * Gets the config node of this config option
+     *
+     * @return <p>This config option's config node</p>
+     */
+    public String getConfigNode() {
+        return this.configNode;
+    }
+
+    /**
+     * Gets the description of what this config option does
+     *
+     * @return <p>The description of this config option</p>
+     */
+    public String getDescription() {
+        return this.description;
+    }
+
+    /**
+     * Gets this config option's default value
+     *
+     * @return <p>This config option's default value</p>
+     */
+    public Object getDefaultValue() {
+        return this.defaultValue;
+    }
+
+}

src/main/java/net/knarcraft/stargate/config/EconomyConfig.java

@@ -1,18 +1,18 @@
 package net.knarcraft.stargate.config;
 
 import net.knarcraft.stargate.Stargate;
-import net.knarcraft.stargate.portal.Gate;
 import net.knarcraft.stargate.portal.Portal;
+import net.knarcraft.stargate.portal.property.gate.Gate;
 import net.knarcraft.stargate.utility.PermissionHelper;
 import net.milkbowl.vault.economy.Economy;
 import org.bukkit.Bukkit;
-import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.PluginManager;
 import org.bukkit.plugin.RegisteredServiceProvider;
 import org.bukkit.plugin.ServicesManager;
 
+import java.util.Map;
 import java.util.UUID;
 
 /**
@@ -33,10 +33,10 @@ public final class EconomyConfig {
     /**
      * Instantiates a new economy config
      *
-     * @param newConfig <p>The file configuration to read values from</p>
+     * @param configOptions <p>The loaded config options to read</p>
      */
-    public EconomyConfig(FileConfiguration newConfig) {
-        loadEconomyConfig(newConfig);
+    public EconomyConfig(Map<ConfigOption, Object> configOptions) {
+        loadEconomyConfig(configOptions);
     }
 
     /**
@@ -332,16 +332,16 @@ public final class EconomyConfig {
     /**
      * Loads all config values related to economy
      *
-     * @param newConfig <p>The configuration containing the values to read</p>
+     * @param configOptions <p>The loaded config options to get values from</p>
      */
-    private void loadEconomyConfig(FileConfiguration newConfig) {
-        economyEnabled = newConfig.getBoolean("economy.useEconomy");
-        setDefaultCreateCost(newConfig.getInt("economy.createCost"));
-        setDefaultDestroyCost(newConfig.getInt("economy.destroyCost"));
-        setDefaultUseCost(newConfig.getInt("economy.useCost"));
-        toOwner = newConfig.getBoolean("economy.toOwner");
-        chargeFreeDestination = newConfig.getBoolean("economy.chargeFreeDestination");
-        freeGatesGreen = newConfig.getBoolean("economy.freeGatesGreen");
+    private void loadEconomyConfig(Map<ConfigOption, Object> configOptions) {
+        economyEnabled = (boolean) configOptions.get(ConfigOption.USE_ECONOMY);
+        setDefaultCreateCost((Integer) configOptions.get(ConfigOption.CREATE_COST));
+        setDefaultDestroyCost((Integer) configOptions.get(ConfigOption.DESTROY_COST));
+        setDefaultUseCost((Integer) configOptions.get(ConfigOption.USE_COST));
+        toOwner = (boolean) configOptions.get(ConfigOption.TO_OWNER);
+        chargeFreeDestination = (boolean) configOptions.get(ConfigOption.CHARGE_FREE_DESTINATION);
+        freeGatesGreen = (boolean) configOptions.get(ConfigOption.FREE_GATES_GREEN);
     }
 
     /**

src/main/java/net/knarcraft/stargate/config/OptionDataType.java

@@ -0,0 +1,21 @@
+package net.knarcraft.stargate.config;
+
+/**
+ * An enum defining the different data types an option can have
+ */
+public enum OptionDataType {
+
+    /**
+     * The data type for the option is a String
+     */
+    STRING,
+    /**
+     * The data type for the option is a Boolean
+     */
+    BOOLEAN,
+    /**
+     * The data type for the option is an Integer
+     */
+    INTEGER
+
+}

src/main/java/net/knarcraft/stargate/config/StargateConfig.java

@@ -3,10 +3,10 @@ package net.knarcraft.stargate.config;
 import net.knarcraft.stargate.Stargate;
 import net.knarcraft.stargate.container.BlockChangeRequest;
 import net.knarcraft.stargate.listener.BungeeCordListener;
-import net.knarcraft.stargate.portal.GateHandler;
 import net.knarcraft.stargate.portal.Portal;
 import net.knarcraft.stargate.portal.PortalHandler;
 import net.knarcraft.stargate.portal.PortalRegistry;
+import net.knarcraft.stargate.portal.property.gate.GateHandler;
 import net.knarcraft.stargate.thread.BlockChangeThread;
 import net.knarcraft.stargate.utility.FileHelper;
 import net.knarcraft.stargate.utility.PortalFileHelper;
@@ -18,6 +18,7 @@ import org.bukkit.plugin.messaging.Messenger;
 
 import java.io.File;
 import java.io.IOException;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Queue;
@@ -47,6 +48,7 @@ public final class StargateConfig {
 
     private boolean debuggingEnabled = false;
     private boolean permissionDebuggingEnabled = false;
+    private final Map<ConfigOption, Object> configOptions;
 
     /**
      * Instantiates a new stargate config
@@ -55,6 +57,7 @@ public final class StargateConfig {
      */
     public StargateConfig(Logger logger) {
         this.logger = logger;
+        configOptions = new HashMap<>();
 
         dataFolderPath = Stargate.getInstance().getDataFolder().getPath().replaceAll("\\\\", "/");
         portalFolder = dataFolderPath + "/portals/";
@@ -90,6 +93,15 @@ public final class StargateConfig {
         setupVaultEconomy();
     }
 
+    /**
+     * Gets a copy of all loaded config options with its values
+     *
+     * @return <p>The loaded config options</p>
+     */
+    public Map<ConfigOption, Object> getConfigOptions() {
+        return new HashMap<>(configOptions);
+    }
+
     /**
      * Gets the queue of open portals
      *
@@ -307,16 +319,34 @@ public final class StargateConfig {
         //Copy missing default values if any values are missing
         newConfig.options().copyDefaults(true);
 
+        //Load all options
+        for (ConfigOption option : ConfigOption.values()) {
+            Object optionValue;
+            String configNode = option.getConfigNode();
+
+            //Load the option using its correct data type
+            switch (option.getDataType()) {
+                case STRING -> {
+                    String value = newConfig.getString(configNode);
+                    optionValue = value != null ? value.trim() : "";
+                }
+                case BOOLEAN -> optionValue = newConfig.getBoolean(configNode);
+                case INTEGER -> optionValue = newConfig.getInt(configNode);
+                default -> throw new IllegalArgumentException("Invalid config data type encountered");
+            }
+            configOptions.put(option, optionValue);
+        }
+
         //Get the language name from the config
-        languageName = newConfig.getString("language");
+        languageName = (String) configOptions.get(ConfigOption.LANGUAGE);
 
         //Get important folders from the config
-        portalFolder = newConfig.getString("folders.portalFolder");
-        gateFolder = newConfig.getString("folders.gateFolder");
+        portalFolder = (String) configOptions.get(ConfigOption.PORTAL_FOLDER);
+        gateFolder = (String) configOptions.get(ConfigOption.GATE_FOLDER);
 
         //Get enabled debug settings from the config
-        debuggingEnabled = newConfig.getBoolean("debugging.debug");
-        permissionDebuggingEnabled = newConfig.getBoolean("debugging.permissionDebug");
+        debuggingEnabled = (boolean) configOptions.get(ConfigOption.DEBUG);
+        permissionDebuggingEnabled = (boolean) configOptions.get(ConfigOption.PERMISSION_DEBUG);
 
         //If users have an outdated config, assume they also need to update their default gates
         if (isMigrating) {
@@ -324,10 +354,10 @@ public final class StargateConfig {
         }
 
         //Load all gate config values
-        stargateGateConfig = new StargateGateConfig(newConfig);
+        stargateGateConfig = new StargateGateConfig(configOptions);
 
         //Load all economy config values
-        economyConfig = new EconomyConfig(newConfig);
+        economyConfig = new EconomyConfig(configOptions);
 
         Stargate.getInstance().saveConfig();
     }

src/main/java/net/knarcraft/stargate/config/StargateGateConfig.java

@@ -3,33 +3,25 @@ package net.knarcraft.stargate.config;
 import net.knarcraft.stargate.Stargate;
 import net.knarcraft.stargate.portal.PortalSignDrawer;
 import org.bukkit.ChatColor;
-import org.bukkit.configuration.file.FileConfiguration;
+
+import java.util.Map;
 
 /**
  * The Stargate gate config keeps track of all global config values related to gates
  */
 public final class StargateGateConfig {
-
-    private int maxGatesEachNetwork = 0;
-    private boolean rememberDestination = false;
-    private boolean handleVehicles = true;
-    private boolean handleLeashedCreatures = true;
-    private boolean sortNetworkDestinations = false;
-    private boolean protectEntrance = false;
-    private boolean enableBungee = true;
-    private boolean verifyPortals = true;
-    private boolean destroyExplosion = false;
-    private String defaultGateNetwork = "central";
     private static final int activeTime = 10;
     private static final int openTime = 10;
+    private final Map<ConfigOption, Object> configOptions;
 
     /**
      * Instantiates a new stargate config
      *
-     * @param newConfig <p>The file configuration to read values from</p>
+     * @param configOptions <p>The loaded config options to use</p>
      */
-    public StargateGateConfig(FileConfiguration newConfig) {
-        loadGateConfig(newConfig);
+    public StargateGateConfig(Map<ConfigOption, Object> configOptions) {
+        this.configOptions = configOptions;
+        loadGateConfig();
     }
 
     /**
@@ -56,7 +48,7 @@ public final class StargateGateConfig {
      * @return <p>Maximum number of gates for each network</p>
      */
     public int maxGatesEachNetwork() {
-        return maxGatesEachNetwork;
+        return (int) configOptions.get(ConfigOption.MAX_GATES_EACH_NETWORK);
     }
 
     /**
@@ -65,7 +57,7 @@ public final class StargateGateConfig {
      * @return <p>Whether a portal's lastly used destination should be remembered</p>
      */
     public boolean rememberDestination() {
-        return rememberDestination;
+        return (boolean) configOptions.get(ConfigOption.REMEMBER_DESTINATION);
     }
 
     /**
@@ -74,7 +66,48 @@ public final class StargateGateConfig {
      * @return <p>Whether vehicle teleportation should be handled</p>
      */
     public boolean handleVehicles() {
-        return handleVehicles;
+        return (boolean) configOptions.get(ConfigOption.HANDLE_VEHICLES);
+    }
+
+    /**
+     * Gets whether vehicles with no passengers should be handled
+     *
+     * <p>The handle vehicles option overrides this option if disabled. This option allows empty passenger
+     * minecarts/boats, but also chest/tnt/hopper/furnace minecarts to teleport through stargates.</p>
+     *
+     * @return <p>Whether vehicles without passengers should be handled</p>
+     */
+    public boolean handleEmptyVehicles() {
+        return (boolean) configOptions.get(ConfigOption.HANDLE_EMPTY_VEHICLES);
+    }
+
+    /**
+     * Gets whether vehicles containing creatures should be handled
+     *
+     * <p>The handle vehicles option overrides this option if disabled. This option allows creatures (pigs, pandas,
+     * zombies, etc.) to teleport through stargates if in a vehicle.</p>
+     *
+     * @return <p>Whether vehicles with creatures should be handled</p>
+     */
+    public boolean handleCreatureTransportation() {
+        return (boolean) configOptions.get(ConfigOption.HANDLE_CREATURE_TRANSPORTATION);
+    }
+
+    /**
+     * Gets whether vehicles containing a creature, but not a player should be handled
+     *
+     * <p>The handle vehicles option, and the handle creature transportation option, override this option if disabled.
+     * This option allows creatures (pigs, pandas, zombies, etc.) to teleport through stargates if in a vehicle, even
+     * if no player is in the vehicle.
+     * As it is not possible to check if a creature is allowed through a stargate, they will be able to go through
+     * regardless of whether the initiating player is allowed to enter the stargate. Enabling this is necessary to
+     * teleport creatures using minecarts, but only handleCreatureTransportation is required to teleport creatures
+     * using a boat manned by a player.</p>
+     *
+     * @return <p>Whether non-empty vehicles without a player should be handled</p>
+     */
+    public boolean handleNonPlayerVehicles() {
+        return (boolean) configOptions.get(ConfigOption.HANDLE_NON_PLAYER_VEHICLES);
     }
 
     /**
@@ -83,7 +116,7 @@ public final class StargateGateConfig {
      * @return <p>Whether leashed creatures should be handled</p>
      */
     public boolean handleLeashedCreatures() {
-        return handleLeashedCreatures;
+        return (boolean) configOptions.get(ConfigOption.HANDLE_LEASHED_CREATURES);
     }
 
     /**
@@ -92,7 +125,7 @@ public final class StargateGateConfig {
      * @return <p>Whether network destinations should be sorted</p>
      */
     public boolean sortNetworkDestinations() {
-        return sortNetworkDestinations;
+        return (boolean) configOptions.get(ConfigOption.SORT_NETWORK_DESTINATIONS);
     }
 
     /**
@@ -101,7 +134,7 @@ public final class StargateGateConfig {
      * @return <p>Whether portal entrances should be protected</p>
      */
     public boolean protectEntrance() {
-        return protectEntrance;
+        return (boolean) configOptions.get(ConfigOption.PROTECT_ENTRANCE);
     }
 
     /**
@@ -110,7 +143,7 @@ public final class StargateGateConfig {
      * @return <p>Whether bungee support is enabled</p>
      */
     public boolean enableBungee() {
-        return enableBungee;
+        return (boolean) configOptions.get(ConfigOption.ENABLE_BUNGEE);
     }
 
     /**
@@ -119,7 +152,7 @@ public final class StargateGateConfig {
      * @return <p>Whether portals need to be verified</p>
      */
     public boolean verifyPortals() {
-        return verifyPortals;
+        return (boolean) configOptions.get(ConfigOption.VERIFY_PORTALS);
     }
 
     /**
@@ -128,7 +161,7 @@ public final class StargateGateConfig {
      * @return <p>Whether portals should be destroyed by explosions</p>
      */
     public boolean destroyedByExplosion() {
-        return destroyExplosion;
+        return (boolean) configOptions.get(ConfigOption.DESTROYED_BY_EXPLOSION);
     }
 
     /**
@@ -137,34 +170,16 @@ public final class StargateGateConfig {
      * @return <p>The default portal network</p>
      */
     public String getDefaultPortalNetwork() {
-        return defaultGateNetwork;
+        return (String) configOptions.get(ConfigOption.DEFAULT_GATE_NETWORK);
     }
 
     /**
      * Loads all config values related to gates
-     *
-     * @param newConfig <p>The configuration containing the values to read</p>
      */
-    private void loadGateConfig(FileConfiguration newConfig) {
-        String defaultNetwork = newConfig.getString("gates.defaultGateNetwork");
-        defaultGateNetwork = defaultNetwork != null ? defaultNetwork.trim() : null;
-        maxGatesEachNetwork = newConfig.getInt("gates.maxGatesEachNetwork");
-
-        //Functionality
-        handleVehicles = newConfig.getBoolean("gates.functionality.handleVehicles");
-        handleLeashedCreatures = newConfig.getBoolean("gates.functionality.handleLeashedCreatures");
-        enableBungee = newConfig.getBoolean("gates.functionality.enableBungee");
-
-        //Integrity
-        protectEntrance = newConfig.getBoolean("gates.integrity.protectEntrance");
-        verifyPortals = newConfig.getBoolean("gates.integrity.verifyPortals");
-        destroyExplosion = newConfig.getBoolean("gates.integrity.destroyedByExplosion");
-
-        //Cosmetic
-        sortNetworkDestinations = newConfig.getBoolean("gates.cosmetic.sortNetworkDestinations");
-        rememberDestination = newConfig.getBoolean("gates.cosmetic.rememberDestination");
-        loadSignColor(newConfig.getString("gates.cosmetic.mainSignColor"),
-                newConfig.getString("gates.cosmetic.highlightSignColor"));
+    private void loadGateConfig() {
+        //Load the sign colors
+        loadSignColor((String) configOptions.get(ConfigOption.MAIN_SIGN_COLOR),
+                (String) configOptions.get(ConfigOption.HIGHLIGHT_SIGN_COLOR));
     }
 
     /**

src/main/java/net/knarcraft/stargate/listener/BlockEventListener.java

@@ -1,6 +1,7 @@
 package net.knarcraft.stargate.listener;
 
 import net.knarcraft.stargate.Stargate;
+import net.knarcraft.stargate.container.BlockChangeRequest;
 import net.knarcraft.stargate.event.StargateDestroyEvent;
 import net.knarcraft.stargate.portal.Portal;
 import net.knarcraft.stargate.portal.PortalCreator;
@@ -9,6 +10,7 @@ import net.knarcraft.stargate.portal.PortalRegistry;
 import net.knarcraft.stargate.utility.EconomyHelper;
 import net.knarcraft.stargate.utility.MaterialHelper;
 import net.knarcraft.stargate.utility.PermissionHelper;
+import net.knarcraft.stargate.utility.PortalFileHelper;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
 import org.bukkit.block.data.type.WallSign;
@@ -81,6 +83,13 @@ public class BlockEventListener implements Listener {
             return;
         }
 
+        //Remove the sign if the no sign option is enabled
+        if (portal.getOptions().hasNoSign()) {
+            Material replaceMaterial = PortalFileHelper.decideRemovalMaterial(portal.getSignLocation(), portal);
+            BlockChangeRequest request = new BlockChangeRequest(portal.getSignLocation(), replaceMaterial, null);
+            Stargate.addBlockChangeRequest(request);
+        }
+
         Stargate.getMessageSender().sendSuccessMessage(player, Stargate.getString("createMsg"));
         Stargate.debug("onSignChange", "Initialized stargate: " + portal.getName());
         Stargate.getInstance().getServer().getScheduler().scheduleSyncDelayedTask(Stargate.getInstance(),

src/main/java/net/knarcraft/stargate/listener/PlayerEventListener.java

@@ -1,16 +1,18 @@
 package net.knarcraft.stargate.listener;
 
 import net.knarcraft.stargate.Stargate;
+import net.knarcraft.stargate.config.MessageSender;
 import net.knarcraft.stargate.container.BlockLocation;
-import net.knarcraft.stargate.portal.PlayerTeleporter;
 import net.knarcraft.stargate.portal.Portal;
 import net.knarcraft.stargate.portal.PortalActivator;
 import net.knarcraft.stargate.portal.PortalHandler;
-import net.knarcraft.stargate.portal.VehicleTeleporter;
+import net.knarcraft.stargate.portal.teleporter.PlayerTeleporter;
+import net.knarcraft.stargate.portal.teleporter.VehicleTeleporter;
 import net.knarcraft.stargate.utility.BungeeHelper;
 import net.knarcraft.stargate.utility.MaterialHelper;
 import net.knarcraft.stargate.utility.PermissionHelper;
 import net.knarcraft.stargate.utility.UUIDMigrationHelper;
+import org.bukkit.ChatColor;
 import org.bukkit.GameMode;
 import org.bukkit.block.Block;
 import org.bukkit.block.data.type.WallSign;
@@ -26,6 +28,8 @@ import org.bukkit.event.block.Action;
 import org.bukkit.event.player.PlayerInteractEvent;
 import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.event.player.PlayerMoveEvent;
+import org.bukkit.inventory.EquipmentSlot;
+import org.bukkit.inventory.ItemStack;
 
 /**
  * This listener listens to any player-related events related to stargates
@@ -90,7 +94,8 @@ public class PlayerEventListener implements Listener {
 
         Entity playerVehicle = player.getVehicle();
         //If the player is in a vehicle, but vehicle handling is disabled, just ignore the player
-        if (playerVehicle == null || Stargate.getGateConfig().handleVehicles()) {
+        if (playerVehicle == null || (playerVehicle instanceof LivingEntity &&
+                Stargate.getGateConfig().handleVehicles())) {
             teleportPlayer(playerVehicle, player, entrancePortal, destination, event);
         }
     }
@@ -118,7 +123,9 @@ public class PlayerEventListener implements Listener {
             //Just teleport the player like normal
             new PlayerTeleporter(destination, player).teleport(entrancePortal, event);
         }
-        Stargate.getMessageSender().sendSuccessMessage(player, Stargate.getString("teleportMsg"));
+        if (!entrancePortal.getOptions().isSilent()) {
+            Stargate.getMessageSender().sendSuccessMessage(player, Stargate.getString("teleportMsg"));
+        }
         entrancePortal.getPortalOpener().closePortal(false);
     }
 
@@ -158,7 +165,7 @@ public class PlayerEventListener implements Listener {
 
         //Decide if the user should be teleported to another bungee server
         if (entrancePortal.getOptions().isBungee()) {
-            if (BungeeHelper.bungeeTeleport(player, entrancePortal, event)) {
+            if (BungeeHelper.bungeeTeleport(player, entrancePortal, event) && !entrancePortal.getOptions().isSilent()) {
                 Stargate.getMessageSender().sendSuccessMessage(player, Stargate.getString("teleportMsg"));
             }
             return false;
@@ -181,7 +188,7 @@ public class PlayerEventListener implements Listener {
         }
 
         if (event.getAction() == Action.RIGHT_CLICK_BLOCK) {
-            handleRightClickBlock(event, player, block);
+            handleRightClickBlock(event, player, block, event.getHand());
         } else if (event.getAction() == Action.LEFT_CLICK_BLOCK && block.getBlockData() instanceof WallSign) {
             //Handle left click of a wall sign
             handleSignClick(event, player, block, true);
@@ -240,7 +247,9 @@ public class PlayerEventListener implements Listener {
         boolean deny = PermissionHelper.cannotAccessNetwork(player, portal.getNetwork());
 
         if (PermissionHelper.portalAccessDenied(player, portal, deny)) {
-            Stargate.getMessageSender().sendErrorMessage(player, Stargate.getString("denyMsg"));
+            if (!portal.getOptions().isSilent()) {
+                Stargate.getMessageSender().sendErrorMessage(player, Stargate.getString("denyMsg"));
+            }
             return true;
         }
         return false;
@@ -252,19 +261,20 @@ public class PlayerEventListener implements Listener {
      * @param event  <p>The event triggering the right-click</p>
      * @param player <p>The player doing the right-click</p>
      * @param block  <p>The block the player clicked</p>
+     * @param hand   <p>The hand the player used to interact with the stargate</p>
      */
-    private void handleRightClickBlock(PlayerInteractEvent event, Player player, Block block) {
+    private void handleRightClickBlock(PlayerInteractEvent event, Player player, Block block, EquipmentSlot hand) {
         if (block.getBlockData() instanceof WallSign) {
             handleSignClick(event, player, block, false);
             return;
         }
 
-        if (MaterialHelper.isButtonCompatible(block.getType())) {
-            //Prevent a double click caused by a Spigot bug
-            if (clickIsBug(event, block)) {
-                return;
-            }
+        //Prevent a double click caused by a Spigot bug
+        if (clickIsBug(event, block)) {
+            return;
+        }
 
+        if (MaterialHelper.isButtonCompatible(block.getType())) {
             Portal portal = PortalHandler.getByBlock(block);
             if (portal == null) {
                 return;
@@ -280,33 +290,70 @@ public class PlayerEventListener implements Listener {
             }
 
             PermissionHelper.openPortal(player, portal);
-            if (portal.getPortalOpener().isOpenFor(player)) {
+            if (portal.getPortalOpener().isOpenFor(player) && !MaterialHelper.isContainer(block.getType())) {
                 event.setUseInteractedBlock(Event.Result.ALLOW);
             }
+        } else {
+            //Display information about the portal if it has no sign
+            ItemStack heldItem = player.getInventory().getItem(hand);
+            if (heldItem.getType().isAir() || !heldItem.getType().isBlock()) {
+                displayPortalInfo(block, player);
+            }
         }
     }
 
     /**
-     * This function decides if a right click of a coral is caused by a Spigot bug
+     * Displays information about a clicked portal
      *
-     * <p>The Spigot bug currently makes every right click of a coral trigger twice, causing the portal to close
-     * immediately. This fix should detect the bug without breaking wall coral buttons once the bug is fixed.</p>
+     * <p>This will only display portal info if the portal has no sign and is not silent.</p>
+     *
+     * @param block  <p>The clicked block</p>
+     * @param player <p>The player that clicked the block</p>
+     */
+    private void displayPortalInfo(Block block, Player player) {
+        Portal portal = PortalHandler.getByBlock(block);
+        if (portal == null) {
+            return;
+        }
+
+        //Display portal information as a portal without a sign does not display any
+        if (portal.getOptions().hasNoSign() && !portal.getOptions().isSilent()) {
+            MessageSender sender = Stargate.getMessageSender();
+            sender.sendSuccessMessage(player, ChatColor.GOLD + Stargate.getString("portalInfoTitle"));
+            sender.sendSuccessMessage(player, Stargate.replaceVars(Stargate.getString("portalInfoName"),
+                    "%name%", portal.getName()));
+            sender.sendSuccessMessage(player, Stargate.replaceVars(Stargate.getString("portalInfoDestination"),
+                    "%destination%", portal.getDestinationName()));
+            if (portal.getOptions().isBungee()) {
+                sender.sendSuccessMessage(player, Stargate.replaceVars(Stargate.getString("portalInfoServer"),
+                        "%server%", portal.getNetwork()));
+            } else {
+                sender.sendSuccessMessage(player, Stargate.replaceVars(Stargate.getString("portalInfoNetwork"),
+                        "%network%", portal.getNetwork()));
+            }
+        }
+    }
+
+    /**
+     * This function decides if a right click of a block is caused by a Spigot bug
+     *
+     * <p>The Spigot bug currently makes every right click of some blocks trigger twice, causing the portal to close
+     * immediately, or causing portal information printing twice. This fix should detect the bug without breaking
+     * clicking once the bug is fixed.</p>
      *
      * @param event <p>The event causing the right click</p>
      * @param block <p>The block to check</p>
      * @return <p>True if the click is a bug and should be cancelled</p>
      */
     private boolean clickIsBug(PlayerInteractEvent event, Block block) {
-        if (MaterialHelper.isWallCoral(block.getType())) {
-            if (previousEvent != null &&
-                    event.getPlayer() == previousEvent.getPlayer() && eventTime + 15 > System.currentTimeMillis()) {
-                previousEvent = null;
-                eventTime = 0;
-                return true;
-            }
-            previousEvent = event;
-            eventTime = System.currentTimeMillis();
+        if (previousEvent != null &&
+                event.getPlayer() == previousEvent.getPlayer() && eventTime + 15 > System.currentTimeMillis()) {
+            previousEvent = null;
+            eventTime = 0;
+            return true;
         }
+        previousEvent = event;
+        eventTime = System.currentTimeMillis();
         return false;
     }
 

src/main/java/net/knarcraft/stargate/listener/PortalEventListener.java

@@ -2,9 +2,9 @@ package net.knarcraft.stargate.listener;
 
 import net.knarcraft.stargate.Stargate;
 import net.knarcraft.stargate.container.FromTheEndTeleportation;
-import net.knarcraft.stargate.portal.PlayerTeleporter;
 import net.knarcraft.stargate.portal.Portal;
 import net.knarcraft.stargate.portal.PortalHandler;
+import net.knarcraft.stargate.portal.teleporter.PlayerTeleporter;
 import net.knarcraft.stargate.utility.PermissionHelper;
 import org.bukkit.Location;
 import org.bukkit.Material;

src/main/java/net/knarcraft/stargate/listener/VehicleEventListener.java

@@ -3,7 +3,7 @@ package net.knarcraft.stargate.listener;
 import net.knarcraft.stargate.Stargate;
 import net.knarcraft.stargate.portal.Portal;
 import net.knarcraft.stargate.portal.PortalHandler;
-import net.knarcraft.stargate.portal.VehicleTeleporter;
+import net.knarcraft.stargate.portal.teleporter.VehicleTeleporter;
 import net.knarcraft.stargate.utility.EconomyHelper;
 import net.knarcraft.stargate.utility.EntityHelper;
 import net.knarcraft.stargate.utility.PermissionHelper;
@@ -89,7 +89,9 @@ public class VehicleEventListener implements Listener {
         //On the assumption that a non-player cannot sit in the driver's seat and since some portals can only be open
         // to one player at a time, we only need to check if the portal is open to the driver.
         if (!entrancePortal.getPortalOpener().isOpenFor(player)) {
-            Stargate.getMessageSender().sendErrorMessage(player, Stargate.getString("denyMsg"));
+            if (!entrancePortal.getOptions().isSilent()) {
+                Stargate.getMessageSender().sendErrorMessage(player, Stargate.getString("denyMsg"));
+            }
             return;
         }
 
@@ -115,9 +117,14 @@ public class VehicleEventListener implements Listener {
             }
         }
 
-        Stargate.getMessageSender().sendSuccessMessage(player, Stargate.getString("teleportMsg"));
-        new VehicleTeleporter(destinationPortal, vehicle).teleport(entrancePortal);
-        entrancePortal.getPortalOpener().closePortal(false);
+        //Teleport the vehicle and inform the user if the vehicle was teleported
+        boolean teleported = new VehicleTeleporter(destinationPortal, vehicle).teleport(entrancePortal);
+        if (teleported) {
+            if (!entrancePortal.getOptions().isSilent()) {
+                Stargate.getMessageSender().sendSuccessMessage(player, Stargate.getString("teleportMsg"));
+            }
+            entrancePortal.getPortalOpener().closePortal(false);
+        }
     }
 
     /**
@@ -149,7 +156,9 @@ public class VehicleEventListener implements Listener {
     private static boolean playerCanTeleport(Player player, Portal entrancePortal, Portal destinationPortal) {
         //Make sure the user can access the portal
         if (PermissionHelper.cannotAccessPortal(player, entrancePortal, destinationPortal)) {
-            Stargate.getMessageSender().sendErrorMessage(player, Stargate.getString("denyMsg"));
+            if (!entrancePortal.getOptions().isSilent()) {
+                Stargate.getMessageSender().sendErrorMessage(player, Stargate.getString("denyMsg"));
+            }
             entrancePortal.getPortalOpener().closePortal(false);
             return false;
         }
@@ -157,7 +166,7 @@ public class VehicleEventListener implements Listener {
         //Check if the player is able to afford the teleport fee
         int cost = Stargate.getEconomyConfig().getUseCost(player, entrancePortal, destinationPortal);
         boolean canAffordFee = cost <= 0 || Stargate.getEconomyConfig().canAffordFee(player, cost);
-        if (!canAffordFee) {
+        if (!canAffordFee && !entrancePortal.getOptions().isSilent()) {
             Stargate.getMessageSender().sendErrorMessage(player, Stargate.getString("ecoInFunds"));
         }
         return canAffordFee;

src/main/java/net/knarcraft/stargate/portal/Portal.java

@@ -2,6 +2,12 @@ package net.knarcraft.stargate.portal;
 
 import net.knarcraft.stargate.container.BlockLocation;
 import net.knarcraft.stargate.container.RelativeBlockVector;
+import net.knarcraft.stargate.portal.property.PortalLocation;
+import net.knarcraft.stargate.portal.property.PortalOption;
+import net.knarcraft.stargate.portal.property.PortalOptions;
+import net.knarcraft.stargate.portal.property.PortalOwner;
+import net.knarcraft.stargate.portal.property.PortalStructure;
+import net.knarcraft.stargate.portal.property.gate.Gate;
 import org.bukkit.World;
 import org.bukkit.entity.Player;
 
@@ -15,6 +21,7 @@ public class Portal {
     private final String name;
     private final String network;
     private final PortalOwner portalOwner;
+    private boolean isRegistered;
 
     private final PortalOptions options;
     private final PortalOpener portalOpener;
@@ -48,6 +55,24 @@ public class Portal {
         this.portalActivator = portalOpener.getPortalActivator();
     }
 
+    /**
+     * Checks if this portal is registered
+     *
+     * @return <p>True if this portal is registered</p>
+     */
+    public boolean isRegistered() {
+        return isRegistered;
+    }
+
+    /**
+     * Sets whether this portal is registered
+     *
+     * @param isRegistered <p>True if this portal is registered</p>
+     */
+    public void setRegistered(boolean isRegistered) {
+        this.isRegistered = isRegistered;
+    }
+
     /**
      * Gets the location data for this portal
      *

src/main/java/net/knarcraft/stargate/portal/PortalActivator.java

@@ -248,7 +248,9 @@ public class PortalActivator {
 
         //If no destinations are available, just tell the player and quit
         if (destinations.size() == 0) {
-            Stargate.getMessageSender().sendErrorMessage(player, Stargate.getString("destEmpty"));
+            if (!portal.getOptions().isSilent()) {
+                Stargate.getMessageSender().sendErrorMessage(player, Stargate.getString("destEmpty"));
+            }
             return;
         }
 

src/main/java/net/knarcraft/stargate/portal/PortalCreator.java

@@ -4,14 +4,18 @@ import net.knarcraft.stargate.Stargate;
 import net.knarcraft.stargate.container.BlockLocation;
 import net.knarcraft.stargate.container.RelativeBlockVector;
 import net.knarcraft.stargate.event.StargateCreateEvent;
+import net.knarcraft.stargate.portal.property.PortalLocation;
+import net.knarcraft.stargate.portal.property.PortalOption;
+import net.knarcraft.stargate.portal.property.PortalOptions;
+import net.knarcraft.stargate.portal.property.PortalOwner;
+import net.knarcraft.stargate.portal.property.gate.Gate;
+import net.knarcraft.stargate.portal.property.gate.GateHandler;
 import net.knarcraft.stargate.utility.DirectionHelper;
 import net.knarcraft.stargate.utility.EconomyHelper;
 import net.knarcraft.stargate.utility.PermissionHelper;
 import net.knarcraft.stargate.utility.PortalFileHelper;
-import org.bukkit.Bukkit;
 import org.bukkit.block.Block;
 import org.bukkit.block.BlockFace;
-import org.bukkit.block.data.Directional;
 import org.bukkit.entity.Player;
 import org.bukkit.event.block.SignChangeEvent;
 
@@ -45,16 +49,16 @@ public class PortalCreator {
      */
     public Portal createPortal() {
         BlockLocation signLocation = new BlockLocation(event.getBlock());
-        Block idParent = signLocation.getParent();
+        Block signControlBlock = signLocation.getParent();
 
         //Return early if the sign is not placed on a block, or the block is not a control block
-        if (idParent == null || GateHandler.getGatesByControlBlock(idParent).length == 0) {
+        if (signControlBlock == null || GateHandler.getGatesByControlBlock(signControlBlock).length == 0) {
             Stargate.debug("createPortal", "Control block not registered");
             return null;
         }
 
         //The control block is already part of another portal
-        if (PortalHandler.getByBlock(idParent) != null) {
+        if (PortalHandler.getByBlock(signControlBlock) != null) {
             Stargate.debug("createPortal", "idParent belongs to existing stargate");
             return null;
         }
@@ -69,7 +73,8 @@ public class PortalCreator {
         Map<PortalOption, Boolean> portalOptions = PortalHandler.getPortalOptions(player, destinationName, options);
 
         //Get the yaw
-        float yaw = DirectionHelper.getYawFromLocationDifference(idParent.getLocation(), signLocation.getLocation());
+        float yaw = DirectionHelper.getYawFromLocationDifference(signControlBlock.getLocation(),
+                signLocation.getLocation());
 
         //Get the direction the button should be facing
         BlockFace buttonFacing = DirectionHelper.getBlockFaceFromYaw(yaw);
@@ -80,7 +85,7 @@ public class PortalCreator {
         Stargate.debug("createPortal", "Finished getting all portal info");
 
         //Try and find a gate matching the new portal
-        Gate gate = PortalHandler.findMatchingGate(portalLocation, player);
+        Gate gate = PortalHandler.findMatchingGate(portalLocation, player.getWorld());
         if ((gate == null) || (portalLocation.getButtonVector() == null)) {
             Stargate.debug("createPortal", "Could not find matching gate layout");
             return null;
@@ -196,9 +201,8 @@ public class PortalCreator {
         }
 
         //Add button if the portal is not always on
-        if (!portalOptions.isAlwaysOn() && !portalOptions.isBungee()) {
-            generatePortalButton(portalLocation.getTopLeft(), portalLocation.getButtonVector(),
-                    portalLocation.getButtonFacing());
+        if (!portalOptions.isAlwaysOn()) {
+            PortalFileHelper.generatePortalButton(portal, portalLocation.getButtonFacing());
         }
 
         //Register the new portal
@@ -267,25 +271,6 @@ public class PortalCreator {
         return true;
     }
 
-    /**
-     * Generates a button for a portal
-     *
-     * @param topLeft      <p>The top-left block of the portal</p>
-     * @param buttonVector <p>A relative vector pointing at the button</p>
-     * @param buttonFacing <p>The direction the button should be facing</p>
-     */
-    private void generatePortalButton(BlockLocation topLeft, RelativeBlockVector buttonVector,
-                                      BlockFace buttonFacing) {
-        //Go one block outwards to find the button's location rather than the control block's location
-        BlockLocation button = topLeft.getRelativeLocation(buttonVector.addToVector(
-                RelativeBlockVector.Property.OUT, 1), portal.getYaw());
-
-        Directional buttonData = (Directional) Bukkit.createBlockData(portal.getGate().getPortalButton());
-        buttonData.setFacing(buttonFacing);
-        button.getBlock().setBlockData(buttonData);
-        portal.getStructure().setButton(button);
-    }
-
     /**
      * Updates the open state of the newly created portal
      *

src/main/java/net/knarcraft/stargate/portal/PortalHandler.java

@@ -3,8 +3,14 @@ package net.knarcraft.stargate.portal;
 import net.knarcraft.stargate.Stargate;
 import net.knarcraft.stargate.container.BlockLocation;
 import net.knarcraft.stargate.container.RelativeBlockVector;
+import net.knarcraft.stargate.portal.property.PortalLocation;
+import net.knarcraft.stargate.portal.property.PortalOption;
+import net.knarcraft.stargate.portal.property.PortalStructure;
+import net.knarcraft.stargate.portal.property.gate.Gate;
+import net.knarcraft.stargate.portal.property.gate.GateHandler;
 import net.knarcraft.stargate.utility.PermissionHelper;
 import org.bukkit.Location;
+import org.bukkit.World;
 import org.bukkit.block.Block;
 import org.bukkit.entity.Player;
 
@@ -137,12 +143,12 @@ public class PortalHandler {
      * Tries to find a gate matching the portal the user is trying to create
      *
      * @param portalLocation <p>The location data for the new portal</p>
-     * @param player         <p>The player trying to create the new portal</p>
+     * @param world          <p>The world the player is located in</p>
      * @return <p>The matching gate type, or null if no such gate could be found</p>
      */
-    static Gate findMatchingGate(PortalLocation portalLocation, Player player) {
+    static Gate findMatchingGate(PortalLocation portalLocation, World world) {
         Block signParent = portalLocation.getSignLocation().getParent();
-        BlockLocation parent = new BlockLocation(player.getWorld(), signParent.getX(), signParent.getY(),
+        BlockLocation parent = new BlockLocation(world, signParent.getX(), signParent.getY(),
                 signParent.getZ());
 
         //Get all gates with the used type of control blocks

src/main/java/net/knarcraft/stargate/portal/PortalOpener.java

@@ -5,6 +5,7 @@ import net.knarcraft.stargate.container.BlockChangeRequest;
 import net.knarcraft.stargate.container.BlockLocation;
 import net.knarcraft.stargate.event.StargateCloseEvent;
 import net.knarcraft.stargate.event.StargateOpenEvent;
+import net.knarcraft.stargate.portal.property.PortalOptions;
 import org.bukkit.Axis;
 import org.bukkit.Material;
 import org.bukkit.block.data.Orientable;

src/main/java/net/knarcraft/stargate/portal/PortalRegistry.java

@@ -4,8 +4,6 @@ import net.knarcraft.stargate.Stargate;
 import net.knarcraft.stargate.container.BlockLocation;
 import net.knarcraft.stargate.utility.PortalFileHelper;
 import org.bukkit.World;
-import org.bukkit.block.Sign;
-import org.bukkit.block.data.type.WallSign;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -37,6 +35,7 @@ public class PortalRegistry {
         lookupControls.clear();
         allPortals.clear();
         allPortalNetworks.clear();
+        bungeePortals.clear();
     }
 
     /**
@@ -163,6 +162,7 @@ public class PortalRegistry {
      */
     public static void unregisterPortal(Portal portal, boolean removeAll) {
         Stargate.debug("Unregister", "Unregistering gate " + portal.getName());
+        portal.getPortalActivator().deactivate();
         portal.getPortalOpener().closePortal(true);
 
         String portalName = portal.getName().toLowerCase();
@@ -219,17 +219,11 @@ public class PortalRegistry {
             }
         }
 
-        //Clear sign data
-        if (portal.getSignLocation().getBlock().getBlockData() instanceof WallSign) {
-            Sign sign = (Sign) portal.getSignLocation().getBlock().getState();
-            sign.setLine(0, portal.getName());
-            sign.setLine(1, "");
-            sign.setLine(2, "");
-            sign.setLine(3, "");
-            sign.update();
-        }
+        //Mark the portal's sign as unregistered
+        new PortalSignDrawer(portal).drawUnregisteredSign();
 
         PortalFileHelper.saveAllPortals(portal.getWorld());
+        portal.setRegistered(false);
     }
 
     /**
@@ -250,14 +244,14 @@ public class PortalRegistry {
         } else {
             //Check if network exists in the lookup list. If not, register the new network
             if (!portalLookupByNetwork.containsKey(networkName)) {
-                Stargate.debug("register", "Network " + portal.getNetwork() +
-                        " not in lookupNamesNet, adding");
+                Stargate.debug("register", String.format("Network %s not in lookupNamesNet, adding",
+                        portal.getNetwork()));
                 portalLookupByNetwork.put(networkName, new HashMap<>());
             }
             //Check if this network exists in the network list. If not, register the network
             if (!allPortalNetworks.containsKey(networkName)) {
-                Stargate.debug("register", "Network " + portal.getNetwork() +
-                        " not in allPortalsNet, adding");
+                Stargate.debug("register", String.format("Network %s not in allPortalsNet, adding",
+                        portal.getNetwork()));
                 allPortalNetworks.put(networkName, new ArrayList<>());
             }
 
@@ -277,8 +271,10 @@ public class PortalRegistry {
             lookupBlocks.put(block, portal);
         }
         //Register the sign and button to the lookup lists
-        lookupBlocks.put(portal.getSignLocation(), portal);
-        lookupControls.put(portal.getSignLocation(), portal);
+        if (!portal.getOptions().hasNoSign()) {
+            lookupBlocks.put(portal.getSignLocation(), portal);
+            lookupControls.put(portal.getSignLocation(), portal);
+        }
 
         BlockLocation button = portal.getStructure().getButton();
         if (button != null) {
@@ -292,6 +288,7 @@ public class PortalRegistry {
         }
 
         allPortals.add(portal);
+        portal.setRegistered(true);
     }
 
 }

src/main/java/net/knarcraft/stargate/portal/PortalSignDrawer.java

@@ -1,6 +1,7 @@
 package net.knarcraft.stargate.portal;
 
 import net.knarcraft.stargate.Stargate;
+import net.knarcraft.stargate.portal.property.PortalLocation;
 import net.knarcraft.stargate.utility.PermissionHelper;
 import org.bukkit.ChatColor;
 import org.bukkit.block.Block;
@@ -45,18 +46,33 @@ public class PortalSignDrawer {
      * Draws the sign of the portal this sign drawer is responsible for
      */
     public void drawSign() {
-        Block signBlock = portal.getSignLocation().getBlock();
-        BlockState state = signBlock.getState();
-        if (!(state instanceof Sign sign)) {
-            Stargate.logWarning("Sign block is not a Sign object");
-            Stargate.debug("Portal::drawSign", String.format("Block: %s @ %s", signBlock.getType(),
-                    signBlock.getLocation()));
+        Sign sign = getSign();
+        if (sign == null) {
             return;
         }
 
         drawSign(sign);
     }
 
+    /**
+     * Gets the sign for this sign drawer's portal
+     *
+     * @return <p>The sign of this sign drawer's portal</p>
+     */
+    private Sign getSign() {
+        Block signBlock = portal.getSignLocation().getBlock();
+        BlockState state = signBlock.getState();
+        if (!(state instanceof Sign sign)) {
+            if (!portal.getOptions().hasNoSign()) {
+                Stargate.logWarning("Sign block is not a Sign object");
+                Stargate.debug("Portal::drawSign", String.format("Block: %s @ %s", signBlock.getType(),
+                        signBlock.getLocation()));
+            }
+            return null;
+        }
+        return sign;
+    }
+
     /**
      * Draws the sign of the portal this sign drawer is responsible for
      *
@@ -64,9 +80,7 @@ public class PortalSignDrawer {
      */
     private void drawSign(Sign sign) {
         //Clear sign
-        for (int index = 0; index <= 3; index++) {
-            sign.setLine(index, "");
-        }
+        clearSign(sign);
         setLine(sign, 0, highlightColor + "-" + mainColor +
                 portal.getName() + highlightColor + "-");
 
@@ -89,6 +103,30 @@ public class PortalSignDrawer {
         sign.update();
     }
 
+    /**
+     * Clears all lines of a sign, but does not update the sign
+     *
+     * @param sign <p>The sign to clear</p>
+     */
+    private void clearSign(Sign sign) {
+        for (int index = 0; index <= 3; index++) {
+            sign.setLine(index, "");
+        }
+    }
+
+    /**
+     * Marks this sign drawer's portal as unregistered
+     */
+    public void drawUnregisteredSign() {
+        Sign sign = getSign();
+        if (sign == null) {
+            return;
+        }
+        clearSign(sign);
+        sign.setLine(0, portal.getName());
+        sign.update();
+    }
+
     /**
      * Draws a sign with choose-able network locations
      *
@@ -174,7 +212,7 @@ public class PortalSignDrawer {
     }
 
     /**
-     * Draws a bungee sign
+     * Draws the sign of a BungeeCord portal
      *
      * @param sign <p>The sign to re-draw</p>
      */
@@ -185,7 +223,9 @@ public class PortalSignDrawer {
     }
 
     /**
-     * Draws an inactive sign
+     * Draws the sign of an in-active portal
+     *
+     * <p>The sign for an in-active portal should display the right-click prompt and the network.</p>
      *
      * @param sign <p>The sign to re-draw</p>
      */

src/main/java/net/knarcraft/stargate/portal/property/PortalLocation.java

@@ -1,4 +1,4 @@
-package net.knarcraft.stargate.portal;
+package net.knarcraft.stargate.portal.property;
 
 import net.knarcraft.stargate.container.BlockLocation;
 import net.knarcraft.stargate.container.RelativeBlockVector;

src/main/java/net/knarcraft/stargate/portal/property/PortalOption.java

@@ -1,4 +1,4 @@
-package net.knarcraft.stargate.portal;
+package net.knarcraft.stargate.portal.property;
 
 /**
  * Each enum value represents one option a portal can have/use
@@ -48,7 +48,17 @@ public enum PortalOption {
     /**
      * This option allows a portal to teleport to another server connected through BungeeCord
      */
-    BUNGEE('u', "stargate.admin.bungee", 20);
+    BUNGEE('u', "stargate.admin.bungee", 20),
+
+    /**
+     * This option allows a portal which does not display a teleportation message, for better immersion
+     */
+    SILENT('i', "stargate.option.silent", 21),
+
+    /**
+     * This option causes a fixed portal's sign to be removed after creation
+     */
+    NO_SIGN('e', "stargate.option.nosign", 22);
 
     private final char characterRepresentation;
     private final String permissionString;

src/main/java/net/knarcraft/stargate/portal/property/PortalOptions.java

@@ -1,4 +1,4 @@
-package net.knarcraft.stargate.portal;
+package net.knarcraft.stargate.portal.property;
 
 import net.knarcraft.stargate.Stargate;
 
@@ -25,12 +25,17 @@ public class PortalOptions {
 
         if (this.isAlwaysOn() && !isFixed) {
             this.options.put(PortalOption.ALWAYS_ON, false);
-            Stargate.debug("Portal", "Can not create a non-fixed always-on gate. Setting AlwaysOn = false");
+            Stargate.debug("PortalOptions", "Can not create a non-fixed always-on gate. Setting AlwaysOn = false");
         }
 
-        if (this.isRandom() && !this.isAlwaysOn()) {
+        if ((this.isRandom() || this.isBungee()) && !this.isAlwaysOn()) {
             this.options.put(PortalOption.ALWAYS_ON, true);
-            Stargate.debug("Portal", "Gate marked as random, set to always-on");
+            Stargate.debug("PortalOptions", "Gate marked as random or bungee, set to always-on");
+        }
+
+        if (this.hasNoSign() && !this.isFixed) {
+            this.options.put(PortalOption.NO_SIGN, false);
+            Stargate.debug("PortalOptions", "Gate marked with no sign, but not fixed. Setting NoSign = false");
         }
     }
 
@@ -165,4 +170,27 @@ public class PortalOptions {
         return this.options.get(PortalOption.BUNGEE);
     }
 
+    /**
+     * Gets whether this portal is silent
+     *
+     * <p>A silent portal does not output anything to the chat when teleporting. This option is mainly useful to keep
+     * the immersion during teleportation (for role-playing servers or similar).</p>
+     *
+     * @return <p>Whether this portal is silent</p>
+     */
+    public boolean isSilent() {
+        return this.options.get(PortalOption.SILENT);
+    }
+
+    /**
+     * Gets whether this portal has no sign
+     *
+     * <p>An always-on portal is allowed to not have a sign as it will never be interacted with anyway.</p>
+     *
+     * @return <p>Whether this portal has no sign</p>
+     */
+    public boolean hasNoSign() {
+        return this.options.get(PortalOption.NO_SIGN);
+    }
+
 }

src/main/java/net/knarcraft/stargate/portal/property/PortalOwner.java

@@ -1,4 +1,4 @@
-package net.knarcraft.stargate.portal;
+package net.knarcraft.stargate.portal.property;
 
 import net.knarcraft.stargate.Stargate;
 import org.bukkit.Bukkit;

src/main/java/net/knarcraft/stargate/portal/property/PortalStructure.java

@@ -1,8 +1,10 @@
-package net.knarcraft.stargate.portal;
+package net.knarcraft.stargate.portal.property;
 
 import net.knarcraft.stargate.Stargate;
 import net.knarcraft.stargate.container.BlockLocation;
 import net.knarcraft.stargate.container.RelativeBlockVector;
+import net.knarcraft.stargate.portal.Portal;
+import net.knarcraft.stargate.portal.property.gate.Gate;
 
 /**
  * The portal structure is responsible for the physical properties of a portal

src/main/java/net/knarcraft/stargate/portal/property/gate/Gate.java

@@ -1,4 +1,4 @@
-package net.knarcraft.stargate.portal;
+package net.knarcraft.stargate.portal.property.gate;
 
 import net.knarcraft.stargate.Stargate;
 import net.knarcraft.stargate.container.BlockLocation;

src/main/java/net/knarcraft/stargate/portal/property/gate/GateHandler.java

@@ -1,4 +1,4 @@
-package net.knarcraft.stargate.portal;
+package net.knarcraft.stargate.portal.property.gate;
 
 import net.knarcraft.stargate.Stargate;
 import net.knarcraft.stargate.utility.GateReader;
@@ -243,6 +243,7 @@ public class GateHandler {
         loadGateFromJar("nethergate.gate", gateFolder);
         loadGateFromJar("watergate.gate", gateFolder);
         loadGateFromJar("endgate.gate", gateFolder);
+        loadGateFromJar("squarenetherglowstonegate.gate", gateFolder);
     }
 
     /**

src/main/java/net/knarcraft/stargate/portal/property/gate/GateLayout.java

@@ -1,4 +1,4 @@
-package net.knarcraft.stargate.portal;
+package net.knarcraft.stargate.portal.property.gate;
 
 import net.knarcraft.stargate.container.RelativeBlockVector;
 

src/main/java/net/knarcraft/stargate/portal/teleporter/EntityTeleporter.java

@@ -1,7 +1,8 @@
-package net.knarcraft.stargate.portal;
+package net.knarcraft.stargate.portal.teleporter;
 
 import net.knarcraft.stargate.Stargate;
 import net.knarcraft.stargate.event.StargateEntityPortalEvent;
+import net.knarcraft.stargate.portal.Portal;
 import org.bukkit.Location;
 import org.bukkit.entity.Entity;
 
@@ -26,8 +27,9 @@ public class EntityTeleporter extends Teleporter {
      * Teleports an entity to this teleporter's portal
      *
      * @param origin <p>The portal the entity is teleporting from</p>
+     * @return <p>True if the entity was teleported. False otherwise</p>
      */
-    public void teleport(Portal origin) {
+    public boolean teleport(Portal origin) {
         Location traveller = teleportingEntity.getLocation();
         Location exit = getExit(teleportingEntity, traveller);
 
@@ -38,7 +40,7 @@ public class EntityTeleporter extends Teleporter {
         if (!origin.equals(portal)) {
             exit = triggerEntityPortalEvent(origin, exit);
             if (exit == null) {
-                return;
+                return false;
             }
         }
 
@@ -46,6 +48,7 @@ public class EntityTeleporter extends Teleporter {
         loadChunks();
 
         teleportingEntity.teleport(exit);
+        return true;
     }
 
     /**

src/main/java/net/knarcraft/stargate/portal/teleporter/PlayerTeleporter.java

@@ -1,7 +1,8 @@
-package net.knarcraft.stargate.portal;
+package net.knarcraft.stargate.portal.teleporter;
 
 import net.knarcraft.stargate.Stargate;
 import net.knarcraft.stargate.event.StargatePlayerPortalEvent;
+import net.knarcraft.stargate.portal.Portal;
 import org.bukkit.Location;
 import org.bukkit.entity.Player;
 import org.bukkit.event.player.PlayerMoveEvent;

src/main/java/net/knarcraft/stargate/portal/teleporter/Teleporter.java

@@ -1,9 +1,10 @@
-package net.knarcraft.stargate.portal;
+package net.knarcraft.stargate.portal.teleporter;
 
 import net.knarcraft.stargate.Stargate;
 import net.knarcraft.stargate.container.BlockLocation;
 import net.knarcraft.stargate.container.ChunkUnloadRequest;
 import net.knarcraft.stargate.container.RelativeBlockVector;
+import net.knarcraft.stargate.portal.Portal;
 import net.knarcraft.stargate.utility.DirectionHelper;
 import net.knarcraft.stargate.utility.EntityHelper;
 import org.bukkit.Chunk;
@@ -268,7 +269,7 @@ public abstract class Teleporter {
             creature.setLeashHolder(null);
             scheduler.scheduleSyncDelayedTask(Stargate.getInstance(), () -> {
                 new EntityTeleporter(portal, creature).teleport(origin);
-                scheduler.scheduleSyncDelayedTask(Stargate.getInstance(), () -> creature.setLeashHolder(player), 3);
+                scheduler.scheduleSyncDelayedTask(Stargate.getInstance(), () -> creature.setLeashHolder(player), 6);
             }, 2);
         }
     }

src/main/java/net/knarcraft/stargate/portal/teleporter/VehicleTeleporter.java

@@ -1,6 +1,8 @@
-package net.knarcraft.stargate.portal;
+package net.knarcraft.stargate.portal.teleporter;
 
 import net.knarcraft.stargate.Stargate;
+import net.knarcraft.stargate.config.StargateGateConfig;
+import net.knarcraft.stargate.portal.Portal;
 import net.knarcraft.stargate.utility.DirectionHelper;
 import org.bukkit.Location;
 import org.bukkit.World;
@@ -37,9 +39,10 @@ public class VehicleTeleporter extends EntityTeleporter {
      * calling this method.</p>
      *
      * @param origin <p>The portal the vehicle is teleporting from</p>
+     * @return <p>True if the vehicle was teleported. False otherwise</p>
      */
     @Override
-    public void teleport(Portal origin) {
+    public boolean teleport(Portal origin) {
         Location traveller = teleportingVehicle.getLocation();
         Location exit = getExit(teleportingVehicle, traveller);
 
@@ -59,12 +62,12 @@ public class VehicleTeleporter extends EntityTeleporter {
         if (!origin.equals(portal)) {
             exit = triggerEntityPortalEvent(origin, exit);
             if (exit == null) {
-                return;
+                return false;
             }
         }
 
         //Teleport the vehicle
-        teleportVehicle(exit, newVelocity, origin);
+        return teleportVehicle(exit, newVelocity, origin);
     }
 
     /**
@@ -73,13 +76,19 @@ public class VehicleTeleporter extends EntityTeleporter {
      * @param exit        <p>The location the vehicle should be teleported to</p>
      * @param newVelocity <p>The velocity to give the vehicle right after teleportation</p>
      * @param origin      <p>The portal the vehicle teleported from</p>
+     * @return <p>True if the vehicle was teleported. False otherwise</p>
      */
-    private void teleportVehicle(Location exit, Vector newVelocity, Portal origin) {
+    private boolean teleportVehicle(Location exit, Vector newVelocity, Portal origin) {
         //Load chunks to make sure not to teleport to the void
         loadChunks();
 
         List<Entity> passengers = teleportingVehicle.getPassengers();
         if (!passengers.isEmpty()) {
+            //Check if the passengers are allowed according to current config settings
+            if (!vehiclePassengersAllowed(passengers)) {
+                return false;
+            }
+
             if (!(teleportingVehicle instanceof LivingEntity)) {
                 //Teleport a normal vehicle with passengers (minecart or boat)
                 putPassengersInNewVehicle(passengers, exit, newVelocity, origin);
@@ -88,11 +97,62 @@ public class VehicleTeleporter extends EntityTeleporter {
                 teleportLivingVehicle(exit, passengers, origin);
             }
         } else {
+            //Check if teleportation of empty vehicles is enabled
+            if (!Stargate.getGateConfig().handleEmptyVehicles()) {
+                return false;
+            }
             //Teleport an empty vehicle
             teleportingVehicle.teleport(exit);
             scheduler.scheduleSyncDelayedTask(Stargate.getInstance(),
                     () -> teleportingVehicle.setVelocity(newVelocity), 1);
         }
+        return true;
+    }
+
+    /**
+     * Checks whether current config values allow the teleportation of the given passengers
+     *
+     * @param passengers <p>The passengers to teleport</p>
+     * @return <p>True if the passengers are allowed to teleport</p>
+     */
+    private boolean vehiclePassengersAllowed(List<Entity> passengers) {
+        StargateGateConfig config = Stargate.getGateConfig();
+        //Don't teleport if the vehicle contains a creature and creature transportation is disabled
+        if (containsNonPlayer(passengers) && !config.handleCreatureTransportation()) {
+            return false;
+        }
+        //Don't teleport if the player does not contain a player and non-player vehicles is disabled
+        return containsPlayer(passengers) || config.handleNonPlayerVehicles();
+    }
+
+    /**
+     * Checks whether a list of entities contains any non-players
+     *
+     * @param entities <p>The list of entities to check</p>
+     * @return <p>True if at least one entity is not a player</p>
+     */
+    private boolean containsNonPlayer(List<Entity> entities) {
+        for (Entity entity : entities) {
+            if (!(entity instanceof Player)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Checks whether a list of entities contains at least one player
+     *
+     * @param entities <p>The list of entities to check</p>
+     * @return <p>True if at least one player is present among the passengers</p>
+     */
+    private boolean containsPlayer(List<Entity> entities) {
+        for (Entity entity : entities) {
+            if (entity instanceof Player) {
+                return true;
+            }
+        }
+        return false;
     }
 
     /**

src/main/java/net/knarcraft/stargate/thread/StarGateThread.java

@@ -30,8 +30,7 @@ public class StarGateThread implements Runnable {
 
         for (Portal portal : openPortalsQueue) {
             //Skip always open and non-open gates
-            if (portal.getOptions().isAlwaysOn() || portal.getOptions().isRandom() || portal.getOptions().isBungee() ||
-                    !portal.isOpen()) {
+            if (portal.getOptions().isAlwaysOn() || !portal.isOpen()) {
                 continue;
             }
             if (time > portal.getTriggeredTime() + Stargate.getGateConfig().getOpenTime()) {

src/main/java/net/knarcraft/stargate/utility/BungeeHelper.java

@@ -1,9 +1,9 @@
 package net.knarcraft.stargate.utility;
 
 import net.knarcraft.stargate.Stargate;
-import net.knarcraft.stargate.portal.PlayerTeleporter;
 import net.knarcraft.stargate.portal.Portal;
 import net.knarcraft.stargate.portal.PortalHandler;
+import net.knarcraft.stargate.portal.teleporter.PlayerTeleporter;
 import org.bukkit.entity.Player;
 import org.bukkit.event.player.PlayerMoveEvent;
 
@@ -181,7 +181,9 @@ public final class BungeeHelper {
     public static boolean bungeeTeleport(Player player, Portal entrancePortal, PlayerMoveEvent event) {
         //Check if bungee is actually enabled
         if (!Stargate.getGateConfig().enableBungee()) {
-            Stargate.getMessageSender().sendErrorMessage(player, Stargate.getString("bungeeDisabled"));
+            if (!entrancePortal.getOptions().isSilent()) {
+                Stargate.getMessageSender().sendErrorMessage(player, Stargate.getString("bungeeDisabled"));
+            }
             entrancePortal.getPortalOpener().closePortal(false);
             return false;
         }

src/main/java/net/knarcraft/stargate/utility/EconomyHelper.java

@@ -2,7 +2,7 @@ package net.knarcraft.stargate.utility;
 
 import net.knarcraft.stargate.Stargate;
 import net.knarcraft.stargate.portal.Portal;
-import net.knarcraft.stargate.portal.PortalOwner;
+import net.knarcraft.stargate.portal.property.PortalOwner;
 import org.bukkit.entity.Player;
 
 import java.util.UUID;

src/main/java/net/knarcraft/stargate/utility/MaterialHelper.java

@@ -28,6 +28,17 @@ public final class MaterialHelper {
                 material.equals(Material.DEAD_TUBE_CORAL_WALL_FAN);
     }
 
+    /**
+     * Checks whether the given material is a container
+     *
+     * @param material <p>The material to check</p>
+     * @return <p>True if the material is a container</p>
+     */
+    public static boolean isContainer(Material material) {
+        return Tag.SHULKER_BOXES.isTagged(material) || material == Material.CHEST ||
+                material == Material.TRAPPED_CHEST || material == Material.ENDER_CHEST;
+    }
+
     /**
      * Checks whether the given material can be used as a button
      *
@@ -35,8 +46,7 @@ public final class MaterialHelper {
      * @return <p>True if the material can be used as a button</p>
      */
     public static boolean isButtonCompatible(Material material) {
-        return Tag.BUTTONS.isTagged(material) || isWallCoral(material) || Tag.SHULKER_BOXES.isTagged(material) ||
-                material == Material.CHEST || material == Material.TRAPPED_CHEST || material == Material.ENDER_CHEST;
+        return Tag.BUTTONS.isTagged(material) || isWallCoral(material) || isContainer(material);
     }
 
 }

src/main/java/net/knarcraft/stargate/utility/PermissionHelper.java

@@ -2,9 +2,9 @@ package net.knarcraft.stargate.utility;
 
 import net.knarcraft.stargate.Stargate;
 import net.knarcraft.stargate.event.StargateAccessEvent;
-import net.knarcraft.stargate.portal.PlayerTeleporter;
 import net.knarcraft.stargate.portal.Portal;
-import net.knarcraft.stargate.portal.PortalOption;
+import net.knarcraft.stargate.portal.property.PortalOption;
+import net.knarcraft.stargate.portal.teleporter.PlayerTeleporter;
 import org.bukkit.entity.Player;
 import org.bukkit.event.player.PlayerMoveEvent;
 
@@ -27,13 +27,15 @@ public final class PermissionHelper {
         Portal destination = portal.getPortalActivator().getDestination();
 
         //For an always open portal, no action is necessary
-        if (portal.getOptions().isAlwaysOn() || portal.getOptions().isRandom() || portal.getOptions().isBungee()) {
+        if (portal.getOptions().isAlwaysOn()) {
             return;
         }
 
         //Destination is invalid or the same portal. Send an error message
         if (destination == null || destination == portal) {
-            Stargate.getMessageSender().sendErrorMessage(player, Stargate.getString("invalidMsg"));
+            if (!portal.getOptions().isSilent()) {
+                Stargate.getMessageSender().sendErrorMessage(player, Stargate.getString("invalidMsg"));
+            }
             return;
         }
 
@@ -49,19 +51,25 @@ public final class PermissionHelper {
         //Deny access if another player has activated the portal, and it's still in use
         if (!portal.getOptions().isFixed() && portal.getPortalActivator().isActive() &&
                 portal.getActivePlayer() != player) {
-            Stargate.getMessageSender().sendErrorMessage(player, Stargate.getString("denyMsg"));
+            if (!portal.getOptions().isSilent()) {
+                Stargate.getMessageSender().sendErrorMessage(player, Stargate.getString("denyMsg"));
+            }
             return;
         }
 
         //Check if the player can use the private gate
         if (portal.getOptions().isPrivate() && !PermissionHelper.canUsePrivatePortal(player, portal)) {
-            Stargate.getMessageSender().sendErrorMessage(player, Stargate.getString("denyMsg"));
+            if (!portal.getOptions().isSilent()) {
+                Stargate.getMessageSender().sendErrorMessage(player, Stargate.getString("denyMsg"));
+            }
             return;
         }
 
         //Destination is currently in use by another player, blocking teleportation
         if (destination.isOpen() && !destination.getOptions().isAlwaysOn()) {
-            Stargate.getMessageSender().sendErrorMessage(player, Stargate.getString("blockMsg"));
+            if (!portal.getOptions().isSilent()) {
+                Stargate.getMessageSender().sendErrorMessage(player, Stargate.getString("blockMsg"));
+            }
             return;
         }
 
@@ -374,7 +382,9 @@ public final class PermissionHelper {
 
         //Not open for this player
         if (!entrancePortal.getPortalOpener().isOpenFor(player)) {
-            Stargate.getMessageSender().sendErrorMessage(player, Stargate.getString("denyMsg"));
+            if (!entrancePortal.getOptions().isSilent()) {
+                Stargate.getMessageSender().sendErrorMessage(player, Stargate.getString("denyMsg"));
+            }
             new PlayerTeleporter(entrancePortal, player).teleport(entrancePortal, event);
             return true;
         }
@@ -386,7 +396,9 @@ public final class PermissionHelper {
 
         //Player cannot access portal
         if (PermissionHelper.cannotAccessPortal(player, entrancePortal, destination)) {
-            Stargate.getMessageSender().sendErrorMessage(player, Stargate.getString("denyMsg"));
+            if (!entrancePortal.getOptions().isSilent()) {
+                Stargate.getMessageSender().sendErrorMessage(player, Stargate.getString("denyMsg"));
+            }
             new PlayerTeleporter(entrancePortal, player).teleport(entrancePortal, event);
             entrancePortal.getPortalOpener().closePortal(false);
             return true;

src/main/java/net/knarcraft/stargate/utility/PortalFileHelper.java

@@ -1,16 +1,25 @@
 package net.knarcraft.stargate.utility;
 
 import net.knarcraft.stargate.Stargate;
+import net.knarcraft.stargate.container.BlockChangeRequest;
 import net.knarcraft.stargate.container.BlockLocation;
-import net.knarcraft.stargate.portal.Gate;
-import net.knarcraft.stargate.portal.GateHandler;
+import net.knarcraft.stargate.container.RelativeBlockVector;
 import net.knarcraft.stargate.portal.Portal;
 import net.knarcraft.stargate.portal.PortalHandler;
-import net.knarcraft.stargate.portal.PortalLocation;
-import net.knarcraft.stargate.portal.PortalOptions;
-import net.knarcraft.stargate.portal.PortalOwner;
 import net.knarcraft.stargate.portal.PortalRegistry;
+import net.knarcraft.stargate.portal.property.PortalLocation;
+import net.knarcraft.stargate.portal.property.PortalOptions;
+import net.knarcraft.stargate.portal.property.PortalOwner;
+import net.knarcraft.stargate.portal.property.gate.Gate;
+import net.knarcraft.stargate.portal.property.gate.GateHandler;
+import org.bukkit.Bukkit;
+import org.bukkit.Location;
+import org.bukkit.Material;
 import org.bukkit.World;
+import org.bukkit.block.BlockFace;
+import org.bukkit.block.data.BlockData;
+import org.bukkit.block.data.Directional;
+import org.bukkit.block.data.Waterlogged;
 
 import java.io.BufferedWriter;
 import java.io.File;
@@ -114,7 +123,9 @@ public final class PortalFileHelper {
         builder.append(options.isShown()).append(':');
         builder.append(options.isNoNetwork()).append(':');
         builder.append(options.isRandom()).append(':');
-        builder.append(options.isBungee());
+        builder.append(options.isBungee()).append(':');
+        builder.append(options.isSilent()).append(':');
+        builder.append(options.hasNoSign());
     }
 
     /**
@@ -147,14 +158,17 @@ public final class PortalFileHelper {
         int lineIndex = 0;
         try {
             Scanner scanner = new Scanner(database);
+            boolean needsToSaveDatabase = false;
             while (scanner.hasNextLine()) {
                 //Read the line and do whatever needs to be done
-                readPortalLine(scanner, ++lineIndex, world);
+                needsToSaveDatabase = readPortalLine(scanner, ++lineIndex, world) || needsToSaveDatabase;
             }
             scanner.close();
 
             //Do necessary tasks after all portals have loaded
-            doPostLoadTasks(world);
+            Stargate.debug("PortalFileHelper::loadPortals", String.format("Finished loading portals for %s. " +
+                    "Starting post loading tasks", world));
+            doPostLoadTasks(world, needsToSaveDatabase);
             return true;
         } catch (Exception e) {
             Stargate.logSevere(String.format("Exception while reading stargates from %s: %d", database.getName(),
@@ -170,24 +184,25 @@ public final class PortalFileHelper {
      * @param scanner   <p>The scanner to read</p>
      * @param lineIndex <p>The index of the read line</p>
      * @param world     <p>The world for which portals are currently being read</p>
+     * @return <p>True if the read portal has changed and the world's database needs to be saved</p>
      */
-    private static void readPortalLine(Scanner scanner, int lineIndex, World world) {
+    private static boolean readPortalLine(Scanner scanner, int lineIndex, World world) {
         String line = scanner.nextLine().trim();
 
         //Ignore empty and comment lines
         if (line.startsWith("#") || line.isEmpty()) {
-            return;
+            return false;
         }
 
         //Check if the min. required portal data is present
         String[] portalData = line.split(":");
         if (portalData.length < 8) {
             Stargate.logInfo(String.format("Invalid line - %s", lineIndex));
-            return;
+            return false;
         }
 
         //Load the portal defined in the current line
-        loadPortal(portalData, world, lineIndex);
+        return loadPortal(portalData, world, lineIndex);
     }
 
     /**
@@ -196,9 +211,10 @@ public final class PortalFileHelper {
      * <p>This will open always on portals, print info about loaded stargates and re-draw portal signs for loaded
      * portals.</p>
      *
-     * @param world <p>The world portals have been loaded for</p>
+     * @param world               <p>The world portals have been loaded for</p>
+     * @param needsToSaveDatabase <p>Whether the portal database's file needs to be updated</p>
      */
-    private static void doPostLoadTasks(World world) {
+    private static void doPostLoadTasks(World world, boolean needsToSaveDatabase) {
         //Open any always-on portals. Do this here as it should be more efficient than in the loop.
         PortalHandler.verifyAllPortals();
         int portalCount = PortalRegistry.getAllPortals().size();
@@ -210,7 +226,15 @@ public final class PortalFileHelper {
 
         //Re-draw the signs in case a bug in the config prevented the portal from loading and has been fixed since
         for (Portal portal : PortalRegistry.getAllPortals()) {
-            portal.drawSign();
+            if (portal.isRegistered()) {
+                portal.drawSign();
+                updatePortalButton(portal);
+            }
+        }
+        //Save the portals to disk to update with any changes
+        Stargate.debug("PortalFileHelper::doPostLoadTasks", String.format("Saving database for world %s", world));
+        if (needsToSaveDatabase) {
+            saveAllPortals(world);
         }
     }
 
@@ -220,8 +244,9 @@ public final class PortalFileHelper {
      * @param portalData <p>The array describing the portal</p>
      * @param world      <p>The world to create the portal in</p>
      * @param lineIndex  <p>The line index to report in case the user needs to fix an error</p>
+     * @return <p>True if the portal's data has changed and its database needs to be updated</p>
      */
-    private static void loadPortal(String[] portalData, World world, int lineIndex) {
+    private static boolean loadPortal(String[] portalData, World world, int lineIndex) {
         //Load min. required portal data
         String name = portalData[0];
         BlockLocation button = (portalData[2].length() > 0) ? new BlockLocation(world, portalData[2]) : null;
@@ -237,12 +262,13 @@ public final class PortalFileHelper {
         if (gate == null) {
             //Mark the sign as invalid to reduce some player confusion
             markPortalWithInvalidGate(portalLocation, portalData[7], lineIndex);
-            return;
+            return false;
         }
 
         //Load extra portal data
         String destination = (portalData.length > 8) ? portalData[8] : "";
-        String network = (portalData.length > 9 && !portalData[9].isEmpty()) ? portalData[9] : Stargate.getDefaultNetwork();
+        String network = (portalData.length > 9 && !portalData[9].isEmpty()) ? portalData[9] :
+                Stargate.getDefaultNetwork();
         String ownerString = (portalData.length > 10) ? portalData[10] : "";
 
         //Get the owner from the owner string
@@ -253,8 +279,124 @@ public final class PortalFileHelper {
                 PortalHandler.getPortalOptions(portalData));
 
         //Register the portal, and close it in case it wasn't properly closed when the server stopped
+        boolean buttonLocationChanged = updateButtonVector(portal);
         PortalHandler.registerPortal(portal);
         portal.getPortalOpener().closePortal(true);
+        return buttonLocationChanged;
+    }
+
+    /**
+     * Updates a portal's button if it does not match the correct material
+     *
+     * @param portal <p>The portal update the button of</p>
+     */
+    private static void updatePortalButton(Portal portal) {
+        BlockLocation buttonLocation = getButtonLocation(portal);
+        BlockData buttonData = buttonLocation.getBlock().getBlockData();
+        if (portal.getOptions().isAlwaysOn()) {
+            //Clear button if not already air or water
+            if (MaterialHelper.isButtonCompatible(buttonData.getMaterial())) {
+                Material newMaterial = decideRemovalMaterial(buttonLocation, portal);
+                Stargate.addBlockChangeRequest(new BlockChangeRequest(buttonLocation, newMaterial, null));
+            }
+        } else {
+            //Replace button if the material does not match
+            if (buttonData.getMaterial() != portal.getGate().getPortalButton()) {
+                generatePortalButton(portal, DirectionHelper.getBlockFaceFromYaw(portal.getYaw()));
+            }
+        }
+    }
+
+    /**
+     * Decides the material to use for removing a portal's button/sign
+     *
+     * @param location <p>The location of the button/sign to replace</p>
+     * @param portal   <p>The portal the button/sign belongs to</p>
+     * @return <p>The material to use for removing the button/sign</p>
+     */
+    public static Material decideRemovalMaterial(BlockLocation location, Portal portal) {
+        //Get the blocks to each side of the location
+        Location leftLocation = location.getRelativeLocation(-1, 0, 0, portal.getYaw());
+        Location rightLocation = location.getRelativeLocation(1, 0, 0, portal.getYaw());
+
+        //If the block is water or is waterlogged, assume the portal is underwater
+        if (isUnderwater(leftLocation) || isUnderwater(rightLocation)) {
+            return Material.WATER;
+        } else {
+            return Material.AIR;
+        }
+    }
+
+    /**
+     * Checks whether the given location is underwater
+     *
+     * <p>If the location has a water block, or a block which is waterlogged, it will be considered underwater.</p>
+     *
+     * @param location <p>The location to check</p>
+     * @return <p>True if the location is underwater</p>
+     */
+    private static boolean isUnderwater(Location location) {
+        BlockData blockData = location.getBlock().getBlockData();
+        return blockData.getMaterial() == Material.WATER ||
+                (blockData instanceof Waterlogged waterlogged && waterlogged.isWaterlogged());
+    }
+
+    /**
+     * Updates the button vector for the given portal
+     *
+     * <p>As the button vector isn't saved, it is null when the portal is loaded. This method allows it to be
+     * explicitly set when necessary.</p>
+     *
+     * @param portal <p>The portal to update the button vector for</p>
+     * @return <p>True if the calculated button location is not the same as the one in the portal file</p>
+     */
+    private static boolean updateButtonVector(Portal portal) {
+        for (RelativeBlockVector control : portal.getGate().getLayout().getControls()) {
+            BlockLocation controlLocation = portal.getLocation().getTopLeft().getRelativeLocation(control,
+                    portal.getYaw());
+            BlockLocation buttonLocation = controlLocation.getRelativeLocation(
+                    new RelativeBlockVector(0, 0, 1), portal.getYaw());
+            if (!buttonLocation.equals(portal.getLocation().getSignLocation())) {
+                portal.getLocation().setButtonVector(control);
+
+                BlockLocation oldButtonLocation = portal.getStructure().getButton();
+                if (oldButtonLocation != null && !oldButtonLocation.equals(buttonLocation)) {
+                    Stargate.addBlockChangeRequest(new BlockChangeRequest(oldButtonLocation, Material.AIR, null));
+                    portal.getStructure().setButton(buttonLocation);
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Generates a button for a portal
+     *
+     * @param portal       <p>The portal to generate button for</p>
+     * @param buttonFacing <p>The direction the button should be facing</p>
+     */
+    public static void generatePortalButton(Portal portal, BlockFace buttonFacing) {
+        //Go one block outwards to find the button's location rather than the control block's location
+        BlockLocation button = getButtonLocation(portal);
+
+        Directional buttonData = (Directional) Bukkit.createBlockData(portal.getGate().getPortalButton());
+        buttonData.setFacing(buttonFacing);
+        button.getBlock().setBlockData(buttonData);
+        portal.getStructure().setButton(button);
+    }
+
+    /**
+     * Gets the location of a portal's button
+     *
+     * @param portal <p>The portal to find the button for</p>
+     * @return <p>The location of the portal's button</p>
+     */
+    private static BlockLocation getButtonLocation(Portal portal) {
+        BlockLocation topLeft = portal.getTopLeft();
+        RelativeBlockVector buttonVector = portal.getLocation().getButtonVector();
+        return topLeft.getRelativeLocation(buttonVector.addToVector(RelativeBlockVector.Property.OUT, 1),
+                portal.getYaw());
     }
 
 }

src/main/java/net/knarcraft/stargate/utility/UUIDMigrationHelper.java

@@ -3,8 +3,8 @@ package net.knarcraft.stargate.utility;
 import net.knarcraft.stargate.Stargate;
 import net.knarcraft.stargate.portal.Portal;
 import net.knarcraft.stargate.portal.PortalHandler;
-import net.knarcraft.stargate.portal.PortalOwner;
 import net.knarcraft.stargate.portal.PortalRegistry;
+import net.knarcraft.stargate.portal.property.PortalOwner;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.World;
 

src/main/resources/config.yml

@@ -8,7 +8,10 @@
 # maxGatesEachNetwork - The maximum number of gates allowed on a network - 0 for unlimited
 # language - The language file to load for messages
 # rememberDestination - Whether to remember the cursor location between uses
-# handleVehicles - Whether to allow vehicles through gates
+# handleVehicles - Whether to allow vehicles through gates. This overrides other vehicle settings
+# handleEmptyVehicles - Whether to allow empty vehicles through gates (chest/hopper/tnt/furnace minecarts included)
+# handleCreatureTransportation - Whether to allow players to transport creatures by sending vehicles (minecarts, boats) through gates
+# handleNonPlayerVehicles - Whether to allow vehicles with a passenger which is not a player through gates. handleCreatureTransportation must be enabled
 # handleLeashedCreatures - Whether to allow creatures lead by a player to teleport with the player
 # sortNetworkDestinations - Whether to sort network lists alphabetically
 # protectEntrance - Whether to protect gate entrance material (More resource intensive. Only enable if using destroyable open/closed material)
@@ -50,6 +53,9 @@ gates:
   functionality:
     enableBungee: false
     handleVehicles: true
+    handleEmptyVehicles: true
+    handleCreatureTransportation: true
+    handleNonPlayerVehicles: true
     handleLeashedCreatures: true
 economy:
   useEconomy: false

src/main/resources/gates/squarenetherglowstonegate.gate

@@ -0,0 +1,13 @@
+portal-open=NETHER_PORTAL
+portal-closed=AIR
+button=OAK_BUTTON
+toowner=false
+X=OBSIDIAN
+-=GLOWSTONE
+A=GLOWSTONE
+
+ XAX
+X...X
+-...-
+X.*.X
+ XAX

src/main/resources/lang/en.txt

@@ -35,3 +35,9 @@ bungeeDisabled=BungeeCord support is disabled.
 bungeeDeny=You do not have permission to create BungeeCord gates.
 bungeeEmpty=BungeeCord gates require both a destination and network.
 bungeeSign=Teleport to
+
+portalInfoTitle=[STARGATE INFO]
+portalInfoName=Name: %name%
+portalInfoDestination=Destination: %destination%
+portalInfoNetwork=Network: %network%
+portalInfoServer=Server: %server%

src/main/resources/lang/nb-no.txt

@@ -35,3 +35,9 @@ bungeeDisabled=BungeeCord støtte er slått av.
 bungeeDeny=Du har ikke tillatelse til å opprette BungeeCord porter.
 bungeeEmpty=BungeeCord porter behøver bade en destinasjon og et nettverk.
 bungeeSign=Teleporter til
+
+portalInfoTitle=[STJERNEPORT INFO]
+portalInfoName=Navn: %name%
+portalInfoDestination=Destinasjon: %destination%
+portalInfoNetwork=Nettverk: %network%
+portalInfoServer=Server: %server%

src/main/resources/lang/nn-no.txt

@@ -35,3 +35,9 @@ bungeeDisabled=BungeeCord støtte er slått av.
 bungeeDeny=Du har ikkje løyve til å opprette BungeeCord portar.
 bungeeEmpty=BungeeCord portar treng bade ein destinasjon og eit nettverk.
 bungeeSign=Teleporter til
+
+portalInfoTitle=[STJERNEPORT INFO]
+portalInfoName=Namn: %name%
+portalInfoDestination=Destinasjon: %destination%
+portalInfoNetwork=Nettverk: %network%
+portalInfoServer=Server: %server%

src/main/resources/plugin.yml

@@ -1,6 +1,6 @@
 name: Stargate
 main: net.knarcraft.stargate.Stargate
-version: 0.9.0.4
+version: 0.9.1.0
 description: Stargate mod for Bukkit Revived
 author: EpicKnarvik97
 authors: [ Drakia, PseudoKnight, EpicKnarvik97 ]
@@ -97,6 +97,8 @@ permissions:
       stargate.option.show: true
       stargate.option.nonetwork: true
       stargate.option.random: true
+      stargate.option.silent: true
+      stargate.option.nosign: true
   stargate.option.hidden:
     description: Allows the creation of a hidden stargate
     default: false
@@ -121,6 +123,12 @@ permissions:
   stargate.option.random:
     description: Allows the creation of a stargate with a random destination
     default: false
+  stargate.option.silent:
+    description: Allows the creation of a stargate which does not output anything to the chat
+    default: false
+  stargate.option.nosign:
+    description: Allows the creation of a stargate which has no sign
+    default: false
   stargate.admin.hidden:
     description: Allows this player to see all hidden stargates
     default: false
@@ -130,14 +138,18 @@ permissions:
   stargate.admin.bungee:
     description: Allows the creation and destruction of a stargate between BungeeCord servers
     default: false
+  stargate.admin.config:
+    description: Allows the player to change config values from the chat
+    default: false
   stargate.server:
     description: Allows the creation of a BungeeCord stargate going to any server
     default: false
   stargate.admin:
-    description: Allow all admin features and commands (Hidden/Private bypass, BungeeCord, Reload)
+    description: Allow all admin features and commands (Hidden/Private bypass, BungeeCord, Reload, Config)
     default: op
     children:
       stargate.admin.reload: true
       stargate.admin.hidden: true
       stargate.admin.private: true
-      stargate.admin.bungee: true
+      stargate.admin.bungee: true
+      stargate.admin.config: true

src/test/java/net/knarcraft/stargate/portal/GateLayoutTest.java

@@ -5,6 +5,8 @@ import be.seeseemelk.mockbukkit.ServerMock;
 import be.seeseemelk.mockbukkit.WorldMock;
 import net.knarcraft.stargate.Stargate;
 import net.knarcraft.stargate.container.RelativeBlockVector;
+import net.knarcraft.stargate.portal.property.gate.GateHandler;
+import net.knarcraft.stargate.portal.property.gate.GateLayout;
 import org.bukkit.Material;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;