From 0abffbe7e3ebed2b6400e6ba8abc14cfaef725a4 Mon Sep 17 00:00:00 2001
From: Thatsmusic99 <25277367+Thatsmusic99@users.noreply.github.com>
Date: Sat, 20 Mar 2021 09:11:32 +0000
Subject: [PATCH] all of it moved and that's all you need to know
---
AdvancedTP-Bukkit/AdvancedTP-Bukkit.iml | 32 -----------
.../dependency-reduced-pom.xml | 2 +-
.../pom.xml | 4 +-
.../advancedteleport/CoreClass.java | 0
.../niestrat99/advancedteleport/Metrics.java | 0
.../advancedteleport/UpdateChecker.java | 0
.../advancedteleport/api/ATPlayer.java | 9 ++-
.../advancedteleport/api/BackInfo.java | 0
.../advancedteleport/api/BlockInfo.java | 0
.../niestrat99/advancedteleport/api/Home.java | 0
.../niestrat99/advancedteleport/api/Warp.java | 1 +
.../api/events/ATTeleportEvent.java | 0
.../advancedteleport/commands/ATCommand.java | 0
.../commands/AsyncATCommand.java | 0
.../advancedteleport/commands/AtHelp.java | 0
.../advancedteleport/commands/AtInfo.java | 0
.../advancedteleport/commands/AtReload.java | 0
.../commands/core/HelpCommand.java | 0
.../commands/core/InfoCommand.java | 0
.../commands/home/AbstractHomeCommand.java | 0
.../commands/home/DelHome.java | 0
.../commands/home/HomeCommand.java | 0
.../commands/home/HomesCommand.java | 0
.../commands/home/MoveHomeCommand.java | 0
.../commands/home/SetHomeCommand.java | 0
.../commands/home/SetMainHomeCommand.java | 0
.../commands/spawn/SetSpawn.java | 0
.../commands/spawn/SpawnCommand.java | 0
.../commands/teleport/Back.java | 0
.../commands/teleport/ToggleTP.java | 0
.../commands/teleport/TpAll.java | 0
.../commands/teleport/TpBlockCommand.java | 0
.../commands/teleport/TpCancel.java | 0
.../commands/teleport/TpHereOffline.java | 0
.../commands/teleport/TpList.java | 0
.../commands/teleport/TpLoc.java | 0
.../commands/teleport/TpNo.java | 0
.../commands/teleport/TpOff.java | 0
.../commands/teleport/TpOffline.java | 0
.../commands/teleport/TpOn.java | 0
.../commands/teleport/TpUnblock.java | 0
.../commands/teleport/TpYes.java | 0
.../commands/teleport/Tpa.java | 4 +-
.../commands/teleport/TpaHere.java | 4 +-
.../commands/teleport/Tpo.java | 0
.../commands/teleport/TpoHere.java | 0
.../commands/teleport/Tpr.java | 0
.../commands/warp/AbstractWarpCommand.java | 0
.../commands/warp/DeleteWarpCommand.java | 0
.../commands/warp/MoveWarpCommand.java | 0
.../commands/warp/SetWarpCommand.java | 4 +-
.../commands/warp/WarpCommand.java | 0
.../commands/warp/WarpsCommand.java | 0
.../config/CustomMessages.java | 57 +++++++++++--------
.../advancedteleport/config/GUI.java | 0
.../advancedteleport/config/NewConfig.java | 23 +++++++-
.../advancedteleport/config/Spawn.java | 0
.../fanciful/FancyMessage.java | 0
.../fanciful/JsonRepresentedObject.java | 0
.../advancedteleport/fanciful/JsonString.java | 0
.../fanciful/MessagePart.java | 0
.../fanciful/TextualComponent.java | 0
.../limitations/LimitationsManager.java | 0
.../limitations/commands/CommandRule.java | 0
.../commands/CommandRuleManager.java | 0
.../limitations/commands/list/IgnoreRule.java | 0
.../commands/list/OverrideRule.java | 0
.../limitations/worlds/WorldRule.java | 0
.../limitations/worlds/WorldRulesManager.java | 0
.../limitations/worlds/list/StopIntoRule.java | 0
.../worlds/list/StopOutOfRule.java | 0
.../worlds/list/StopWithinRule.java | 0
.../advancedteleport/listeners/ATSign.java | 0
.../advancedteleport/listeners/AtSigns.java | 0
.../listeners/PlayerListeners.java | 0
.../managers/CommandManager.java | 0
.../managers/CooldownManager.java | 0
.../managers/MovementManager.java | 0
.../managers/TeleportTrackingManager.java | 0
.../advancedteleport/payments/Payment.java | 0
.../payments/PaymentManager.java | 0
.../payments/types/LevelsPayment.java | 0
.../payments/types/PointsPayment.java | 0
.../payments/types/VaultPayment.java | 0
.../advancedteleport/sql/AuditLogManager.java | 0
.../sql/BlocklistManager.java | 0
.../advancedteleport/sql/DataFailManager.java | 0
.../advancedteleport/sql/HomeSQLManager.java | 0
.../sql/PlayerSQLManager.java | 0
.../advancedteleport/sql/SQLManager.java | 0
.../advancedteleport/sql/WarpSQLManager.java | 0
.../utilities/AcceptRequest.java | 0
.../utilities/ArrayWrapper.java | 0
.../utilities/ConditionChecker.java | 0
.../utilities/DistanceLimiter.java | 0
.../advancedteleport/utilities/IconMenu.java | 0
.../utilities/PagedLists.java | 0
.../utilities/RandomCoords.java | 0
.../utilities/RandomTPAlgorithms.java | 0
.../advancedteleport/utilities/TPRequest.java | 10 ++++
.../utilities/TeleportTests.java | 0
.../utilities/nbt/NBTReader.java | 0
.../src/main/resources/plugin.yml | 2 +-
pom.xml | 4 +-
104 files changed, 85 insertions(+), 71 deletions(-)
delete mode 100644 AdvancedTP-Bukkit/AdvancedTP-Bukkit.iml
rename {AdvancedTP-Bukkit => AdvancedTeleport-Bukkit}/dependency-reduced-pom.xml (98%)
rename {AdvancedTP-Bukkit => AdvancedTeleport-Bukkit}/pom.xml (82%)
rename {AdvancedTP-Bukkit => AdvancedTeleport-Bukkit}/src/main/java/io/github/niestrat99/advancedteleport/CoreClass.java (100%)
rename {AdvancedTP-Bukkit => AdvancedTeleport-Bukkit}/src/main/java/io/github/niestrat99/advancedteleport/Metrics.java (100%)
rename {AdvancedTP-Bukkit => AdvancedTeleport-Bukkit}/src/main/java/io/github/niestrat99/advancedteleport/UpdateChecker.java (100%)
rename {AdvancedTP-Bukkit => AdvancedTeleport-Bukkit}/src/main/java/io/github/niestrat99/advancedteleport/api/ATPlayer.java (97%)
rename {AdvancedTP-Bukkit => AdvancedTeleport-Bukkit}/src/main/java/io/github/niestrat99/advancedteleport/api/BackInfo.java (100%)
rename {AdvancedTP-Bukkit => AdvancedTeleport-Bukkit}/src/main/java/io/github/niestrat99/advancedteleport/api/BlockInfo.java (100%)
rename {AdvancedTP-Bukkit => AdvancedTeleport-Bukkit}/src/main/java/io/github/niestrat99/advancedteleport/api/Home.java (100%)
rename {AdvancedTP-Bukkit => AdvancedTeleport-Bukkit}/src/main/java/io/github/niestrat99/advancedteleport/api/Warp.java (98%)
rename {AdvancedTP-Bukkit => AdvancedTeleport-Bukkit}/src/main/java/io/github/niestrat99/advancedteleport/api/events/ATTeleportEvent.java (100%)
rename {AdvancedTP-Bukkit => AdvancedTeleport-Bukkit}/src/main/java/io/github/niestrat99/advancedteleport/commands/ATCommand.java (100%)
rename {AdvancedTP-Bukkit => AdvancedTeleport-Bukkit}/src/main/java/io/github/niestrat99/advancedteleport/commands/AsyncATCommand.java (100%)
rename {AdvancedTP-Bukkit => AdvancedTeleport-Bukkit}/src/main/java/io/github/niestrat99/advancedteleport/commands/AtHelp.java (100%)
rename {AdvancedTP-Bukkit => AdvancedTeleport-Bukkit}/src/main/java/io/github/niestrat99/advancedteleport/commands/AtInfo.java (100%)
rename {AdvancedTP-Bukkit => AdvancedTeleport-Bukkit}/src/main/java/io/github/niestrat99/advancedteleport/commands/AtReload.java (100%)
rename {AdvancedTP-Bukkit => AdvancedTeleport-Bukkit}/src/main/java/io/github/niestrat99/advancedteleport/commands/core/HelpCommand.java (100%)
rename {AdvancedTP-Bukkit => AdvancedTeleport-Bukkit}/src/main/java/io/github/niestrat99/advancedteleport/commands/core/InfoCommand.java (100%)
rename {AdvancedTP-Bukkit => AdvancedTeleport-Bukkit}/src/main/java/io/github/niestrat99/advancedteleport/commands/home/AbstractHomeCommand.java (100%)
rename {AdvancedTP-Bukkit => AdvancedTeleport-Bukkit}/src/main/java/io/github/niestrat99/advancedteleport/commands/home/DelHome.java (100%)
rename {AdvancedTP-Bukkit => AdvancedTeleport-Bukkit}/src/main/java/io/github/niestrat99/advancedteleport/commands/home/HomeCommand.java (100%)
rename {AdvancedTP-Bukkit => AdvancedTeleport-Bukkit}/src/main/java/io/github/niestrat99/advancedteleport/commands/home/HomesCommand.java (100%)
rename {AdvancedTP-Bukkit => AdvancedTeleport-Bukkit}/src/main/java/io/github/niestrat99/advancedteleport/commands/home/MoveHomeCommand.java (100%)
rename {AdvancedTP-Bukkit => AdvancedTeleport-Bukkit}/src/main/java/io/github/niestrat99/advancedteleport/commands/home/SetHomeCommand.java (100%)
rename {AdvancedTP-Bukkit => AdvancedTeleport-Bukkit}/src/main/java/io/github/niestrat99/advancedteleport/commands/home/SetMainHomeCommand.java (100%)
rename {AdvancedTP-Bukkit => AdvancedTeleport-Bukkit}/src/main/java/io/github/niestrat99/advancedteleport/commands/spawn/SetSpawn.java (100%)
rename {AdvancedTP-Bukkit => AdvancedTeleport-Bukkit}/src/main/java/io/github/niestrat99/advancedteleport/commands/spawn/SpawnCommand.java (100%)
rename {AdvancedTP-Bukkit => AdvancedTeleport-Bukkit}/src/main/java/io/github/niestrat99/advancedteleport/commands/teleport/Back.java (100%)
rename {AdvancedTP-Bukkit => AdvancedTeleport-Bukkit}/src/main/java/io/github/niestrat99/advancedteleport/commands/teleport/ToggleTP.java (100%)
rename {AdvancedTP-Bukkit => AdvancedTeleport-Bukkit}/src/main/java/io/github/niestrat99/advancedteleport/commands/teleport/TpAll.java (100%)
rename {AdvancedTP-Bukkit => AdvancedTeleport-Bukkit}/src/main/java/io/github/niestrat99/advancedteleport/commands/teleport/TpBlockCommand.java (100%)
rename {AdvancedTP-Bukkit => AdvancedTeleport-Bukkit}/src/main/java/io/github/niestrat99/advancedteleport/commands/teleport/TpCancel.java (100%)
rename {AdvancedTP-Bukkit => AdvancedTeleport-Bukkit}/src/main/java/io/github/niestrat99/advancedteleport/commands/teleport/TpHereOffline.java (100%)
rename {AdvancedTP-Bukkit => AdvancedTeleport-Bukkit}/src/main/java/io/github/niestrat99/advancedteleport/commands/teleport/TpList.java (100%)
rename {AdvancedTP-Bukkit => AdvancedTeleport-Bukkit}/src/main/java/io/github/niestrat99/advancedteleport/commands/teleport/TpLoc.java (100%)
rename {AdvancedTP-Bukkit => AdvancedTeleport-Bukkit}/src/main/java/io/github/niestrat99/advancedteleport/commands/teleport/TpNo.java (100%)
rename {AdvancedTP-Bukkit => AdvancedTeleport-Bukkit}/src/main/java/io/github/niestrat99/advancedteleport/commands/teleport/TpOff.java (100%)
rename {AdvancedTP-Bukkit => AdvancedTeleport-Bukkit}/src/main/java/io/github/niestrat99/advancedteleport/commands/teleport/TpOffline.java (100%)
rename {AdvancedTP-Bukkit => AdvancedTeleport-Bukkit}/src/main/java/io/github/niestrat99/advancedteleport/commands/teleport/TpOn.java (100%)
rename {AdvancedTP-Bukkit => AdvancedTeleport-Bukkit}/src/main/java/io/github/niestrat99/advancedteleport/commands/teleport/TpUnblock.java (100%)
rename {AdvancedTP-Bukkit => AdvancedTeleport-Bukkit}/src/main/java/io/github/niestrat99/advancedteleport/commands/teleport/TpYes.java (100%)
rename {AdvancedTP-Bukkit => AdvancedTeleport-Bukkit}/src/main/java/io/github/niestrat99/advancedteleport/commands/teleport/Tpa.java (94%)
rename {AdvancedTP-Bukkit => AdvancedTeleport-Bukkit}/src/main/java/io/github/niestrat99/advancedteleport/commands/teleport/TpaHere.java (94%)
rename {AdvancedTP-Bukkit => AdvancedTeleport-Bukkit}/src/main/java/io/github/niestrat99/advancedteleport/commands/teleport/Tpo.java (100%)
rename {AdvancedTP-Bukkit => AdvancedTeleport-Bukkit}/src/main/java/io/github/niestrat99/advancedteleport/commands/teleport/TpoHere.java (100%)
rename {AdvancedTP-Bukkit => AdvancedTeleport-Bukkit}/src/main/java/io/github/niestrat99/advancedteleport/commands/teleport/Tpr.java (100%)
rename {AdvancedTP-Bukkit => AdvancedTeleport-Bukkit}/src/main/java/io/github/niestrat99/advancedteleport/commands/warp/AbstractWarpCommand.java (100%)
rename {AdvancedTP-Bukkit => AdvancedTeleport-Bukkit}/src/main/java/io/github/niestrat99/advancedteleport/commands/warp/DeleteWarpCommand.java (100%)
rename {AdvancedTP-Bukkit => AdvancedTeleport-Bukkit}/src/main/java/io/github/niestrat99/advancedteleport/commands/warp/MoveWarpCommand.java (100%)
rename {AdvancedTP-Bukkit => AdvancedTeleport-Bukkit}/src/main/java/io/github/niestrat99/advancedteleport/commands/warp/SetWarpCommand.java (95%)
rename {AdvancedTP-Bukkit => AdvancedTeleport-Bukkit}/src/main/java/io/github/niestrat99/advancedteleport/commands/warp/WarpCommand.java (100%)
rename {AdvancedTP-Bukkit => AdvancedTeleport-Bukkit}/src/main/java/io/github/niestrat99/advancedteleport/commands/warp/WarpsCommand.java (100%)
rename {AdvancedTP-Bukkit => AdvancedTeleport-Bukkit}/src/main/java/io/github/niestrat99/advancedteleport/config/CustomMessages.java (88%)
rename {AdvancedTP-Bukkit => AdvancedTeleport-Bukkit}/src/main/java/io/github/niestrat99/advancedteleport/config/GUI.java (100%)
rename {AdvancedTP-Bukkit => AdvancedTeleport-Bukkit}/src/main/java/io/github/niestrat99/advancedteleport/config/NewConfig.java (96%)
rename {AdvancedTP-Bukkit => AdvancedTeleport-Bukkit}/src/main/java/io/github/niestrat99/advancedteleport/config/Spawn.java (100%)
rename {AdvancedTP-Bukkit => AdvancedTeleport-Bukkit}/src/main/java/io/github/niestrat99/advancedteleport/fanciful/FancyMessage.java (100%)
rename {AdvancedTP-Bukkit => AdvancedTeleport-Bukkit}/src/main/java/io/github/niestrat99/advancedteleport/fanciful/JsonRepresentedObject.java (100%)
rename {AdvancedTP-Bukkit => AdvancedTeleport-Bukkit}/src/main/java/io/github/niestrat99/advancedteleport/fanciful/JsonString.java (100%)
rename {AdvancedTP-Bukkit => AdvancedTeleport-Bukkit}/src/main/java/io/github/niestrat99/advancedteleport/fanciful/MessagePart.java (100%)
rename {AdvancedTP-Bukkit => AdvancedTeleport-Bukkit}/src/main/java/io/github/niestrat99/advancedteleport/fanciful/TextualComponent.java (100%)
rename {AdvancedTP-Bukkit => AdvancedTeleport-Bukkit}/src/main/java/io/github/niestrat99/advancedteleport/limitations/LimitationsManager.java (100%)
rename {AdvancedTP-Bukkit => AdvancedTeleport-Bukkit}/src/main/java/io/github/niestrat99/advancedteleport/limitations/commands/CommandRule.java (100%)
rename {AdvancedTP-Bukkit => AdvancedTeleport-Bukkit}/src/main/java/io/github/niestrat99/advancedteleport/limitations/commands/CommandRuleManager.java (100%)
rename {AdvancedTP-Bukkit => AdvancedTeleport-Bukkit}/src/main/java/io/github/niestrat99/advancedteleport/limitations/commands/list/IgnoreRule.java (100%)
rename {AdvancedTP-Bukkit => AdvancedTeleport-Bukkit}/src/main/java/io/github/niestrat99/advancedteleport/limitations/commands/list/OverrideRule.java (100%)
rename {AdvancedTP-Bukkit => AdvancedTeleport-Bukkit}/src/main/java/io/github/niestrat99/advancedteleport/limitations/worlds/WorldRule.java (100%)
rename {AdvancedTP-Bukkit => AdvancedTeleport-Bukkit}/src/main/java/io/github/niestrat99/advancedteleport/limitations/worlds/WorldRulesManager.java (100%)
rename {AdvancedTP-Bukkit => AdvancedTeleport-Bukkit}/src/main/java/io/github/niestrat99/advancedteleport/limitations/worlds/list/StopIntoRule.java (100%)
rename {AdvancedTP-Bukkit => AdvancedTeleport-Bukkit}/src/main/java/io/github/niestrat99/advancedteleport/limitations/worlds/list/StopOutOfRule.java (100%)
rename {AdvancedTP-Bukkit => AdvancedTeleport-Bukkit}/src/main/java/io/github/niestrat99/advancedteleport/limitations/worlds/list/StopWithinRule.java (100%)
rename {AdvancedTP-Bukkit => AdvancedTeleport-Bukkit}/src/main/java/io/github/niestrat99/advancedteleport/listeners/ATSign.java (100%)
rename {AdvancedTP-Bukkit => AdvancedTeleport-Bukkit}/src/main/java/io/github/niestrat99/advancedteleport/listeners/AtSigns.java (100%)
rename {AdvancedTP-Bukkit => AdvancedTeleport-Bukkit}/src/main/java/io/github/niestrat99/advancedteleport/listeners/PlayerListeners.java (100%)
rename {AdvancedTP-Bukkit => AdvancedTeleport-Bukkit}/src/main/java/io/github/niestrat99/advancedteleport/managers/CommandManager.java (100%)
rename {AdvancedTP-Bukkit => AdvancedTeleport-Bukkit}/src/main/java/io/github/niestrat99/advancedteleport/managers/CooldownManager.java (100%)
rename {AdvancedTP-Bukkit => AdvancedTeleport-Bukkit}/src/main/java/io/github/niestrat99/advancedteleport/managers/MovementManager.java (100%)
rename {AdvancedTP-Bukkit => AdvancedTeleport-Bukkit}/src/main/java/io/github/niestrat99/advancedteleport/managers/TeleportTrackingManager.java (100%)
rename {AdvancedTP-Bukkit => AdvancedTeleport-Bukkit}/src/main/java/io/github/niestrat99/advancedteleport/payments/Payment.java (100%)
rename {AdvancedTP-Bukkit => AdvancedTeleport-Bukkit}/src/main/java/io/github/niestrat99/advancedteleport/payments/PaymentManager.java (100%)
rename {AdvancedTP-Bukkit => AdvancedTeleport-Bukkit}/src/main/java/io/github/niestrat99/advancedteleport/payments/types/LevelsPayment.java (100%)
rename {AdvancedTP-Bukkit => AdvancedTeleport-Bukkit}/src/main/java/io/github/niestrat99/advancedteleport/payments/types/PointsPayment.java (100%)
rename {AdvancedTP-Bukkit => AdvancedTeleport-Bukkit}/src/main/java/io/github/niestrat99/advancedteleport/payments/types/VaultPayment.java (100%)
rename {AdvancedTP-Bukkit => AdvancedTeleport-Bukkit}/src/main/java/io/github/niestrat99/advancedteleport/sql/AuditLogManager.java (100%)
rename {AdvancedTP-Bukkit => AdvancedTeleport-Bukkit}/src/main/java/io/github/niestrat99/advancedteleport/sql/BlocklistManager.java (100%)
rename {AdvancedTP-Bukkit => AdvancedTeleport-Bukkit}/src/main/java/io/github/niestrat99/advancedteleport/sql/DataFailManager.java (100%)
rename {AdvancedTP-Bukkit => AdvancedTeleport-Bukkit}/src/main/java/io/github/niestrat99/advancedteleport/sql/HomeSQLManager.java (100%)
rename {AdvancedTP-Bukkit => AdvancedTeleport-Bukkit}/src/main/java/io/github/niestrat99/advancedteleport/sql/PlayerSQLManager.java (100%)
rename {AdvancedTP-Bukkit => AdvancedTeleport-Bukkit}/src/main/java/io/github/niestrat99/advancedteleport/sql/SQLManager.java (100%)
rename {AdvancedTP-Bukkit => AdvancedTeleport-Bukkit}/src/main/java/io/github/niestrat99/advancedteleport/sql/WarpSQLManager.java (100%)
rename {AdvancedTP-Bukkit => AdvancedTeleport-Bukkit}/src/main/java/io/github/niestrat99/advancedteleport/utilities/AcceptRequest.java (100%)
rename {AdvancedTP-Bukkit => AdvancedTeleport-Bukkit}/src/main/java/io/github/niestrat99/advancedteleport/utilities/ArrayWrapper.java (100%)
rename {AdvancedTP-Bukkit => AdvancedTeleport-Bukkit}/src/main/java/io/github/niestrat99/advancedteleport/utilities/ConditionChecker.java (100%)
rename {AdvancedTP-Bukkit => AdvancedTeleport-Bukkit}/src/main/java/io/github/niestrat99/advancedteleport/utilities/DistanceLimiter.java (100%)
rename {AdvancedTP-Bukkit => AdvancedTeleport-Bukkit}/src/main/java/io/github/niestrat99/advancedteleport/utilities/IconMenu.java (100%)
rename {AdvancedTP-Bukkit => AdvancedTeleport-Bukkit}/src/main/java/io/github/niestrat99/advancedteleport/utilities/PagedLists.java (100%)
rename {AdvancedTP-Bukkit => AdvancedTeleport-Bukkit}/src/main/java/io/github/niestrat99/advancedteleport/utilities/RandomCoords.java (100%)
rename {AdvancedTP-Bukkit => AdvancedTeleport-Bukkit}/src/main/java/io/github/niestrat99/advancedteleport/utilities/RandomTPAlgorithms.java (100%)
rename {AdvancedTP-Bukkit => AdvancedTeleport-Bukkit}/src/main/java/io/github/niestrat99/advancedteleport/utilities/TPRequest.java (80%)
rename {AdvancedTP-Bukkit => AdvancedTeleport-Bukkit}/src/main/java/io/github/niestrat99/advancedteleport/utilities/TeleportTests.java (100%)
rename {AdvancedTP-Bukkit => AdvancedTeleport-Bukkit}/src/main/java/io/github/niestrat99/advancedteleport/utilities/nbt/NBTReader.java (100%)
rename {AdvancedTP-Bukkit => AdvancedTeleport-Bukkit}/src/main/resources/plugin.yml (99%)
diff --git a/AdvancedTP-Bukkit/AdvancedTP-Bukkit.iml b/AdvancedTP-Bukkit/AdvancedTP-Bukkit.iml
deleted file mode 100644
index a55e4e7b..00000000
--- a/AdvancedTP-Bukkit/AdvancedTP-Bukkit.iml
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/AdvancedTP-Bukkit/dependency-reduced-pom.xml b/AdvancedTeleport-Bukkit/dependency-reduced-pom.xml
similarity index 98%
rename from AdvancedTP-Bukkit/dependency-reduced-pom.xml
rename to AdvancedTeleport-Bukkit/dependency-reduced-pom.xml
index 9542445a..5d5a3153 100644
--- a/AdvancedTP-Bukkit/dependency-reduced-pom.xml
+++ b/AdvancedTeleport-Bukkit/dependency-reduced-pom.xml
@@ -3,7 +3,7 @@
AdvancedTeleport
io.github.niestrat99
- v5.4.6-SNAPSHOT-2
+ v5.4.6-SNAPSHOT-3
4.0.0
AdvancedTP-Bukkit
diff --git a/AdvancedTP-Bukkit/pom.xml b/AdvancedTeleport-Bukkit/pom.xml
similarity index 82%
rename from AdvancedTP-Bukkit/pom.xml
rename to AdvancedTeleport-Bukkit/pom.xml
index 270dc009..f790385e 100644
--- a/AdvancedTP-Bukkit/pom.xml
+++ b/AdvancedTeleport-Bukkit/pom.xml
@@ -5,12 +5,12 @@
AdvancedTeleport
io.github.niestrat99
- v5.4.6-SNAPSHOT-2
+ v5.4.6-SNAPSHOT-3
4.0.0
jar
- AdvancedTP-Bukkit
+ AdvancedTeleport-Bukkit
\ No newline at end of file
diff --git a/AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/CoreClass.java b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/CoreClass.java
similarity index 100%
rename from AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/CoreClass.java
rename to AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/CoreClass.java
diff --git a/AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/Metrics.java b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/Metrics.java
similarity index 100%
rename from AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/Metrics.java
rename to AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/Metrics.java
diff --git a/AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/UpdateChecker.java b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/UpdateChecker.java
similarity index 100%
rename from AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/UpdateChecker.java
rename to AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/UpdateChecker.java
diff --git a/AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/api/ATPlayer.java b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/api/ATPlayer.java
similarity index 97%
rename from AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/api/ATPlayer.java
rename to AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/api/ATPlayer.java
index d86def1d..6194f74e 100644
--- a/AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/api/ATPlayer.java
+++ b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/api/ATPlayer.java
@@ -36,6 +36,10 @@ public class ATPlayer {
private static final HashMap players = new HashMap<>();
+ /**
+ *
+ * @param player
+ */
public ATPlayer(Player player) {
this(player.getUniqueId(), player.getName());
}
@@ -114,9 +118,10 @@ public void setTeleportationEnabled(boolean teleportationEnabled, SQLManager.SQL
*/
/**
+ * Checks to see if this player has blocked a specified player.
*
- * @param otherPlayer
- * @return
+ * @param otherPlayer The player that this one theoretically blocked.
+ * @return true is otherPlayer is blocked, false if otherwise.
*/
public boolean hasBlocked(OfflinePlayer otherPlayer) {
return blockedUsers.containsKey(otherPlayer.getUniqueId());
diff --git a/AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/api/BackInfo.java b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/api/BackInfo.java
similarity index 100%
rename from AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/api/BackInfo.java
rename to AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/api/BackInfo.java
diff --git a/AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/api/BlockInfo.java b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/api/BlockInfo.java
similarity index 100%
rename from AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/api/BlockInfo.java
rename to AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/api/BlockInfo.java
diff --git a/AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/api/Home.java b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/api/Home.java
similarity index 100%
rename from AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/api/Home.java
rename to AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/api/Home.java
diff --git a/AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/api/Warp.java b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/api/Warp.java
similarity index 98%
rename from AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/api/Warp.java
rename to AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/api/Warp.java
index fa68fb1e..09089b26 100644
--- a/AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/api/Warp.java
+++ b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/api/Warp.java
@@ -70,6 +70,7 @@ public static HashMap getWarps() {
}
public void delete(SQLManager.SQLCallback callback) {
+ warps.remove(name);
WarpSQLManager.get().removeWarp(name, callback);
}
}
diff --git a/AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/api/events/ATTeleportEvent.java b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/api/events/ATTeleportEvent.java
similarity index 100%
rename from AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/api/events/ATTeleportEvent.java
rename to AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/api/events/ATTeleportEvent.java
diff --git a/AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/ATCommand.java b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/ATCommand.java
similarity index 100%
rename from AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/ATCommand.java
rename to AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/ATCommand.java
diff --git a/AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/AsyncATCommand.java b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/AsyncATCommand.java
similarity index 100%
rename from AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/AsyncATCommand.java
rename to AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/AsyncATCommand.java
diff --git a/AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/AtHelp.java b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/AtHelp.java
similarity index 100%
rename from AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/AtHelp.java
rename to AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/AtHelp.java
diff --git a/AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/AtInfo.java b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/AtInfo.java
similarity index 100%
rename from AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/AtInfo.java
rename to AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/AtInfo.java
diff --git a/AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/AtReload.java b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/AtReload.java
similarity index 100%
rename from AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/AtReload.java
rename to AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/AtReload.java
diff --git a/AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/core/HelpCommand.java b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/core/HelpCommand.java
similarity index 100%
rename from AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/core/HelpCommand.java
rename to AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/core/HelpCommand.java
diff --git a/AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/core/InfoCommand.java b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/core/InfoCommand.java
similarity index 100%
rename from AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/core/InfoCommand.java
rename to AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/core/InfoCommand.java
diff --git a/AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/home/AbstractHomeCommand.java b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/home/AbstractHomeCommand.java
similarity index 100%
rename from AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/home/AbstractHomeCommand.java
rename to AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/home/AbstractHomeCommand.java
diff --git a/AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/home/DelHome.java b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/home/DelHome.java
similarity index 100%
rename from AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/home/DelHome.java
rename to AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/home/DelHome.java
diff --git a/AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/home/HomeCommand.java b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/home/HomeCommand.java
similarity index 100%
rename from AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/home/HomeCommand.java
rename to AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/home/HomeCommand.java
diff --git a/AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/home/HomesCommand.java b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/home/HomesCommand.java
similarity index 100%
rename from AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/home/HomesCommand.java
rename to AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/home/HomesCommand.java
diff --git a/AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/home/MoveHomeCommand.java b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/home/MoveHomeCommand.java
similarity index 100%
rename from AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/home/MoveHomeCommand.java
rename to AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/home/MoveHomeCommand.java
diff --git a/AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/home/SetHomeCommand.java b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/home/SetHomeCommand.java
similarity index 100%
rename from AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/home/SetHomeCommand.java
rename to AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/home/SetHomeCommand.java
diff --git a/AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/home/SetMainHomeCommand.java b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/home/SetMainHomeCommand.java
similarity index 100%
rename from AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/home/SetMainHomeCommand.java
rename to AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/home/SetMainHomeCommand.java
diff --git a/AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/spawn/SetSpawn.java b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/spawn/SetSpawn.java
similarity index 100%
rename from AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/spawn/SetSpawn.java
rename to AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/spawn/SetSpawn.java
diff --git a/AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/spawn/SpawnCommand.java b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/spawn/SpawnCommand.java
similarity index 100%
rename from AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/spawn/SpawnCommand.java
rename to AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/spawn/SpawnCommand.java
diff --git a/AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/teleport/Back.java b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/teleport/Back.java
similarity index 100%
rename from AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/teleport/Back.java
rename to AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/teleport/Back.java
diff --git a/AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/teleport/ToggleTP.java b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/teleport/ToggleTP.java
similarity index 100%
rename from AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/teleport/ToggleTP.java
rename to AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/teleport/ToggleTP.java
diff --git a/AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/teleport/TpAll.java b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/teleport/TpAll.java
similarity index 100%
rename from AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/teleport/TpAll.java
rename to AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/teleport/TpAll.java
diff --git a/AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/teleport/TpBlockCommand.java b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/teleport/TpBlockCommand.java
similarity index 100%
rename from AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/teleport/TpBlockCommand.java
rename to AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/teleport/TpBlockCommand.java
diff --git a/AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/teleport/TpCancel.java b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/teleport/TpCancel.java
similarity index 100%
rename from AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/teleport/TpCancel.java
rename to AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/teleport/TpCancel.java
diff --git a/AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/teleport/TpHereOffline.java b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/teleport/TpHereOffline.java
similarity index 100%
rename from AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/teleport/TpHereOffline.java
rename to AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/teleport/TpHereOffline.java
diff --git a/AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/teleport/TpList.java b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/teleport/TpList.java
similarity index 100%
rename from AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/teleport/TpList.java
rename to AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/teleport/TpList.java
diff --git a/AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/teleport/TpLoc.java b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/teleport/TpLoc.java
similarity index 100%
rename from AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/teleport/TpLoc.java
rename to AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/teleport/TpLoc.java
diff --git a/AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/teleport/TpNo.java b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/teleport/TpNo.java
similarity index 100%
rename from AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/teleport/TpNo.java
rename to AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/teleport/TpNo.java
diff --git a/AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/teleport/TpOff.java b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/teleport/TpOff.java
similarity index 100%
rename from AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/teleport/TpOff.java
rename to AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/teleport/TpOff.java
diff --git a/AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/teleport/TpOffline.java b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/teleport/TpOffline.java
similarity index 100%
rename from AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/teleport/TpOffline.java
rename to AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/teleport/TpOffline.java
diff --git a/AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/teleport/TpOn.java b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/teleport/TpOn.java
similarity index 100%
rename from AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/teleport/TpOn.java
rename to AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/teleport/TpOn.java
diff --git a/AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/teleport/TpUnblock.java b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/teleport/TpUnblock.java
similarity index 100%
rename from AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/teleport/TpUnblock.java
rename to AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/teleport/TpUnblock.java
diff --git a/AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/teleport/TpYes.java b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/teleport/TpYes.java
similarity index 100%
rename from AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/teleport/TpYes.java
rename to AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/teleport/TpYes.java
diff --git a/AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/teleport/Tpa.java b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/teleport/Tpa.java
similarity index 94%
rename from AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/teleport/Tpa.java
rename to AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/teleport/Tpa.java
index 601073fc..d68d6fd8 100644
--- a/AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/teleport/Tpa.java
+++ b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/teleport/Tpa.java
@@ -58,7 +58,9 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
BukkitRunnable run = new BukkitRunnable() {
@Override
public void run() {
- CustomMessages.sendMessage(sender, "Error.requestExpired", "{player}", target.getName());
+ if (NewConfig.get().NOTIFY_ON_EXPIRE.get()) {
+ CustomMessages.sendMessage(sender, "Error.requestExpired", "{player}", target.getName());
+ }
TPRequest.removeRequest(TPRequest.getRequestByReqAndResponder(target, player));
}
};
diff --git a/AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/teleport/TpaHere.java b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/teleport/TpaHere.java
similarity index 94%
rename from AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/teleport/TpaHere.java
rename to AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/teleport/TpaHere.java
index d7451998..576a9085 100644
--- a/AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/teleport/TpaHere.java
+++ b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/teleport/TpaHere.java
@@ -55,7 +55,9 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command
BukkitRunnable run = new BukkitRunnable() {
@Override
public void run() {
- CustomMessages.sendMessage(sender, "Error.requestExpired", "{player}", target.getName());
+ if (NewConfig.get().NOTIFY_ON_EXPIRE.get()) {
+ CustomMessages.sendMessage(sender, "Error.requestExpired", "{player}", target.getName());
+ }
TPRequest.removeRequest(TPRequest.getRequestByReqAndResponder(target, player));
}
};
diff --git a/AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/teleport/Tpo.java b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/teleport/Tpo.java
similarity index 100%
rename from AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/teleport/Tpo.java
rename to AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/teleport/Tpo.java
diff --git a/AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/teleport/TpoHere.java b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/teleport/TpoHere.java
similarity index 100%
rename from AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/teleport/TpoHere.java
rename to AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/teleport/TpoHere.java
diff --git a/AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/teleport/Tpr.java b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/teleport/Tpr.java
similarity index 100%
rename from AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/teleport/Tpr.java
rename to AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/teleport/Tpr.java
diff --git a/AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/warp/AbstractWarpCommand.java b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/warp/AbstractWarpCommand.java
similarity index 100%
rename from AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/warp/AbstractWarpCommand.java
rename to AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/warp/AbstractWarpCommand.java
diff --git a/AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/warp/DeleteWarpCommand.java b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/warp/DeleteWarpCommand.java
similarity index 100%
rename from AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/warp/DeleteWarpCommand.java
rename to AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/warp/DeleteWarpCommand.java
diff --git a/AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/warp/MoveWarpCommand.java b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/warp/MoveWarpCommand.java
similarity index 100%
rename from AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/warp/MoveWarpCommand.java
rename to AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/warp/MoveWarpCommand.java
diff --git a/AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/warp/SetWarpCommand.java b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/warp/SetWarpCommand.java
similarity index 95%
rename from AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/warp/SetWarpCommand.java
rename to AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/warp/SetWarpCommand.java
index e24bec06..ae329679 100644
--- a/AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/warp/SetWarpCommand.java
+++ b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/warp/SetWarpCommand.java
@@ -1,7 +1,7 @@
package io.github.niestrat99.advancedteleport.commands.warp;
import io.github.niestrat99.advancedteleport.api.Warp;
-import io.github.niestrat99.advancedteleport.commands.AsyncATCommand;
+import io.github.niestrat99.advancedteleport.commands.ATCommand;
import io.github.niestrat99.advancedteleport.config.CustomMessages;
import io.github.niestrat99.advancedteleport.sql.WarpSQLManager;
import org.bukkit.Location;
@@ -13,7 +13,7 @@
import java.util.List;
-public class SetWarpCommand extends AbstractWarpCommand implements AsyncATCommand {
+public class SetWarpCommand extends AbstractWarpCommand implements ATCommand {
@Override
public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) {
diff --git a/AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/warp/WarpCommand.java b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/warp/WarpCommand.java
similarity index 100%
rename from AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/warp/WarpCommand.java
rename to AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/warp/WarpCommand.java
diff --git a/AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/warp/WarpsCommand.java b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/warp/WarpsCommand.java
similarity index 100%
rename from AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/warp/WarpsCommand.java
rename to AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/commands/warp/WarpsCommand.java
diff --git a/AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/config/CustomMessages.java b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/config/CustomMessages.java
similarity index 88%
rename from AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/config/CustomMessages.java
rename to AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/config/CustomMessages.java
index 0b2a9df8..7fd05946 100644
--- a/AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/config/CustomMessages.java
+++ b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/config/CustomMessages.java
@@ -18,11 +18,13 @@ public class CustomMessages extends CMFile {
public static File ConfigFile = new File(CoreClass.getInstance().getDataFolder(),"custom-messages.yml");
public static CustomMessages config;
+ private static HashMap titleManager;
public CustomMessages(Plugin plugin) {
super(plugin, "custom-messages");
setDescription(null);
config = this;
+ titleManager = new HashMap<>();
}
public void loadDefaults() {
@@ -44,6 +46,10 @@ public void loadDefaults() {
addDefault("Teleport.eventBeforeTPMovementAllowed" , "&b↑ &8» &7Teleporting in &b{countdown} seconds&7!");
addDefault("Teleport.eventTeleport" , "&b↑ &8» &7Teleporting...");
addDefault("Teleport.eventMovement" , "&b↑ &8» &7Teleport has been cancelled due to movement.");
+ addDefault("Teleport.eventMovement_title.length", 60);
+ addDefault("Teleport.eventMovement_title.fade-in", 0);
+ addDefault("Teleport.eventMovement_title.fade-out", 10);
+ addDefault("Teleport.eventMovement_title.0", "&e&l! &c&lCancelled &e&l!");
addDefault("Teleport.teleportingToSpawn", "&b↑ &8» &7Teleporting you to spawn!");
addDefault("Teleport.teleporting", "&b↑ &8» &7Teleporting to &b{player}&7!");
addDefault("Teleport.teleportingToHome", "&b↑ &8» &7Teleporting to &b{home}&7!");
@@ -90,34 +96,34 @@ public void loadDefaults() {
addDefault("Error.noBedHomeOther", "&b↑ &8» &b{player} &7doesn't have a bed spawn set!");
addDefault("Error.reachedHomeLimit", "&b↑ &8» &7You can't set any more homes!");
addDefault("Error.homeAlreadySet", "&b↑ &8» &7You already have a home called &b{home}&7!");
- config.addDefault("Error.noWarpInput", "&b↑ &8» &7You have to include the warp's name!");
- config.addDefault("Error.noSuchWarp", "&b↑ &8» &7That warp doesn't exist!");
- config.addDefault("Error.noSuchWorld", "&b↑ &8» &7That world doesn't exist!");
- config.addDefault("Error.noLocation", "&b↑ &8» &7You don't have any location to teleport back to!");
- config.addDefault("Error.notAPlayer", "&b↑ &8» &7You must be a player to run this command!");
+ addDefault("Error.noWarpInput", "&b↑ &8» &7You have to include the warp's name!");
+ addDefault("Error.noSuchWarp", "&b↑ &8» &7That warp doesn't exist!");
+ addDefault("Error.noSuchWorld", "&b↑ &8» &7That world doesn't exist!");
+ addDefault("Error.noLocation", "&b↑ &8» &7You don't have any location to teleport back to!");
+ addDefault("Error.notAPlayer", "&b↑ &8» &7You must be a player to run this command!");
config.addDefault("Error.noHomes", "&b↑ &8» &7You haven't got any homes!");
config.addDefault("Error.noHomesOtherPlayer", "&b↑ &8» &b{player} &7hasn't got any homes!");
config.addDefault("Error.tooFarAway", "&b↑ &8» &7The teleport destination is too far away so you can not teleport there!");
config.addDefault("Error.noRequestsSent", "&b↑ &8» &7Couldn't send a request to anyone :(");
config.addDefault("Error.onCountdown","&b↑ &8» &7You can't use this command whilst waiting to teleport!");
config.addDefault("Error.noPermissionWarp", "&b↑ &8» &7You can't warp to &b{warp}&7!");
- config.addDefault("Error.cantTPToWorld", "&b↑ &8» &7You can't randomly teleport in that world!");
+ addDefault("Error.cantTPToWorld", "&b↑ &8» &7You can't randomly teleport in that world!");
// config.addDefault("Error.invalidName", "&cHomes and warps may only have letters and numbers in the names!");
- config.addDefault("Error.cantTPToWorldLim", "&b↑ &8» &7You can't teleport to &b{world}&7!");
- config.addDefault("Error.tooFewArguments", "&b↑ &8» &7Too few arguments!");
- config.addDefault("Error.invalidArgs", "&b↑ &8» &7Invalid arguments!");
- config.addDefault("Error.cantTPToPlayer", "&b↑ &8» &7You can't request a teleportation to &b{player}&7!");
- config.addDefault("Error.noWarps", "&b↑ &8» &7There are no warps as of currently!");
- config.addDefault("Error.noAccessHome", "&b↑ &8» &7You cannot access &b{home}&7 as of currently!");
- config.addDefault("Error.moveHomeFail", "&b↑ &8» &7The home has been moved but the data has not been stored successfully. The plugin will try to fix this itself.");
- config.addDefault("Error.setMainHomeFail", "&b↑ &8» &7The main home has been set but the data has not been stored successfully. The plugin will try to fix this itself.");
- config.addDefault("Error.deleteHomeFail", "&b↑ &8» &7The home has been deleted but the data has not been stored successfully. The plugin will try to fix this itself.");
- config.addDefault("Error.setHomeFail", "&b↑ &8» &7The home has been set but the data has not been stored successfully. The plugin will try to fix this itself.");
- config.addDefault("Error.deleteWarpFail", "&b↑ &8» &7The warp has been set but the data has not been stored successfully. The plugin will try to fix this itself.");
- config.addDefault("Error.homesNotLoaded", "&b↑ &8» &7Homes for this player haven't loaded yet, please wait a little bit (even just a second) before trying this again!");
- config.addDefault("Error.noOfflineLocation", "&b↑ &8» &7No offline location was found for &b{player}&7!");
- config.addDefault("Error.failedOfflineTeleport", "&b↑ &8» &7Failed to teleport to offline player &b{player}&7!");
- config.addDefault("Error.failedOfflineTeleportHere", "&b↑ &8» &7Failed to teleport offline player &b{player} &7 to your location!");
+ addDefault("Error.cantTPToWorldLim", "&b↑ &8» &7You can't teleport to &b{world}&7!");
+ addDefault("Error.tooFewArguments", "&b↑ &8» &7Too few arguments!");
+ addDefault("Error.invalidArgs", "&b↑ &8» &7Invalid arguments!");
+ addDefault("Error.cantTPToPlayer", "&b↑ &8» &7You can't request a teleportation to &b{player}&7!");
+ addDefault("Error.noWarps", "&b↑ &8» &7There are no warps as of currently!");
+ addDefault("Error.noAccessHome", "&b↑ &8» &7You cannot access &b{home}&7 as of currently!");
+ addDefault("Error.moveHomeFail", "&b↑ &8» &7The home has been moved but the data has not been stored successfully. The plugin will try to fix this itself.");
+ addDefault("Error.setMainHomeFail", "&b↑ &8» &7The main home has been set but the data has not been stored successfully. The plugin will try to fix this itself.");
+ addDefault("Error.deleteHomeFail", "&b↑ &8» &7The home has been deleted but the data has not been stored successfully. The plugin will try to fix this itself.");
+ addDefault("Error.setHomeFail", "&b↑ &8» &7The home has been set but the data has not been stored successfully. The plugin will try to fix this itself.");
+ addDefault("Error.deleteWarpFail", "&b↑ &8» &7The warp has been set but the data has not been stored successfully. The plugin will try to fix this itself.");
+ addDefault("Error.homesNotLoaded", "&b↑ &8» &7Homes for this player haven't loaded yet, please wait a little bit (even just a second) before trying this again!");
+ addDefault("Error.noOfflineLocation", "&b↑ &8» &7No offline location was found for &b{player}&7!");
+ addDefault("Error.failedOfflineTeleport", "&b↑ &8» &7Failed to teleport to offline player &b{player}&7!");
+ addDefault("Error.failedOfflineTeleportHere", "&b↑ &8» &7Failed to teleport offline player &b{player} &7 to your location!");
addDefault("Error.alreadySearching", "&b↑ &8» &7Already searching for a location to teleport to!");
config.addDefault("Info.tpOff", "&b↑ &8» &7Successfully disabled teleport requests!");
@@ -152,6 +158,7 @@ public void loadDefaults() {
config.addDefault("Info.multipleRequestDeny", "&b↑ &8» &7You have multiple teleport requests pending! Click one of the following to deny:");
config.addDefault("Info.requestDeclined", "&b↑ &8» &7You've declined the teleport request!");
config.addDefault("Info.requestDeclinedResponder", "&b↑ &8» &b{player} &7has declined your teleport request!");
+ config.addDefault("Info.requestDisplaced", "&b↑ &8» &7Your request has been cancelled because &b{player} &7got another request!");
config.addDefault("Info.deletedHome", "&b↑ &8» &7Successfully deleted the home &b{home}&7!");
config.addDefault("Info.deletedHomeOther", "&b↑ &8» &7Successfully deleted the home &b{home} &7for &b{player}&7!");
@@ -289,7 +296,7 @@ public static void sendMessage(CommandSender sender, String path, String... plac
titleInfo[2] = titles.getInt("fade-out");
}
- new BukkitRunnable() {
+ BukkitRunnable runnable = new BukkitRunnable() {
private int current = 0;
private String previousTitle = null;
@@ -297,7 +304,7 @@ public static void sendMessage(CommandSender sender, String path, String... plac
@Override
public void run() {
- if (current == titleInfo[1]) {
+ if (current == titleInfo[1] || titleManager.get(player) != this) {
cancel();
return;
}
@@ -318,7 +325,9 @@ public void run() {
current++;
}
- }.runTaskTimer(CoreClass.getInstance(), 1, 1);
+ };
+ titleManager.put(player, runnable);
+ runnable.runTaskTimer(CoreClass.getInstance(), 1, 1);
}
}
if (config.getConfig().get(path) instanceof List) {
diff --git a/AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/config/GUI.java b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/config/GUI.java
similarity index 100%
rename from AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/config/GUI.java
rename to AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/config/GUI.java
diff --git a/AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/config/NewConfig.java b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/config/NewConfig.java
similarity index 96%
rename from AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/config/NewConfig.java
rename to AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/config/NewConfig.java
index a9adcd44..0334fb38 100644
--- a/AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/config/NewConfig.java
+++ b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/config/NewConfig.java
@@ -20,9 +20,12 @@ public class NewConfig extends CMFile {
public ConfigOption USE_RANDOMTP;
public ConfigOption USE_SPAWN;
public ConfigOption USE_HOMES;
- public ConfigOption REQUEST_LIFETIME;
public ConfigOption> DISABLED_COMMANDS;
+ public ConfigOption REQUEST_LIFETIME;
+ public ConfigOption USE_MULTIPLE_REQUESTS;
+ public ConfigOption NOTIFY_ON_EXPIRE;
+
public ConfigOption WARM_UP_TIMER_DURATION;
public ConfigOption CANCEL_WARM_UP_ON_ROTATION;
public ConfigOption CANCEL_WARM_UP_ON_MOVEMENT;
@@ -111,11 +114,18 @@ public void loadDefaults() {
addDefault("use-spawn", true, "Whether the plugin should modify spawn/spawn properties.");
addDefault("use-randomtp", true, "Whether the plugin should allow random teleportation.");
addDefault("use-homes", true, "Whether homes should be enabled in the plugin.");
- addDefault("request-lifetime", 60, "How long tpa and tpahere requests last before expiring.");
addDefault("disabled-commands", new ArrayList<>(), "The commands that AT should not register upon starting up.\n" +
"In other words, this gives up the command for other plugins to use.\n" +
"NOTE: If you are using Essentials with AT and want AT to give up its commands to Essentials, Essentials does NOT go down without a fight. Jesus Christ. You'll need to restart the server for anything to change.");
+ addSection("Teleport Requesting");
+ addDefault("request-lifetime", 60, "How long tpa and tpahere requests last before expiring.");
+ addDefault("allow-multiple-requests", true, "Whether or not the plugin should enable the use of multiple requests.\n" +
+ "When enabled, user 1 may get TPA requests from user 2 and 3, but user 1 is prompted to select a specific request.\n" +
+ "When this is disabled and user 1 receives requests from user 2 and then 3, they will only have user 3's request to respond to.");
+ addDefault("notify-on-expire", true, "Let the player know when their request has timed out or been displaced by another user's request.\n" +
+ "Displacement only occurs when allow-multiple-requests is disabled.");
+
addDefault("warm-up-timer-duration", 3, "Warm-Up Timers", "The number of seconds it takes for the teleportation to take place following confirmation.\n" +
"(i.e. \"You will teleport in 3 seconds!\")\n" +
"This acts as the default option for the per-command warm-ups.");
@@ -156,6 +166,8 @@ public void loadDefaults() {
addDefault("per-command-cooldowns.spawn", "default", "Cooldown for /spawn");
addDefault("per-command-cooldowns.home", "default", "Cooldown for /home");
addDefault("per-command-cooldowns.back", "default", "Cooldown for /back");
+ //addDefault("per-command-cooldowns.sethome", "default", "Cooldown for /sethome");
+ //addDefault("per-command-cooldowns.setwarp", "default", "Cooldown for /setwarp");
addDefault("cost-amount", 100.0, "Teleportation Costs", "The amount it costs to teleport somewhere." +
"\nIf you want to use Vault Economy, use 100.0 to charge $100." +
@@ -172,6 +184,8 @@ public void loadDefaults() {
addDefault("per-command-cost.spawn", "default", "Cost for /spawn");
addDefault("per-command-cost.home", "default", "Cost for /home");
addDefault("per-command-cost.back", "default", "Cost for /back");
+ //addDefault("per-command-cost.sethome", "default", "Cost for /sethome");
+ //addDefault("pet-command-cost.setwarp", "default", "Cost for /setwarp");
addSection("SQL Storage");
@@ -433,9 +447,12 @@ public void postSave() {
USE_RANDOMTP = new ConfigOption<>("use-randomtp");
USE_SPAWN = new ConfigOption<>("use-spawn");
USE_HOMES = new ConfigOption<>("use-homes");
- REQUEST_LIFETIME = new ConfigOption<>("request-lifetime");
DISABLED_COMMANDS = new ConfigOption<>("disabled-commands");
+ REQUEST_LIFETIME = new ConfigOption<>("request-lifetime");
+ USE_MULTIPLE_REQUESTS = new ConfigOption<>("allow-multiple-requests");
+ NOTIFY_ON_EXPIRE = new ConfigOption<>("notify-on-expire");
+
WARM_UP_TIMER_DURATION = new ConfigOption<>("warm-up-timer-duration");
CANCEL_WARM_UP_ON_ROTATION = new ConfigOption<>("cancel-warm-up-on-rotation");
CANCEL_WARM_UP_ON_MOVEMENT = new ConfigOption<>("cancel-warm-up-on-movement");
diff --git a/AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/config/Spawn.java b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/config/Spawn.java
similarity index 100%
rename from AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/config/Spawn.java
rename to AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/config/Spawn.java
diff --git a/AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/fanciful/FancyMessage.java b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/fanciful/FancyMessage.java
similarity index 100%
rename from AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/fanciful/FancyMessage.java
rename to AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/fanciful/FancyMessage.java
diff --git a/AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/fanciful/JsonRepresentedObject.java b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/fanciful/JsonRepresentedObject.java
similarity index 100%
rename from AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/fanciful/JsonRepresentedObject.java
rename to AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/fanciful/JsonRepresentedObject.java
diff --git a/AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/fanciful/JsonString.java b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/fanciful/JsonString.java
similarity index 100%
rename from AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/fanciful/JsonString.java
rename to AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/fanciful/JsonString.java
diff --git a/AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/fanciful/MessagePart.java b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/fanciful/MessagePart.java
similarity index 100%
rename from AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/fanciful/MessagePart.java
rename to AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/fanciful/MessagePart.java
diff --git a/AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/fanciful/TextualComponent.java b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/fanciful/TextualComponent.java
similarity index 100%
rename from AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/fanciful/TextualComponent.java
rename to AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/fanciful/TextualComponent.java
diff --git a/AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/limitations/LimitationsManager.java b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/limitations/LimitationsManager.java
similarity index 100%
rename from AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/limitations/LimitationsManager.java
rename to AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/limitations/LimitationsManager.java
diff --git a/AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/limitations/commands/CommandRule.java b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/limitations/commands/CommandRule.java
similarity index 100%
rename from AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/limitations/commands/CommandRule.java
rename to AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/limitations/commands/CommandRule.java
diff --git a/AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/limitations/commands/CommandRuleManager.java b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/limitations/commands/CommandRuleManager.java
similarity index 100%
rename from AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/limitations/commands/CommandRuleManager.java
rename to AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/limitations/commands/CommandRuleManager.java
diff --git a/AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/limitations/commands/list/IgnoreRule.java b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/limitations/commands/list/IgnoreRule.java
similarity index 100%
rename from AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/limitations/commands/list/IgnoreRule.java
rename to AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/limitations/commands/list/IgnoreRule.java
diff --git a/AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/limitations/commands/list/OverrideRule.java b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/limitations/commands/list/OverrideRule.java
similarity index 100%
rename from AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/limitations/commands/list/OverrideRule.java
rename to AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/limitations/commands/list/OverrideRule.java
diff --git a/AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/limitations/worlds/WorldRule.java b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/limitations/worlds/WorldRule.java
similarity index 100%
rename from AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/limitations/worlds/WorldRule.java
rename to AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/limitations/worlds/WorldRule.java
diff --git a/AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/limitations/worlds/WorldRulesManager.java b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/limitations/worlds/WorldRulesManager.java
similarity index 100%
rename from AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/limitations/worlds/WorldRulesManager.java
rename to AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/limitations/worlds/WorldRulesManager.java
diff --git a/AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/limitations/worlds/list/StopIntoRule.java b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/limitations/worlds/list/StopIntoRule.java
similarity index 100%
rename from AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/limitations/worlds/list/StopIntoRule.java
rename to AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/limitations/worlds/list/StopIntoRule.java
diff --git a/AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/limitations/worlds/list/StopOutOfRule.java b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/limitations/worlds/list/StopOutOfRule.java
similarity index 100%
rename from AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/limitations/worlds/list/StopOutOfRule.java
rename to AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/limitations/worlds/list/StopOutOfRule.java
diff --git a/AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/limitations/worlds/list/StopWithinRule.java b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/limitations/worlds/list/StopWithinRule.java
similarity index 100%
rename from AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/limitations/worlds/list/StopWithinRule.java
rename to AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/limitations/worlds/list/StopWithinRule.java
diff --git a/AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/listeners/ATSign.java b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/listeners/ATSign.java
similarity index 100%
rename from AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/listeners/ATSign.java
rename to AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/listeners/ATSign.java
diff --git a/AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/listeners/AtSigns.java b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/listeners/AtSigns.java
similarity index 100%
rename from AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/listeners/AtSigns.java
rename to AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/listeners/AtSigns.java
diff --git a/AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/listeners/PlayerListeners.java b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/listeners/PlayerListeners.java
similarity index 100%
rename from AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/listeners/PlayerListeners.java
rename to AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/listeners/PlayerListeners.java
diff --git a/AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/managers/CommandManager.java b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/managers/CommandManager.java
similarity index 100%
rename from AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/managers/CommandManager.java
rename to AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/managers/CommandManager.java
diff --git a/AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/managers/CooldownManager.java b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/managers/CooldownManager.java
similarity index 100%
rename from AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/managers/CooldownManager.java
rename to AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/managers/CooldownManager.java
diff --git a/AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/managers/MovementManager.java b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/managers/MovementManager.java
similarity index 100%
rename from AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/managers/MovementManager.java
rename to AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/managers/MovementManager.java
diff --git a/AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/managers/TeleportTrackingManager.java b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/managers/TeleportTrackingManager.java
similarity index 100%
rename from AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/managers/TeleportTrackingManager.java
rename to AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/managers/TeleportTrackingManager.java
diff --git a/AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/payments/Payment.java b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/payments/Payment.java
similarity index 100%
rename from AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/payments/Payment.java
rename to AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/payments/Payment.java
diff --git a/AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/payments/PaymentManager.java b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/payments/PaymentManager.java
similarity index 100%
rename from AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/payments/PaymentManager.java
rename to AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/payments/PaymentManager.java
diff --git a/AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/payments/types/LevelsPayment.java b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/payments/types/LevelsPayment.java
similarity index 100%
rename from AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/payments/types/LevelsPayment.java
rename to AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/payments/types/LevelsPayment.java
diff --git a/AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/payments/types/PointsPayment.java b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/payments/types/PointsPayment.java
similarity index 100%
rename from AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/payments/types/PointsPayment.java
rename to AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/payments/types/PointsPayment.java
diff --git a/AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/payments/types/VaultPayment.java b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/payments/types/VaultPayment.java
similarity index 100%
rename from AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/payments/types/VaultPayment.java
rename to AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/payments/types/VaultPayment.java
diff --git a/AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/sql/AuditLogManager.java b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/sql/AuditLogManager.java
similarity index 100%
rename from AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/sql/AuditLogManager.java
rename to AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/sql/AuditLogManager.java
diff --git a/AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/sql/BlocklistManager.java b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/sql/BlocklistManager.java
similarity index 100%
rename from AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/sql/BlocklistManager.java
rename to AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/sql/BlocklistManager.java
diff --git a/AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/sql/DataFailManager.java b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/sql/DataFailManager.java
similarity index 100%
rename from AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/sql/DataFailManager.java
rename to AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/sql/DataFailManager.java
diff --git a/AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/sql/HomeSQLManager.java b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/sql/HomeSQLManager.java
similarity index 100%
rename from AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/sql/HomeSQLManager.java
rename to AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/sql/HomeSQLManager.java
diff --git a/AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/sql/PlayerSQLManager.java b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/sql/PlayerSQLManager.java
similarity index 100%
rename from AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/sql/PlayerSQLManager.java
rename to AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/sql/PlayerSQLManager.java
diff --git a/AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/sql/SQLManager.java b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/sql/SQLManager.java
similarity index 100%
rename from AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/sql/SQLManager.java
rename to AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/sql/SQLManager.java
diff --git a/AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/sql/WarpSQLManager.java b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/sql/WarpSQLManager.java
similarity index 100%
rename from AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/sql/WarpSQLManager.java
rename to AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/sql/WarpSQLManager.java
diff --git a/AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/utilities/AcceptRequest.java b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/utilities/AcceptRequest.java
similarity index 100%
rename from AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/utilities/AcceptRequest.java
rename to AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/utilities/AcceptRequest.java
diff --git a/AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/utilities/ArrayWrapper.java b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/utilities/ArrayWrapper.java
similarity index 100%
rename from AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/utilities/ArrayWrapper.java
rename to AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/utilities/ArrayWrapper.java
diff --git a/AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/utilities/ConditionChecker.java b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/utilities/ConditionChecker.java
similarity index 100%
rename from AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/utilities/ConditionChecker.java
rename to AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/utilities/ConditionChecker.java
diff --git a/AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/utilities/DistanceLimiter.java b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/utilities/DistanceLimiter.java
similarity index 100%
rename from AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/utilities/DistanceLimiter.java
rename to AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/utilities/DistanceLimiter.java
diff --git a/AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/utilities/IconMenu.java b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/utilities/IconMenu.java
similarity index 100%
rename from AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/utilities/IconMenu.java
rename to AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/utilities/IconMenu.java
diff --git a/AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/utilities/PagedLists.java b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/utilities/PagedLists.java
similarity index 100%
rename from AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/utilities/PagedLists.java
rename to AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/utilities/PagedLists.java
diff --git a/AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/utilities/RandomCoords.java b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/utilities/RandomCoords.java
similarity index 100%
rename from AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/utilities/RandomCoords.java
rename to AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/utilities/RandomCoords.java
diff --git a/AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/utilities/RandomTPAlgorithms.java b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/utilities/RandomTPAlgorithms.java
similarity index 100%
rename from AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/utilities/RandomTPAlgorithms.java
rename to AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/utilities/RandomTPAlgorithms.java
diff --git a/AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/utilities/TPRequest.java b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/utilities/TPRequest.java
similarity index 80%
rename from AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/utilities/TPRequest.java
rename to AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/utilities/TPRequest.java
index 3fadb986..923dd353 100644
--- a/AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/utilities/TPRequest.java
+++ b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/utilities/TPRequest.java
@@ -1,5 +1,7 @@
package io.github.niestrat99.advancedteleport.utilities;
+import io.github.niestrat99.advancedteleport.config.CustomMessages;
+import io.github.niestrat99.advancedteleport.config.NewConfig;
import org.bukkit.entity.Player;
import org.bukkit.scheduler.BukkitRunnable;
@@ -72,6 +74,14 @@ public static TPRequest getRequestByReqAndResponder(Player responder, Player req
}
public static void addRequest(TPRequest request) {
+ if (!NewConfig.get().USE_MULTIPLE_REQUESTS.get()) {
+ for (TPRequest otherRequest : getRequests(request.responder)) {
+ if (NewConfig.get().NOTIFY_ON_EXPIRE.get()) {
+ CustomMessages.sendMessage(otherRequest.requester, "Info.requestDisplaced", "{player}", request.responder.getName());
+ }
+ otherRequest.destroy();
+ }
+ }
requestList.add(request);
}
diff --git a/AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/utilities/TeleportTests.java b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/utilities/TeleportTests.java
similarity index 100%
rename from AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/utilities/TeleportTests.java
rename to AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/utilities/TeleportTests.java
diff --git a/AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/utilities/nbt/NBTReader.java b/AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/utilities/nbt/NBTReader.java
similarity index 100%
rename from AdvancedTP-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/utilities/nbt/NBTReader.java
rename to AdvancedTeleport-Bukkit/src/main/java/io/github/niestrat99/advancedteleport/utilities/nbt/NBTReader.java
diff --git a/AdvancedTP-Bukkit/src/main/resources/plugin.yml b/AdvancedTeleport-Bukkit/src/main/resources/plugin.yml
similarity index 99%
rename from AdvancedTP-Bukkit/src/main/resources/plugin.yml
rename to AdvancedTeleport-Bukkit/src/main/resources/plugin.yml
index 586a8dfd..d0ae522f 100644
--- a/AdvancedTP-Bukkit/src/main/resources/plugin.yml
+++ b/AdvancedTeleport-Bukkit/src/main/resources/plugin.yml
@@ -1,6 +1,6 @@
main: io.github.niestrat99.advancedteleport.CoreClass
name: AdvancedTeleport
-version: 5.4.6-SNAPSHOT-2
+version: 5.4.6-SNAPSHOT-3
description: A rapidly growing teleportation plugin looking to break the boundaries of traditional teleport plugins.
authors: [Niestrat99, Thatsmusic99]
contributors: [SuspiciousLookingOwl (Github), animeavi (Github), MrEngMan]
diff --git a/pom.xml b/pom.xml
index 5cf40c3c..9814c152 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,14 +7,14 @@
io.github.niestrat99
AdvancedTeleport
pom
- v5.4.6-SNAPSHOT-2
+ v5.4.6-SNAPSHOT-3
UTF-8
- AdvancedTP-Bukkit
+ AdvancedTeleport-Bukkit