Updates README and version

Moves some teleportation code to the TeleportHelper class
Changes some teleportation method names
Tries to reduce some code duplication between teleporters
Recursively teleports entities to make sure the teleported entity will arrive in the same shape it entered as
Makes player checks for teleported vehicles account for any number of players riding any entity in the stack

README.md

@@ -15,6 +15,10 @@ can share a network or be split into clusters; they can be hidden on a network o
 - **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
+- **Color customization** -- Stargate signs can be colored in many ways. Colors can be set globally, or on a per sign
+  type basis
+- **RGB and dye support** -- Signs can use RGB colors (using hex codes) as their main and highlighting colors, and can
+  also be dyed on a per-sign basis
 
 ## Background
 
@@ -85,6 +89,7 @@ stargate.admin -- Allow all admin features (Hidden/Private bypass, BungeeCord, R
   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
+  stargate.admin.dye -- Allows this player to change the dye of any stargate's sign
 ```
 
 ## Default Permissions
@@ -301,11 +306,13 @@ folders:
 gates:
   maxGatesEachNetwork - If non-zero, will define the maximum amount of gates allowed on any network.
   defaultGateNetwork - The default gate network
+  exitVelocity - The velocity to give players exiting stargates, relative to the entry velocity (1 = same as entry velocity)
   cosmetic:
     rememberDestination - Whether to set the first destination as the last used destination for all gates
     sortNetworkDestinations - If true, network lists will be sorted alphabetically.
-    mainSignColor - This allows you to specify the color of the gate signs.
-    highlightSignColor - This allows you to specify the color of the sign markings.
+    mainSignColor - This allows you to specify the color of the gate signs. Use a color code such as WHITE,BLACK,YELLOW or a hex color code such as '#ed76d9'. You need quotes around hex color codes.
+    highlightSignColor - This allows you to specify the color of the sign markings. Use a color code such as WHITE,BLACK,YELLOW or a hex color code such as '#ed76d9'. You need quotes around hex color codes.
+    perSignColors: - A list of per-sign color specifications. Format: "SIGN_TYPE:mainColor,highlight_color". The SIGN_TYPE is OAK for an oak sign, DARK_OAK for a dark oak sign and so on. The colors can be "default" to use the color specified in "mainSignColor" or "highlightSignColor", "inverted" to use the inverse color of the default color, a normal color such as BLACK,WHITE,YELLOW or a hex color code such as #ed76d9.
   integrity:
     destroyedByExplosion - Whether to destroy a stargate with explosions, or stop an explosion if it contains a gates controls.
     verifyPortals - Whether or not all the non-sign blocks are checked to match the gate layout when an old stargate is loaded at startup.
@@ -317,6 +324,7 @@ gates:
     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.
+    enableCraftBookRemoveOnEjectFix - Whether to enable a fix that causes loss of NBT data, but allows vehicle teleportation to work when CraftBook's remove minecart/boat on eject setting is enabled
 economy:
   useEconomy - Whether or not to enable Economy using Vault (must have the Vault plugin)
   createCost - The cost to create a stargate
@@ -329,6 +337,8 @@ economy:
 debugging:
   debug - Whether to show massive debug output
   permissionDebug - Whether to show massive permission debug output
+advanced:
+  waitForPlayerAfterTeleportDelay - The amount of ticks to wait before adding a player as passenger of a vehicle. On slow servers, a value of 6 is required to avoid client glitches after teleporting on a vehicle.
 ```
 
 # Message Customization
@@ -390,6 +400,47 @@ portalInfoServer=Server: %server%
 
 # Changes
 
+#### \[Version 0.9.3.5] EpicKnarvik97 fork
+
+- Fixes the wait for player delay being too low by default
+- Performs some minor code optimizations and restructuring
+
+#### \[Version 0.9.3.4] EpicKnarvik97 fork
+
+- Includes passengers of passengers when teleporting entities
+- Fixes a bug which caused Stargate to use more CPU for no reason
+- Teleports boats/minecarts like other vehicles unless *enableCraftBookRemoveOnEjectFix* is enabled
+- Adds the *waitForPlayerAfterTeleportDelay* config option which allows changing the delay between vehicle teleportation
+  and the player being teleported to the vehicle
+- Makes boats keep their wood type even when re-created
+
+#### \[Version 0.9.3.3] EpicKnarvik97 fork
+
+- Prevents Zombified Piglins from randomly spawning at Stargates
+
+#### \[Version 0.9.3.2] EpicKnarvik97 fork
+
+- Adds a config option to set the exit velocity of any players exiting a stargate
+- Adjusts vehicle teleportation a bit to prevent passengers' exit rotation from being wrong
+- Improves the checking for buggy double-clicks on non-button blocks
+
+#### \[Version 0.9.3.1] EpicKnarvik97 fork
+
+- Ignores the type of air when checking if a stargate is valid
+
+#### \[Version 0.9.3.0] EpicKnarvik97 fork
+
+- Adds support for RGB colors (use hex color codes)
+- Adds support for dyed and glowing signs
+- Adds support for specifying sign colors per sign type
+- Adds a tab-completable config sub-command for easily changing per-sign colors
+- Allows a per-sign color to be set as the inverse of the default color of the given type
+
+#### \[Version 0.9.2.5] EpicKnarvik97 fork
+
+- Updates Java version to JDK 17
+- Updates Spigot API version to 1.18
+
 #### \[Version 0.9.2.4] EpicKnarvik97 fork
 
 - Adds update checking, which will display a notice in the console when updates are available

pom.xml

@@ -4,7 +4,7 @@
 
     <groupId>net.knarcraft</groupId>
     <artifactId>Stargate</artifactId>
-    <version>0.9.2.4</version>
+    <version>0.9.3.5</version>
 
     <licenses>
         <license>
@@ -15,8 +15,8 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>16</maven.compiler.source>
-        <maven.compiler.target>16</maven.compiler.target>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
     </properties>
 
     <repositories>
@@ -34,7 +34,7 @@
         <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot-api</artifactId>
-            <version>1.17.1-R0.1-SNAPSHOT</version>
+            <version>1.18.1-R0.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>net.milkbowl.vault</groupId>
@@ -44,25 +44,25 @@
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-api</artifactId>
-            <version>5.8.0-M1</version>
+            <version>5.8.2</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>com.github.seeseemelk</groupId>
-            <artifactId>MockBukkit-v1.17</artifactId>
-            <version>1.7.0</version>
+            <artifactId>MockBukkit-v1.18</artifactId>
+            <version>1.15.5</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.jetbrains</groupId>
             <artifactId>annotations</artifactId>
-            <version>19.0.0</version>
+            <version>22.0.0</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.13.1</version>
+            <version>4.13.2</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -75,8 +75,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.6.1</version>
                 <configuration>
-                    <source>16</source>
-                    <target>16</target>
+                    <source>17</source>
+                    <target>17</target>
                 </configuration>
             </plugin>
         </plugins>

src/main/java/net/knarcraft/stargate/Stargate.java

@@ -10,6 +10,7 @@ import net.knarcraft.stargate.container.BlockChangeRequest;
 import net.knarcraft.stargate.container.ChunkUnloadRequest;
 import net.knarcraft.stargate.listener.BlockEventListener;
 import net.knarcraft.stargate.listener.EntityEventListener;
+import net.knarcraft.stargate.listener.EntitySpawnListener;
 import net.knarcraft.stargate.listener.PlayerEventListener;
 import net.knarcraft.stargate.listener.PluginEventListener;
 import net.knarcraft.stargate.listener.PortalEventListener;
@@ -44,18 +45,14 @@ import java.util.logging.Logger;
 @SuppressWarnings("unused")
 public class Stargate extends JavaPlugin {
 
-    //Used for changing gate open/closed material.
     private static final Queue<BlockChangeRequest> blockChangeRequestQueue = new LinkedList<>();
     private static final Queue<ChunkUnloadRequest> chunkUnloadQueue = new PriorityQueue<>();
 
     private static Logger logger;
     private static Stargate stargate;
-
     private static String pluginVersion;
-
     private static PluginManager pluginManager;
     private static StargateConfig stargateConfig;
-
     private static String updateAvailable = null;
 
     /**
@@ -339,6 +336,9 @@ public class Stargate extends JavaPlugin {
         PluginDescriptionFile pluginDescriptionFile = this.getDescription();
         pluginManager = getServer().getPluginManager();
         FileConfiguration newConfig = this.getConfig();
+        this.saveDefaultConfig();
+        newConfig.options().copyDefaults(true);
+
         logger = Logger.getLogger("Minecraft");
         Server server = getServer();
         stargate = this;
@@ -385,6 +385,7 @@ public class Stargate extends JavaPlugin {
         pluginManager.registerEvents(new WorldEventListener(), this);
         pluginManager.registerEvents(new PluginEventListener(this), this);
         pluginManager.registerEvents(new TeleportEventListener(), this);
+        pluginManager.registerEvents(new EntitySpawnListener(), this);
     }
 
     /**
@@ -425,4 +426,5 @@ public class Stargate extends JavaPlugin {
     public static StargateConfig getStargateConfig() {
         return stargateConfig;
     }
+
 }

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

@@ -1,7 +1,7 @@
 package net.knarcraft.stargate.command;
 
 import net.knarcraft.stargate.Stargate;
-import org.bukkit.ChatColor;
+import net.md_5.bungee.api.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
@@ -23,8 +23,9 @@ public class CommandAbout implements CommandExecutor {
         commandSender.sendMessage(textColor + "Go to " + highlightColor +
                 "https://git.knarcraft.net/EpicKnarvik97/Stargate " + textColor + "for the official repository");
         String author = Stargate.getStargateConfig().getLanguageLoader().getString("author");
-        if (!author.isEmpty())
+        if (!author.isEmpty()) {
             commandSender.sendMessage(textColor + "Language created by " + highlightColor + author);
+        }
         return true;
     }
 

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

@@ -3,10 +3,13 @@ package net.knarcraft.stargate.command;
 import net.knarcraft.stargate.Stargate;
 import net.knarcraft.stargate.config.ConfigOption;
 import net.knarcraft.stargate.config.ConfigTag;
+import net.knarcraft.stargate.config.OptionDataType;
 import net.knarcraft.stargate.portal.Portal;
 import net.knarcraft.stargate.portal.PortalRegistry;
 import net.knarcraft.stargate.portal.PortalSignDrawer;
-import org.bukkit.ChatColor;
+import net.md_5.bungee.api.ChatColor;
+import org.apache.commons.lang.StringUtils;
+import org.bukkit.Material;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
@@ -14,6 +17,9 @@ import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * This command represents the config command for changing config values
  */
@@ -35,7 +41,11 @@ public class CommandConfig implements CommandExecutor {
                 return false;
             }
             if (args.length > 1) {
-                updateConfigValue(selectedOption, commandSender, args[1]);
+                if (selectedOption.getDataType() == OptionDataType.STRING_LIST) {
+                    updateListConfigValue(selectedOption, commandSender, args);
+                } else {
+                    updateConfigValue(selectedOption, commandSender, args[1]);
+                }
             } else {
                 //Display info and the current value of the given config value
                 printConfigOptionValue(commandSender, selectedOption);
@@ -61,7 +71,7 @@ public class CommandConfig implements CommandExecutor {
         //Validate any sign colors
         if (ConfigTag.COLOR.isTagged(selectedOption)) {
             try {
-                ChatColor.valueOf(value.toUpperCase());
+                ChatColor.of(value.toUpperCase());
             } catch (IllegalArgumentException | NullPointerException ignored) {
                 commandSender.sendMessage(ChatColor.RED + "Invalid color given");
                 return;
@@ -70,14 +80,7 @@ public class CommandConfig implements CommandExecutor {
 
         //Store the config values, accounting for the data type
         switch (selectedOption.getDataType()) {
-            case BOOLEAN -> {
-                boolean newValue = Boolean.parseBoolean(value);
-                if (selectedOption == ConfigOption.ENABLE_BUNGEE && newValue != Stargate.getGateConfig().enableBungee()) {
-                    Stargate.getStargateConfig().startStopBungeeListener(newValue);
-                }
-                Stargate.getStargateConfig().getConfigOptionsReference().put(selectedOption, newValue);
-                configuration.set(selectedOption.getConfigNode(), newValue);
-            }
+            case BOOLEAN -> updateBooleanConfigValue(selectedOption, value, configuration);
             case INTEGER -> {
                 Integer intValue = getInteger(commandSender, selectedOption, value);
                 if (intValue == null) {
@@ -87,23 +90,17 @@ public class CommandConfig implements CommandExecutor {
                     configuration.set(selectedOption.getConfigNode(), intValue);
                 }
             }
+            case DOUBLE -> {
+                Double doubleValue = getDouble(commandSender, selectedOption, value);
+                if (doubleValue == null) {
+                    return;
+                } else {
+                    Stargate.getStargateConfig().getConfigOptionsReference().put(selectedOption, doubleValue);
+                    configuration.set(selectedOption.getConfigNode(), doubleValue);
+                }
+            }
             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;
-                    }
-                }
-                if (ConfigTag.COLOR.isTagged(selectedOption)) {
-                    if (!registerColor(selectedOption, value, commandSender)) {
-                        return;
-                    }
-                }
-                if (selectedOption == ConfigOption.LANGUAGE) {
-                    Stargate.getStargateConfig().getLanguageLoader().setChosenLanguage(value);
-                }
-                Stargate.getStargateConfig().getConfigOptionsReference().put(selectedOption, value);
+                updateStringConfigValue(selectedOption, commandSender, value);
                 configuration.set(selectedOption.getConfigNode(), value);
             }
             default -> {
@@ -112,6 +109,149 @@ public class CommandConfig implements CommandExecutor {
             }
         }
 
+        saveAndReload(selectedOption, commandSender);
+    }
+
+    /**
+     * Updates a boolean config value
+     *
+     * @param selectedOption <p>The option which should be updated</p>
+     * @param value          <p>The new value of the config option</p>
+     * @param configuration  <p>The configuration file to save to</p>
+     */
+    private void updateBooleanConfigValue(ConfigOption selectedOption, String value, FileConfiguration configuration) {
+        boolean newValue = Boolean.parseBoolean(value);
+        if (selectedOption == ConfigOption.ENABLE_BUNGEE && newValue != Stargate.getGateConfig().enableBungee()) {
+            Stargate.getStargateConfig().startStopBungeeListener(newValue);
+        }
+        Stargate.getStargateConfig().getConfigOptionsReference().put(selectedOption, newValue);
+        configuration.set(selectedOption.getConfigNode(), newValue);
+    }
+
+    /**
+     * Updates a string 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 updateStringConfigValue(ConfigOption selectedOption, CommandSender commandSender, String value) {
+        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;
+            }
+        }
+        if (ConfigTag.COLOR.isTagged(selectedOption)) {
+            if (!registerColor(selectedOption, value, commandSender)) {
+                return;
+            }
+        }
+        if (selectedOption == ConfigOption.LANGUAGE) {
+            Stargate.getStargateConfig().getLanguageLoader().setChosenLanguage(value);
+        }
+        Stargate.getStargateConfig().getConfigOptionsReference().put(selectedOption, value);
+    }
+
+    /**
+     * 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 arguments      <p>The arguments for the new config option</p>
+     */
+    private void updateListConfigValue(ConfigOption selectedOption, CommandSender commandSender, String[] arguments) {
+        FileConfiguration configuration = Stargate.getInstance().getConfig();
+
+        if (selectedOption == ConfigOption.PER_SIGN_COLORS) {
+            if (arguments.length < 4) {
+                Stargate.getMessageSender().sendErrorMessage(commandSender, "Usage: /sg config perSignColors " +
+                        "<SIGN_TYPE> <MAIN_COLOR> <HIGHLIGHTING_COLOR>");
+                return;
+            }
+
+            String colorString = parsePerSignColorInput(commandSender, arguments);
+            if (colorString == null) {
+                return;
+            }
+
+            //Update the per-sign colors according to input
+            updatePerSignColors(arguments[1], colorString, configuration);
+        }
+
+        saveAndReload(selectedOption, commandSender);
+    }
+
+    /**
+     * Parses the input given for changing the per-color string
+     *
+     * @param commandSender <p>The command sender that triggered the command</p>
+     * @param arguments     <p>The arguments given by the user</p>
+     * @return <p>The per-sign color string to update with, or null if the input was invalid</p>
+     */
+    private String parsePerSignColorInput(CommandSender commandSender, String[] arguments) {
+        //Make sure the sign type is an actual sign
+        if (Material.matchMaterial(arguments[1] + "_SIGN") == null) {
+            Stargate.getMessageSender().sendErrorMessage(commandSender, "The given sign type is invalid");
+            return null;
+        }
+        String colorString = arguments[1] + ":";
+
+        //Validate the colors given by the user
+        String[] errorMessage = new String[]{"The given main sign color is invalid!", "The given highlight sign color is invalid!"};
+        String[] newColors = new String[2];
+        for (int i = 0; i < 2; i++) {
+            if (validatePerSignColor(arguments[i + 2])) {
+                newColors[i] = arguments[i + 2];
+            } else {
+                Stargate.getMessageSender().sendErrorMessage(commandSender, errorMessage[i]);
+                return null;
+            }
+        }
+        colorString += String.join(",", newColors);
+        return colorString;
+    }
+
+    /**
+     * Updates the per-sign colors with the given input
+     *
+     * @param signType      <p>The sign type that is updated</p>
+     * @param colorString   <p>The new color string to replace any previous value with</p>
+     * @param configuration <p>The file configuration to update with the new per-sign colors</p>
+     */
+    private void updatePerSignColors(String signType, String colorString, FileConfiguration configuration) {
+        List<String> newColorStrings = new ArrayList<>();
+        List<?> oldColors = (List<?>) Stargate.getStargateConfig().getConfigOptionsReference().get(ConfigOption.PER_SIGN_COLORS);
+        for (Object object : oldColors) {
+            newColorStrings.add(String.valueOf(object));
+        }
+        newColorStrings.removeIf((item) -> item.startsWith(signType));
+        newColorStrings.add(colorString);
+
+        Stargate.getStargateConfig().getConfigOptionsReference().put(ConfigOption.PER_SIGN_COLORS, newColorStrings);
+        configuration.set(ConfigOption.PER_SIGN_COLORS.getConfigNode(), newColorStrings);
+    }
+
+    /**
+     * Tries to validate one of the colors given when changing per-sign colors
+     *
+     * @param color <p>The color chosen by the user</p>
+     * @return <p>True if the given color is valid</p>
+     */
+    private boolean validatePerSignColor(String color) {
+        ChatColor newHighlightColor = parseColor(color);
+        return newHighlightColor != null || color.equalsIgnoreCase("default") ||
+                color.equalsIgnoreCase("inverted");
+    }
+
+    /**
+     * Saves the configuration file and reloads as necessary
+     *
+     * @param selectedOption <p>The config option that was changed</p>
+     * @param commandSender  <p>The command sender that executed the config command</p>
+     */
+    private void saveAndReload(ConfigOption selectedOption, CommandSender commandSender) {
         //Save the config file and reload if necessary
         Stargate.getInstance().saveConfig();
 
@@ -153,7 +293,7 @@ public class CommandConfig implements CommandExecutor {
      */
     private ChatColor parseColor(String value) {
         try {
-            return ChatColor.valueOf(value.toUpperCase());
+            return ChatColor.of(value.toUpperCase());
         } catch (IllegalArgumentException | NullPointerException ignored) {
             return null;
         }
@@ -183,6 +323,30 @@ public class CommandConfig implements CommandExecutor {
         }
     }
 
+    /**
+     * Gets a double from a string
+     *
+     * @param commandSender  <p>The command sender that sent the config command</p>
+     * @param selectedOption <p>The option the command sender is trying to change</p>
+     * @param value          <p>The value given</p>
+     * @return <p>A double, or null if it was invalid</p>
+     */
+    private Double getDouble(CommandSender commandSender, ConfigOption selectedOption, String value) {
+        try {
+            double doubleValue = Double.parseDouble(value);
+
+            if (selectedOption == ConfigOption.EXIT_VELOCITY && doubleValue < 0) {
+                commandSender.sendMessage(ChatColor.RED + "This config option cannot be negative.");
+                return null;
+            }
+
+            return doubleValue;
+        } catch (NumberFormatException exception) {
+            commandSender.sendMessage(ChatColor.RED + "Invalid number given");
+            return null;
+        }
+    }
+
     /**
      * Reloads the config if necessary
      *
@@ -193,20 +357,27 @@ public class CommandConfig implements CommandExecutor {
         if (ConfigTag.requiresFullReload(configOption)) {
             //Reload everything
             Stargate.getStargateConfig().reload(commandSender);
-        } else if (ConfigTag.requiresPortalReload(configOption)) {
-            //Just unload and reload the portals
-            Stargate.getStargateConfig().unloadAllPortals();
-            Stargate.getStargateConfig().loadAllPortals();
-        } else if (ConfigTag.requiresLanguageReload(configOption)) {
-            //Reload the language loader
-            Stargate.getStargateConfig().getLanguageLoader().reload();
-            //Re-draw all portal signs
-            for (Portal portal : PortalRegistry.getAllPortals()) {
-                portal.drawSign();
+        } else {
+            if (ConfigTag.requiresColorReload(configOption)) {
+                Stargate.getStargateConfig().getStargateGateConfig().loadPerSignColors();
+            }
+            if (ConfigTag.requiresPortalReload(configOption)) {
+                //Just unload and reload the portals
+                Stargate.getStargateConfig().unloadAllPortals();
+                Stargate.getStargateConfig().loadAllPortals();
+            }
+            if (ConfigTag.requiresLanguageReload(configOption)) {
+                //Reload the language loader
+                Stargate.getStargateConfig().getLanguageLoader().reload();
+                //Re-draw all portal signs
+                for (Portal portal : PortalRegistry.getAllPortals()) {
+                    portal.drawSign();
+                }
+            }
+            if (ConfigTag.requiresEconomyReload(configOption)) {
+                //Load or unload Vault and Economy as necessary
+                Stargate.getStargateConfig().reloadEconomy();
             }
-        } else if (ConfigTag.requiresEconomyReload(configOption)) {
-            //Load or unload Vault and Economy as necessary
-            Stargate.getStargateConfig().reloadEconomy();
         }
     }
 
@@ -242,8 +413,13 @@ public class CommandConfig implements CommandExecutor {
      * @return <p>A string describing the config option</p>
      */
     private String getOptionDescription(ConfigOption option) {
+        Object defaultValue = option.getDefaultValue();
+        String stringValue = String.valueOf(defaultValue);
+        if (option.getDataType() == OptionDataType.STRING_LIST) {
+            stringValue = "[" + StringUtils.join((String[]) defaultValue, ",") + "]";
+        }
         return ChatColor.GOLD + option.getName() + ChatColor.WHITE + " - " + ChatColor.GREEN + option.getDescription() +
-                ChatColor.DARK_GRAY + " (Default: " + ChatColor.GRAY + option.getDefaultValue() + ChatColor.DARK_GRAY + ")";
+                ChatColor.DARK_GRAY + " (Default: " + ChatColor.GRAY + stringValue + ChatColor.DARK_GRAY + ")";
     }
 
 }

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

@@ -1,8 +1,8 @@
 package net.knarcraft.stargate.command;
 
 import net.knarcraft.stargate.Stargate;
+import net.md_5.bungee.api.ChatColor;
 import org.apache.commons.lang.ArrayUtils;
-import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
@@ -35,4 +35,5 @@ public class CommandStarGate implements CommandExecutor {
             return true;
         }
     }
+
 }

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

@@ -2,7 +2,9 @@ package net.knarcraft.stargate.command;
 
 import net.knarcraft.stargate.config.ConfigOption;
 import net.knarcraft.stargate.config.OptionDataType;
-import org.bukkit.ChatColor;
+import net.md_5.bungee.api.ChatColor;
+import org.bukkit.Material;
+import org.bukkit.Tag;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.TabCompleter;
@@ -17,15 +19,27 @@ import java.util.List;
  */
 public class ConfigTabCompleter implements TabCompleter {
 
+    private List<String> signTypes;
+    private List<String> booleans;
+    private List<String> integers;
+    private List<String> chatColors;
+    private List<String> languages;
+    private List<String> extendedColors;
+    private List<String> doubles;
+
     @Nullable
     @Override
     public List<String> onTabComplete(@NotNull CommandSender commandSender, @NotNull Command command, @NotNull String s,
                                       @NotNull String[] args) {
-
+        if (signTypes == null || booleans == null || integers == null || chatColors == null || languages == null) {
+            initializeAutoCompleteLists();
+        }
         if (args.length > 1) {
             ConfigOption selectedOption = ConfigOption.getByName(args[0]);
             if (selectedOption == null) {
                 return new ArrayList<>();
+            } else if (selectedOption.getDataType() == OptionDataType.STRING_LIST) {
+                return getPossibleStringListOptionValues(selectedOption, args);
             } else {
                 return getPossibleOptionValues(selectedOption, args[1]);
             }
@@ -63,18 +77,10 @@ public class ConfigTabCompleter implements TabCompleter {
      * @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);
+                return filterMatching(languages, typedText);
             case GATE_FOLDER:
             case PORTAL_FOLDER:
             case DEFAULT_GATE_NETWORK:
@@ -88,7 +94,7 @@ public class ConfigTabCompleter implements TabCompleter {
             case HIGHLIGHT_SIGN_COLOR:
             case FREE_GATES_COLOR:
                 //Return all colors
-                return filterMatching(getColors(), typedText);
+                return filterMatching(chatColors, typedText);
         }
 
         //If the config value is a boolean, show the two boolean values
@@ -99,73 +105,53 @@ public class ConfigTabCompleter implements TabCompleter {
         //If the config value is an integer, display some valid numbers
         if (selectedOption.getDataType() == OptionDataType.INTEGER) {
             if (typedText.trim().isEmpty()) {
-                return numbers;
+                return integers;
             } else {
                 return new ArrayList<>();
             }
         }
 
+        //If the config value is a double, display some valid numbers
+        if (selectedOption.getDataType() == OptionDataType.DOUBLE) {
+            if (typedText.trim().isEmpty()) {
+                return doubles;
+            } else {
+                return new ArrayList<>();
+            }
+        }
         return null;
     }
 
     /**
-     * Gets all available languages
+     * Get possible values for the selected string list option
      *
-     * @return <p>The available languages</p>
+     * @param selectedOption <p>The selected option</p>
+     * @param args           <p>The arguments given by the user</p>
+     * @return <p>Some or all of the valid values for the option</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());
+    private List<String> getPossibleStringListOptionValues(ConfigOption selectedOption, String[] args) {
+        if (selectedOption == ConfigOption.PER_SIGN_COLORS) {
+            return getPerSignColorCompletion(args);
+        } else {
+            return null;
         }
-        return colors;
     }
 
     /**
-     * Gets a list of all available chat colors
+     * Gets the tab completion values for completing the per-sign color text
      *
-     * @return <p>A list of chat colors</p>
+     * @param args <p>The arguments given by the user</p>
+     * @return <p>The options to give the user</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;
+    private List<String> getPerSignColorCompletion(String[] args) {
+        if (args.length < 3) {
+            return filterMatching(signTypes, args[1]);
+        } else if (args.length < 4) {
+            return filterMatching(extendedColors, args[2]);
+        } else if (args.length < 5) {
+            return filterMatching(extendedColors, args[3]);
+        }
+        return new ArrayList<>();
     }
 
     /**
@@ -180,4 +166,84 @@ public class ConfigTabCompleter implements TabCompleter {
         return list;
     }
 
+    /**
+     * Initializes all lists of auto-completable values
+     */
+    private void initializeAutoCompleteLists() {
+        booleans = new ArrayList<>();
+        booleans.add("true");
+        booleans.add("false");
+
+        integers = new ArrayList<>();
+        integers.add("0");
+        integers.add("5");
+
+        signTypes = new ArrayList<>();
+        for (Material material : Material.values()) {
+            if (Tag.STANDING_SIGNS.isTagged(material)) {
+                signTypes.add(material.toString().replace("_SIGN", ""));
+            }
+        }
+
+        getColors();
+        initializeLanguages();
+
+        extendedColors = new ArrayList<>(chatColors);
+        extendedColors.add("default");
+        extendedColors.add("inverted");
+
+        doubles = new ArrayList<>();
+        doubles.add("5");
+        doubles.add("1");
+        doubles.add("0.5");
+        doubles.add("0.1");
+    }
+
+
+    /**
+     * Initializes the list of chat colors
+     */
+    private void getColors() {
+        chatColors = new ArrayList<>();
+        for (ChatColor color : getChatColors()) {
+            chatColors.add(color.getName());
+        }
+    }
+
+    /**
+     * Gets available chat colors
+     *
+     * @return <p>The available chat colors</p>
+     */
+    private List<ChatColor> getChatColors() {
+        List<ChatColor> chatColors = new ArrayList<>();
+        char[] colors = new char[]{'a', 'b', 'c', 'd', 'e', 'f', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9'};
+        for (char color : colors) {
+            chatColors.add(ChatColor.getByChar(color));
+        }
+        chatColors.add(ChatColor.of("#ed76d9"));
+        chatColors.add(ChatColor.of("#ffecb7"));
+        return chatColors;
+    }
+
+    /**
+     * Initializes the list of all available languages
+     */
+    private void initializeLanguages() {
+        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");
+        //TODO: Generate this list dynamically by listing the language files in the jar and adding the user's custom 
+        // language files
+    }
+
 }

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

@@ -50,6 +50,13 @@ public enum ConfigOption {
      */
     HIGHLIGHT_SIGN_COLOR("gates.cosmetic.highlightSignColor", "The text color used for highlighting stargate signs", "WHITE"),
 
+    /**
+     * The colors to use for each type of sign
+     */
+    PER_SIGN_COLORS("gates.cosmetic.perSignColors", "The per-sign color specification", new String[]{
+            "'ACACIA:default,default'", "'BIRCH:default,default'", "'CRIMSON:inverted,inverted'", "'DARK_OAK:inverted,inverted'",
+            "'JUNGLE:default,default'", "'OAK:default,default'", "'SPRUCE:inverted,inverted'", "'WARPED:inverted,inverted'"}),
+
     /**
      * Whether to destroy portals when any blocks are broken by explosions
      */
@@ -98,6 +105,20 @@ public enum ConfigOption {
     HANDLE_LEASHED_CREATURES("gates.functionality.handleLeashedCreatures",
             "Whether to enable players to teleport a creature on a leash", true),
 
+    /**
+     * Whether to enable a fix that makes teleportation of minecarts/boats work even with craftbook's vehicle removal
+     */
+    ENABLE_CRAFT_BOOK_REMOVE_ON_EJECT_FIX("gates.functionality.enableCraftBookRemoveOnEjectFix",
+            "Whether to enable a fix that causes loss of NBT data, but allows vehicle teleportation to work " +
+                    "when CraftBook's remove minecart/boat on eject setting is enabled", false),
+
+    /**
+     * The delay between teleporting a vehicle and adding the player as passenger
+     */
+    WAIT_FOR_PLAYER_AFTER_TELEPORT_DELAY("advanced.waitForPlayerAfterTeleportDelay",
+            "The amount of ticks to wait before adding a player as passenger of a vehicle. On slow servers, " +
+                    "a value of 6 is required to avoid client glitches after teleporting on a vehicle.", 6),
+
     /**
      * Whether to enable economy support for taking payment from players creating/destroying/using stargates
      */
@@ -152,8 +173,12 @@ public enum ConfigOption {
     /**
      * Whether to alert admins about new updates
      */
-    ADMIN_UPDATE_ALERT("adminUpdateAlert", "Whether to alert admins about new plugin updates", true);
+    ADMIN_UPDATE_ALERT("adminUpdateAlert", "Whether to alert admins about new plugin updates", true),
 
+    /**
+     * The velocity of players exiting a stargate, relative to the entry velocity
+     */
+    EXIT_VELOCITY("gates.exitVelocity", "The velocity of players exiting stargates, relative to the entry velocity", 0.1D);
 
     private final String configNode;
     private final String description;
@@ -172,14 +197,18 @@ public enum ConfigOption {
         this.description = description;
         this.defaultValue = defaultValue;
 
-        if (defaultValue instanceof String) {
+        if (defaultValue instanceof String[]) {
+            this.dataType = OptionDataType.STRING_LIST;
+        } else 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 if (defaultValue instanceof Double) {
+            this.dataType = OptionDataType.DOUBLE;
         } else {
-            throw new IllegalArgumentException("Unknown config data type encountered.");
+            throw new IllegalArgumentException("Unknown config data type encountered: " + defaultValue);
         }
     }
 

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

@@ -7,7 +7,8 @@ import java.util.Arrays;
  */
 public enum ConfigTag {
 
-    COLOR(new ConfigOption[]{ConfigOption.FREE_GATES_COLOR, ConfigOption.MAIN_SIGN_COLOR, ConfigOption.HIGHLIGHT_SIGN_COLOR}),
+    COLOR(new ConfigOption[]{ConfigOption.FREE_GATES_COLOR, ConfigOption.MAIN_SIGN_COLOR,
+            ConfigOption.HIGHLIGHT_SIGN_COLOR, ConfigOption.PER_SIGN_COLORS}),
     FOLDER(new ConfigOption[]{ConfigOption.GATE_FOLDER, ConfigOption.PORTAL_FOLDER});
 
     private final ConfigOption[] taggedOptions;
@@ -31,6 +32,16 @@ public enum ConfigTag {
         return Arrays.stream(taggedOptions).anyMatch((item) -> item == option);
     }
 
+    /**
+     * Checks whether a given config option requires a "reload of colors" to take effect
+     *
+     * @param configOption <p>The config option to check</p>
+     * @return <p>True if changing the config option requires a "reload of colors" to take effect</p>
+     */
+    public static boolean requiresColorReload(ConfigOption configOption) {
+        return (COLOR.isTagged(configOption) && configOption != ConfigOption.FREE_GATES_COLOR);
+    }
+
     /**
      * Checks whether a given config option requires a full reload to take effect
      *

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

@@ -4,8 +4,8 @@ import net.knarcraft.stargate.Stargate;
 import net.knarcraft.stargate.portal.PortalSignDrawer;
 import net.knarcraft.stargate.portal.property.gate.Gate;
 import net.knarcraft.stargate.utility.PermissionHelper;
+import net.md_5.bungee.api.ChatColor;
 import net.milkbowl.vault.economy.Economy;
-import org.bukkit.ChatColor;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.PluginManager;
@@ -33,7 +33,7 @@ public final class EconomyConfig {
         this.configOptions = configOptions;
         try {
             String freeColor = (String) configOptions.get(ConfigOption.FREE_GATES_COLOR);
-            PortalSignDrawer.setFreeColor(ChatColor.valueOf(freeColor.toUpperCase()));
+            PortalSignDrawer.setFreeColor(ChatColor.of(freeColor.toUpperCase()));
         } catch (IllegalArgumentException | NullPointerException ignored) {
             PortalSignDrawer.setFreeColor(ChatColor.DARK_GREEN);
         }

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

@@ -1,6 +1,6 @@
 package net.knarcraft.stargate.config;
 
-import org.bukkit.ChatColor;
+import net.md_5.bungee.api.ChatColor;
 import org.bukkit.command.CommandSender;
 
 /**

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

@@ -6,16 +6,28 @@ package net.knarcraft.stargate.config;
 public enum OptionDataType {
 
     /**
-     * The data type for the option is a String
+     * The data type if the option is a String
      */
     STRING,
+
     /**
-     * The data type for the option is a Boolean
+     * The data type if the option is a Boolean
      */
     BOOLEAN,
+
     /**
-     * The data type for the option is an Integer
+     * The data type if the option is a string list
      */
-    INTEGER
+    STRING_LIST,
+
+    /**
+     * The data type if the option is an Integer
+     */
+    INTEGER,
+
+    /**
+     * The data type if the option is a double
+     */
+    DOUBLE
 
 }

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

@@ -351,12 +351,14 @@ public final class StargateConfig {
 
             //Load the option using its correct data type
             switch (option.getDataType()) {
+                case STRING_LIST -> optionValue = newConfig.getStringList(configNode);
                 case STRING -> {
                     String value = newConfig.getString(configNode);
                     optionValue = value != null ? value.trim() : "";
                 }
                 case BOOLEAN -> optionValue = newConfig.getBoolean(configNode);
                 case INTEGER -> optionValue = newConfig.getInt(configNode);
+                case DOUBLE -> optionValue = newConfig.getDouble(configNode);
                 default -> throw new IllegalArgumentException("Invalid config data type encountered");
             }
             configOptions.put(option, optionValue);
@@ -518,4 +520,5 @@ public final class StargateConfig {
     public LanguageLoader getLanguageLoader() {
         return languageLoader;
     }
+
 }

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

@@ -2,14 +2,21 @@ package net.knarcraft.stargate.config;
 
 import net.knarcraft.stargate.Stargate;
 import net.knarcraft.stargate.portal.PortalSignDrawer;
-import org.bukkit.ChatColor;
+import net.knarcraft.stargate.utility.ColorHelper;
+import net.md_5.bungee.api.ChatColor;
+import org.bukkit.Color;
+import org.bukkit.Material;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
  * The Stargate gate config keeps track of all global config values related to gates
  */
 public final class StargateGateConfig {
+
     private static final int activeTime = 10;
     private static final int openTime = 10;
     private final Map<ConfigOption, Object> configOptions;
@@ -119,6 +126,29 @@ public final class StargateGateConfig {
         return (boolean) configOptions.get(ConfigOption.HANDLE_LEASHED_CREATURES);
     }
 
+    /**
+     * Gets whether the CraftBook vehicle removal fix is enabled
+     *
+     * <p>If enabled, minecarts and boats should be re-created instead of teleported.</p>
+     *
+     * @return <p>True if the CraftBook vehicle removal fix is enabled</p>
+     */
+    public boolean enableCraftBookRemoveOnEjectFix() {
+        return (boolean) configOptions.get(ConfigOption.ENABLE_CRAFT_BOOK_REMOVE_ON_EJECT_FIX);
+    }
+
+    /**
+     * Gets the delay to use before adding a player as passenger of a teleported vehicle
+     *
+     * @return <p>The delay to use before adding a player as passenger of a teleported vehicle</p>
+     */
+    public int waitForPlayerAfterTeleportDelay() {
+        if ((int) configOptions.get(ConfigOption.WAIT_FOR_PLAYER_AFTER_TELEPORT_DELAY) < 2) {
+            configOptions.put(ConfigOption.WAIT_FOR_PLAYER_AFTER_TELEPORT_DELAY, 6);
+        }
+        return (int) configOptions.get(ConfigOption.WAIT_FOR_PLAYER_AFTER_TELEPORT_DELAY);
+    }
+
     /**
      * Gets whether the list of destinations within a network should be sorted
      *
@@ -173,13 +203,105 @@ public final class StargateGateConfig {
         return (String) configOptions.get(ConfigOption.DEFAULT_GATE_NETWORK);
     }
 
+    /**
+     * Gets the exit velocity of players using stargates, relative to the entry velocity
+     *
+     * @return <p>The relative exit velocity</p>
+     */
+    public double getExitVelocity() {
+        return (double) configOptions.get(ConfigOption.EXIT_VELOCITY);
+    }
+
     /**
      * Loads all config values related to gates
      */
     private void loadGateConfig() {
         //Load the sign colors
-        loadSignColor((String) configOptions.get(ConfigOption.MAIN_SIGN_COLOR),
-                (String) configOptions.get(ConfigOption.HIGHLIGHT_SIGN_COLOR));
+        String mainSignColor = (String) configOptions.get(ConfigOption.MAIN_SIGN_COLOR);
+        String highlightSignColor = (String) configOptions.get(ConfigOption.HIGHLIGHT_SIGN_COLOR);
+        loadPerSignColor(mainSignColor, highlightSignColor);
+        loadPerSignColors();
+    }
+
+    /**
+     * Loads the per-sign colors specified in the config file
+     */
+    public void loadPerSignColors() {
+        List<?> perSignColors = (List<?>) configOptions.get(ConfigOption.PER_SIGN_COLORS);
+        ChatColor[] defaultColors = new ChatColor[]{PortalSignDrawer.getMainColor(), PortalSignDrawer.getHighlightColor()};
+        List<Map<Material, ChatColor>> colorMaps = new ArrayList<>();
+        colorMaps.add(new HashMap<>());
+        colorMaps.add(new HashMap<>());
+
+        for (Object signColorSpecification : perSignColors) {
+            parsePerSignColors(signColorSpecification, defaultColors, colorMaps);
+        }
+
+        PortalSignDrawer.setPerSignMainColors(colorMaps.get(0));
+        PortalSignDrawer.setPerSignHighlightColors(colorMaps.get(1));
+    }
+
+    /**
+     * Parses a per-sign color specification object and stores the result
+     *
+     * @param signColorSpecification <p>The sign color specification to parse</p>
+     * @param defaultColors          <p>The specified default colors</p>
+     * @param colorMaps              <p>The list of color maps to save the resulting colors to</p>
+     */
+    private void parsePerSignColors(Object signColorSpecification, ChatColor[] defaultColors,
+                                    List<Map<Material, ChatColor>> colorMaps) {
+        String[] specificationData = String.valueOf(signColorSpecification).split(":");
+        Material[] signMaterials = new Material[]{Material.matchMaterial(specificationData[0] + "_SIGN"),
+                Material.matchMaterial(specificationData[0] + "_WALL_SIGN")};
+
+        if (specificationData.length != 2) {
+            Stargate.logWarning("You have an invalid per-sign line in your config.yml file. Please fix it!");
+            return;
+        }
+        String[] colors = specificationData[1].split(",");
+        if (colors.length != 2) {
+            Stargate.logWarning("You have an invalid per-sign line in your config.yml file. Please fix it!");
+            return;
+        }
+        for (int colorIndex = 0; colorIndex < 2; colorIndex++) {
+            if (colors[colorIndex].equalsIgnoreCase("default")) {
+                continue;
+            }
+            loadPerSignColor(colors, colorIndex, defaultColors, signMaterials, colorMaps);
+        }
+    }
+
+    /**
+     * Loads a per-sign color
+     *
+     * @param colors        <p>The colors specified in the config file</p>
+     * @param colorIndex    <p>The index of the color to load</p>
+     * @param defaultColors <p>The specified default colors</p>
+     * @param signMaterials <p>The materials to load this color for</p>
+     * @param colorMaps     <p>The list of color maps to save the resulting color to</p>
+     */
+    private void loadPerSignColor(String[] colors, int colorIndex, ChatColor[] defaultColors, Material[] signMaterials,
+                                  List<Map<Material, ChatColor>> colorMaps) {
+        ChatColor parsedColor;
+        if (colors[colorIndex].equalsIgnoreCase("inverted")) {
+            //Convert from ChatColor to awt.Color to Bukkit.Color then invert and convert to ChatColor
+            java.awt.Color color = defaultColors[colorIndex].getColor();
+            parsedColor = ColorHelper.fromColor(ColorHelper.invert(Color.fromRGB(color.getRed(), color.getGreen(),
+                    color.getBlue())));
+        } else {
+            try {
+                parsedColor = ChatColor.of(colors[colorIndex]);
+            } catch (IllegalArgumentException | NullPointerException exception) {
+                Stargate.logWarning("You have specified an invalid per-sign color in your config.yml. Custom color for \"" +
+                        signMaterials[0] + "\" disabled");
+                return;
+            }
+        }
+        if (parsedColor != null) {
+            for (Material signMaterial : signMaterials) {
+                colorMaps.get(colorIndex).put(signMaterial, parsedColor);
+            }
+        }
     }
 
     /**
@@ -187,14 +309,20 @@ public final class StargateGateConfig {
      *
      * @param mainSignColor <p>A string representing the main sign color</p>
      */
-    private void loadSignColor(String mainSignColor, String highlightSignColor) {
+    private void loadPerSignColor(String mainSignColor, String highlightSignColor) {
         try {
-            PortalSignDrawer.setMainColor(ChatColor.valueOf(mainSignColor.toUpperCase()));
-            PortalSignDrawer.setHighlightColor(ChatColor.valueOf(highlightSignColor.toUpperCase()));
+            PortalSignDrawer.setMainColor(ChatColor.of(mainSignColor.toUpperCase()));
         } catch (IllegalArgumentException | NullPointerException exception) {
-            Stargate.logWarning("You have specified an invalid color in your config.yml. Defaulting to BLACK and WHITE");
+            Stargate.logWarning("You have specified an invalid main sign color in your config.yml. Defaulting to BLACK");
             PortalSignDrawer.setMainColor(ChatColor.BLACK);
+        }
+
+        try {
+            PortalSignDrawer.setHighlightColor(ChatColor.of(highlightSignColor.toUpperCase()));
+        } catch (IllegalArgumentException | NullPointerException exception) {
+            Stargate.logWarning("You have specified an invalid highlighting sign color in your config.yml. Defaulting to WHITE");
             PortalSignDrawer.setHighlightColor(ChatColor.WHITE);
         }
     }
+
 }

src/main/java/net/knarcraft/stargate/container/RelativeBlockVector.java

@@ -58,16 +58,11 @@ public class RelativeBlockVector {
      * @return <p>A new relative block vector with the property altered</p>
      */
     public RelativeBlockVector addToVector(Property propertyToAddTo, int valueToAdd) {
-        switch (propertyToAddTo) {
-            case RIGHT:
-                return new RelativeBlockVector(this.right + valueToAdd, this.down, this.out);
-            case DOWN:
-                return new RelativeBlockVector(this.right, this.down + valueToAdd, this.out);
-            case OUT:
-                return new RelativeBlockVector(this.right, this.down, this.out + valueToAdd);
-            default:
-                throw new IllegalArgumentException("Invalid relative block vector property given");
-        }
+        return switch (propertyToAddTo) {
+            case RIGHT -> new RelativeBlockVector(this.right + valueToAdd, this.down, this.out);
+            case DOWN -> new RelativeBlockVector(this.right, this.down + valueToAdd, this.out);
+            case OUT -> new RelativeBlockVector(this.right, this.down, this.out + valueToAdd);
+        };
     }
 
     /**

src/main/java/net/knarcraft/stargate/container/SignData.java

@@ -0,0 +1,67 @@
+package net.knarcraft.stargate.container;
+
+import net.knarcraft.stargate.utility.ColorHelper;
+import net.md_5.bungee.api.ChatColor;
+import org.bukkit.DyeColor;
+import org.bukkit.block.Sign;
+
+/**
+ * A class that keeps track of the sign colors for a given sign
+ */
+public class SignData {
+
+    private final Sign sign;
+    private final ChatColor mainSignColor;
+    private final ChatColor highlightSignColor;
+    private final DyeColor dyedColor;
+
+    /**
+     * Instantiates a new sign colors object
+     *
+     * @param sign               <p>The sign the colors belong to</p>
+     * @param mainSignColor      <p>The main color to use for the sign</p>
+     * @param highlightSignColor <p>The highlighting color to use for the sign</p>
+     */
+    public SignData(Sign sign, ChatColor mainSignColor, ChatColor highlightSignColor) {
+        this.sign = sign;
+        this.mainSignColor = mainSignColor;
+        this.highlightSignColor = highlightSignColor;
+        this.dyedColor = sign.getColor();
+    }
+
+    /**
+     * Gets the sign of this sign colors object
+     *
+     * @return <p>The sign of this sign colors object</p>
+     */
+    public Sign getSign() {
+        return sign;
+    }
+
+    /**
+     * Gets the main color of the sign
+     *
+     * @return <p>The main color of the sign</p>
+     */
+    public ChatColor getMainSignColor() {
+        if (dyedColor != DyeColor.BLACK) {
+            return ColorHelper.fromColor(dyedColor.getColor());
+        } else {
+            return mainSignColor;
+        }
+    }
+
+    /**
+     * Gets the highlighting color of the sign
+     *
+     * @return <p>The highlighting color of the sign</p>
+     */
+    public ChatColor getHighlightSignColor() {
+        if (dyedColor != DyeColor.BLACK) {
+            return ColorHelper.fromColor(ColorHelper.invert(dyedColor.getColor()));
+        } else {
+            return highlightSignColor;
+        }
+    }
+
+}

src/main/java/net/knarcraft/stargate/event/StargateEntityPortalEvent.java

@@ -12,7 +12,7 @@ import org.jetbrains.annotations.NotNull;
  * <p>This event can be used to overwrite the location the entity is teleported to.</p>
  */
 @SuppressWarnings("unused")
-public class StargateEntityPortalEvent extends StargateEvent {
+public class StargateEntityPortalEvent extends StargateEvent implements StargateTeleportEvent {
 
     private static final HandlerList handlers = new HandlerList();
     final Entity travellingEntity;
@@ -58,6 +58,7 @@ public class StargateEntityPortalEvent extends StargateEvent {
      *
      * @return <p>Location of the exit point</p>
      */
+    @Override
     public Location getExit() {
         return exit;
     }

src/main/java/net/knarcraft/stargate/event/StargatePlayerPortalEvent.java

@@ -12,7 +12,7 @@ import org.jetbrains.annotations.NotNull;
  * <p>This event can be used to overwrite the location the player is teleported to.</p>
  */
 @SuppressWarnings("unused")
-public class StargatePlayerPortalEvent extends StargatePlayerEvent {
+public class StargatePlayerPortalEvent extends StargatePlayerEvent implements StargateTeleportEvent {
 
     private static final HandlerList handlers = new HandlerList();
     private final Portal destination;
@@ -47,6 +47,7 @@ public class StargatePlayerPortalEvent extends StargatePlayerEvent {
      *
      * @return <p>Location of the exit point</p>
      */
+    @Override
     public Location getExit() {
         return exit;
     }

src/main/java/net/knarcraft/stargate/event/StargateTeleportEvent.java

@@ -0,0 +1,18 @@
+package net.knarcraft.stargate.event;
+
+import org.bukkit.Location;
+import org.bukkit.event.Cancellable;
+
+/**
+ * A generic teleportation event
+ */
+public interface StargateTeleportEvent extends Cancellable {
+
+    /**
+     * Return the location of the players exit point
+     *
+     * @return <p>Location of the exit point</p>
+     */
+    Location getExit();
+
+}

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

@@ -0,0 +1,25 @@
+package net.knarcraft.stargate.listener;
+
+import net.knarcraft.stargate.Stargate;
+import net.knarcraft.stargate.portal.PortalHandler;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.entity.CreatureSpawnEvent;
+
+/**
+ * A listener that listens for any relevant events causing entities to spawn
+ */
+public class EntitySpawnListener implements Listener {
+
+    @EventHandler
+    public void onCreatureSpawn(CreatureSpawnEvent event) {
+        //Prevent Zombified Piglins and other creatures form spawning at stargates
+        if (event.getSpawnReason() == CreatureSpawnEvent.SpawnReason.NETHER_PORTAL) {
+            if (PortalHandler.getByEntrance(event.getLocation()) != null) {
+                event.setCancelled(true);
+                Stargate.debug("EntitySpawnListener", "Prevented creature from spawning at Stargate");
+            }
+        }
+    }
+
+}

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

@@ -7,14 +7,15 @@ import net.knarcraft.stargate.portal.Portal;
 import net.knarcraft.stargate.portal.PortalActivator;
 import net.knarcraft.stargate.portal.PortalHandler;
 import net.knarcraft.stargate.portal.teleporter.PlayerTeleporter;
-import net.knarcraft.stargate.portal.teleporter.Teleporter;
 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.TeleportHelper;
 import net.knarcraft.stargate.utility.UUIDMigrationHelper;
 import net.knarcraft.stargate.utility.UpdateChecker;
-import org.bukkit.ChatColor;
+import net.md_5.bungee.api.ChatColor;
+import org.bukkit.Bukkit;
 import org.bukkit.GameMode;
 import org.bukkit.block.Block;
 import org.bukkit.block.data.type.WallSign;
@@ -32,6 +33,10 @@ import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.event.player.PlayerMoveEvent;
 import org.bukkit.inventory.EquipmentSlot;
 import org.bukkit.inventory.ItemStack;
+import org.bukkit.util.Vector;
+
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * This listener listens to any player-related events related to stargates
@@ -39,8 +44,7 @@ import org.bukkit.inventory.ItemStack;
 @SuppressWarnings("unused")
 public class PlayerEventListener implements Listener {
 
-    private static long eventTime;
-    private static PlayerInteractEvent previousEvent;
+    private static final Map<Player, Long> previousEventTimes = new HashMap<>();
 
     /**
      * This event handler handles detection of any player teleporting through a bungee gate
@@ -128,10 +132,11 @@ public class PlayerEventListener implements Listener {
                 horse.setOwner(player);
             }
             //Teleport the player's vehicle
-            new VehicleTeleporter(destination, (Vehicle) playerVehicle).teleport(entrancePortal);
+            player.setVelocity(new Vector());
+            new VehicleTeleporter(destination, (Vehicle) playerVehicle).teleportEntity(entrancePortal);
         } else {
             //Just teleport the player like normal
-            new PlayerTeleporter(destination, player).teleport(entrancePortal, event);
+            new PlayerTeleporter(destination, player).teleportPlayer(entrancePortal, event);
         }
         if (!entrancePortal.getOptions().isSilent()) {
             Stargate.getMessageSender().sendSuccessMessage(player, Stargate.getString("teleportMsg"));
@@ -182,7 +187,7 @@ public class PlayerEventListener implements Listener {
         }
 
         //Make sure to check if the player has any leashed creatures, even though leashed teleportation is disabled
-        return Teleporter.noLeashedCreaturesPreventTeleportation(player);
+        return TeleportHelper.noLeashedCreaturesPreventTeleportation(player);
     }
 
     /**
@@ -221,6 +226,18 @@ public class PlayerEventListener implements Listener {
             return;
         }
 
+        //Allow players with permissions to apply dye to signs
+        EquipmentSlot hand = event.getHand();
+        if (hand != null && (PermissionHelper.hasPermission(player, "stargate.admin.dye") ||
+                portal.isOwner(player))) {
+            String itemName = player.getInventory().getItem(hand).getType().toString();
+            if (itemName.endsWith("DYE") || itemName.endsWith("INK_SAC")) {
+                event.setUseInteractedBlock(Event.Result.ALLOW);
+                Bukkit.getScheduler().scheduleSyncDelayedTask(Stargate.getInstance(), portal::drawSign, 1);
+                return;
+            }
+        }
+
         event.setUseInteractedBlock(Event.Result.DENY);
         if (leftClick) {
             //Cancel event in creative mode to prevent breaking the sign
@@ -282,7 +299,7 @@ public class PlayerEventListener implements Listener {
         }
 
         //Prevent a double click caused by a Spigot bug
-        if (clickIsBug(event, block)) {
+        if (clickIsBug(event.getPlayer(), block)) {
             return;
         }
 
@@ -353,19 +370,17 @@ public class PlayerEventListener implements Listener {
      * 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>
+     * @param player <p>The player performing 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 (previousEvent != null &&
-                event.getPlayer() == previousEvent.getPlayer() && eventTime + 15 > System.currentTimeMillis()) {
-            previousEvent = null;
-            eventTime = 0;
+    private boolean clickIsBug(Player player, Block block) {
+        Long previousEventTime = previousEventTimes.get(player);
+        if (previousEventTime != null && previousEventTime + 50 > System.currentTimeMillis()) {
+            previousEventTimes.put(player, null);
             return true;
         }
-        previousEvent = event;
-        eventTime = System.currentTimeMillis();
+        previousEventTimes.put(player, System.currentTimeMillis());
         return false;
     }
 

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

@@ -49,4 +49,5 @@ public class PluginEventListener implements Listener {
             Stargate.logInfo("Vault plugin lost.");
         }
     }
+
 }

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

@@ -95,8 +95,7 @@ public class PortalEventListener implements Listener {
 
         Portal exitPortal = teleportation.getExit();
         //Overwrite respawn location to respawn in front of the portal
-        event.setRespawnLocation(new PlayerTeleporter(exitPortal, respawningPlayer).getExit(respawningPlayer,
-                respawningPlayer.getLocation()));
+        event.setRespawnLocation(new PlayerTeleporter(exitPortal, respawningPlayer).getExit());
         //Properly close the portal to prevent it from staying in a locked state until it times out
         exitPortal.getPortalOpener().closePortal(false);
     }

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

@@ -3,11 +3,10 @@ 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.teleporter.Teleporter;
 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;
+import net.knarcraft.stargate.utility.TeleportHelper;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 import org.bukkit.entity.Vehicle;
@@ -62,11 +61,11 @@ public class VehicleEventListener implements Listener {
     private static void teleportVehicle(List<Entity> passengers, Portal entrancePortal, Vehicle vehicle) {
         String route = "VehicleEventListener::teleportVehicle";
 
-        if (!passengers.isEmpty() && passengers.get(0) instanceof Player) {
+        if (!passengers.isEmpty() && TeleportHelper.containsPlayer(passengers)) {
             Stargate.debug(route, "Found passenger vehicle");
-            teleportPlayerAndVehicle(entrancePortal, vehicle, passengers);
+            teleportPlayerAndVehicle(entrancePortal, vehicle);
         } else {
-            Stargate.debug(route, "Found empty vehicle");
+            Stargate.debug(route, "Found vehicle without players");
             Portal destinationPortal = entrancePortal.getPortalActivator().getDestination();
             if (destinationPortal == null) {
                 Stargate.debug(route, "Unable to find portal destination");
@@ -74,7 +73,7 @@ public class VehicleEventListener implements Listener {
             }
             Stargate.debug("vehicleTeleport", destinationPortal.getWorld() + " " +
                     destinationPortal.getSignLocation());
-            new VehicleTeleporter(destinationPortal, vehicle).teleport(entrancePortal);
+            new VehicleTeleporter(destinationPortal, vehicle).teleportEntity(entrancePortal);
         }
     }
 
@@ -83,98 +82,66 @@ public class VehicleEventListener implements Listener {
      *
      * @param entrancePortal <p>The portal the minecart entered</p>
      * @param vehicle        <p>The vehicle to teleport</p>
-     * @param passengers     <p>Any entities sitting in the minecart</p>
      */
-    private static void teleportPlayerAndVehicle(Portal entrancePortal, Vehicle vehicle, List<Entity> passengers) {
-        Player player = (Player) passengers.get(0);
-        //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)) {
-            if (!entrancePortal.getOptions().isSilent()) {
-                Stargate.getMessageSender().sendErrorMessage(player, Stargate.getString("denyMsg"));
+    private static void teleportPlayerAndVehicle(Portal entrancePortal, Vehicle vehicle) {
+        Entity rootEntity = vehicle;
+        while (rootEntity.getVehicle() != null) {
+            rootEntity = rootEntity.getVehicle();
+        }
+        List<Player> players = TeleportHelper.getPlayers(rootEntity.getPassengers());
+        Portal destinationPortal = null;
+
+        for (Player player : players) {
+            //The entrance portal must be open for one player for the teleportation to happen
+            if (!entrancePortal.getPortalOpener().isOpenFor(player)) {
+                continue;
             }
-            return;
-        }
 
-        //If no destination exists, the teleportation cannot happen
-        Portal destinationPortal = entrancePortal.getPortalActivator().getDestination(player);
-        if (destinationPortal == null) {
-            return;
-        }
-
-        //Make sure all player passengers are allowed to, and can afford to, enter the portal
-        for (Entity entity : passengers) {
-            if (entity instanceof Player && !playerCanTeleport((Player) entity, entrancePortal, destinationPortal)) {
-                return;
+            //Check if any of the players has selected the destination
+            Portal possibleDestinationPortal = entrancePortal.getPortalActivator().getDestination(player);
+            if (possibleDestinationPortal != null) {
+                destinationPortal = possibleDestinationPortal;
             }
         }
 
-        //To prevent the case where the first passenger pays and then the second passenger is denied, this has to be
-        // run after it has been confirmed that all passengers are able to pay
-        int cost = EconomyHelper.getUseCost(player, entrancePortal, destinationPortal);
-        if (cost > 0) {
-            if (!takePlayerPayment(passengers, entrancePortal, cost)) {
-                return;
+        //Cancel the teleport if no players activated the portal, or if any players are denied access
+        boolean cancelTeleport = false;
+        for (Player player : players) {
+            if (destinationPortal == null) {
+                cancelTeleport = true;
+                if (!entrancePortal.getOptions().isSilent()) {
+                    Stargate.getMessageSender().sendErrorMessage(player, Stargate.getString("invalidMsg"));
+                }
+            } else if (!TeleportHelper.playerCanTeleport(player, entrancePortal, destinationPortal)) {
+                cancelTeleport = true;
+            }
+        }
+        if (cancelTeleport) {
+            return;
+        }
+
+        //Take payment from all players
+        for (Player player : players) {
+            //To prevent the case where the first passenger pays and then the second passenger is denied, this has to be
+            // run after it has been confirmed that all passengers are able to pay
+            int cost = EconomyHelper.getUseCost(player, entrancePortal, destinationPortal);
+            if (cost > 0) {
+                if (EconomyHelper.cannotPayTeleportFee(entrancePortal, player, cost)) {
+                    return;
+                }
             }
         }
 
         //Teleport the vehicle and inform the user if the vehicle was teleported
-        boolean teleported = new VehicleTeleporter(destinationPortal, vehicle).teleport(entrancePortal);
+        boolean teleported = new VehicleTeleporter(destinationPortal, vehicle).teleportEntity(entrancePortal);
         if (teleported) {
             if (!entrancePortal.getOptions().isSilent()) {
-                Stargate.getMessageSender().sendSuccessMessage(player, Stargate.getString("teleportMsg"));
+                for (Player player : players) {
+                    Stargate.getMessageSender().sendSuccessMessage(player, Stargate.getString("teleportMsg"));
+                }
             }
             entrancePortal.getPortalOpener().closePortal(false);
         }
     }
 
-    /**
-     * Takes payment from all player passengers
-     *
-     * @param passengers     <p>All passengers in the teleporting vehicle</p>
-     * @param entrancePortal <p>The portal the vehicle is entering from</p>
-     * @param cost           <p>The cost each player has to pay</p>
-     * @return <p>True if all player passengers paid successfully</p>
-     */
-    private static boolean takePlayerPayment(List<Entity> passengers, Portal entrancePortal, int cost) {
-        for (Entity entity : passengers) {
-            //If the passenger is a player, make it pay
-            if (entity instanceof Player && EconomyHelper.cannotPayTeleportFee(entrancePortal, (Player) entity, cost)) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    /**
-     * Checks whether the given player is allowed to and can afford to teleport
-     *
-     * @param player            <p>The player trying to teleport</p>
-     * @param entrancePortal    <p>The portal the player is entering</p>
-     * @param destinationPortal <p>The portal the player is to exit from</p>
-     * @return <p>True if the player is allowed to teleport and is able to pay necessary fees</p>
-     */
-    private static boolean playerCanTeleport(Player player, Portal entrancePortal, Portal destinationPortal) {
-        //Make sure the user can access the portal
-        if (PermissionHelper.cannotAccessPortal(player, entrancePortal, destinationPortal)) {
-            if (!entrancePortal.getOptions().isSilent()) {
-                Stargate.getMessageSender().sendErrorMessage(player, Stargate.getString("denyMsg"));
-            }
-            entrancePortal.getPortalOpener().closePortal(false);
-            return false;
-        }
-
-        //Check if the player is able to afford the teleport fee
-        int cost = EconomyHelper.getUseCost(player, entrancePortal, destinationPortal);
-        boolean canAffordFee = cost <= 0 || Stargate.getEconomyConfig().canAffordFee(player, cost);
-        if (!canAffordFee) {
-            if (!entrancePortal.getOptions().isSilent()) {
-                Stargate.getMessageSender().sendErrorMessage(player, Stargate.getString("ecoInFunds"));
-            }
-            return false;
-        }
-
-        return Teleporter.noLeashedCreaturesPreventTeleportation(player);
-    }
-
 }

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

@@ -46,4 +46,5 @@ public class WorldEventListener implements Listener {
             PortalRegistry.clearPortals(world);
         }
     }
+
 }

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

@@ -8,7 +8,7 @@ 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.ChatColor;
+import net.md_5.bungee.api.ChatColor;
 import org.bukkit.World;
 import org.bukkit.entity.Player;
 
@@ -345,4 +345,5 @@ public class Portal {
             return cleanNetwork.equalsIgnoreCase(other.cleanNetwork);
         }
     }
+
 }

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

@@ -448,4 +448,5 @@ public class PortalHandler {
         }
         return input.replaceAll("[|:#]", "").trim();
     }
+
 }

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

@@ -1,13 +1,19 @@
 package net.knarcraft.stargate.portal;
 
 import net.knarcraft.stargate.Stargate;
+import net.knarcraft.stargate.container.SignData;
 import net.knarcraft.stargate.portal.property.PortalLocation;
 import net.knarcraft.stargate.utility.PermissionHelper;
-import org.bukkit.ChatColor;
+import net.md_5.bungee.api.ChatColor;
+import org.bukkit.Material;
 import org.bukkit.block.Block;
 import org.bukkit.block.BlockState;
 import org.bukkit.block.Sign;
 
+import java.util.Map;
+
+import static net.knarcraft.stargate.utility.ColorHelper.translateAllColorCodes;
+
 /**
  * The portal sign drawer draws the sing of a given portal
  */
@@ -18,6 +24,8 @@ public class PortalSignDrawer {
     private static ChatColor freeColor;
     private static ChatColor mainColor;
     private static ChatColor highlightColor;
+    private static Map<Material, ChatColor> perSignMainColors;
+    private static Map<Material, ChatColor> perSignHighlightColors;
 
     /**
      * Instantiates a new portal sign drawer
@@ -59,6 +67,42 @@ public class PortalSignDrawer {
         PortalSignDrawer.freeColor = freeColor;
     }
 
+    /**
+     * Sets the per-sign main colors
+     *
+     * @param signMainColors <p>The per-sign main colors</p>
+     */
+    public static void setPerSignMainColors(Map<Material, ChatColor> signMainColors) {
+        PortalSignDrawer.perSignMainColors = signMainColors;
+    }
+
+    /**
+     * Sets the per-sign highlight colors
+     *
+     * @param signHighlightColors <p>The per-sign highlight colors</p>
+     */
+    public static void setPerSignHighlightColors(Map<Material, ChatColor> signHighlightColors) {
+        PortalSignDrawer.perSignHighlightColors = signHighlightColors;
+    }
+
+    /**
+     * Gets the currently used main sign color
+     *
+     * @return <p>The currently used main sign color</p>
+     */
+    public static ChatColor getMainColor() {
+        return mainColor;
+    }
+
+    /**
+     * Gets the currently used highlighting sign color
+     *
+     * @return <p>The currently used highlighting sign color</p>
+     */
+    public static ChatColor getHighlightColor() {
+        return highlightColor;
+    }
+
     /**
      * Draws the sign of the portal this sign drawer is responsible for
      */
@@ -68,7 +112,8 @@ public class PortalSignDrawer {
             return;
         }
 
-        drawSign(sign);
+        SignData signData = new SignData(sign, getMainColor(sign.getType()), getHighlightColor(sign.getType()));
+        drawSign(signData);
     }
 
     /**
@@ -93,26 +138,30 @@ public class PortalSignDrawer {
     /**
      * Draws the sign of the portal this sign drawer is responsible for
      *
-     * @param sign <p>The sign re-draw</p>
+     * @param signData <p>All necessary sign information</p>
      */
-    private void drawSign(Sign sign) {
+    private void drawSign(SignData signData) {
+        Sign sign = signData.getSign();
+        ChatColor highlightColor = signData.getHighlightSignColor();
+        ChatColor mainColor = signData.getMainSignColor();
         //Clear sign
         clearSign(sign);
-        setLine(sign, 0, highlightColor + "-" + mainColor + fixColor(portal.getName()) + highlightColor + "-");
+        setLine(signData, 0, highlightColor + "-" + mainColor + translateAllColorCodes(portal.getName()) +
+                highlightColor + "-");
 
         if (!portal.getPortalActivator().isActive()) {
             //Default sign text
-            drawInactiveSign(sign);
+            drawInactiveSign(signData);
         } else {
             if (portal.getOptions().isBungee()) {
                 //Bungee sign
-                drawBungeeSign(sign);
+                drawBungeeSign(signData);
             } else if (portal.getOptions().isFixed()) {
                 //Sign pointing at one other portal
-                drawFixedSign(sign);
+                drawFixedSign(signData);
             } else {
                 //Networking stuff
-                drawNetworkSign(sign);
+                drawNetworkSign(signData);
             }
         }
 
@@ -139,16 +188,16 @@ public class PortalSignDrawer {
             return;
         }
         clearSign(sign);
-        sign.setLine(0, fixColor(portal.getName()));
+        sign.setLine(0, translateAllColorCodes(portal.getName()));
         sign.update();
     }
 
     /**
      * Draws a sign with choose-able network locations
      *
-     * @param sign <p>The sign to re-draw</p>
+     * @param signData <p>All necessary sign information</p>
      */
-    private void drawNetworkSign(Sign sign) {
+    private void drawNetworkSign(SignData signData) {
         PortalActivator destinations = portal.getPortalActivator();
         int maxIndex = destinations.getDestinations().size() - 1;
         int signLineIndex = 0;
@@ -158,85 +207,91 @@ public class PortalSignDrawer {
 
         //Last, and not only entry. Draw the entry two back
         if ((destinationIndex == maxIndex) && (maxIndex > 1)) {
-            drawNetworkSignLine(freeGatesColored, sign, ++signLineIndex, destinationIndex - 2);
+            drawNetworkSignLine(signData, freeGatesColored, ++signLineIndex, destinationIndex - 2);
         }
         //Not first entry. Draw the previous entry
         if (destinationIndex > 0) {
-            drawNetworkSignLine(freeGatesColored, sign, ++signLineIndex, destinationIndex - 1);
+            drawNetworkSignLine(signData, freeGatesColored, ++signLineIndex, destinationIndex - 1);
         }
         //Draw the chosen entry (line 2 or 3)
-        drawNetworkSignChosenLine(freeGatesColored, sign, ++signLineIndex);
+        drawNetworkSignChosenLine(signData, freeGatesColored, ++signLineIndex);
         //Has another entry and space on the sign
         if ((maxIndex >= destinationIndex + 1)) {
-            drawNetworkSignLine(freeGatesColored, sign, ++signLineIndex, destinationIndex + 1);
+            drawNetworkSignLine(signData, freeGatesColored, ++signLineIndex, destinationIndex + 1);
         }
         //Has another entry and space on the sign
         if ((maxIndex >= destinationIndex + 2) && (++signLineIndex <= 3)) {
-            drawNetworkSignLine(freeGatesColored, sign, signLineIndex, destinationIndex + 2);
+            drawNetworkSignLine(signData, freeGatesColored, signLineIndex, destinationIndex + 2);
         }
     }
 
     /**
      * Draws the chosen destination on one sign line
      *
+     * @param signData         <p>All necessary sign information</p>
      * @param freeGatesColored <p>Whether to display free gates in a different color</p>
-     * @param sign             <p>The sign to draw on</p>
      * @param signLineIndex    <p>The line to draw on</p>
      */
-    private void drawNetworkSignChosenLine(boolean freeGatesColored, Sign sign, int signLineIndex) {
+    private void drawNetworkSignChosenLine(SignData signData, boolean freeGatesColored, int signLineIndex) {
+        ChatColor highlightColor = signData.getHighlightSignColor();
+        ChatColor mainColor = signData.getMainSignColor();
         if (freeGatesColored) {
             Portal destination = PortalHandler.getByName(portal.getDestinationName(), portal.getNetwork());
             boolean free = PermissionHelper.isFree(portal.getActivePlayer(), portal, destination);
             ChatColor nameColor = (free ? freeColor : highlightColor);
-            setLine(sign, signLineIndex, nameColor + ">" + (free ? freeColor : mainColor) +
-                    fixColor(portal.getDestinationName()) + nameColor + "<");
+            setLine(signData, signLineIndex, nameColor + ">" + (free ? freeColor : mainColor) +
+                    translateAllColorCodes(portal.getDestinationName()) + nameColor + "<");
         } else {
-            setLine(sign, signLineIndex, highlightColor + ">" + mainColor +
-                    fixColor(portal.getDestinationName()) + highlightColor + "<");
+            setLine(signData, signLineIndex, highlightColor + ">" + mainColor +
+                    translateAllColorCodes(portal.getDestinationName()) + highlightColor + "<");
         }
     }
 
     /**
      * Sets a line on a sign, adding the chosen sign color
      *
-     * @param sign  <p>The sign to update</p>
-     * @param index <p>The index of the sign line to change</p>
-     * @param text  <p>The new text on the sign</p>
+     * @param signData <p>All necessary sign information</p>
+     * @param index    <p>The index of the sign line to change</p>
+     * @param text     <p>The new text on the sign</p>
      */
-    public void setLine(Sign sign, int index, String text) {
-        sign.setLine(index, mainColor + text);
+    public void setLine(SignData signData, int index, String text) {
+        ChatColor mainColor = signData.getMainSignColor();
+        signData.getSign().setLine(index, mainColor + text);
     }
 
     /**
      * Draws one network destination on one sign line
      *
+     * @param signData         <p>All necessary sign information</p>
      * @param freeGatesColored <p>Whether to display free gates in a different color</p>
-     * @param sign             <p>The sign to draw on</p>
      * @param signLineIndex    <p>The line to draw on</p>
      * @param destinationIndex <p>The index of the destination to draw</p>
      */
-    private void drawNetworkSignLine(boolean freeGatesColored, Sign sign, int signLineIndex, int destinationIndex) {
+    private void drawNetworkSignLine(SignData signData, boolean freeGatesColored, int signLineIndex, int destinationIndex) {
+        ChatColor mainColor = signData.getMainSignColor();
         PortalActivator destinations = portal.getPortalActivator();
         String destinationName = destinations.getDestinations().get(destinationIndex);
         if (freeGatesColored) {
             Portal destination = PortalHandler.getByName(destinationName, portal.getNetwork());
             boolean free = PermissionHelper.isFree(portal.getActivePlayer(), portal, destination);
-            setLine(sign, signLineIndex, (free ? freeColor : mainColor) + fixColor(destinationName));
+            setLine(signData, signLineIndex, (free ? freeColor : mainColor) + translateAllColorCodes(destinationName));
         } else {
-            setLine(sign, signLineIndex, mainColor + fixColor(destinationName));
+            setLine(signData, signLineIndex, mainColor + translateAllColorCodes(destinationName));
         }
     }
 
     /**
      * Draws the sign of a BungeeCord portal
      *
-     * @param sign <p>The sign to re-draw</p>
+     * @param signData <p>All necessary sign information</p>
      */
-    private void drawBungeeSign(Sign sign) {
-        setLine(sign, 1, Stargate.getString("bungeeSign"));
-        setLine(sign, 2, highlightColor + ">" + mainColor + fixColor(portal.getDestinationName()) +
+    private void drawBungeeSign(SignData signData) {
+        ChatColor highlightColor = signData.getHighlightSignColor();
+        ChatColor mainColor = signData.getMainSignColor();
+        setLine(signData, 1, Stargate.getString("bungeeSign"));
+        setLine(signData, 2, highlightColor + ">" + mainColor + translateAllColorCodes(portal.getDestinationName()) +
                 highlightColor + "<");
-        setLine(sign, 3, highlightColor + "[" + mainColor + fixColor(portal.getNetwork()) +
+        setLine(signData, 3, highlightColor + "[" + mainColor + translateAllColorCodes(portal.getNetwork()) +
                 highlightColor + "]");
     }
 
@@ -245,43 +300,48 @@ public class PortalSignDrawer {
      *
      * <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>
+     * @param signData <p>All necessary sign information</p>
      */
-    private void drawInactiveSign(Sign sign) {
-        setLine(sign, 1, Stargate.getString("signRightClick"));
-        setLine(sign, 2, Stargate.getString("signToUse"));
+    private void drawInactiveSign(SignData signData) {
+        ChatColor highlightColor = signData.getHighlightSignColor();
+        ChatColor mainColor = signData.getMainSignColor();
+        setLine(signData, 1, Stargate.getString("signRightClick"));
+        setLine(signData, 2, Stargate.getString("signToUse"));
         if (!portal.getOptions().isNoNetwork()) {
-            setLine(sign, 3, highlightColor + "(" + mainColor + fixColor(portal.getNetwork()) +
+            setLine(signData, 3, highlightColor + "(" + mainColor + translateAllColorCodes(portal.getNetwork()) +
                     highlightColor + ")");
         } else {
-            setLine(sign, 3, "");
+            setLine(signData, 3, "");
         }
     }
 
     /**
      * Draws a sign pointing to a fixed location
      *
-     * @param sign <p>The sign to re-draw</p>
+     * @param signData <p>All necessary sign information</p>
      */
-    private void drawFixedSign(Sign sign) {
+    private void drawFixedSign(SignData signData) {
+        ChatColor highlightColor = signData.getHighlightSignColor();
+        ChatColor mainColor = signData.getMainSignColor();
         Portal destinationPortal = PortalHandler.getByName(Portal.cleanString(portal.getDestinationName()),
                 portal.getCleanNetwork());
         String destinationName = portal.getOptions().isRandom() ? Stargate.getString("signRandom") :
                 (destinationPortal != null ? destinationPortal.getName() : portal.getDestinationName());
-        setLine(sign, 1, highlightColor + ">" + mainColor + fixColor(destinationName) + highlightColor + "<");
+        setLine(signData, 1, highlightColor + ">" + mainColor + translateAllColorCodes(destinationName) +
+                highlightColor + "<");
 
         if (portal.getOptions().isNoNetwork()) {
-            setLine(sign, 2, "");
+            setLine(signData, 2, "");
         } else {
-            setLine(sign, 2, highlightColor + "(" + mainColor + fixColor(portal.getNetwork()) +
-                    highlightColor + ")");
+            setLine(signData, 2, highlightColor + "(" + mainColor +
+                    translateAllColorCodes(portal.getNetwork()) + highlightColor + ")");
         }
         Portal destination = PortalHandler.getByName(Portal.cleanString(portal.getDestinationName()),
                 portal.getNetwork());
         if (destination == null && !portal.getOptions().isRandom()) {
-            setLine(sign, 3, errorColor + Stargate.getString("signDisconnected"));
+            setLine(signData, 3, errorColor + Stargate.getString("signDisconnected"));
         } else {
-            setLine(sign, 3, "");
+            setLine(signData, 3, "");
         }
     }
 
@@ -304,13 +364,33 @@ public class PortalSignDrawer {
     }
 
     /**
-     * Fixes coloring of signs as the & character isn't translated on all servers
+     * Gets the main color to use for the given sign type
      *
-     * @param text <p>The text to fix the coloring of</p>
-     * @return <p>The text with the coloring fixed</p>
+     * @param signType <p>The sign type to get the main color for</p>
+     * @return <p>The main color for the given sign type</p>
      */
-    private String fixColor(String text) {
-        return ChatColor.translateAlternateColorCodes('&', text);
+    private ChatColor getMainColor(Material signType) {
+        ChatColor signColor = perSignMainColors.get(signType);
+        if (signColor == null) {
+            return mainColor;
+        } else {
+            return signColor;
+        }
+    }
+
+    /**
+     * Gets the highlight color to use for the given sign type
+     *
+     * @param signType <p>The sign type to get the highlight color for</p>
+     * @return <p>The highlight color for the given sign type</p>
+     */
+    private ChatColor getHighlightColor(Material signType) {
+        ChatColor signColor = perSignHighlightColors.get(signType);
+        if (signColor == null) {
+            return highlightColor;
+        } else {
+            return signColor;
+        }
     }
 
 }

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

@@ -235,7 +235,7 @@ public class Gate {
             Material type = topLeft.getRelativeLocation(entranceVector, yaw).getType();
 
             //Ignore entrance if it's air or water, and we're creating a new gate
-            if (onCreate && (type == Material.AIR || type == Material.WATER)) {
+            if (onCreate && (type.isAir() || type == Material.WATER)) {
                 continue;
             }
 

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

@@ -1,9 +1,7 @@
 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;
 
 /**
@@ -16,10 +14,10 @@ public class EntityTeleporter extends Teleporter {
     /**
      * Instantiates a new portal teleporter
      *
-     * @param portal <p>The portal which is the target of the teleportation</p>
+     * @param targetPortal <p>The portal which is the target of the teleportation</p>
      */
-    public EntityTeleporter(Portal portal, Entity teleportingEntity) {
-        super(portal);
+    public EntityTeleporter(Portal targetPortal, Entity teleportingEntity) {
+        super(targetPortal, teleportingEntity);
         this.teleportingEntity = teleportingEntity;
     }
 
@@ -29,44 +27,8 @@ public class EntityTeleporter extends Teleporter {
      * @param origin <p>The portal the entity is teleporting from</p>
      * @return <p>True if the entity was teleported. False otherwise</p>
      */
-    public boolean teleport(Portal origin) {
-        Location traveller = teleportingEntity.getLocation();
-        Location exit = getExit(teleportingEntity, traveller);
-
-        //Rotate the entity to face out from the portal
-        adjustRotation(exit);
-
-        //Call the StargateEntityPortalEvent to allow plugins to change destination
-        if (!origin.equals(portal)) {
-            exit = triggerEntityPortalEvent(origin, exit);
-            if (exit == null) {
-                return false;
-            }
-        }
-
-        //Load chunks to make sure not to teleport to the void
-        loadChunks();
-
-        teleportingEntity.teleport(exit);
-        return true;
+    public boolean teleportEntity(Portal origin) {
+        return teleport(origin, new StargateEntityPortalEvent(teleportingEntity, origin, portal, exit));
     }
 
-    /**
-     * Triggers the entity portal event to allow plugins to change the exit location
-     *
-     * @param origin <p>The origin portal teleported from</p>
-     * @param exit   <p>The exit location to teleport the entity to</p>
-     * @return <p>The location the entity should be teleported to, or null if the event was cancelled</p>
-     */
-    protected Location triggerEntityPortalEvent(Portal origin, Location exit) {
-        StargateEntityPortalEvent stargateEntityPortalEvent = new StargateEntityPortalEvent(teleportingEntity, origin,
-                portal, exit);
-        Stargate.getInstance().getServer().getPluginManager().callEvent(stargateEntityPortalEvent);
-        //Teleport is cancelled. Teleport the entity back to where it came from just for sanity's sake
-        if (stargateEntityPortalEvent.isCancelled()) {
-            new EntityTeleporter(origin, teleportingEntity).teleport(origin);
-            return null;
-        }
-        return stargateEntityPortalEvent.getExit();
-    }
 }

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

@@ -3,9 +3,15 @@ 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 net.knarcraft.stargate.utility.DirectionHelper;
+import net.knarcraft.stargate.utility.TeleportHelper;
+import org.bukkit.Bukkit;
+import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 import org.bukkit.event.player.PlayerMoveEvent;
+import org.bukkit.util.Vector;
+
+import java.util.List;
 
 /**
  * The portal teleporter takes care of the actual portal teleportation for any players
@@ -17,11 +23,11 @@ public class PlayerTeleporter extends Teleporter {
     /**
      * Instantiates a new player teleporter
      *
-     * @param portal <p>The portal which is the target of the teleportation</p>
-     * @param player <p>The teleporting player</p>
+     * @param targetPortal <p>The portal which is the target of the teleportation</p>
+     * @param player       <p>The teleporting player</p>
      */
-    public PlayerTeleporter(Portal portal, Player player) {
-        super(portal);
+    public PlayerTeleporter(Portal targetPortal, Player player) {
+        super(targetPortal, player);
         this.player = player;
     }
 
@@ -31,53 +37,42 @@ public class PlayerTeleporter extends Teleporter {
      * @param origin <p>The portal the player teleports from</p>
      * @param event  <p>The player move event triggering the event</p>
      */
-    public void teleport(Portal origin, PlayerMoveEvent event) {
-        Location traveller = player.getLocation();
-        Location exit = getExit(player, traveller);
-
-        //Rotate the player to face out from the portal
-        adjustRotation(exit);
+    public void teleportPlayer(Portal origin, PlayerMoveEvent event) {
+        double velocity = player.getVelocity().length();
+        List<Entity> passengers = player.getPassengers();
 
         //Call the StargatePlayerPortalEvent to allow plugins to change destination
         if (!origin.equals(portal)) {
-            exit = triggerPlayerPortalEvent(origin, exit, event);
+            exit = triggerPortalEvent(origin, new StargatePlayerPortalEvent(player, origin, portal, exit));
             if (exit == null) {
                 return;
             }
         }
 
+        //Calculate the exit velocity of the player
+        Vector newVelocityDirection = DirectionHelper.getDirectionVectorFromYaw(portal.getYaw());
+        Vector newVelocity = newVelocityDirection.multiply(velocity * Stargate.getGateConfig().getExitVelocity());
+
         //Load chunks to make sure not to teleport to the void
         loadChunks();
 
         //Teleport any creatures leashed by the player in a 15-block range
-        teleportLeashedCreatures(player, origin);
+        TeleportHelper.teleportLeashedCreatures(player, origin, portal);
+
+        if (player.eject()) {
+            TeleportHelper.handleEntityPassengers(passengers, player, origin, portal, exit.getDirection(), newVelocity);
+        }
 
         //If no event is passed in, assume it's a teleport, and act as such
         if (event == null) {
             player.teleport(exit);
         } else {
-            //The new method to teleport in a move event is set the "to" field.
+            //Set the exit location of the event
             event.setTo(exit);
         }
-    }
 
-    /**
-     * Triggers the player portal event to allow plugins to change the exit location
-     *
-     * @param origin <p>The origin portal teleported from</p>
-     * @param exit   <p>The exit location to teleport the player to</p>
-     * @param event  <p>The player move event which triggered the teleportation</p>
-     * @return <p>The location the player should be teleported to, or null if the event was cancelled</p>
-     */
-    private Location triggerPlayerPortalEvent(Portal origin, Location exit, PlayerMoveEvent event) {
-        StargatePlayerPortalEvent stargatePlayerPortalEvent = new StargatePlayerPortalEvent(player, origin, portal, exit);
-        Stargate.getInstance().getServer().getPluginManager().callEvent(stargatePlayerPortalEvent);
-        //Teleport is cancelled. Teleport the player back to where it came from
-        if (stargatePlayerPortalEvent.isCancelled()) {
-            new PlayerTeleporter(origin, player).teleport(origin, event);
-            return null;
-        }
-        return stargatePlayerPortalEvent.getExit();
+        //Set the velocity of the teleported player after the teleportation is finished
+        Bukkit.getScheduler().scheduleSyncDelayedTask(Stargate.getInstance(), () -> player.setVelocity(newVelocity), 1);
     }
 
 }

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

@@ -4,9 +4,11 @@ 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.event.StargateTeleportEvent;
 import net.knarcraft.stargate.portal.Portal;
 import net.knarcraft.stargate.utility.DirectionHelper;
 import net.knarcraft.stargate.utility.EntityHelper;
+import net.knarcraft.stargate.utility.TeleportHelper;
 import org.bukkit.Chunk;
 import org.bukkit.Location;
 import org.bukkit.Material;
@@ -14,10 +16,10 @@ import org.bukkit.block.data.Bisected;
 import org.bukkit.block.data.BlockData;
 import org.bukkit.block.data.type.Slab;
 import org.bukkit.entity.AbstractHorse;
-import org.bukkit.entity.Creature;
 import org.bukkit.entity.Entity;
-import org.bukkit.entity.Player;
+import org.bukkit.event.Event;
 import org.bukkit.scheduler.BukkitScheduler;
+import org.bukkit.util.Vector;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -31,71 +33,114 @@ public abstract class Teleporter {
      * The portal the entity is teleporting to
      */
     protected final Portal portal;
+
     /**
      * The scheduler to use for delaying tasks
      */
     protected final BukkitScheduler scheduler;
 
+    /**
+     * The exit location any entities will be teleported to
+     */
+    protected Location exit;
+
+    /**
+     * The entity being teleported by this teleporter
+     */
+    protected final Entity teleportedEntity;
+
     /**
      * Instantiates a new portal teleporter
      *
-     * @param portal <p>The portal which is the target of the teleportation</p>
+     * @param portal           <p>The portal which is the target of the teleportation</p>
+     * @param teleportedEntity <p>The entity teleported by this teleporter</p>
      */
-    public Teleporter(Portal portal) {
+    public Teleporter(Portal portal, Entity teleportedEntity) {
         this.portal = portal;
         this.scheduler = Stargate.getInstance().getServer().getScheduler();
+        this.teleportedEntity = teleportedEntity;
+        this.exit = getExit(teleportedEntity);
     }
 
+    /**
+     * Teleports an entity
+     *
+     * @param origin                <p>The portal the entity teleported from</p>
+     * @param stargateTeleportEvent <p>The event to call to make sure the teleportation is valid</p>
+     * @return <p>True if the teleportation was successfully performed</p>
+     */
+    public boolean teleport(Portal origin, StargateTeleportEvent stargateTeleportEvent) {
+        List<Entity> passengers = teleportedEntity.getPassengers();
+
+        //Call the StargateEntityPortalEvent to allow plugins to change destination
+        if (!origin.equals(portal)) {
+            exit = triggerPortalEvent(origin, stargateTeleportEvent);
+            if (exit == null) {
+                return false;
+            }
+        }
+
+        //Load chunks to make sure not to teleport to the void
+        loadChunks();
+
+        if (teleportedEntity.eject()) {
+            TeleportHelper.handleEntityPassengers(passengers, teleportedEntity, origin, portal, exit.getDirection(),
+                    new Vector());
+        }
+        teleportedEntity.teleport(exit);
+        return true;
+    }
+
+    /**
+     * Gets the exit location of this teleporter
+     *
+     * @return <p>The exit location of this teleporter</p>
+     */
+    public Location getExit() {
+        return exit.clone();
+    }
+
+    /**
+     * Triggers the entity portal event to allow plugins to change the exit location
+     *
+     * @param origin                <p>The origin portal teleported from</p>
+     * @param stargateTeleportEvent <p>The exit location to teleport the entity to</p>
+     * @return <p>The location the entity should be teleported to, or null if the event was cancelled</p>
+     */
+    protected Location triggerPortalEvent(Portal origin, StargateTeleportEvent stargateTeleportEvent) {
+        Stargate.getInstance().getServer().getPluginManager().callEvent((Event) stargateTeleportEvent);
+        //Teleport is cancelled. Teleport the entity back to where it came from just for sanity's sake
+        if (stargateTeleportEvent.isCancelled()) {
+            new EntityTeleporter(origin, teleportedEntity).teleportEntity(origin);
+            return null;
+        }
+        return stargateTeleportEvent.getExit();
+    }
 
     /**
      * Adjusts the rotation of the exit to make the teleporting entity face directly out from the portal
      *
      * @param exit <p>The location the entity will exit from</p>
      */
-    protected void adjustRotation(Location exit) {
+    protected void adjustExitLocationRotation(Location exit) {
         int adjust = 0;
         if (portal.getOptions().isBackwards()) {
             adjust = 180;
         }
         float newYaw = (portal.getYaw() + adjust) % 360;
         Stargate.debug("Portal::adjustRotation", "Setting exit yaw to " + newYaw);
-        exit.setYaw(newYaw);
+        exit.setDirection(DirectionHelper.getDirectionVectorFromYaw(newYaw));
     }
 
     /**
-     * Gets the exit location for a given entity and current location
-     *
-     * @param entity    <p>The entity to teleport (used to determine distance from portal to avoid suffocation)</p>
-     * @param traveller <p>The location of the entity travelling</p>
-     * @return <p>The location the entity should be teleported to.</p>
+     * Loads the chunks outside the portal's entrance
      */
-    public Location getExit(Entity entity, Location traveller) {
-        Location exitLocation = null;
-        RelativeBlockVector relativeExit = portal.getGate().getLayout().getExit();
-        if (relativeExit != null) {
-            BlockLocation exit = portal.getBlockAt(relativeExit);
-
-            //Move one block out to prevent exiting inside the portal
-            float portalYaw = portal.getYaw();
-            if (portal.getOptions().isBackwards()) {
-                portalYaw += 180;
-            }
-            exitLocation = exit.getRelativeLocation(0D, 0D, 1, portalYaw);
-
-            if (entity != null) {
-                double entitySize = EntityHelper.getEntityMaxSize(entity);
-                //Prevent exit suffocation for players riding horses or similar
-                if (entitySize > 1) {
-                    exitLocation = preventExitSuffocation(relativeExit, exitLocation, entity);
-                }
-            }
-        } else {
-            Stargate.logWarning(String.format("Missing destination point in .gate file %s",
-                    portal.getGate().getFilename()));
+    protected void loadChunks() {
+        for (Chunk chunk : getChunksToLoad()) {
+            chunk.addPluginChunkTicket(Stargate.getInstance());
+            //Allow the chunk to unload after 10 seconds
+            Stargate.addChunkUnloadRequest(new ChunkUnloadRequest(chunk, 10000L));
         }
-
-        //Adjust pitch and height
-        return adjustExitLocation(traveller, exitLocation);
     }
 
     /**
@@ -141,7 +186,7 @@ public abstract class Teleporter {
         if (entitySize > 1) {
             double entityOffset;
             if (portal.getOptions().isAlwaysOn()) {
-                entityOffset = entityBoxSize / 2D;
+                entityOffset = (entityBoxSize / 2D);
             } else {
                 entityOffset = (entitySize / 2D) - 1;
             }
@@ -185,41 +230,62 @@ public abstract class Teleporter {
      * slab check is necessary to prevent the player from clipping through the slab and spawning beneath it. The water
      * check is necessary when teleporting boats to prevent it from becoming a submarine.</p>
      *
-     * @param traveller    <p>The location of the travelling entity</p>
+     * @param entity       <p>The travelling entity</p>
      * @param exitLocation <p>The exit location generated</p>
      * @return <p>The location the travelling entity should be teleported to</p>
      */
-    private Location adjustExitLocation(Location traveller, Location exitLocation) {
+    private Location adjustExitLocationHeight(Entity entity, Location exitLocation) {
         if (exitLocation != null) {
             BlockData blockData = exitLocation.getBlock().getBlockData();
             if ((blockData instanceof Bisected bisected && bisected.getHalf() == Bisected.Half.BOTTOM) ||
-                    (blockData instanceof Slab slab && slab.getType() == Slab.Type.BOTTOM)) {
-                //Prevent traveller from spawning inside a slab
-                Stargate.debug("adjustExitLocation", "Added a block to get above a slab");
-                exitLocation.add(0, 1, 0);
-            } else if (blockData.getMaterial() == Material.WATER) {
-                //If there's water outside, go one up to allow for boat teleportation
-                Stargate.debug("adjustExitLocation", "Added a block to get above a block of water");
+                    (blockData instanceof Slab slab && slab.getType() == Slab.Type.BOTTOM) ||
+                    blockData.getMaterial() == Material.WATER) {
+                //Prevent traveller from spawning inside a slab, or a boat from spawning inside water
+                Stargate.debug("adjustExitLocation", "Added a block to get above a slab or a block of water");
                 exitLocation.add(0, 1, 0);
             }
-
-            exitLocation.setPitch(traveller.getPitch());
             return exitLocation;
         } else {
             Stargate.logWarning("Unable to generate exit location");
-            return traveller;
+            return entity.getLocation();
         }
     }
 
     /**
-     * Loads the chunks outside the portal's entrance
+     * Gets the exit location for a given entity and current location
+     *
+     * @param entity <p>The entity to teleport (used to determine distance from portal to avoid suffocation)</p>
+     * @return <p>The location the entity should be teleported to.</p>
      */
-    protected void loadChunks() {
-        for (Chunk chunk : getChunksToLoad()) {
-            chunk.addPluginChunkTicket(Stargate.getInstance());
-            //Allow the chunk to unload after 3 seconds
-            Stargate.addChunkUnloadRequest(new ChunkUnloadRequest(chunk, 3000L));
+    private Location getExit(Entity entity) {
+        Location exitLocation = null;
+        RelativeBlockVector relativeExit = portal.getGate().getLayout().getExit();
+        if (relativeExit != null) {
+            BlockLocation exit = portal.getBlockAt(relativeExit);
+
+            //Move one block out to prevent exiting inside the portal
+            float portalYaw = portal.getYaw();
+            if (portal.getOptions().isBackwards()) {
+                portalYaw += 180;
+            }
+            exitLocation = exit.getRelativeLocation(0D, 0D, 1, portalYaw);
+
+            if (entity != null) {
+                double entitySize = EntityHelper.getEntityMaxSize(entity);
+                //Prevent exit suffocation for players riding horses or similar
+                if (entitySize > 1) {
+                    exitLocation = preventExitSuffocation(relativeExit, exitLocation, entity);
+                }
+            }
+        } else {
+            Stargate.logWarning(String.format("Missing destination point in .gate file %s",
+                    portal.getGate().getFilename()));
         }
+
+        //Adjust height and rotation
+        Location adjusted = adjustExitLocationHeight(entity, exitLocation);
+        adjustExitLocationRotation(adjusted);
+        return adjusted;
     }
 
     /**
@@ -250,76 +316,4 @@ public abstract class Teleporter {
         return chunksToLoad;
     }
 
-    /**
-     * Checks whether a player has leashed creatures that block the teleportation
-     *
-     * @param player <p>The player trying to teleport</p>
-     * @return <p>False if the player has leashed any creatures that cannot go through the portal</p>
-     */
-    public static boolean noLeashedCreaturesPreventTeleportation(Player player) {
-        //Find any nearby leashed entities to teleport with the player
-        List<Creature> nearbyCreatures = getLeashedCreatures(player);
-
-        //Disallow creatures with passengers to prevent smuggling
-        for (Creature creature : nearbyCreatures) {
-            if (!creature.getPassengers().isEmpty()) {
-                return false;
-            }
-        }
-
-        //If it's enabled, there is no problem
-        if (Stargate.getGateConfig().handleLeashedCreatures()) {
-            return true;
-        } else {
-            return nearbyCreatures.isEmpty();
-        }
-    }
-
-    /**
-     * Teleports any creatures leashed by the player
-     *
-     * <p>Will return false if the teleportation should be aborted because the player has leashed creatures that
-     * aren't allowed to be teleported with the player.</p>
-     *
-     * @param player <p>The player which is teleported</p>
-     * @param origin <p>The portal the player is teleporting from</p>
-     */
-    protected void teleportLeashedCreatures(Player player, Portal origin) {
-        //If this feature is disabled, just return
-        if (!Stargate.getGateConfig().handleLeashedCreatures()) {
-            return;
-        }
-
-        //Find any nearby leashed entities to teleport with the player
-        List<Creature> nearbyEntities = getLeashedCreatures(player);
-
-        //Teleport all creatures leashed by the player to the portal the player is to exit from
-        for (Creature creature : nearbyEntities) {
-            creature.setLeashHolder(null);
-            scheduler.scheduleSyncDelayedTask(Stargate.getInstance(), () -> {
-                new EntityTeleporter(portal, creature).teleport(origin);
-                scheduler.scheduleSyncDelayedTask(Stargate.getInstance(), () -> creature.setLeashHolder(player), 6);
-            }, 2);
-        }
-    }
-
-    /**
-     * Gets all creatures leashed by a player within the given range
-     *
-     * @param player <p>The player to check</p>
-     * @return <p>A list of all creatures the player is holding in a leash (lead)</p>
-     */
-    protected static List<Creature> getLeashedCreatures(Player player) {
-        List<Creature> leashedCreatures = new ArrayList<>();
-        //Find any nearby leashed entities to teleport with the player
-        List<Entity> nearbyEntities = player.getNearbyEntities(15, 15, 15);
-        //Teleport all creatures leashed by the player to the portal the player is to exit from
-        for (Entity entity : nearbyEntities) {
-            if (entity instanceof Creature creature && creature.isLeashed() && creature.getLeashHolder() == player) {
-                leashedCreatures.add(creature);
-            }
-        }
-        return leashedCreatures;
-    }
-
 }

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

@@ -2,14 +2,17 @@ package net.knarcraft.stargate.portal.teleporter;
 
 import net.knarcraft.stargate.Stargate;
 import net.knarcraft.stargate.config.StargateGateConfig;
+import net.knarcraft.stargate.event.StargateEntityPortalEvent;
 import net.knarcraft.stargate.portal.Portal;
 import net.knarcraft.stargate.utility.DirectionHelper;
+import net.knarcraft.stargate.utility.TeleportHelper;
 import org.bukkit.Location;
 import org.bukkit.World;
+import org.bukkit.entity.Boat;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.LivingEntity;
-import org.bukkit.entity.Player;
 import org.bukkit.entity.Vehicle;
+import org.bukkit.event.player.PlayerTeleportEvent;
 import org.bukkit.util.Vector;
 
 import java.util.List;
@@ -24,11 +27,11 @@ public class VehicleTeleporter extends EntityTeleporter {
     /**
      * Instantiates a new vehicle teleporter
      *
-     * @param portal             <p>The portal which is the target of the teleportation</p>
+     * @param targetPortal       <p>The targetPortal which is the target of the teleportation</p>
      * @param teleportingVehicle <p>The teleporting vehicle</p>
      */
-    public VehicleTeleporter(Portal portal, Vehicle teleportingVehicle) {
-        super(portal, teleportingVehicle);
+    public VehicleTeleporter(Portal targetPortal, Vehicle teleportingVehicle) {
+        super(targetPortal, teleportingVehicle);
         this.teleportingVehicle = teleportingVehicle;
     }
 
@@ -42,28 +45,22 @@ public class VehicleTeleporter extends EntityTeleporter {
      * @return <p>True if the vehicle was teleported. False otherwise</p>
      */
     @Override
-    public boolean teleport(Portal origin) {
-        Location traveller = teleportingVehicle.getLocation();
-        Location exit = getExit(teleportingVehicle, traveller);
+    public boolean teleportEntity(Portal origin) {
+        Stargate.debug("VehicleTeleporter::teleport", "Preparing to teleport: " + teleportingVehicle);
 
         double velocity = teleportingVehicle.getVelocity().length();
 
-        //Stop and teleport
+        //Stop the vehicle before teleporting
         teleportingVehicle.setVelocity(new Vector());
 
         //Get new velocity
         Vector newVelocityDirection = DirectionHelper.getDirectionVectorFromYaw(portal.getYaw());
         Vector newVelocity = newVelocityDirection.multiply(velocity);
 
-        //Make sure the vehicle points out from the portal
-        adjustRotation(exit);
-
         //Call the StargateEntityPortalEvent to allow plugins to change destination
-        if (!origin.equals(portal)) {
-            exit = triggerEntityPortalEvent(origin, exit);
-            if (exit == null) {
-                return false;
-            }
+        exit = triggerPortalEvent(origin, new StargateEntityPortalEvent(teleportingVehicle, origin, portal, exit));
+        if (exit == null) {
+            return false;
         }
 
         //Teleport the vehicle
@@ -89,12 +86,13 @@ public class VehicleTeleporter extends EntityTeleporter {
                 return false;
             }
 
-            if (!(teleportingVehicle instanceof LivingEntity)) {
+            if (!(teleportingVehicle instanceof LivingEntity) &&
+                    Stargate.getGateConfig().enableCraftBookRemoveOnEjectFix()) {
                 //Teleport a normal vehicle with passengers (minecart or boat)
                 putPassengersInNewVehicle(passengers, exit, newVelocity, origin);
             } else {
                 //Teleport a living vehicle with passengers (pig, horse, donkey, strider)
-                teleportLivingVehicle(exit, passengers, origin);
+                teleportVehicle(passengers, exit, newVelocity, origin);
             }
         } else {
             //Check if teleportation of empty vehicles is enabled
@@ -118,54 +116,35 @@ public class VehicleTeleporter extends EntityTeleporter {
     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()) {
+        if (TeleportHelper.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;
+        return TeleportHelper.containsPlayer(passengers) || config.handleNonPlayerVehicles();
     }
 
     /**
      * Teleport a vehicle which is not a minecart or a boat
      *
-     * @param exit       <p>The location the vehicle will exit</p>
-     * @param passengers <p>The passengers of the vehicle</p>
-     * @param origin     <p>The portal the vehicle teleported from</p>
+     * @param passengers  <p>The passengers of the vehicle</p>
+     * @param exit        <p>The location the vehicle will exit</p>
+     * @param newVelocity <p>The new velocity of the teleported vehicle</p>
+     * @param origin      <p>The portal the vehicle teleported from</p>
      */
-    private void teleportLivingVehicle(Location exit, List<Entity> passengers, Portal origin) {
-        teleportingVehicle.eject();
-        teleportingVehicle.teleport(exit);
-        handleVehiclePassengers(passengers, teleportingVehicle, 2, origin);
+    private void teleportVehicle(List<Entity> passengers, Location exit, Vector newVelocity, Portal origin) {
+        if (teleportingVehicle.eject()) {
+            TeleportHelper.handleEntityPassengers(passengers, teleportingVehicle, origin, portal, exit.getDirection(),
+                    newVelocity);
+        }
+        Stargate.debug("VehicleTeleporter::teleportVehicle", "Teleporting " + teleportingVehicle +
+                " to final location " + exit + " with direction " + exit.getDirection());
+        teleportingVehicle.teleport(exit, PlayerTeleportEvent.TeleportCause.PLUGIN);
+        scheduler.scheduleSyncDelayedTask(Stargate.getInstance(),
+                () -> {
+                    Stargate.debug("VehicleTeleporter::teleportVehicle", "Setting velocity " + newVelocity +
+                            " for vehicle " + teleportingVehicle);
+                    teleportingVehicle.setVelocity(newVelocity);
+                }, 1);
     }
 
     /**
@@ -189,52 +168,16 @@ public class VehicleTeleporter extends EntityTeleporter {
         }
         //Spawn a new vehicle
         Vehicle newVehicle = vehicleWorld.spawn(exit, teleportingVehicle.getClass());
+        if (teleportingVehicle instanceof Boat boat) {
+            ((Boat) newVehicle).setWoodType(boat.getWoodType());
+        }
         //Remove the old vehicle
-        teleportingVehicle.eject();
+        if (teleportingVehicle.eject()) {
+            TeleportHelper.handleEntityPassengers(passengers, newVehicle, origin, portal, exit.getDirection(),
+                    newVelocity);
+        }
         teleportingVehicle.remove();
-        //Set rotation, add passengers and restore velocity
-        newVehicle.setRotation(exit.getYaw(), exit.getPitch());
-        handleVehiclePassengers(passengers, newVehicle, 1, origin);
         scheduler.scheduleSyncDelayedTask(Stargate.getInstance(), () -> newVehicle.setVelocity(newVelocity), 1);
     }
 
-    /**
-     * Ejects, teleports and adds all passengers to the target vehicle
-     *
-     * @param passengers <p>The passengers to handle</p>
-     * @param vehicle    <p>The vehicle the passengers should be put into</p>
-     * @param delay      <p>The amount of milliseconds to wait before adding the vehicle passengers</p>
-     * @param origin     <p>The portal the vehicle teleported from</p>
-     */
-    private void handleVehiclePassengers(List<Entity> passengers, Vehicle vehicle, long delay, Portal origin) {
-        for (Entity passenger : passengers) {
-            passenger.eject();
-            scheduler.scheduleSyncDelayedTask(Stargate.getInstance(), () -> {
-                if (passenger instanceof Player player) {
-                    //Teleport any creatures leashed by the player in a 15-block range
-                    teleportLeashedCreatures(player, origin);
-                }
-                teleportAndAddPassenger(vehicle, passenger);
-            }, delay);
-        }
-    }
-
-    /**
-     * Teleports and adds a passenger to a vehicle
-     *
-     * <p>Teleportation of living vehicles is really buggy if you wait between the teleportation and passenger adding,
-     * but there needs to be a delay between teleporting the vehicle and teleporting and adding the passenger.</p>
-     *
-     * @param targetVehicle <p>The vehicle to add the passenger to</p>
-     * @param passenger     <p>The passenger to teleport and add</p>
-     */
-    private void teleportAndAddPassenger(Vehicle targetVehicle, Entity passenger) {
-        if (!passenger.teleport(targetVehicle.getLocation())) {
-            Stargate.debug("handleVehiclePassengers", "Failed to teleport passenger");
-        }
-        if (!targetVehicle.addPassenger(passenger)) {
-            Stargate.debug("handleVehiclePassengers", "Failed to add passenger");
-        }
-    }
-
 }

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

@@ -21,32 +21,36 @@ public class BlockChangeThread implements Runnable {
         long sTime = System.nanoTime();
         //Repeat for at most 0.025 seconds
         while (System.nanoTime() - sTime < 25000000) {
-            pollQueue();
+            if (pollQueue()) {
+                break;
+            }
         }
     }
 
     /**
      * Polls the block change request queue for any waiting requests
+     *
+     * @return <p>True if the queue is empty and it's safe to quit</p>
      */
-    public static void pollQueue() {
+    public static boolean pollQueue() {
         //Abort if there's no work to be done
         BlockChangeRequest blockChangeRequest = Stargate.getBlockChangeRequestQueue().poll();
         if (blockChangeRequest == null) {
-            return;
+            return true;
         }
 
         //Change the material of the pulled block
         Block block = blockChangeRequest.getBlockLocation().getBlock();
         block.setType(blockChangeRequest.getMaterial(), false);
 
-        if (blockChangeRequest.getMaterial() == Material.END_GATEWAY &&
-                block.getWorld().getEnvironment() == World.Environment.THE_END) {
+        if (blockChangeRequest.getMaterial() == Material.END_GATEWAY) {
             //Force a specific location to prevent exit gateway generation
             fixEndGatewayGate(block);
         } else if (blockChangeRequest.getAxis() != null) {
             //If orientation is relevant, adjust the block's orientation
             orientBlock(block, blockChangeRequest.getAxis());
         }
+        return false;
     }
 
     /**
@@ -56,8 +60,11 @@ public class BlockChangeThread implements Runnable {
      */
     private static void fixEndGatewayGate(Block block) {
         EndGateway gateway = (EndGateway) block.getState();
-        gateway.setExitLocation(block.getLocation());
-        gateway.setExactTeleport(true);
+        gateway.setAge(Long.MIN_VALUE);
+        if (block.getWorld().getEnvironment() == World.Environment.THE_END) {
+            gateway.setExitLocation(block.getLocation());
+            gateway.setExactTeleport(true);
+        }
         gateway.update(false, false);
     }
 

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

@@ -4,7 +4,7 @@ import net.knarcraft.stargate.Stargate;
 import net.knarcraft.stargate.portal.Portal;
 import net.knarcraft.stargate.portal.PortalHandler;
 import net.knarcraft.stargate.portal.teleporter.PlayerTeleporter;
-import org.bukkit.ChatColor;
+import net.md_5.bungee.api.ChatColor;
 import org.bukkit.entity.Player;
 import org.bukkit.event.player.PlayerMoveEvent;
 
@@ -190,7 +190,7 @@ public final class BungeeHelper {
         }
 
         //Teleport the player back to this gate, for sanity's sake
-        new PlayerTeleporter(entrancePortal, player).teleport(entrancePortal, event);
+        new PlayerTeleporter(entrancePortal, player).teleportPlayer(entrancePortal, event);
 
         //Send the SGBungee packet first, it will be queued by BC if required
         if (!BungeeHelper.sendTeleportationMessage(player, entrancePortal)) {

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

@@ -0,0 +1,54 @@
+package net.knarcraft.stargate.utility;
+
+import net.md_5.bungee.api.ChatColor;
+import org.bukkit.Color;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * A helper class for dealing with colors
+ */
+public final class ColorHelper {
+
+    private ColorHelper() {
+
+    }
+
+    /**
+     * Inverts the given color
+     *
+     * @param color <p>The color to invert</p>
+     * @return <p>The inverted color</p>
+     */
+    public static Color invert(Color color) {
+        return color.setRed(255 - color.getRed()).setGreen(255 - color.getGreen()).setBlue(255 - color.getBlue());
+    }
+
+    /**
+     * Gets the chat color corresponding to the given color
+     *
+     * @param color <p>The color to convert into a chat color</p>
+     * @return <p>The resulting chat color</p>
+     */
+    public static ChatColor fromColor(Color color) {
+        return ChatColor.of(String.format("#%02X%02X%02X", color.getRed(), color.getGreen(), color.getBlue()));
+    }
+
+    /**
+     * Translates all found color codes to formatting in a string
+     *
+     * @param message <p>The string to search for color codes</p>
+     * @return <p>The message with color codes translated</p>
+     */
+    public static String translateAllColorCodes(String message) {
+        message = ChatColor.translateAlternateColorCodes('&', message);
+        Pattern pattern = Pattern.compile("(#[a-fA-F0-9]{6})");
+        Matcher matcher = pattern.matcher(message);
+        while (matcher.find()) {
+            message = message.replace(matcher.group(), "" + ChatColor.of(matcher.group()));
+        }
+        return message;
+    }
+
+}

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

@@ -113,16 +113,21 @@ public final class DirectionHelper {
      * @return <p>A normal vector</p>
      */
     public static Vector getCoordinateVectorFromRelativeVector(double right, double down, double out, double yaw) {
-        Vector distanceVector = DirectionHelper.getDirectionVectorFromYaw(yaw);
-        distanceVector.multiply(out);
-
-        Vector rightVector = DirectionHelper.getDirectionVectorFromYaw(yaw - 90);
-        rightVector.multiply(right);
-
-        Vector depthVector = new Vector(0, -1, 0);
-        depthVector.multiply(down);
-
-        return distanceVector.add(rightVector).add(depthVector);
+        if (yaw == 0) {
+            //South
+            return new Vector(right, -down, out);
+        } else if (yaw == 90) {
+            //West
+            return new Vector(-out, -down, right);
+        } else if (yaw == 180) {
+            //North
+            return new Vector(-right, -down, -out);
+        } else if (yaw == 270) {
+            //East
+            return new Vector(out, -down, -right);
+        } else {
+            throw new IllegalArgumentException(String.format("Invalid yaw %f given", yaw));
+        }
     }
 
     /**

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

@@ -1,6 +1,6 @@
 package net.knarcraft.stargate.utility;
 
-import org.bukkit.ChatColor;
+import net.md_5.bungee.api.ChatColor;
 
 import java.io.BufferedReader;
 import java.io.BufferedWriter;

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

@@ -387,7 +387,7 @@ public final class PermissionHelper {
             if (!entrancePortal.getOptions().isSilent()) {
                 Stargate.getMessageSender().sendErrorMessage(player, Stargate.getString("denyMsg"));
             }
-            new PlayerTeleporter(entrancePortal, player).teleport(entrancePortal, event);
+            new PlayerTeleporter(entrancePortal, player).teleportPlayer(entrancePortal, event);
             return true;
         }
 
@@ -401,7 +401,7 @@ public final class PermissionHelper {
             if (!entrancePortal.getOptions().isSilent()) {
                 Stargate.getMessageSender().sendErrorMessage(player, Stargate.getString("denyMsg"));
             }
-            new PlayerTeleporter(entrancePortal, player).teleport(entrancePortal, event);
+            new PlayerTeleporter(entrancePortal, player).teleportPlayer(entrancePortal, event);
             entrancePortal.getPortalOpener().closePortal(false);
             return true;
         }

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

@@ -0,0 +1,247 @@
+package net.knarcraft.stargate.utility;
+
+import net.knarcraft.stargate.Stargate;
+import net.knarcraft.stargate.portal.Portal;
+import net.knarcraft.stargate.portal.teleporter.EntityTeleporter;
+import org.bukkit.Bukkit;
+import org.bukkit.Location;
+import org.bukkit.entity.Creature;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.Player;
+import org.bukkit.scheduler.BukkitScheduler;
+import org.bukkit.util.Vector;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * A helper class with methods for various teleportation tasks
+ *
+ * <p>The teleport helper mainly helps with passengers and leashed creatures</p>
+ */
+public final class TeleportHelper {
+
+    private TeleportHelper() {
+
+    }
+
+    /**
+     * Checks whether a player has leashed creatures that block the teleportation
+     *
+     * @param player <p>The player trying to teleport</p>
+     * @return <p>False if the player has leashed any creatures that cannot go through the portal</p>
+     */
+    public static boolean noLeashedCreaturesPreventTeleportation(Player player) {
+        //Find any nearby leashed entities to teleport with the player
+        List<Creature> nearbyCreatures = getLeashedCreatures(player);
+
+        //Disallow creatures with passengers to prevent smuggling
+        for (Creature creature : nearbyCreatures) {
+            if (!creature.getPassengers().isEmpty()) {
+                return false;
+            }
+        }
+        //TODO: Improve this to account for any players sitting on any of the lead creatures
+
+        //If it's enabled, there is no problem
+        if (Stargate.getGateConfig().handleLeashedCreatures()) {
+            return true;
+        } else {
+            return nearbyCreatures.isEmpty();
+        }
+    }
+
+    /**
+     * Gets all creatures leashed by a player within the given range
+     *
+     * @param player <p>The player to check</p>
+     * @return <p>A list of all creatures the player is holding in a leash (lead)</p>
+     */
+    public static List<Creature> getLeashedCreatures(Player player) {
+        List<Creature> leashedCreatures = new ArrayList<>();
+        //Find any nearby leashed entities to teleport with the player
+        List<Entity> nearbyEntities = player.getNearbyEntities(15, 15, 15);
+        //Teleport all creatures leashed by the player to the portal the player is to exit from
+        for (Entity entity : nearbyEntities) {
+            if (entity instanceof Creature creature && creature.isLeashed() && creature.getLeashHolder() == player) {
+                leashedCreatures.add(creature);
+            }
+        }
+        return leashedCreatures;
+    }
+
+    /**
+     * Teleports and adds a passenger to an entity
+     *
+     * <p>Teleportation of living vehicles is really buggy if you wait between the teleportation and passenger adding,
+     * but there needs to be a delay between teleporting the vehicle and teleporting and adding the passenger.</p>
+     *
+     * @param targetVehicle <p>The entity to add the passenger to</p>
+     * @param passenger     <p>The passenger to teleport and add</p>
+     * @param exitDirection <p>The direction of any passengers exiting the stargate</p>
+     * @param newVelocity   <p>The new velocity of the teleported passenger</p>
+     */
+    public static void teleportAndAddPassenger(Entity targetVehicle, Entity passenger, Vector exitDirection,
+                                               Vector newVelocity) {
+        Location passengerExit = targetVehicle.getLocation().clone().setDirection(exitDirection);
+        if (!passenger.teleport(passengerExit)) {
+            Stargate.debug("TeleportHelper::handleVehiclePassengers", "Failed to teleport passenger" +
+                    passenger);
+        } else {
+            Stargate.debug("TeleportHelper::handleVehiclePassengers", "Teleported " + passenger +
+                    " to " + passengerExit);
+        }
+        if (!targetVehicle.addPassenger(passenger)) {
+            Stargate.debug("TeleportHelper::handleVehiclePassengers", "Failed to add passenger" +
+                    passenger);
+        } else {
+            Stargate.debug("TeleportHelper::handleVehiclePassengers", "Added passenger " + passenger +
+                    " to " + targetVehicle);
+        }
+        Stargate.debug("VehicleTeleporter::teleportVehicle", "Setting velocity " + newVelocity +
+                " for passenger " + passenger);
+        passenger.setVelocity(newVelocity);
+    }
+
+    /**
+     * Ejects, teleports and adds all passengers to the target entity
+     *
+     * @param passengers   <p>The passengers to handle</p>
+     * @param entity       <p>The entity the passengers should be put into</p
+     * @param origin       <p>The portal the entity teleported from</p>
+     * @param target       <p>The portal the entity is teleporting to</p>
+     * @param exitRotation <p>The rotation of any passengers exiting the stargate</p>
+     * @param newVelocity  <p>The new velocity of the teleported passengers</p>
+     */
+    public static void handleEntityPassengers(List<Entity> passengers, Entity entity, Portal origin, Portal target,
+                                              Vector exitRotation, Vector newVelocity) {
+        for (Entity passenger : passengers) {
+            List<Entity> passengerPassengers = passenger.getPassengers();
+            if (!passengerPassengers.isEmpty()) {
+                Stargate.debug("Teleporter::handleEntityPassengers", "Found the entities: " +
+                        passengerPassengers + " as passengers of " + entity);
+            }
+            if (passenger.eject()) {
+                //Teleport any passengers of the passenger
+                handleEntityPassengers(passengerPassengers, passenger, origin, target, exitRotation, newVelocity);
+            }
+            Bukkit.getScheduler().scheduleSyncDelayedTask(Stargate.getInstance(), () -> {
+                if (passenger instanceof Player player) {
+                    //Teleport any creatures leashed by the player in a 15-block range
+                    teleportLeashedCreatures(player, origin, target);
+                }
+                teleportAndAddPassenger(entity, passenger, exitRotation, newVelocity);
+            }, passenger instanceof Player ? Stargate.getGateConfig().waitForPlayerAfterTeleportDelay() : 0);
+        }
+    }
+
+    /**
+     * Teleports any creatures leashed by the player
+     *
+     * <p>Will return false if the teleportation should be aborted because the player has leashed creatures that
+     * aren't allowed to be teleported with the player.</p>
+     *
+     * @param player <p>The player which is teleported</p>
+     * @param origin <p>The portal the player is teleporting from</p>
+     * @param target <p>The portal the player is teleporting to</p>
+     */
+    public static void teleportLeashedCreatures(Player player, Portal origin, Portal target) {
+        //If this feature is disabled, just return
+        if (!Stargate.getGateConfig().handleLeashedCreatures()) {
+            return;
+        }
+        BukkitScheduler scheduler = Bukkit.getScheduler();
+
+        //Find any nearby leashed entities to teleport with the player
+        List<Creature> nearbyEntities = TeleportHelper.getLeashedCreatures(player);
+
+        //Teleport all creatures leashed by the player to the portal the player is to exit from
+        for (Creature creature : nearbyEntities) {
+            creature.setLeashHolder(null);
+            scheduler.scheduleSyncDelayedTask(Stargate.getInstance(), () -> {
+                new EntityTeleporter(target, creature).teleportEntity(origin);
+                scheduler.scheduleSyncDelayedTask(Stargate.getInstance(), () -> creature.setLeashHolder(player),
+                        Stargate.getGateConfig().waitForPlayerAfterTeleportDelay());
+            }, 2);
+        }
+    }
+
+    /**
+     * Checks whether a list of entities or any of their passengers 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>
+     */
+    public static boolean containsNonPlayer(List<Entity> entities) {
+        for (Entity entity : entities) {
+            if (!(entity instanceof Player) || containsNonPlayer(entity.getPassengers())) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Checks whether a list of entities of their passengers 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>
+     */
+    public static boolean containsPlayer(List<Entity> entities) {
+        for (Entity entity : entities) {
+            if (entity instanceof Player || containsPlayer(entity.getPassengers())) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Gets all players recursively from a list of entities
+     *
+     * @param entities <p>The entities to check for players</p>
+     * @return <p>The found players</p>
+     */
+    public static List<Player> getPlayers(List<Entity> entities) {
+        List<Player> players = new ArrayList<>(5);
+        for (Entity entity : entities) {
+            if (entity instanceof Player) {
+                players.add((Player) entity);
+            }
+            players.addAll(getPlayers(entity.getPassengers()));
+        }
+        return players;
+    }
+
+    /**
+     * Checks whether the given player is allowed to and can afford to teleport
+     *
+     * @param player            <p>The player trying to teleport</p>
+     * @param entrancePortal    <p>The portal the player is entering</p>
+     * @param destinationPortal <p>The portal the player is to exit from</p>
+     * @return <p>True if the player is allowed to teleport and is able to pay necessary fees</p>
+     */
+    public static boolean playerCanTeleport(Player player, Portal entrancePortal, Portal destinationPortal) {
+        //Make sure the user can access the portal
+        if (PermissionHelper.cannotAccessPortal(player, entrancePortal, destinationPortal)) {
+            if (!entrancePortal.getOptions().isSilent()) {
+                Stargate.getMessageSender().sendErrorMessage(player, Stargate.getString("denyMsg"));
+            }
+            entrancePortal.getPortalOpener().closePortal(false);
+            return false;
+        }
+
+        //Check if the player is able to afford the teleport fee
+        int cost = EconomyHelper.getUseCost(player, entrancePortal, destinationPortal);
+        boolean canAffordFee = cost <= 0 || Stargate.getEconomyConfig().canAffordFee(player, cost);
+        if (!canAffordFee) {
+            if (!entrancePortal.getOptions().isSilent()) {
+                Stargate.getMessageSender().sendErrorMessage(player, Stargate.getString("ecoInFunds"));
+            }
+            return false;
+        }
+
+        return TeleportHelper.noLeashedCreaturesPreventTeleportation(player);
+    }
+
+}

src/main/resources/config.yml

@@ -1,74 +1,91 @@
 # stargate Configuration File
 # Main stargate config
-# I----------I----------I #
-# portalFolder -  The folder for storing portals
-# gateFolder - The folder for storing gate layouts
-# defaultGateNetwork - The default gate network
-# destroyedByExplosion - Whether to destroy gates with explosions (Creeper, TNT, etc.)
-# 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. 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)
-# mainSignColor - The color used for drawing signs (Default: BLACK).
-# highlightSignColor - The color used for sign markings (Default: WHITE)
-# verifyPortals - Whether all the non-sign blocks are checked to match the gate layout when a stargate is loaded.
-# adminUpdateAlert - Whether to alert admins about new plugin updates
-# I------------I-------------I #
-# stargate economy options #
-# I------------I-------------I #
-# useEconomy - Whether to use an economy plugin
-# createCost - The cost to create a gate
-# destroyCost - The cost to destroy a gate
-# useCost - The cost to use a gate
-# toOwner - Whether the charge for using a gate goes to the gate's owner
-# chargeFreeDestination - Whether a gate whose destination is a free gate is still charged
-# freeGatesColored - Whether a free gate in the destination list is marked with a color
-# freeGatesColor - The color to use for marking free gates
-# I-------I-------I #
-# Debug options #
-# I-------I-------I #
-# debug - Debug -- Only enable if you have issues, massive console output
-# permissionDebug - This will output any and all Permissions checks to console, used for permissions debugging (Requires debug: true)
 
+# language - The language file to load for messages
 language: en
+# adminUpdateAlert - Whether to alert admins about new plugin updates
 adminUpdateAlert: true
 folders:
+  # portalFolder -  The folder for storing portals
   portalFolder: plugins/Stargate/portals/
+  # gateFolder - The folder for storing gate layouts
   gateFolder: plugins/Stargate/gates/
 gates:
+  # maxGatesEachNetwork - The maximum number of gates allowed on a network - 0 for unlimited
   maxGatesEachNetwork: 0
+  # defaultGateNetwork - The default gate network
   defaultGateNetwork: central
+  # exitVelocity - The velocity to give players exiting stargates, relative to the entry velocity
+  exitVelocity: 0.1
   cosmetic:
+    # rememberDestination - Whether to remember the cursor location between uses
     rememberDestination: false
+    # sortNetworkDestinations - Whether to sort network lists alphabetically
     sortNetworkDestinations: false
+    # mainSignColor - The color used for drawing signs (Default: BLACK).
     mainSignColor: BLACK
+    # highlightSignColor - The color used for sign markings (Default: WHITE)
     highlightSignColor: WHITE
+    perSignColors:
+      - 'ACACIA:default,default'
+      - 'BIRCH:default,default'
+      - 'CRIMSON:inverted,inverted'
+      - 'DARK_OAK:inverted,inverted'
+      - 'JUNGLE:default,default'
+      - 'OAK:default,default'
+      - 'SPRUCE:inverted,inverted'
+      - 'WARPED:inverted,inverted'
   integrity:
+    # destroyedByExplosion - Whether to destroy gates with explosions (Creeper, TNT, etc.)
     destroyedByExplosion: false
+    # verifyPortals - Whether all the non-sign blocks are checked to match the gate layout when a stargate is loaded.
     verifyPortals: false
+    # protectEntrance - Whether to protect gate entrance material (More resource intensive. Only enable if using destroyable open/closed material)
     protectEntrance: false
   functionality:
     enableBungee: false
+    # handleVehicles - Whether to allow vehicles through gates. This overrides other vehicle settings
     handleVehicles: true
+    # handleEmptyVehicles - Whether to allow empty vehicles through gates (chest/hopper/tnt/furnace minecarts included)
     handleEmptyVehicles: true
+    # handleCreatureTransportation - Whether to allow players to transport creatures by sending vehicles (minecarts, boats) through gates
     handleCreatureTransportation: true
+    # handleNonPlayerVehicles - Whether to allow vehicles with a passenger which is not a player through gates. handleCreatureTransportation must be enabled
     handleNonPlayerVehicles: true
+    # handleLeashedCreatures - Whether to allow creatures lead by a player to teleport with the player
     handleLeashedCreatures: true
+    # enableCraftBookRemoveOnEjectFix - Whether to enable a fix that causes loss of NBT data, but allows vehicle teleportation to work when CraftBook's remove minecart/boat on eject setting is enabled
+    enableCraftBookRemoveOnEjectFix: false
+
+# I------------I-------------I #
+# stargate economy options #
+# I------------I-------------I #
 economy:
+  # useEconomy - Whether to use an economy plugin
   useEconomy: false
+  # createCost - The cost to create a gate
   createCost: 0
+  # destroyCost - The cost to destroy a gate
   destroyCost: 0
+  # useCost - The cost to use a gate
   useCost: 0
+  # toOwner - Whether the charge for using a gate goes to the gate's owner
   toOwner: false
+  # chargeFreeDestination - Whether a gate whose destination is a free gate is still charged
   chargeFreeDestination: true
+  # freeGatesColored - Whether a free gate in the destination list is marked with a color
   freeGatesColored: false
+  # freeGatesColor - The color to use for marking free gates
   freeGatesColor: DARK_GREEN
+
+# I-------I-------I #
+# Debug options #
+# I-------I-------I #
 debugging:
+  # debug - Debug -- Only enable if you have issues, massive console output
   debug: false
-  permissionDebug: false
+  # permissionDebug - This will output any and all Permissions checks to console, used for permissions debugging (Requires debug: true)
+  permissionDebug: false
+advanced:
+  # waitForPlayerAfterTeleportDelay - The amount of ticks to wait before adding a player as passenger of a vehicle. On slow servers, a value of 6 is required to avoid client glitches after teleporting on a vehicle.
+  waitForPlayerAfterTeleportDelay: 6

src/main/resources/plugin.yml

@@ -1,11 +1,11 @@
 name: Stargate
 main: net.knarcraft.stargate.Stargate
-version: 0.9.2.4
+version: 0.9.3.5
 description: Stargate mod for Bukkit Revived
 author: EpicKnarvik97
 authors: [ Drakia, PseudoKnight, EpicKnarvik97 ]
 website: https://git.knarcraft.net/EpicKnarvik97/Stargate
-api-version: 1.17
+api-version: 1.18
 softdepend: [ Vault ]
 commands:
   stargate:
@@ -141,6 +141,9 @@ permissions:
   stargate.admin.config:
     description: Allows the player to change config values from the chat
     default: false
+  stargate.admin.dye:
+    description: Allows this player to change the dye of any stargate's sign
+    default: false
   stargate.server:
     description: Allows the creation of a BungeeCord stargate going to any server
     default: false
@@ -152,4 +155,5 @@ permissions:
       stargate.admin.hidden: true
       stargate.admin.private: true
       stargate.admin.bungee: true
-      stargate.admin.config: true
+      stargate.admin.config: true
+      stargate.admin.dye: true

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

@@ -32,6 +32,7 @@ public class GateLayoutTest {
 
     @AfterAll
     public static void tearDown() {
+        MockBukkit.getMock().getPluginManager().disablePlugins();
         MockBukkit.unmock();
     }