From 53a277d894abfc861a5fc1c781c8a9d6ac071aaa Mon Sep 17 00:00:00 2001 From: Kas-tle <26531652+Kas-tle@users.noreply.github.com> Date: Mon, 12 Sep 2022 05:48:01 +0000 Subject: [PATCH] Restructure project for future move to gradle --- bukkit/pom.xml | 6 +-- .../bukkit/ParadisuMain.java | 40 ++++++++--------- .../bukkit/commands/AdminCommands.java | 4 +- .../bukkit/commands/EssentialCommands.java | 4 +- .../bukkit/commands/ParadisuCommands.java | 18 ++++---- .../bukkit/events/GuiListeners.java | 10 ++--- .../bukkit/events/ParadisuEvents.java | 10 ++--- .../bukkit/events/PlaytimeEvents.java | 4 +- .../bukkit/items/GenItemManager.java | 4 +- .../bukkit/items/ItemCommands.java | 10 ++--- .../bukkit/items/ItemEvents.java | 6 +-- .../bukkit/items/SpinningCoins.java | 2 +- .../items/common/ingame/ParadisuCoin.java | 2 +- .../bukkit/items/common/ingame/StarCoin.java | 2 +- .../bukkit/items/common/menu/BlankItem.java | 2 +- .../bukkit/items/common/menu/NoItem.java | 2 +- .../items/common/menu/ParadisuEffects.java | 2 +- .../items/common/menu/ParadisuHead.java | 4 +- .../bukkit/items/invs/ModelGiveInv.java | 10 ++--- .../bukkit/items/invs/ServerSwitcher.java | 4 +- .../bukkit/items/invs/TrashCan.java | 10 ++--- .../bukkit/items/models/ModelCommands.java | 6 +-- .../bukkit/items/models/ModelInvManager.java | 4 +- .../bukkit/items/models/ModelItemManager.java | 4 +- .../modelscroller/ModelScrollerCommands.java | 6 +-- .../modelscroller/ModelScrollerEvents.java | 8 ++-- .../bukkit/npc/NpcCommands.java | 2 +- .../bukkit/playerdata/PlayerData.java | 4 +- .../bukkit/playerdata/PlayerDataEvents.java | 4 +- .../bukkit/playerdata/PlayerDataGetter.java | 2 +- .../bukkit/shops/PlayerInventories.java | 4 +- .../bukkit/shops/ShopCommands.java | 4 +- .../bukkit/shops/ShopGuis.java | 6 +-- .../bukkit/util/DatabaseConnection.java | 4 +- .../bukkit/util/EventCooldowns.java | 2 +- .../bukkit/util/InventoryGUI.java | 2 +- .../bukkit/util/TimeZone.java | 2 +- .../protocollib/ProtoLibBasicCommands.java | 4 +- .../protocollib/ProtoLibEntityHandling.java | 2 +- .../bukkit/warps/Warp.java | 2 +- .../bukkit/warps/WarpAlias.java | 2 +- .../bukkit/warps/WarpCommands.java | 4 +- .../bukkit/warps/WarpsDataHandler.java | 4 +- .../src/main/resources/META-INF/MANIFEST.MF | 2 +- bukkit/src/main/resources/plugin.yml | 2 +- plugin/pom.xml | 12 +++--- pom.xml | 43 +++---------------- velocity/pom.xml | 4 +- .../velocity/Paradisu.java | 12 +++--- .../commands/command/BackCommand.java | 10 ++--- .../commands/command/ListCommand.java | 8 ++-- .../commands/command/LocateCommand.java | 8 ++-- .../command/TeleportAcceptCommand.java | 14 +++--- .../command/TeleportCancelCommand.java | 12 +++--- .../commands/command/TeleportCommand.java | 10 ++--- .../commands/command/TeleportDenyCommand.java | 12 +++--- .../commands/command/TeleportHereCommand.java | 10 ++--- .../command/TeleportHereRequestCommand.java | 12 +++--- .../command/TeleportPositionCommand.java | 10 ++--- .../command/TeleportRequestCommand.java | 12 +++--- .../commands/command/VParadisuCommand.java | 8 ++-- .../commands/command/WarpCommand.java | 6 +-- .../commands/util/AbstractCommand.java | 4 +- .../util/teleport/TeleportHistory.java | 2 +- .../commands/util/teleport/TeleportQueue.java | 2 +- .../util/teleport/TeleportRequestHeader.java | 2 +- .../velocity/config/ConfigManager.java | 6 +-- .../velocity/config/MessagesConfig.java | 2 +- .../velocity/config/ParadisuConfig.java | 2 +- .../velocity/config/loader/ConfigLoader.java | 2 +- .../velocity/locale/Messages.java | 2 +- .../velocity/locale/TranslationManager.java | 6 +-- .../velocity/utils/FileUtils.java | 2 +- .../src/main/resources/velocity-plugin.json | 2 +- 74 files changed, 225 insertions(+), 254 deletions(-) rename bukkit/src/main/java/net/paradisu/{paradisuplugin => }/bukkit/ParadisuMain.java (85%) rename bukkit/src/main/java/net/paradisu/{paradisuplugin => }/bukkit/commands/AdminCommands.java (96%) rename bukkit/src/main/java/net/paradisu/{paradisuplugin => }/bukkit/commands/EssentialCommands.java (98%) rename bukkit/src/main/java/net/paradisu/{paradisuplugin => }/bukkit/commands/ParadisuCommands.java (93%) rename bukkit/src/main/java/net/paradisu/{paradisuplugin => }/bukkit/events/GuiListeners.java (93%) rename bukkit/src/main/java/net/paradisu/{paradisuplugin => }/bukkit/events/ParadisuEvents.java (96%) rename bukkit/src/main/java/net/paradisu/{paradisuplugin => }/bukkit/events/PlaytimeEvents.java (96%) rename bukkit/src/main/java/net/paradisu/{paradisuplugin => }/bukkit/items/GenItemManager.java (95%) rename bukkit/src/main/java/net/paradisu/{paradisuplugin => }/bukkit/items/ItemCommands.java (95%) rename bukkit/src/main/java/net/paradisu/{paradisuplugin => }/bukkit/items/ItemEvents.java (95%) rename bukkit/src/main/java/net/paradisu/{paradisuplugin => }/bukkit/items/SpinningCoins.java (95%) rename bukkit/src/main/java/net/paradisu/{paradisuplugin => }/bukkit/items/common/ingame/ParadisuCoin.java (88%) rename bukkit/src/main/java/net/paradisu/{paradisuplugin => }/bukkit/items/common/ingame/StarCoin.java (89%) rename bukkit/src/main/java/net/paradisu/{paradisuplugin => }/bukkit/items/common/menu/BlankItem.java (87%) rename bukkit/src/main/java/net/paradisu/{paradisuplugin => }/bukkit/items/common/menu/NoItem.java (91%) rename bukkit/src/main/java/net/paradisu/{paradisuplugin => }/bukkit/items/common/menu/ParadisuEffects.java (95%) rename bukkit/src/main/java/net/paradisu/{paradisuplugin => }/bukkit/items/common/menu/ParadisuHead.java (88%) rename bukkit/src/main/java/net/paradisu/{paradisuplugin => }/bukkit/items/invs/ModelGiveInv.java (91%) rename bukkit/src/main/java/net/paradisu/{paradisuplugin => }/bukkit/items/invs/ServerSwitcher.java (80%) rename bukkit/src/main/java/net/paradisu/{paradisuplugin => }/bukkit/items/invs/TrashCan.java (74%) rename bukkit/src/main/java/net/paradisu/{paradisuplugin => }/bukkit/items/models/ModelCommands.java (95%) rename bukkit/src/main/java/net/paradisu/{paradisuplugin => }/bukkit/items/models/ModelInvManager.java (95%) rename bukkit/src/main/java/net/paradisu/{paradisuplugin => }/bukkit/items/models/ModelItemManager.java (96%) rename bukkit/src/main/java/net/paradisu/{paradisuplugin => }/bukkit/items/models/modelscroller/ModelScrollerCommands.java (91%) rename bukkit/src/main/java/net/paradisu/{paradisuplugin => }/bukkit/items/models/modelscroller/ModelScrollerEvents.java (92%) rename bukkit/src/main/java/net/paradisu/{paradisuplugin => }/bukkit/npc/NpcCommands.java (97%) rename bukkit/src/main/java/net/paradisu/{paradisuplugin => }/bukkit/playerdata/PlayerData.java (97%) rename bukkit/src/main/java/net/paradisu/{paradisuplugin => }/bukkit/playerdata/PlayerDataEvents.java (90%) rename bukkit/src/main/java/net/paradisu/{paradisuplugin => }/bukkit/playerdata/PlayerDataGetter.java (96%) rename bukkit/src/main/java/net/paradisu/{paradisuplugin => }/bukkit/shops/PlayerInventories.java (93%) rename bukkit/src/main/java/net/paradisu/{paradisuplugin => }/bukkit/shops/ShopCommands.java (91%) rename bukkit/src/main/java/net/paradisu/{paradisuplugin => }/bukkit/shops/ShopGuis.java (95%) rename bukkit/src/main/java/net/paradisu/{paradisuplugin => }/bukkit/util/DatabaseConnection.java (94%) rename bukkit/src/main/java/net/paradisu/{paradisuplugin => }/bukkit/util/EventCooldowns.java (93%) rename bukkit/src/main/java/net/paradisu/{paradisuplugin => }/bukkit/util/InventoryGUI.java (80%) rename bukkit/src/main/java/net/paradisu/{paradisuplugin => }/bukkit/util/TimeZone.java (98%) rename bukkit/src/main/java/net/paradisu/{paradisuplugin => }/bukkit/util/protocollib/ProtoLibBasicCommands.java (94%) rename bukkit/src/main/java/net/paradisu/{paradisuplugin => }/bukkit/util/protocollib/ProtoLibEntityHandling.java (99%) rename bukkit/src/main/java/net/paradisu/{paradisuplugin => }/bukkit/warps/Warp.java (97%) rename bukkit/src/main/java/net/paradisu/{paradisuplugin => }/bukkit/warps/WarpAlias.java (86%) rename bukkit/src/main/java/net/paradisu/{paradisuplugin => }/bukkit/warps/WarpCommands.java (98%) rename bukkit/src/main/java/net/paradisu/{paradisuplugin => }/bukkit/warps/WarpsDataHandler.java (96%) rename velocity/src/main/java/net/paradisu/{paradisuplugin => }/velocity/Paradisu.java (94%) rename velocity/src/main/java/net/paradisu/{paradisuplugin => }/velocity/commands/command/BackCommand.java (90%) rename velocity/src/main/java/net/paradisu/{paradisuplugin => }/velocity/commands/command/ListCommand.java (93%) rename velocity/src/main/java/net/paradisu/{paradisuplugin => }/velocity/commands/command/LocateCommand.java (90%) rename velocity/src/main/java/net/paradisu/{paradisuplugin => }/velocity/commands/command/TeleportAcceptCommand.java (89%) rename velocity/src/main/java/net/paradisu/{paradisuplugin => }/velocity/commands/command/TeleportCancelCommand.java (86%) rename velocity/src/main/java/net/paradisu/{paradisuplugin => }/velocity/commands/command/TeleportCommand.java (89%) rename velocity/src/main/java/net/paradisu/{paradisuplugin => }/velocity/commands/command/TeleportDenyCommand.java (87%) rename velocity/src/main/java/net/paradisu/{paradisuplugin => }/velocity/commands/command/TeleportHereCommand.java (88%) rename velocity/src/main/java/net/paradisu/{paradisuplugin => }/velocity/commands/command/TeleportHereRequestCommand.java (88%) rename velocity/src/main/java/net/paradisu/{paradisuplugin => }/velocity/commands/command/TeleportPositionCommand.java (92%) rename velocity/src/main/java/net/paradisu/{paradisuplugin => }/velocity/commands/command/TeleportRequestCommand.java (88%) rename velocity/src/main/java/net/paradisu/{paradisuplugin => }/velocity/commands/command/VParadisuCommand.java (90%) rename velocity/src/main/java/net/paradisu/{paradisuplugin => }/velocity/commands/command/WarpCommand.java (50%) rename velocity/src/main/java/net/paradisu/{paradisuplugin => }/velocity/commands/util/AbstractCommand.java (94%) rename velocity/src/main/java/net/paradisu/{paradisuplugin => }/velocity/commands/util/teleport/TeleportHistory.java (93%) rename velocity/src/main/java/net/paradisu/{paradisuplugin => }/velocity/commands/util/teleport/TeleportQueue.java (98%) rename velocity/src/main/java/net/paradisu/{paradisuplugin => }/velocity/commands/util/teleport/TeleportRequestHeader.java (96%) rename velocity/src/main/java/net/paradisu/{paradisuplugin => }/velocity/config/ConfigManager.java (90%) rename velocity/src/main/java/net/paradisu/{paradisuplugin => }/velocity/config/MessagesConfig.java (99%) rename velocity/src/main/java/net/paradisu/{paradisuplugin => }/velocity/config/ParadisuConfig.java (82%) rename velocity/src/main/java/net/paradisu/{paradisuplugin => }/velocity/config/loader/ConfigLoader.java (96%) rename velocity/src/main/java/net/paradisu/{paradisuplugin => }/velocity/locale/Messages.java (94%) rename velocity/src/main/java/net/paradisu/{paradisuplugin => }/velocity/locale/TranslationManager.java (97%) rename velocity/src/main/java/net/paradisu/{paradisuplugin => }/velocity/utils/FileUtils.java (96%) diff --git a/bukkit/pom.xml b/bukkit/pom.xml index 5893fbf..30badcf 100644 --- a/bukkit/pom.xml +++ b/bukkit/pom.xml @@ -3,9 +3,9 @@ 4.0.0 - net.paradisu.paradisuplugin + net.paradisu parent - ${minecraft.plugin.version} + 3.4.0 bukkit @@ -99,7 +99,7 @@ de.themoep - net.paradisu.paradisuplugin.libs + net.paradisu.libs diff --git a/bukkit/src/main/java/net/paradisu/paradisuplugin/bukkit/ParadisuMain.java b/bukkit/src/main/java/net/paradisu/bukkit/ParadisuMain.java similarity index 85% rename from bukkit/src/main/java/net/paradisu/paradisuplugin/bukkit/ParadisuMain.java rename to bukkit/src/main/java/net/paradisu/bukkit/ParadisuMain.java index 2ad74ee..e94ae42 100644 --- a/bukkit/src/main/java/net/paradisu/paradisuplugin/bukkit/ParadisuMain.java +++ b/bukkit/src/main/java/net/paradisu/bukkit/ParadisuMain.java @@ -1,4 +1,4 @@ -package net.paradisu.paradisuplugin.bukkit; +package net.paradisu.bukkit; import java.io.File; @@ -21,25 +21,25 @@ import cloud.commandframework.execution.CommandExecutionCoordinator; import cloud.commandframework.meta.SimpleCommandMeta; import cloud.commandframework.paper.PaperCommandManager; -import net.paradisu.paradisuplugin.bukkit.util.DatabaseConnection; -import net.paradisu.paradisuplugin.bukkit.util.TimeZone; -import net.paradisu.paradisuplugin.bukkit.commands.AdminCommands; -import net.paradisu.paradisuplugin.bukkit.commands.EssentialCommands; -import net.paradisu.paradisuplugin.bukkit.commands.ParadisuCommands; -import net.paradisu.paradisuplugin.bukkit.events.GuiListeners; -import net.paradisu.paradisuplugin.bukkit.events.ParadisuEvents; -import net.paradisu.paradisuplugin.bukkit.items.ItemCommands; -import net.paradisu.paradisuplugin.bukkit.items.SpinningCoins; -import net.paradisu.paradisuplugin.bukkit.items.ItemEvents; -import net.paradisu.paradisuplugin.bukkit.items.models.ModelCommands; -import net.paradisu.paradisuplugin.bukkit.items.models.ModelInvManager; -import net.paradisu.paradisuplugin.bukkit.items.models.ModelItemManager; -import net.paradisu.paradisuplugin.bukkit.items.models.modelscroller.ModelScrollerEvents; -import net.paradisu.paradisuplugin.bukkit.playerdata.PlayerDataEvents; -import net.paradisu.paradisuplugin.bukkit.shops.ShopCommands; -import net.paradisu.paradisuplugin.bukkit.shops.ShopGuis; -import net.paradisu.paradisuplugin.bukkit.warps.WarpCommands; -import net.paradisu.paradisuplugin.bukkit.warps.WarpsDataHandler; +import net.paradisu.bukkit.util.DatabaseConnection; +import net.paradisu.bukkit.util.TimeZone; +import net.paradisu.bukkit.commands.AdminCommands; +import net.paradisu.bukkit.commands.EssentialCommands; +import net.paradisu.bukkit.commands.ParadisuCommands; +import net.paradisu.bukkit.events.GuiListeners; +import net.paradisu.bukkit.events.ParadisuEvents; +import net.paradisu.bukkit.items.ItemCommands; +import net.paradisu.bukkit.items.SpinningCoins; +import net.paradisu.bukkit.items.ItemEvents; +import net.paradisu.bukkit.items.models.ModelCommands; +import net.paradisu.bukkit.items.models.ModelInvManager; +import net.paradisu.bukkit.items.models.ModelItemManager; +import net.paradisu.bukkit.items.models.modelscroller.ModelScrollerEvents; +import net.paradisu.bukkit.playerdata.PlayerDataEvents; +import net.paradisu.bukkit.shops.ShopCommands; +import net.paradisu.bukkit.shops.ShopGuis; +import net.paradisu.bukkit.warps.WarpCommands; +import net.paradisu.bukkit.warps.WarpsDataHandler; public class ParadisuMain extends JavaPlugin { diff --git a/bukkit/src/main/java/net/paradisu/paradisuplugin/bukkit/commands/AdminCommands.java b/bukkit/src/main/java/net/paradisu/bukkit/commands/AdminCommands.java similarity index 96% rename from bukkit/src/main/java/net/paradisu/paradisuplugin/bukkit/commands/AdminCommands.java rename to bukkit/src/main/java/net/paradisu/bukkit/commands/AdminCommands.java index 5317246..00d9cb9 100644 --- a/bukkit/src/main/java/net/paradisu/paradisuplugin/bukkit/commands/AdminCommands.java +++ b/bukkit/src/main/java/net/paradisu/bukkit/commands/AdminCommands.java @@ -1,4 +1,4 @@ -package net.paradisu.paradisuplugin.bukkit.commands; +package net.paradisu.bukkit.commands; import java.util.List; @@ -15,7 +15,7 @@ import cloud.commandframework.annotations.CommandPermission; import cloud.commandframework.annotations.ProxiedBy; import net.luckperms.api.LuckPermsProvider; -import net.paradisu.paradisuplugin.bukkit.ParadisuMain; +import net.paradisu.bukkit.ParadisuMain; public class AdminCommands { diff --git a/bukkit/src/main/java/net/paradisu/paradisuplugin/bukkit/commands/EssentialCommands.java b/bukkit/src/main/java/net/paradisu/bukkit/commands/EssentialCommands.java similarity index 98% rename from bukkit/src/main/java/net/paradisu/paradisuplugin/bukkit/commands/EssentialCommands.java rename to bukkit/src/main/java/net/paradisu/bukkit/commands/EssentialCommands.java index 6fe82d8..5fb6f64 100644 --- a/bukkit/src/main/java/net/paradisu/paradisuplugin/bukkit/commands/EssentialCommands.java +++ b/bukkit/src/main/java/net/paradisu/bukkit/commands/EssentialCommands.java @@ -1,4 +1,4 @@ -package net.paradisu.paradisuplugin.bukkit.commands; +package net.paradisu.bukkit.commands; import org.bukkit.GameMode; import org.bukkit.command.CommandSender; @@ -8,7 +8,7 @@ import cloud.commandframework.annotations.CommandDescription; import cloud.commandframework.annotations.CommandMethod; import cloud.commandframework.annotations.CommandPermission; -import net.paradisu.paradisuplugin.bukkit.ParadisuMain; +import net.paradisu.bukkit.ParadisuMain; public class EssentialCommands /* MEANT FOR ANY REWRITTEN VANILLA/QOL COMMANDS */ { diff --git a/bukkit/src/main/java/net/paradisu/paradisuplugin/bukkit/commands/ParadisuCommands.java b/bukkit/src/main/java/net/paradisu/bukkit/commands/ParadisuCommands.java similarity index 93% rename from bukkit/src/main/java/net/paradisu/paradisuplugin/bukkit/commands/ParadisuCommands.java rename to bukkit/src/main/java/net/paradisu/bukkit/commands/ParadisuCommands.java index 816124a..3929516 100644 --- a/bukkit/src/main/java/net/paradisu/paradisuplugin/bukkit/commands/ParadisuCommands.java +++ b/bukkit/src/main/java/net/paradisu/bukkit/commands/ParadisuCommands.java @@ -1,4 +1,4 @@ -package net.paradisu.paradisuplugin.bukkit.commands; +package net.paradisu.bukkit.commands; import java.sql.Connection; import java.sql.PreparedStatement; @@ -17,14 +17,14 @@ import cloud.commandframework.annotations.CommandDescription; import cloud.commandframework.annotations.CommandMethod; import cloud.commandframework.annotations.CommandPermission; -import net.paradisu.paradisuplugin.bukkit.ParadisuMain; -import net.paradisu.paradisuplugin.bukkit.events.PlaytimeEvents; -import net.paradisu.paradisuplugin.bukkit.items.common.menu.BlankItem; -import net.paradisu.paradisuplugin.bukkit.items.common.menu.NoItem; -import net.paradisu.paradisuplugin.bukkit.items.common.menu.ParadisuEffects; -import net.paradisu.paradisuplugin.bukkit.items.common.menu.ParadisuHead; -import net.paradisu.paradisuplugin.bukkit.items.invs.TrashCan; -import net.paradisu.paradisuplugin.bukkit.util.TimeZone; +import net.paradisu.bukkit.ParadisuMain; +import net.paradisu.bukkit.events.PlaytimeEvents; +import net.paradisu.bukkit.items.common.menu.BlankItem; +import net.paradisu.bukkit.items.common.menu.NoItem; +import net.paradisu.bukkit.items.common.menu.ParadisuEffects; +import net.paradisu.bukkit.items.common.menu.ParadisuHead; +import net.paradisu.bukkit.items.invs.TrashCan; +import net.paradisu.bukkit.util.TimeZone; public class ParadisuCommands { diff --git a/bukkit/src/main/java/net/paradisu/paradisuplugin/bukkit/events/GuiListeners.java b/bukkit/src/main/java/net/paradisu/bukkit/events/GuiListeners.java similarity index 93% rename from bukkit/src/main/java/net/paradisu/paradisuplugin/bukkit/events/GuiListeners.java rename to bukkit/src/main/java/net/paradisu/bukkit/events/GuiListeners.java index d6c2697..80767e1 100644 --- a/bukkit/src/main/java/net/paradisu/paradisuplugin/bukkit/events/GuiListeners.java +++ b/bukkit/src/main/java/net/paradisu/bukkit/events/GuiListeners.java @@ -1,4 +1,4 @@ -package net.paradisu.paradisuplugin.bukkit.events; +package net.paradisu.bukkit.events; import org.bukkit.Material; import org.bukkit.configuration.ConfigurationSection; @@ -10,10 +10,10 @@ import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.PlayerInventory; -import net.paradisu.paradisuplugin.bukkit.ParadisuMain; -import net.paradisu.paradisuplugin.bukkit.items.models.ModelItemManager; -import net.paradisu.paradisuplugin.bukkit.shops.PlayerInventories; -import net.paradisu.paradisuplugin.bukkit.shops.ShopGuis; +import net.paradisu.bukkit.ParadisuMain; +import net.paradisu.bukkit.items.models.ModelItemManager; +import net.paradisu.bukkit.shops.PlayerInventories; +import net.paradisu.bukkit.shops.ShopGuis; public class GuiListeners implements Listener { diff --git a/bukkit/src/main/java/net/paradisu/paradisuplugin/bukkit/events/ParadisuEvents.java b/bukkit/src/main/java/net/paradisu/bukkit/events/ParadisuEvents.java similarity index 96% rename from bukkit/src/main/java/net/paradisu/paradisuplugin/bukkit/events/ParadisuEvents.java rename to bukkit/src/main/java/net/paradisu/bukkit/events/ParadisuEvents.java index 02d4265..45f88ab 100644 --- a/bukkit/src/main/java/net/paradisu/paradisuplugin/bukkit/events/ParadisuEvents.java +++ b/bukkit/src/main/java/net/paradisu/bukkit/events/ParadisuEvents.java @@ -1,4 +1,4 @@ -package net.paradisu.paradisuplugin.bukkit.events; +package net.paradisu.bukkit.events; import static org.bukkit.Bukkit.getServer; @@ -34,10 +34,10 @@ import org.bukkit.potion.PotionEffect; import org.bukkit.potion.PotionEffectType; -import net.paradisu.paradisuplugin.bukkit.ParadisuMain; -import net.paradisu.paradisuplugin.bukkit.items.GenItemManager; -import net.paradisu.paradisuplugin.bukkit.items.invs.TrashCan; -import net.paradisu.paradisuplugin.bukkit.util.InventoryGUI; +import net.paradisu.bukkit.ParadisuMain; +import net.paradisu.bukkit.items.GenItemManager; +import net.paradisu.bukkit.items.invs.TrashCan; +import net.paradisu.bukkit.util.InventoryGUI; public class ParadisuEvents implements Listener { diff --git a/bukkit/src/main/java/net/paradisu/paradisuplugin/bukkit/events/PlaytimeEvents.java b/bukkit/src/main/java/net/paradisu/bukkit/events/PlaytimeEvents.java similarity index 96% rename from bukkit/src/main/java/net/paradisu/paradisuplugin/bukkit/events/PlaytimeEvents.java rename to bukkit/src/main/java/net/paradisu/bukkit/events/PlaytimeEvents.java index 244069d..914af9c 100644 --- a/bukkit/src/main/java/net/paradisu/paradisuplugin/bukkit/events/PlaytimeEvents.java +++ b/bukkit/src/main/java/net/paradisu/bukkit/events/PlaytimeEvents.java @@ -1,4 +1,4 @@ -package net.paradisu.paradisuplugin.bukkit.events; +package net.paradisu.bukkit.events; import java.sql.Connection; import java.sql.PreparedStatement; @@ -16,7 +16,7 @@ import org.bukkit.event.player.PlayerJoinEvent; import org.bukkit.event.player.PlayerQuitEvent; -import net.paradisu.paradisuplugin.bukkit.ParadisuMain; +import net.paradisu.bukkit.ParadisuMain; public class PlaytimeEvents implements Listener { diff --git a/bukkit/src/main/java/net/paradisu/paradisuplugin/bukkit/items/GenItemManager.java b/bukkit/src/main/java/net/paradisu/bukkit/items/GenItemManager.java similarity index 95% rename from bukkit/src/main/java/net/paradisu/paradisuplugin/bukkit/items/GenItemManager.java rename to bukkit/src/main/java/net/paradisu/bukkit/items/GenItemManager.java index e58ead1..1e2c318 100644 --- a/bukkit/src/main/java/net/paradisu/paradisuplugin/bukkit/items/GenItemManager.java +++ b/bukkit/src/main/java/net/paradisu/bukkit/items/GenItemManager.java @@ -1,6 +1,6 @@ -package net.paradisu.paradisuplugin.bukkit.items; +package net.paradisu.bukkit.items; -import net.paradisu.paradisuplugin.bukkit.ParadisuMain; +import net.paradisu.bukkit.ParadisuMain; import org.bukkit.Material; import org.bukkit.inventory.ItemFlag; import org.bukkit.inventory.ItemStack; diff --git a/bukkit/src/main/java/net/paradisu/paradisuplugin/bukkit/items/ItemCommands.java b/bukkit/src/main/java/net/paradisu/bukkit/items/ItemCommands.java similarity index 95% rename from bukkit/src/main/java/net/paradisu/paradisuplugin/bukkit/items/ItemCommands.java rename to bukkit/src/main/java/net/paradisu/bukkit/items/ItemCommands.java index 24a7abf..6f422db 100644 --- a/bukkit/src/main/java/net/paradisu/paradisuplugin/bukkit/items/ItemCommands.java +++ b/bukkit/src/main/java/net/paradisu/bukkit/items/ItemCommands.java @@ -1,14 +1,14 @@ -package net.paradisu.paradisuplugin.bukkit.items; +package net.paradisu.bukkit.items; import cloud.commandframework.annotations.Argument; import cloud.commandframework.annotations.CommandMethod; import cloud.commandframework.annotations.CommandPermission; import cloud.commandframework.annotations.ProxiedBy; import cloud.commandframework.annotations.specifier.Greedy; -import net.paradisu.paradisuplugin.bukkit.ParadisuMain; -import net.paradisu.paradisuplugin.bukkit.items.common.ingame.ParadisuCoin; -import net.paradisu.paradisuplugin.bukkit.items.common.ingame.StarCoin; -import net.paradisu.paradisuplugin.bukkit.items.common.menu.ParadisuHead; +import net.paradisu.bukkit.ParadisuMain; +import net.paradisu.bukkit.items.common.ingame.ParadisuCoin; +import net.paradisu.bukkit.items.common.ingame.StarCoin; +import net.paradisu.bukkit.items.common.menu.ParadisuHead; import net.md_5.bungee.api.ChatColor; import org.bukkit.Material; import org.bukkit.command.CommandSender; diff --git a/bukkit/src/main/java/net/paradisu/paradisuplugin/bukkit/items/ItemEvents.java b/bukkit/src/main/java/net/paradisu/bukkit/items/ItemEvents.java similarity index 95% rename from bukkit/src/main/java/net/paradisu/paradisuplugin/bukkit/items/ItemEvents.java rename to bukkit/src/main/java/net/paradisu/bukkit/items/ItemEvents.java index 6965dcd..a906c9a 100644 --- a/bukkit/src/main/java/net/paradisu/paradisuplugin/bukkit/items/ItemEvents.java +++ b/bukkit/src/main/java/net/paradisu/bukkit/items/ItemEvents.java @@ -1,4 +1,4 @@ -package net.paradisu.paradisuplugin.bukkit.items; +package net.paradisu.bukkit.items; import java.util.Random; import java.util.UUID; @@ -13,8 +13,8 @@ import org.bukkit.event.player.PlayerInteractEvent; import org.bukkit.inventory.ItemStack; -import net.paradisu.paradisuplugin.bukkit.ParadisuMain; -import net.paradisu.paradisuplugin.bukkit.util.EventCooldowns; +import net.paradisu.bukkit.ParadisuMain; +import net.paradisu.bukkit.util.EventCooldowns; public class ItemEvents implements Listener { diff --git a/bukkit/src/main/java/net/paradisu/paradisuplugin/bukkit/items/SpinningCoins.java b/bukkit/src/main/java/net/paradisu/bukkit/items/SpinningCoins.java similarity index 95% rename from bukkit/src/main/java/net/paradisu/paradisuplugin/bukkit/items/SpinningCoins.java rename to bukkit/src/main/java/net/paradisu/bukkit/items/SpinningCoins.java index dc860b8..2187aec 100644 --- a/bukkit/src/main/java/net/paradisu/paradisuplugin/bukkit/items/SpinningCoins.java +++ b/bukkit/src/main/java/net/paradisu/bukkit/items/SpinningCoins.java @@ -1,4 +1,4 @@ -package net.paradisu.paradisuplugin.bukkit.items; +package net.paradisu.bukkit.items; import org.bukkit.Bukkit; import org.bukkit.Location; diff --git a/bukkit/src/main/java/net/paradisu/paradisuplugin/bukkit/items/common/ingame/ParadisuCoin.java b/bukkit/src/main/java/net/paradisu/bukkit/items/common/ingame/ParadisuCoin.java similarity index 88% rename from bukkit/src/main/java/net/paradisu/paradisuplugin/bukkit/items/common/ingame/ParadisuCoin.java rename to bukkit/src/main/java/net/paradisu/bukkit/items/common/ingame/ParadisuCoin.java index e7197dd..eb06664 100644 --- a/bukkit/src/main/java/net/paradisu/paradisuplugin/bukkit/items/common/ingame/ParadisuCoin.java +++ b/bukkit/src/main/java/net/paradisu/bukkit/items/common/ingame/ParadisuCoin.java @@ -1,4 +1,4 @@ -package net.paradisu.paradisuplugin.bukkit.items.common.ingame; +package net.paradisu.bukkit.items.common.ingame; import org.bukkit.Material; import org.bukkit.inventory.ItemFlag; diff --git a/bukkit/src/main/java/net/paradisu/paradisuplugin/bukkit/items/common/ingame/StarCoin.java b/bukkit/src/main/java/net/paradisu/bukkit/items/common/ingame/StarCoin.java similarity index 89% rename from bukkit/src/main/java/net/paradisu/paradisuplugin/bukkit/items/common/ingame/StarCoin.java rename to bukkit/src/main/java/net/paradisu/bukkit/items/common/ingame/StarCoin.java index 4591c06..f7af791 100644 --- a/bukkit/src/main/java/net/paradisu/paradisuplugin/bukkit/items/common/ingame/StarCoin.java +++ b/bukkit/src/main/java/net/paradisu/bukkit/items/common/ingame/StarCoin.java @@ -1,4 +1,4 @@ -package net.paradisu.paradisuplugin.bukkit.items.common.ingame; +package net.paradisu.bukkit.items.common.ingame; import org.bukkit.Material; import org.bukkit.inventory.ItemFlag; diff --git a/bukkit/src/main/java/net/paradisu/paradisuplugin/bukkit/items/common/menu/BlankItem.java b/bukkit/src/main/java/net/paradisu/bukkit/items/common/menu/BlankItem.java similarity index 87% rename from bukkit/src/main/java/net/paradisu/paradisuplugin/bukkit/items/common/menu/BlankItem.java rename to bukkit/src/main/java/net/paradisu/bukkit/items/common/menu/BlankItem.java index 0792d09..2c652af 100644 --- a/bukkit/src/main/java/net/paradisu/paradisuplugin/bukkit/items/common/menu/BlankItem.java +++ b/bukkit/src/main/java/net/paradisu/bukkit/items/common/menu/BlankItem.java @@ -1,4 +1,4 @@ -package net.paradisu.paradisuplugin.bukkit.items.common.menu; +package net.paradisu.bukkit.items.common.menu; import org.bukkit.Material; import org.bukkit.inventory.ItemFlag; diff --git a/bukkit/src/main/java/net/paradisu/paradisuplugin/bukkit/items/common/menu/NoItem.java b/bukkit/src/main/java/net/paradisu/bukkit/items/common/menu/NoItem.java similarity index 91% rename from bukkit/src/main/java/net/paradisu/paradisuplugin/bukkit/items/common/menu/NoItem.java rename to bukkit/src/main/java/net/paradisu/bukkit/items/common/menu/NoItem.java index 0a7b9a0..402ad73 100644 --- a/bukkit/src/main/java/net/paradisu/paradisuplugin/bukkit/items/common/menu/NoItem.java +++ b/bukkit/src/main/java/net/paradisu/bukkit/items/common/menu/NoItem.java @@ -1,4 +1,4 @@ -package net.paradisu.paradisuplugin.bukkit.items.common.menu; +package net.paradisu.bukkit.items.common.menu; import org.bukkit.Material; import org.bukkit.inventory.ItemFlag; diff --git a/bukkit/src/main/java/net/paradisu/paradisuplugin/bukkit/items/common/menu/ParadisuEffects.java b/bukkit/src/main/java/net/paradisu/bukkit/items/common/menu/ParadisuEffects.java similarity index 95% rename from bukkit/src/main/java/net/paradisu/paradisuplugin/bukkit/items/common/menu/ParadisuEffects.java rename to bukkit/src/main/java/net/paradisu/bukkit/items/common/menu/ParadisuEffects.java index 2264dec..d359750 100644 --- a/bukkit/src/main/java/net/paradisu/paradisuplugin/bukkit/items/common/menu/ParadisuEffects.java +++ b/bukkit/src/main/java/net/paradisu/bukkit/items/common/menu/ParadisuEffects.java @@ -1,4 +1,4 @@ -package net.paradisu.paradisuplugin.bukkit.items.common.menu; +package net.paradisu.bukkit.items.common.menu; import java.util.ArrayList; diff --git a/bukkit/src/main/java/net/paradisu/paradisuplugin/bukkit/items/common/menu/ParadisuHead.java b/bukkit/src/main/java/net/paradisu/bukkit/items/common/menu/ParadisuHead.java similarity index 88% rename from bukkit/src/main/java/net/paradisu/paradisuplugin/bukkit/items/common/menu/ParadisuHead.java rename to bukkit/src/main/java/net/paradisu/bukkit/items/common/menu/ParadisuHead.java index 32f6f92..8fca816 100644 --- a/bukkit/src/main/java/net/paradisu/paradisuplugin/bukkit/items/common/menu/ParadisuHead.java +++ b/bukkit/src/main/java/net/paradisu/bukkit/items/common/menu/ParadisuHead.java @@ -1,11 +1,11 @@ -package net.paradisu.paradisuplugin.bukkit.items.common.menu; +package net.paradisu.bukkit.items.common.menu; import org.bukkit.Material; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.SkullMeta; -import net.paradisu.paradisuplugin.bukkit.playerdata.PlayerDataGetter; +import net.paradisu.bukkit.playerdata.PlayerDataGetter; public class ParadisuHead extends ItemStack { public ParadisuHead (Player player){ diff --git a/bukkit/src/main/java/net/paradisu/paradisuplugin/bukkit/items/invs/ModelGiveInv.java b/bukkit/src/main/java/net/paradisu/bukkit/items/invs/ModelGiveInv.java similarity index 91% rename from bukkit/src/main/java/net/paradisu/paradisuplugin/bukkit/items/invs/ModelGiveInv.java rename to bukkit/src/main/java/net/paradisu/bukkit/items/invs/ModelGiveInv.java index fdf765d..abe9ab8 100644 --- a/bukkit/src/main/java/net/paradisu/paradisuplugin/bukkit/items/invs/ModelGiveInv.java +++ b/bukkit/src/main/java/net/paradisu/bukkit/items/invs/ModelGiveInv.java @@ -1,4 +1,4 @@ -package net.paradisu.paradisuplugin.bukkit.items.invs; +package net.paradisu.bukkit.items.invs; import java.util.ArrayList; import java.util.List; @@ -12,10 +12,10 @@ import org.bukkit.inventory.PlayerInventory; import org.bukkit.inventory.meta.ItemMeta; -import net.paradisu.paradisuplugin.bukkit.items.common.menu.BlankItem; -import net.paradisu.paradisuplugin.bukkit.items.models.ModelInvManager; -import net.paradisu.paradisuplugin.bukkit.items.models.ModelItemManager; -import net.paradisu.paradisuplugin.bukkit.util.InventoryGUI; +import net.paradisu.bukkit.items.common.menu.BlankItem; +import net.paradisu.bukkit.items.models.ModelInvManager; +import net.paradisu.bukkit.items.models.ModelItemManager; +import net.paradisu.bukkit.util.InventoryGUI; public class ModelGiveInv implements InventoryGUI{ diff --git a/bukkit/src/main/java/net/paradisu/paradisuplugin/bukkit/items/invs/ServerSwitcher.java b/bukkit/src/main/java/net/paradisu/bukkit/items/invs/ServerSwitcher.java similarity index 80% rename from bukkit/src/main/java/net/paradisu/paradisuplugin/bukkit/items/invs/ServerSwitcher.java rename to bukkit/src/main/java/net/paradisu/bukkit/items/invs/ServerSwitcher.java index 4f144ad..c361786 100644 --- a/bukkit/src/main/java/net/paradisu/paradisuplugin/bukkit/items/invs/ServerSwitcher.java +++ b/bukkit/src/main/java/net/paradisu/bukkit/items/invs/ServerSwitcher.java @@ -1,11 +1,11 @@ -package net.paradisu.paradisuplugin.bukkit.items.invs; +package net.paradisu.bukkit.items.invs; // import org.bukkit.entity.Player; // import org.bukkit.inventory.Inventory; // import org.bukkit.plugin.Plugin; // import net.luckperms.api.cacheddata.CachedDataManager.Container; -// import net.paradisu.paradisuplugin.bukkit.ParadisuMain; +// import net.paradisu.bukkit.ParadisuMain; // import de.themoep.inventorygui.InventoryGui; public class ServerSwitcher { diff --git a/bukkit/src/main/java/net/paradisu/paradisuplugin/bukkit/items/invs/TrashCan.java b/bukkit/src/main/java/net/paradisu/bukkit/items/invs/TrashCan.java similarity index 74% rename from bukkit/src/main/java/net/paradisu/paradisuplugin/bukkit/items/invs/TrashCan.java rename to bukkit/src/main/java/net/paradisu/bukkit/items/invs/TrashCan.java index 4215090..1f18c44 100644 --- a/bukkit/src/main/java/net/paradisu/paradisuplugin/bukkit/items/invs/TrashCan.java +++ b/bukkit/src/main/java/net/paradisu/bukkit/items/invs/TrashCan.java @@ -1,14 +1,14 @@ -package net.paradisu.paradisuplugin.bukkit.items.invs; +package net.paradisu.bukkit.items.invs; import org.bukkit.Bukkit; import org.bukkit.event.inventory.InventoryAction; import org.bukkit.event.inventory.InventoryClickEvent; import org.bukkit.inventory.Inventory; -import net.paradisu.paradisuplugin.bukkit.ParadisuMain; -import net.paradisu.paradisuplugin.bukkit.items.common.menu.BlankItem; -import net.paradisu.paradisuplugin.bukkit.items.models.ModelItemManager; -import net.paradisu.paradisuplugin.bukkit.util.InventoryGUI; +import net.paradisu.bukkit.ParadisuMain; +import net.paradisu.bukkit.items.common.menu.BlankItem; +import net.paradisu.bukkit.items.models.ModelItemManager; +import net.paradisu.bukkit.util.InventoryGUI; public class TrashCan implements InventoryGUI { diff --git a/bukkit/src/main/java/net/paradisu/paradisuplugin/bukkit/items/models/ModelCommands.java b/bukkit/src/main/java/net/paradisu/bukkit/items/models/ModelCommands.java similarity index 95% rename from bukkit/src/main/java/net/paradisu/paradisuplugin/bukkit/items/models/ModelCommands.java rename to bukkit/src/main/java/net/paradisu/bukkit/items/models/ModelCommands.java index 426a6e8..55e66c5 100644 --- a/bukkit/src/main/java/net/paradisu/paradisuplugin/bukkit/items/models/ModelCommands.java +++ b/bukkit/src/main/java/net/paradisu/bukkit/items/models/ModelCommands.java @@ -1,4 +1,4 @@ -package net.paradisu.paradisuplugin.bukkit.items.models; +package net.paradisu.bukkit.items.models; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @@ -7,8 +7,8 @@ import cloud.commandframework.annotations.Argument; import cloud.commandframework.annotations.CommandMethod; import cloud.commandframework.annotations.CommandPermission; -import net.paradisu.paradisuplugin.bukkit.ParadisuMain; -import net.paradisu.paradisuplugin.bukkit.items.invs.ModelGiveInv; +import net.paradisu.bukkit.ParadisuMain; +import net.paradisu.bukkit.items.invs.ModelGiveInv; public class ModelCommands { diff --git a/bukkit/src/main/java/net/paradisu/paradisuplugin/bukkit/items/models/ModelInvManager.java b/bukkit/src/main/java/net/paradisu/bukkit/items/models/ModelInvManager.java similarity index 95% rename from bukkit/src/main/java/net/paradisu/paradisuplugin/bukkit/items/models/ModelInvManager.java rename to bukkit/src/main/java/net/paradisu/bukkit/items/models/ModelInvManager.java index ee9f061..41735cd 100644 --- a/bukkit/src/main/java/net/paradisu/paradisuplugin/bukkit/items/models/ModelInvManager.java +++ b/bukkit/src/main/java/net/paradisu/bukkit/items/models/ModelInvManager.java @@ -1,4 +1,4 @@ -package net.paradisu.paradisuplugin.bukkit.items.models; +package net.paradisu.bukkit.items.models; import java.util.ArrayList; import java.util.List; @@ -6,7 +6,7 @@ import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.ItemMeta; -import net.paradisu.paradisuplugin.bukkit.ParadisuMain; +import net.paradisu.bukkit.ParadisuMain; public abstract class ModelInvManager { diff --git a/bukkit/src/main/java/net/paradisu/paradisuplugin/bukkit/items/models/ModelItemManager.java b/bukkit/src/main/java/net/paradisu/bukkit/items/models/ModelItemManager.java similarity index 96% rename from bukkit/src/main/java/net/paradisu/paradisuplugin/bukkit/items/models/ModelItemManager.java rename to bukkit/src/main/java/net/paradisu/bukkit/items/models/ModelItemManager.java index 69ddfd2..44bc136 100644 --- a/bukkit/src/main/java/net/paradisu/paradisuplugin/bukkit/items/models/ModelItemManager.java +++ b/bukkit/src/main/java/net/paradisu/bukkit/items/models/ModelItemManager.java @@ -1,4 +1,4 @@ -package net.paradisu.paradisuplugin.bukkit.items.models; +package net.paradisu.bukkit.items.models; import java.sql.Connection; import java.sql.PreparedStatement; @@ -11,7 +11,7 @@ import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.ItemMeta; -import net.paradisu.paradisuplugin.bukkit.ParadisuMain; +import net.paradisu.bukkit.ParadisuMain; public class ModelItemManager { diff --git a/bukkit/src/main/java/net/paradisu/paradisuplugin/bukkit/items/models/modelscroller/ModelScrollerCommands.java b/bukkit/src/main/java/net/paradisu/bukkit/items/models/modelscroller/ModelScrollerCommands.java similarity index 91% rename from bukkit/src/main/java/net/paradisu/paradisuplugin/bukkit/items/models/modelscroller/ModelScrollerCommands.java rename to bukkit/src/main/java/net/paradisu/bukkit/items/models/modelscroller/ModelScrollerCommands.java index 6a0d903..243ac19 100644 --- a/bukkit/src/main/java/net/paradisu/paradisuplugin/bukkit/items/models/modelscroller/ModelScrollerCommands.java +++ b/bukkit/src/main/java/net/paradisu/bukkit/items/models/modelscroller/ModelScrollerCommands.java @@ -1,7 +1,7 @@ -package net.paradisu.paradisuplugin.bukkit.items.models.modelscroller; +package net.paradisu.bukkit.items.models.modelscroller; -import net.paradisu.paradisuplugin.bukkit.items.models.ModelItemManager; -import net.paradisu.paradisuplugin.bukkit.ParadisuMain; +import net.paradisu.bukkit.items.models.ModelItemManager; +import net.paradisu.bukkit.ParadisuMain; import net.md_5.bungee.api.ChatColor; import org.bukkit.World; import org.bukkit.command.Command; diff --git a/bukkit/src/main/java/net/paradisu/paradisuplugin/bukkit/items/models/modelscroller/ModelScrollerEvents.java b/bukkit/src/main/java/net/paradisu/bukkit/items/models/modelscroller/ModelScrollerEvents.java similarity index 92% rename from bukkit/src/main/java/net/paradisu/paradisuplugin/bukkit/items/models/modelscroller/ModelScrollerEvents.java rename to bukkit/src/main/java/net/paradisu/bukkit/items/models/modelscroller/ModelScrollerEvents.java index 7b322c9..717bd6e 100644 --- a/bukkit/src/main/java/net/paradisu/paradisuplugin/bukkit/items/models/modelscroller/ModelScrollerEvents.java +++ b/bukkit/src/main/java/net/paradisu/bukkit/items/models/modelscroller/ModelScrollerEvents.java @@ -1,4 +1,4 @@ -package net.paradisu.paradisuplugin.bukkit.items.models.modelscroller; +package net.paradisu.bukkit.items.models.modelscroller; import org.bukkit.World; import org.bukkit.entity.ArmorStand; @@ -9,9 +9,9 @@ import org.bukkit.event.Listener; import org.bukkit.event.player.PlayerInteractAtEntityEvent; -import net.paradisu.paradisuplugin.bukkit.ParadisuMain; -//import net.paradisu.paradisuplugin.bukkit.modelmanager.PropModelInv; -import net.paradisu.paradisuplugin.bukkit.items.models.ModelItemManager; +import net.paradisu.bukkit.ParadisuMain; +//import net.paradisu.bukkit.modelmanager.PropModelInv; +import net.paradisu.bukkit.items.models.ModelItemManager; public class ModelScrollerEvents implements Listener { diff --git a/bukkit/src/main/java/net/paradisu/paradisuplugin/bukkit/npc/NpcCommands.java b/bukkit/src/main/java/net/paradisu/bukkit/npc/NpcCommands.java similarity index 97% rename from bukkit/src/main/java/net/paradisu/paradisuplugin/bukkit/npc/NpcCommands.java rename to bukkit/src/main/java/net/paradisu/bukkit/npc/NpcCommands.java index 0bb5b24..6e35c02 100644 --- a/bukkit/src/main/java/net/paradisu/paradisuplugin/bukkit/npc/NpcCommands.java +++ b/bukkit/src/main/java/net/paradisu/bukkit/npc/NpcCommands.java @@ -1,4 +1,4 @@ -package net.paradisu.paradisuplugin.bukkit.npc; +package net.paradisu.bukkit.npc; import com.comphenix.protocol.PacketType; import com.comphenix.protocol.ProtocolLibrary; diff --git a/bukkit/src/main/java/net/paradisu/paradisuplugin/bukkit/playerdata/PlayerData.java b/bukkit/src/main/java/net/paradisu/bukkit/playerdata/PlayerData.java similarity index 97% rename from bukkit/src/main/java/net/paradisu/paradisuplugin/bukkit/playerdata/PlayerData.java rename to bukkit/src/main/java/net/paradisu/bukkit/playerdata/PlayerData.java index b8a254b..e5d429f 100644 --- a/bukkit/src/main/java/net/paradisu/paradisuplugin/bukkit/playerdata/PlayerData.java +++ b/bukkit/src/main/java/net/paradisu/bukkit/playerdata/PlayerData.java @@ -1,4 +1,4 @@ -package net.paradisu.paradisuplugin.bukkit.playerdata; +package net.paradisu.bukkit.playerdata; import java.sql.Connection; import java.sql.PreparedStatement; @@ -11,7 +11,7 @@ import org.bukkit.Bukkit; import org.bukkit.entity.Player; -import net.paradisu.paradisuplugin.bukkit.ParadisuMain; +import net.paradisu.bukkit.ParadisuMain; import net.md_5.bungee.api.ChatColor; public class PlayerData { diff --git a/bukkit/src/main/java/net/paradisu/paradisuplugin/bukkit/playerdata/PlayerDataEvents.java b/bukkit/src/main/java/net/paradisu/bukkit/playerdata/PlayerDataEvents.java similarity index 90% rename from bukkit/src/main/java/net/paradisu/paradisuplugin/bukkit/playerdata/PlayerDataEvents.java rename to bukkit/src/main/java/net/paradisu/bukkit/playerdata/PlayerDataEvents.java index df0473d..1d13565 100644 --- a/bukkit/src/main/java/net/paradisu/paradisuplugin/bukkit/playerdata/PlayerDataEvents.java +++ b/bukkit/src/main/java/net/paradisu/bukkit/playerdata/PlayerDataEvents.java @@ -1,4 +1,4 @@ -package net.paradisu.paradisuplugin.bukkit.playerdata; +package net.paradisu.bukkit.playerdata; import java.sql.Connection; import java.sql.PreparedStatement; @@ -9,7 +9,7 @@ import org.bukkit.event.Listener; import org.bukkit.event.player.PlayerJoinEvent; -import net.paradisu.paradisuplugin.bukkit.ParadisuMain; +import net.paradisu.bukkit.ParadisuMain; public class PlayerDataEvents implements Listener { diff --git a/bukkit/src/main/java/net/paradisu/paradisuplugin/bukkit/playerdata/PlayerDataGetter.java b/bukkit/src/main/java/net/paradisu/bukkit/playerdata/PlayerDataGetter.java similarity index 96% rename from bukkit/src/main/java/net/paradisu/paradisuplugin/bukkit/playerdata/PlayerDataGetter.java rename to bukkit/src/main/java/net/paradisu/bukkit/playerdata/PlayerDataGetter.java index 80b3199..428f4a3 100644 --- a/bukkit/src/main/java/net/paradisu/paradisuplugin/bukkit/playerdata/PlayerDataGetter.java +++ b/bukkit/src/main/java/net/paradisu/bukkit/playerdata/PlayerDataGetter.java @@ -1,4 +1,4 @@ -package net.paradisu.paradisuplugin.bukkit.playerdata; +package net.paradisu.bukkit.playerdata; import org.bukkit.entity.Player; diff --git a/bukkit/src/main/java/net/paradisu/paradisuplugin/bukkit/shops/PlayerInventories.java b/bukkit/src/main/java/net/paradisu/bukkit/shops/PlayerInventories.java similarity index 93% rename from bukkit/src/main/java/net/paradisu/paradisuplugin/bukkit/shops/PlayerInventories.java rename to bukkit/src/main/java/net/paradisu/bukkit/shops/PlayerInventories.java index 9d1524e..697b54c 100644 --- a/bukkit/src/main/java/net/paradisu/paradisuplugin/bukkit/shops/PlayerInventories.java +++ b/bukkit/src/main/java/net/paradisu/bukkit/shops/PlayerInventories.java @@ -1,6 +1,6 @@ -package net.paradisu.paradisuplugin.bukkit.shops; +package net.paradisu.bukkit.shops; -import net.paradisu.paradisuplugin.bukkit.ParadisuMain; +import net.paradisu.bukkit.ParadisuMain; import org.bukkit.Material; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; diff --git a/bukkit/src/main/java/net/paradisu/paradisuplugin/bukkit/shops/ShopCommands.java b/bukkit/src/main/java/net/paradisu/bukkit/shops/ShopCommands.java similarity index 91% rename from bukkit/src/main/java/net/paradisu/paradisuplugin/bukkit/shops/ShopCommands.java rename to bukkit/src/main/java/net/paradisu/bukkit/shops/ShopCommands.java index f4e76a4..81a5e26 100644 --- a/bukkit/src/main/java/net/paradisu/paradisuplugin/bukkit/shops/ShopCommands.java +++ b/bukkit/src/main/java/net/paradisu/bukkit/shops/ShopCommands.java @@ -1,6 +1,6 @@ -package net.paradisu.paradisuplugin.bukkit.shops; +package net.paradisu.bukkit.shops; -import net.paradisu.paradisuplugin.bukkit.ParadisuMain; +import net.paradisu.bukkit.ParadisuMain; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; diff --git a/bukkit/src/main/java/net/paradisu/paradisuplugin/bukkit/shops/ShopGuis.java b/bukkit/src/main/java/net/paradisu/bukkit/shops/ShopGuis.java similarity index 95% rename from bukkit/src/main/java/net/paradisu/paradisuplugin/bukkit/shops/ShopGuis.java rename to bukkit/src/main/java/net/paradisu/bukkit/shops/ShopGuis.java index d8824bd..421c062 100644 --- a/bukkit/src/main/java/net/paradisu/paradisuplugin/bukkit/shops/ShopGuis.java +++ b/bukkit/src/main/java/net/paradisu/bukkit/shops/ShopGuis.java @@ -1,7 +1,7 @@ -package net.paradisu.paradisuplugin.bukkit.shops; +package net.paradisu.bukkit.shops; -import net.paradisu.paradisuplugin.bukkit.items.models.ModelItemManager; -import net.paradisu.paradisuplugin.bukkit.ParadisuMain; +import net.paradisu.bukkit.items.models.ModelItemManager; +import net.paradisu.bukkit.ParadisuMain; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.configuration.ConfigurationSection; diff --git a/bukkit/src/main/java/net/paradisu/paradisuplugin/bukkit/util/DatabaseConnection.java b/bukkit/src/main/java/net/paradisu/bukkit/util/DatabaseConnection.java similarity index 94% rename from bukkit/src/main/java/net/paradisu/paradisuplugin/bukkit/util/DatabaseConnection.java rename to bukkit/src/main/java/net/paradisu/bukkit/util/DatabaseConnection.java index 9ebe93e..b508822 100644 --- a/bukkit/src/main/java/net/paradisu/paradisuplugin/bukkit/util/DatabaseConnection.java +++ b/bukkit/src/main/java/net/paradisu/bukkit/util/DatabaseConnection.java @@ -1,4 +1,4 @@ -package net.paradisu.paradisuplugin.bukkit.util; +package net.paradisu.bukkit.util; import static org.bukkit.Bukkit.getServer; @@ -8,7 +8,7 @@ import org.bukkit.ChatColor; import org.bukkit.configuration.file.FileConfiguration; import org.mariadb.jdbc.MariaDbDataSource; -import net.paradisu.paradisuplugin.bukkit.ParadisuMain; +import net.paradisu.bukkit.ParadisuMain; public class DatabaseConnection { diff --git a/bukkit/src/main/java/net/paradisu/paradisuplugin/bukkit/util/EventCooldowns.java b/bukkit/src/main/java/net/paradisu/bukkit/util/EventCooldowns.java similarity index 93% rename from bukkit/src/main/java/net/paradisu/paradisuplugin/bukkit/util/EventCooldowns.java rename to bukkit/src/main/java/net/paradisu/bukkit/util/EventCooldowns.java index b69fd84..0ddb527 100644 --- a/bukkit/src/main/java/net/paradisu/paradisuplugin/bukkit/util/EventCooldowns.java +++ b/bukkit/src/main/java/net/paradisu/bukkit/util/EventCooldowns.java @@ -1,4 +1,4 @@ -package net.paradisu.paradisuplugin.bukkit.util; +package net.paradisu.bukkit.util; import java.util.HashMap; import java.util.Map; diff --git a/bukkit/src/main/java/net/paradisu/paradisuplugin/bukkit/util/InventoryGUI.java b/bukkit/src/main/java/net/paradisu/bukkit/util/InventoryGUI.java similarity index 80% rename from bukkit/src/main/java/net/paradisu/paradisuplugin/bukkit/util/InventoryGUI.java rename to bukkit/src/main/java/net/paradisu/bukkit/util/InventoryGUI.java index 6a41e8a..416aa74 100644 --- a/bukkit/src/main/java/net/paradisu/paradisuplugin/bukkit/util/InventoryGUI.java +++ b/bukkit/src/main/java/net/paradisu/bukkit/util/InventoryGUI.java @@ -1,4 +1,4 @@ -package net.paradisu.paradisuplugin.bukkit.util; +package net.paradisu.bukkit.util; import org.bukkit.event.inventory.InventoryClickEvent; import org.bukkit.inventory.InventoryHolder; diff --git a/bukkit/src/main/java/net/paradisu/paradisuplugin/bukkit/util/TimeZone.java b/bukkit/src/main/java/net/paradisu/bukkit/util/TimeZone.java similarity index 98% rename from bukkit/src/main/java/net/paradisu/paradisuplugin/bukkit/util/TimeZone.java rename to bukkit/src/main/java/net/paradisu/bukkit/util/TimeZone.java index c657d5f..90d71d1 100644 --- a/bukkit/src/main/java/net/paradisu/paradisuplugin/bukkit/util/TimeZone.java +++ b/bukkit/src/main/java/net/paradisu/bukkit/util/TimeZone.java @@ -1,4 +1,4 @@ -package net.paradisu.paradisuplugin.bukkit.util; +package net.paradisu.bukkit.util; import org.bukkit.Bukkit; import org.bukkit.ChatColor; diff --git a/bukkit/src/main/java/net/paradisu/paradisuplugin/bukkit/util/protocollib/ProtoLibBasicCommands.java b/bukkit/src/main/java/net/paradisu/bukkit/util/protocollib/ProtoLibBasicCommands.java similarity index 94% rename from bukkit/src/main/java/net/paradisu/paradisuplugin/bukkit/util/protocollib/ProtoLibBasicCommands.java rename to bukkit/src/main/java/net/paradisu/bukkit/util/protocollib/ProtoLibBasicCommands.java index 7731905..693b93c 100644 --- a/bukkit/src/main/java/net/paradisu/paradisuplugin/bukkit/util/protocollib/ProtoLibBasicCommands.java +++ b/bukkit/src/main/java/net/paradisu/bukkit/util/protocollib/ProtoLibBasicCommands.java @@ -1,8 +1,8 @@ -package net.paradisu.paradisuplugin.bukkit.util.protocollib; +package net.paradisu.bukkit.util.protocollib; import com.comphenix.protocol.ProtocolLibrary; import com.comphenix.protocol.ProtocolManager; -import net.paradisu.paradisuplugin.bukkit.ParadisuMain; +import net.paradisu.bukkit.ParadisuMain; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; diff --git a/bukkit/src/main/java/net/paradisu/paradisuplugin/bukkit/util/protocollib/ProtoLibEntityHandling.java b/bukkit/src/main/java/net/paradisu/bukkit/util/protocollib/ProtoLibEntityHandling.java similarity index 99% rename from bukkit/src/main/java/net/paradisu/paradisuplugin/bukkit/util/protocollib/ProtoLibEntityHandling.java rename to bukkit/src/main/java/net/paradisu/bukkit/util/protocollib/ProtoLibEntityHandling.java index 63bfb42..f89a40f 100644 --- a/bukkit/src/main/java/net/paradisu/paradisuplugin/bukkit/util/protocollib/ProtoLibEntityHandling.java +++ b/bukkit/src/main/java/net/paradisu/bukkit/util/protocollib/ProtoLibEntityHandling.java @@ -1,4 +1,4 @@ -package net.paradisu.paradisuplugin.bukkit.util.protocollib; +package net.paradisu.bukkit.util.protocollib; // import com.comphenix.protocol.PacketType; // import com.comphenix.protocol.ProtocolManager; diff --git a/bukkit/src/main/java/net/paradisu/paradisuplugin/bukkit/warps/Warp.java b/bukkit/src/main/java/net/paradisu/bukkit/warps/Warp.java similarity index 97% rename from bukkit/src/main/java/net/paradisu/paradisuplugin/bukkit/warps/Warp.java rename to bukkit/src/main/java/net/paradisu/bukkit/warps/Warp.java index 64bb8d0..36c3cb1 100644 --- a/bukkit/src/main/java/net/paradisu/paradisuplugin/bukkit/warps/Warp.java +++ b/bukkit/src/main/java/net/paradisu/bukkit/warps/Warp.java @@ -1,4 +1,4 @@ -package net.paradisu.paradisuplugin.bukkit.warps; +package net.paradisu.bukkit.warps; import java.util.ArrayList; diff --git a/bukkit/src/main/java/net/paradisu/paradisuplugin/bukkit/warps/WarpAlias.java b/bukkit/src/main/java/net/paradisu/bukkit/warps/WarpAlias.java similarity index 86% rename from bukkit/src/main/java/net/paradisu/paradisuplugin/bukkit/warps/WarpAlias.java rename to bukkit/src/main/java/net/paradisu/bukkit/warps/WarpAlias.java index 4da4852..9ee4501 100644 --- a/bukkit/src/main/java/net/paradisu/paradisuplugin/bukkit/warps/WarpAlias.java +++ b/bukkit/src/main/java/net/paradisu/bukkit/warps/WarpAlias.java @@ -1,4 +1,4 @@ -package net.paradisu.paradisuplugin.bukkit.warps; +package net.paradisu.bukkit.warps; public class WarpAlias { private String Alias; diff --git a/bukkit/src/main/java/net/paradisu/paradisuplugin/bukkit/warps/WarpCommands.java b/bukkit/src/main/java/net/paradisu/bukkit/warps/WarpCommands.java similarity index 98% rename from bukkit/src/main/java/net/paradisu/paradisuplugin/bukkit/warps/WarpCommands.java rename to bukkit/src/main/java/net/paradisu/bukkit/warps/WarpCommands.java index adbc630..14b7816 100644 --- a/bukkit/src/main/java/net/paradisu/paradisuplugin/bukkit/warps/WarpCommands.java +++ b/bukkit/src/main/java/net/paradisu/bukkit/warps/WarpCommands.java @@ -1,4 +1,4 @@ -package net.paradisu.paradisuplugin.bukkit.warps; +package net.paradisu.bukkit.warps; import java.sql.Connection; import java.sql.PreparedStatement; @@ -19,7 +19,7 @@ import cloud.commandframework.annotations.CommandPermission; import cloud.commandframework.annotations.ProxiedBy; import cloud.commandframework.annotations.specifier.Greedy; -import net.paradisu.paradisuplugin.bukkit.ParadisuMain; +import net.paradisu.bukkit.ParadisuMain; public class WarpCommands { diff --git a/bukkit/src/main/java/net/paradisu/paradisuplugin/bukkit/warps/WarpsDataHandler.java b/bukkit/src/main/java/net/paradisu/bukkit/warps/WarpsDataHandler.java similarity index 96% rename from bukkit/src/main/java/net/paradisu/paradisuplugin/bukkit/warps/WarpsDataHandler.java rename to bukkit/src/main/java/net/paradisu/bukkit/warps/WarpsDataHandler.java index f1e5d92..471a25a 100644 --- a/bukkit/src/main/java/net/paradisu/paradisuplugin/bukkit/warps/WarpsDataHandler.java +++ b/bukkit/src/main/java/net/paradisu/bukkit/warps/WarpsDataHandler.java @@ -1,4 +1,4 @@ -package net.paradisu.paradisuplugin.bukkit.warps; +package net.paradisu.bukkit.warps; import java.sql.Connection; import java.sql.PreparedStatement; @@ -8,7 +8,7 @@ import org.bukkit.Bukkit; -import net.paradisu.paradisuplugin.bukkit.ParadisuMain; +import net.paradisu.bukkit.ParadisuMain; public class WarpsDataHandler { diff --git a/bukkit/src/main/resources/META-INF/MANIFEST.MF b/bukkit/src/main/resources/META-INF/MANIFEST.MF index aa945f0..43935a4 100644 --- a/bukkit/src/main/resources/META-INF/MANIFEST.MF +++ b/bukkit/src/main/resources/META-INF/MANIFEST.MF @@ -1,3 +1,3 @@ Manifest-Version: 1.0 -Main-Class: net.paradisu.paradisuplugin.bukkit.paradisumain +Main-Class: net.paradisu.bukkit.paradisumain diff --git a/bukkit/src/main/resources/plugin.yml b/bukkit/src/main/resources/plugin.yml index f3bc1ec..56a8796 100644 --- a/bukkit/src/main/resources/plugin.yml +++ b/bukkit/src/main/resources/plugin.yml @@ -1,7 +1,7 @@ name: ParadisuPlugin version: ${minecraft.plugin.version} authors: [JJakee, cytocracy, _Kastle, CookieCrafted] -main: net.paradisu.paradisuplugin.bukkit.ParadisuMain +main: net.paradisu.bukkit.ParadisuMain api-version: 1.18 commands: dbconnect: diff --git a/plugin/pom.xml b/plugin/pom.xml index 2ca70c2..2029fbe 100644 --- a/plugin/pom.xml +++ b/plugin/pom.xml @@ -5,24 +5,24 @@ 4.0.0 - net.paradisu.paradisuplugin + net.paradisu parent - ${minecraft.plugin.version} + 3.4.0 plugin - ${groupId} + net.paradisu bukkit - ${project.version} + 3.4.0 compile - ${groupId} + net.paradisu velocity - ${project.version} + 3.4.0 compile diff --git a/pom.xml b/pom.xml index e2df833..b290a79 100644 --- a/pom.xml +++ b/pom.xml @@ -6,20 +6,19 @@ > 4.0.0 - net.paradisu.paradisuplugin + net.paradisu parent - ${minecraft.plugin.version} + 3.4.0 pom - ${plugin.name} + ParadisuPlugin ParadisuPlugin UTF-8 - 3.3.3 - 16 - 16 - 1.2-SNAPSHOT + 3.4.0 + 17 + 17 + 1.2-SNAPSHOT @@ -28,32 +27,4 @@ plugin - - - static_build_number - - - !env.BUILD_NUMBER - - - - 0 - (compiled at ${maven.build.timestamp}) - - - - dynamic_build_number - - - env.BUILD_NUMBER - - - - ${env.BUILD_NUMBER} - (build ${env.BUILD_NUMBER}) - - - - diff --git a/velocity/pom.xml b/velocity/pom.xml index 71ef4ec..fa5e855 100644 --- a/velocity/pom.xml +++ b/velocity/pom.xml @@ -5,9 +5,9 @@ 4.0.0 - net.paradisu.paradisuplugin + net.paradisu parent - ${minecraft.plugin.version} + 3.4.0 velocity diff --git a/velocity/src/main/java/net/paradisu/paradisuplugin/velocity/Paradisu.java b/velocity/src/main/java/net/paradisu/velocity/Paradisu.java similarity index 94% rename from velocity/src/main/java/net/paradisu/paradisuplugin/velocity/Paradisu.java rename to velocity/src/main/java/net/paradisu/velocity/Paradisu.java index 9c863bb..b2c0364 100644 --- a/velocity/src/main/java/net/paradisu/paradisuplugin/velocity/Paradisu.java +++ b/velocity/src/main/java/net/paradisu/velocity/Paradisu.java @@ -1,15 +1,15 @@ -package net.paradisu.paradisuplugin.velocity; +package net.paradisu.velocity; import com.google.inject.Inject; import cloud.commandframework.CommandManager; import cloud.commandframework.execution.CommandExecutionCoordinator; import cloud.commandframework.velocity.VelocityCommandManager; import de.themoep.connectorplugin.velocity.VelocityConnectorPlugin; -import net.paradisu.paradisuplugin.velocity.commands.util.AbstractCommand; -import net.paradisu.paradisuplugin.velocity.config.ConfigManager; -import net.paradisu.paradisuplugin.velocity.config.MessagesConfig; -import net.paradisu.paradisuplugin.velocity.locale.TranslationManager; -import net.paradisu.paradisuplugin.velocity.commands.command.*; +import net.paradisu.velocity.commands.util.AbstractCommand; +import net.paradisu.velocity.config.ConfigManager; +import net.paradisu.velocity.config.MessagesConfig; +import net.paradisu.velocity.locale.TranslationManager; +import net.paradisu.velocity.commands.command.*; import com.velocitypowered.api.command.CommandSource; import com.velocitypowered.api.event.Subscribe; diff --git a/velocity/src/main/java/net/paradisu/paradisuplugin/velocity/commands/command/BackCommand.java b/velocity/src/main/java/net/paradisu/velocity/commands/command/BackCommand.java similarity index 90% rename from velocity/src/main/java/net/paradisu/paradisuplugin/velocity/commands/command/BackCommand.java rename to velocity/src/main/java/net/paradisu/velocity/commands/command/BackCommand.java index ea88669..62f8e38 100644 --- a/velocity/src/main/java/net/paradisu/paradisuplugin/velocity/commands/command/BackCommand.java +++ b/velocity/src/main/java/net/paradisu/velocity/commands/command/BackCommand.java @@ -1,4 +1,4 @@ -package net.paradisu.paradisuplugin.velocity.commands.command; +package net.paradisu.velocity.commands.command; import com.velocitypowered.api.command.CommandSource; import com.velocitypowered.api.proxy.Player; @@ -11,10 +11,10 @@ import net.kyori.adventure.text.Component; import net.kyori.adventure.text.minimessage.MiniMessage; import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder; -import net.paradisu.paradisuplugin.velocity.Paradisu; -import net.paradisu.paradisuplugin.velocity.commands.util.AbstractCommand; -import net.paradisu.paradisuplugin.velocity.commands.util.teleport.TeleportHistory; -import net.paradisu.paradisuplugin.velocity.locale.Messages; +import net.paradisu.velocity.Paradisu; +import net.paradisu.velocity.commands.util.AbstractCommand; +import net.paradisu.velocity.commands.util.teleport.TeleportHistory; +import net.paradisu.velocity.locale.Messages; public final class BackCommand extends AbstractCommand { public BackCommand(Paradisu paradisu) { diff --git a/velocity/src/main/java/net/paradisu/paradisuplugin/velocity/commands/command/ListCommand.java b/velocity/src/main/java/net/paradisu/velocity/commands/command/ListCommand.java similarity index 93% rename from velocity/src/main/java/net/paradisu/paradisuplugin/velocity/commands/command/ListCommand.java rename to velocity/src/main/java/net/paradisu/velocity/commands/command/ListCommand.java index 64624d1..9db1005 100644 --- a/velocity/src/main/java/net/paradisu/paradisuplugin/velocity/commands/command/ListCommand.java +++ b/velocity/src/main/java/net/paradisu/velocity/commands/command/ListCommand.java @@ -1,4 +1,4 @@ -package net.paradisu.paradisuplugin.velocity.commands.command; +package net.paradisu.velocity.commands.command; import java.util.ArrayList; import java.util.List; @@ -17,9 +17,9 @@ import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder; import net.luckperms.api.LuckPerms; import net.luckperms.api.LuckPermsProvider; -import net.paradisu.paradisuplugin.velocity.Paradisu; -import net.paradisu.paradisuplugin.velocity.commands.util.AbstractCommand; -import net.paradisu.paradisuplugin.velocity.locale.Messages; +import net.paradisu.velocity.Paradisu; +import net.paradisu.velocity.commands.util.AbstractCommand; +import net.paradisu.velocity.locale.Messages; public final class ListCommand extends AbstractCommand { public ListCommand(Paradisu paradisu) { diff --git a/velocity/src/main/java/net/paradisu/paradisuplugin/velocity/commands/command/LocateCommand.java b/velocity/src/main/java/net/paradisu/velocity/commands/command/LocateCommand.java similarity index 90% rename from velocity/src/main/java/net/paradisu/paradisuplugin/velocity/commands/command/LocateCommand.java rename to velocity/src/main/java/net/paradisu/velocity/commands/command/LocateCommand.java index 1d05913..76d293d 100644 --- a/velocity/src/main/java/net/paradisu/paradisuplugin/velocity/commands/command/LocateCommand.java +++ b/velocity/src/main/java/net/paradisu/velocity/commands/command/LocateCommand.java @@ -1,4 +1,4 @@ -package net.paradisu.paradisuplugin.velocity.commands.command; +package net.paradisu.velocity.commands.command; import com.velocitypowered.api.command.CommandSource; import com.velocitypowered.api.proxy.Player; @@ -10,9 +10,9 @@ import net.kyori.adventure.text.Component; import net.kyori.adventure.text.minimessage.MiniMessage; import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder; -import net.paradisu.paradisuplugin.velocity.Paradisu; -import net.paradisu.paradisuplugin.velocity.commands.util.AbstractCommand; -import net.paradisu.paradisuplugin.velocity.locale.Messages; +import net.paradisu.velocity.Paradisu; +import net.paradisu.velocity.commands.util.AbstractCommand; +import net.paradisu.velocity.locale.Messages; public final class LocateCommand extends AbstractCommand { public LocateCommand(Paradisu paradisu) { diff --git a/velocity/src/main/java/net/paradisu/paradisuplugin/velocity/commands/command/TeleportAcceptCommand.java b/velocity/src/main/java/net/paradisu/velocity/commands/command/TeleportAcceptCommand.java similarity index 89% rename from velocity/src/main/java/net/paradisu/paradisuplugin/velocity/commands/command/TeleportAcceptCommand.java rename to velocity/src/main/java/net/paradisu/velocity/commands/command/TeleportAcceptCommand.java index a7725fe..3b055b9 100644 --- a/velocity/src/main/java/net/paradisu/paradisuplugin/velocity/commands/command/TeleportAcceptCommand.java +++ b/velocity/src/main/java/net/paradisu/velocity/commands/command/TeleportAcceptCommand.java @@ -1,4 +1,4 @@ -package net.paradisu.paradisuplugin.velocity.commands.command; +package net.paradisu.velocity.commands.command; import com.velocitypowered.api.command.CommandSource; import com.velocitypowered.api.proxy.Player; @@ -10,12 +10,12 @@ import net.kyori.adventure.text.Component; import net.kyori.adventure.text.minimessage.MiniMessage; import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder; -import net.paradisu.paradisuplugin.velocity.Paradisu; -import net.paradisu.paradisuplugin.velocity.commands.util.AbstractCommand; -import net.paradisu.paradisuplugin.velocity.commands.util.teleport.TeleportHistory; -import net.paradisu.paradisuplugin.velocity.commands.util.teleport.TeleportQueue; -import net.paradisu.paradisuplugin.velocity.commands.util.teleport.TeleportRequestHeader; -import net.paradisu.paradisuplugin.velocity.locale.Messages; +import net.paradisu.velocity.Paradisu; +import net.paradisu.velocity.commands.util.AbstractCommand; +import net.paradisu.velocity.commands.util.teleport.TeleportHistory; +import net.paradisu.velocity.commands.util.teleport.TeleportQueue; +import net.paradisu.velocity.commands.util.teleport.TeleportRequestHeader; +import net.paradisu.velocity.locale.Messages; public final class TeleportAcceptCommand extends AbstractCommand { public TeleportAcceptCommand(Paradisu paradisu) { diff --git a/velocity/src/main/java/net/paradisu/paradisuplugin/velocity/commands/command/TeleportCancelCommand.java b/velocity/src/main/java/net/paradisu/velocity/commands/command/TeleportCancelCommand.java similarity index 86% rename from velocity/src/main/java/net/paradisu/paradisuplugin/velocity/commands/command/TeleportCancelCommand.java rename to velocity/src/main/java/net/paradisu/velocity/commands/command/TeleportCancelCommand.java index f2eaf7e..e7bf3b0 100644 --- a/velocity/src/main/java/net/paradisu/paradisuplugin/velocity/commands/command/TeleportCancelCommand.java +++ b/velocity/src/main/java/net/paradisu/velocity/commands/command/TeleportCancelCommand.java @@ -1,4 +1,4 @@ -package net.paradisu.paradisuplugin.velocity.commands.command; +package net.paradisu.velocity.commands.command; import com.velocitypowered.api.command.CommandSource; import com.velocitypowered.api.proxy.Player; @@ -10,11 +10,11 @@ import net.kyori.adventure.text.Component; import net.kyori.adventure.text.minimessage.MiniMessage; import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder; -import net.paradisu.paradisuplugin.velocity.Paradisu; -import net.paradisu.paradisuplugin.velocity.commands.util.AbstractCommand; -import net.paradisu.paradisuplugin.velocity.commands.util.teleport.TeleportQueue; -import net.paradisu.paradisuplugin.velocity.commands.util.teleport.TeleportRequestHeader; -import net.paradisu.paradisuplugin.velocity.locale.Messages; +import net.paradisu.velocity.Paradisu; +import net.paradisu.velocity.commands.util.AbstractCommand; +import net.paradisu.velocity.commands.util.teleport.TeleportQueue; +import net.paradisu.velocity.commands.util.teleport.TeleportRequestHeader; +import net.paradisu.velocity.locale.Messages; public final class TeleportCancelCommand extends AbstractCommand { public TeleportCancelCommand(Paradisu paradisu) { diff --git a/velocity/src/main/java/net/paradisu/paradisuplugin/velocity/commands/command/TeleportCommand.java b/velocity/src/main/java/net/paradisu/velocity/commands/command/TeleportCommand.java similarity index 89% rename from velocity/src/main/java/net/paradisu/paradisuplugin/velocity/commands/command/TeleportCommand.java rename to velocity/src/main/java/net/paradisu/velocity/commands/command/TeleportCommand.java index 48ec537..1f09736 100644 --- a/velocity/src/main/java/net/paradisu/paradisuplugin/velocity/commands/command/TeleportCommand.java +++ b/velocity/src/main/java/net/paradisu/velocity/commands/command/TeleportCommand.java @@ -1,4 +1,4 @@ -package net.paradisu.paradisuplugin.velocity.commands.command; +package net.paradisu.velocity.commands.command; import com.velocitypowered.api.command.CommandSource; import com.velocitypowered.api.proxy.Player; @@ -10,10 +10,10 @@ import net.kyori.adventure.text.Component; import net.kyori.adventure.text.minimessage.MiniMessage; import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder; -import net.paradisu.paradisuplugin.velocity.Paradisu; -import net.paradisu.paradisuplugin.velocity.commands.util.AbstractCommand; -import net.paradisu.paradisuplugin.velocity.commands.util.teleport.TeleportHistory; -import net.paradisu.paradisuplugin.velocity.locale.Messages; +import net.paradisu.velocity.Paradisu; +import net.paradisu.velocity.commands.util.AbstractCommand; +import net.paradisu.velocity.commands.util.teleport.TeleportHistory; +import net.paradisu.velocity.locale.Messages; public final class TeleportCommand extends AbstractCommand { public TeleportCommand(Paradisu paradisu) { diff --git a/velocity/src/main/java/net/paradisu/paradisuplugin/velocity/commands/command/TeleportDenyCommand.java b/velocity/src/main/java/net/paradisu/velocity/commands/command/TeleportDenyCommand.java similarity index 87% rename from velocity/src/main/java/net/paradisu/paradisuplugin/velocity/commands/command/TeleportDenyCommand.java rename to velocity/src/main/java/net/paradisu/velocity/commands/command/TeleportDenyCommand.java index e63cb3d..5b4ad6e 100644 --- a/velocity/src/main/java/net/paradisu/paradisuplugin/velocity/commands/command/TeleportDenyCommand.java +++ b/velocity/src/main/java/net/paradisu/velocity/commands/command/TeleportDenyCommand.java @@ -1,4 +1,4 @@ -package net.paradisu.paradisuplugin.velocity.commands.command; +package net.paradisu.velocity.commands.command; import com.velocitypowered.api.command.CommandSource; import com.velocitypowered.api.proxy.Player; @@ -10,11 +10,11 @@ import net.kyori.adventure.text.Component; import net.kyori.adventure.text.minimessage.MiniMessage; import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder; -import net.paradisu.paradisuplugin.velocity.Paradisu; -import net.paradisu.paradisuplugin.velocity.commands.util.AbstractCommand; -import net.paradisu.paradisuplugin.velocity.commands.util.teleport.TeleportQueue; -import net.paradisu.paradisuplugin.velocity.commands.util.teleport.TeleportRequestHeader; -import net.paradisu.paradisuplugin.velocity.locale.Messages; +import net.paradisu.velocity.Paradisu; +import net.paradisu.velocity.commands.util.AbstractCommand; +import net.paradisu.velocity.commands.util.teleport.TeleportQueue; +import net.paradisu.velocity.commands.util.teleport.TeleportRequestHeader; +import net.paradisu.velocity.locale.Messages; public final class TeleportDenyCommand extends AbstractCommand { public TeleportDenyCommand(Paradisu paradisu) { diff --git a/velocity/src/main/java/net/paradisu/paradisuplugin/velocity/commands/command/TeleportHereCommand.java b/velocity/src/main/java/net/paradisu/velocity/commands/command/TeleportHereCommand.java similarity index 88% rename from velocity/src/main/java/net/paradisu/paradisuplugin/velocity/commands/command/TeleportHereCommand.java rename to velocity/src/main/java/net/paradisu/velocity/commands/command/TeleportHereCommand.java index a835f7c..1e4698c 100644 --- a/velocity/src/main/java/net/paradisu/paradisuplugin/velocity/commands/command/TeleportHereCommand.java +++ b/velocity/src/main/java/net/paradisu/velocity/commands/command/TeleportHereCommand.java @@ -1,4 +1,4 @@ -package net.paradisu.paradisuplugin.velocity.commands.command; +package net.paradisu.velocity.commands.command; import com.velocitypowered.api.command.CommandSource; import com.velocitypowered.api.proxy.Player; @@ -10,10 +10,10 @@ import net.kyori.adventure.text.Component; import net.kyori.adventure.text.minimessage.MiniMessage; import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder; -import net.paradisu.paradisuplugin.velocity.Paradisu; -import net.paradisu.paradisuplugin.velocity.commands.util.AbstractCommand; -import net.paradisu.paradisuplugin.velocity.commands.util.teleport.TeleportHistory; -import net.paradisu.paradisuplugin.velocity.locale.Messages; +import net.paradisu.velocity.Paradisu; +import net.paradisu.velocity.commands.util.AbstractCommand; +import net.paradisu.velocity.commands.util.teleport.TeleportHistory; +import net.paradisu.velocity.locale.Messages; public final class TeleportHereCommand extends AbstractCommand { public TeleportHereCommand(Paradisu paradisu) { diff --git a/velocity/src/main/java/net/paradisu/paradisuplugin/velocity/commands/command/TeleportHereRequestCommand.java b/velocity/src/main/java/net/paradisu/velocity/commands/command/TeleportHereRequestCommand.java similarity index 88% rename from velocity/src/main/java/net/paradisu/paradisuplugin/velocity/commands/command/TeleportHereRequestCommand.java rename to velocity/src/main/java/net/paradisu/velocity/commands/command/TeleportHereRequestCommand.java index 429793f..a7b78cc 100644 --- a/velocity/src/main/java/net/paradisu/paradisuplugin/velocity/commands/command/TeleportHereRequestCommand.java +++ b/velocity/src/main/java/net/paradisu/velocity/commands/command/TeleportHereRequestCommand.java @@ -1,4 +1,4 @@ -package net.paradisu.paradisuplugin.velocity.commands.command; +package net.paradisu.velocity.commands.command; import com.velocitypowered.api.command.CommandSource; import com.velocitypowered.api.proxy.Player; @@ -12,11 +12,11 @@ import net.kyori.adventure.text.format.NamedTextColor; import net.kyori.adventure.text.minimessage.MiniMessage; import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder; -import net.paradisu.paradisuplugin.velocity.Paradisu; -import net.paradisu.paradisuplugin.velocity.commands.util.AbstractCommand; -import net.paradisu.paradisuplugin.velocity.commands.util.teleport.TeleportQueue; -import net.paradisu.paradisuplugin.velocity.commands.util.teleport.TeleportRequestHeader; -import net.paradisu.paradisuplugin.velocity.locale.Messages; +import net.paradisu.velocity.Paradisu; +import net.paradisu.velocity.commands.util.AbstractCommand; +import net.paradisu.velocity.commands.util.teleport.TeleportQueue; +import net.paradisu.velocity.commands.util.teleport.TeleportRequestHeader; +import net.paradisu.velocity.locale.Messages; public final class TeleportHereRequestCommand extends AbstractCommand { public TeleportHereRequestCommand(Paradisu paradisu) { diff --git a/velocity/src/main/java/net/paradisu/paradisuplugin/velocity/commands/command/TeleportPositionCommand.java b/velocity/src/main/java/net/paradisu/velocity/commands/command/TeleportPositionCommand.java similarity index 92% rename from velocity/src/main/java/net/paradisu/paradisuplugin/velocity/commands/command/TeleportPositionCommand.java rename to velocity/src/main/java/net/paradisu/velocity/commands/command/TeleportPositionCommand.java index 4ccc4d0..902ffa6 100644 --- a/velocity/src/main/java/net/paradisu/paradisuplugin/velocity/commands/command/TeleportPositionCommand.java +++ b/velocity/src/main/java/net/paradisu/velocity/commands/command/TeleportPositionCommand.java @@ -1,4 +1,4 @@ -package net.paradisu.paradisuplugin.velocity.commands.command; +package net.paradisu.velocity.commands.command; import com.velocitypowered.api.command.CommandSource; import com.velocitypowered.api.proxy.Player; @@ -14,10 +14,10 @@ import net.kyori.adventure.text.Component; import net.kyori.adventure.text.minimessage.MiniMessage; import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder; -import net.paradisu.paradisuplugin.velocity.Paradisu; -import net.paradisu.paradisuplugin.velocity.commands.util.AbstractCommand; -import net.paradisu.paradisuplugin.velocity.commands.util.teleport.TeleportHistory; -import net.paradisu.paradisuplugin.velocity.locale.Messages; +import net.paradisu.velocity.Paradisu; +import net.paradisu.velocity.commands.util.AbstractCommand; +import net.paradisu.velocity.commands.util.teleport.TeleportHistory; +import net.paradisu.velocity.locale.Messages; public final class TeleportPositionCommand extends AbstractCommand { public TeleportPositionCommand(Paradisu paradisu) { diff --git a/velocity/src/main/java/net/paradisu/paradisuplugin/velocity/commands/command/TeleportRequestCommand.java b/velocity/src/main/java/net/paradisu/velocity/commands/command/TeleportRequestCommand.java similarity index 88% rename from velocity/src/main/java/net/paradisu/paradisuplugin/velocity/commands/command/TeleportRequestCommand.java rename to velocity/src/main/java/net/paradisu/velocity/commands/command/TeleportRequestCommand.java index 66307ef..33fb253 100644 --- a/velocity/src/main/java/net/paradisu/paradisuplugin/velocity/commands/command/TeleportRequestCommand.java +++ b/velocity/src/main/java/net/paradisu/velocity/commands/command/TeleportRequestCommand.java @@ -1,4 +1,4 @@ -package net.paradisu.paradisuplugin.velocity.commands.command; +package net.paradisu.velocity.commands.command; import com.velocitypowered.api.command.CommandSource; import com.velocitypowered.api.proxy.Player; @@ -12,11 +12,11 @@ import net.kyori.adventure.text.format.NamedTextColor; import net.kyori.adventure.text.minimessage.MiniMessage; import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder; -import net.paradisu.paradisuplugin.velocity.Paradisu; -import net.paradisu.paradisuplugin.velocity.commands.util.AbstractCommand; -import net.paradisu.paradisuplugin.velocity.commands.util.teleport.TeleportQueue; -import net.paradisu.paradisuplugin.velocity.commands.util.teleport.TeleportRequestHeader; -import net.paradisu.paradisuplugin.velocity.locale.Messages; +import net.paradisu.velocity.Paradisu; +import net.paradisu.velocity.commands.util.AbstractCommand; +import net.paradisu.velocity.commands.util.teleport.TeleportQueue; +import net.paradisu.velocity.commands.util.teleport.TeleportRequestHeader; +import net.paradisu.velocity.locale.Messages; public final class TeleportRequestCommand extends AbstractCommand { public TeleportRequestCommand(Paradisu paradisu) { diff --git a/velocity/src/main/java/net/paradisu/paradisuplugin/velocity/commands/command/VParadisuCommand.java b/velocity/src/main/java/net/paradisu/velocity/commands/command/VParadisuCommand.java similarity index 90% rename from velocity/src/main/java/net/paradisu/paradisuplugin/velocity/commands/command/VParadisuCommand.java rename to velocity/src/main/java/net/paradisu/velocity/commands/command/VParadisuCommand.java index a204d58..e8d0802 100644 --- a/velocity/src/main/java/net/paradisu/paradisuplugin/velocity/commands/command/VParadisuCommand.java +++ b/velocity/src/main/java/net/paradisu/velocity/commands/command/VParadisuCommand.java @@ -1,4 +1,4 @@ -package net.paradisu.paradisuplugin.velocity.commands.command; +package net.paradisu.velocity.commands.command; import com.velocitypowered.api.command.CommandSource; @@ -6,9 +6,9 @@ import cloud.commandframework.context.CommandContext; import cloud.commandframework.meta.CommandMeta; import net.kyori.adventure.text.minimessage.MiniMessage; -import net.paradisu.paradisuplugin.velocity.Paradisu; -import net.paradisu.paradisuplugin.velocity.commands.util.AbstractCommand; -import net.paradisu.paradisuplugin.velocity.locale.Messages; +import net.paradisu.velocity.Paradisu; +import net.paradisu.velocity.commands.util.AbstractCommand; +import net.paradisu.velocity.locale.Messages; public final class VParadisuCommand extends AbstractCommand { public VParadisuCommand(Paradisu paradisu) { diff --git a/velocity/src/main/java/net/paradisu/paradisuplugin/velocity/commands/command/WarpCommand.java b/velocity/src/main/java/net/paradisu/velocity/commands/command/WarpCommand.java similarity index 50% rename from velocity/src/main/java/net/paradisu/paradisuplugin/velocity/commands/command/WarpCommand.java rename to velocity/src/main/java/net/paradisu/velocity/commands/command/WarpCommand.java index 9f29717..cf09674 100644 --- a/velocity/src/main/java/net/paradisu/paradisuplugin/velocity/commands/command/WarpCommand.java +++ b/velocity/src/main/java/net/paradisu/velocity/commands/command/WarpCommand.java @@ -1,7 +1,7 @@ -package net.paradisu.paradisuplugin.velocity.commands.command; +package net.paradisu.velocity.commands.command; -import net.paradisu.paradisuplugin.velocity.Paradisu; -import net.paradisu.paradisuplugin.velocity.commands.util.AbstractCommand; +import net.paradisu.velocity.Paradisu; +import net.paradisu.velocity.commands.util.AbstractCommand; public final class WarpCommand extends AbstractCommand { public WarpCommand(Paradisu paradisu) { diff --git a/velocity/src/main/java/net/paradisu/paradisuplugin/velocity/commands/util/AbstractCommand.java b/velocity/src/main/java/net/paradisu/velocity/commands/util/AbstractCommand.java similarity index 94% rename from velocity/src/main/java/net/paradisu/paradisuplugin/velocity/commands/util/AbstractCommand.java rename to velocity/src/main/java/net/paradisu/velocity/commands/util/AbstractCommand.java index 6337819..cc8c789 100644 --- a/velocity/src/main/java/net/paradisu/paradisuplugin/velocity/commands/util/AbstractCommand.java +++ b/velocity/src/main/java/net/paradisu/velocity/commands/util/AbstractCommand.java @@ -1,4 +1,4 @@ -package net.paradisu.paradisuplugin.velocity.commands.util; +package net.paradisu.velocity.commands.util; import java.util.Arrays; import java.util.stream.Collectors; @@ -11,7 +11,7 @@ import net.kyori.adventure.text.Component; import net.kyori.adventure.text.format.NamedTextColor; import net.kyori.adventure.text.minimessage.MiniMessage; -import net.paradisu.paradisuplugin.velocity.Paradisu; +import net.paradisu.velocity.Paradisu; public abstract class AbstractCommand { protected final Paradisu paradisu; diff --git a/velocity/src/main/java/net/paradisu/paradisuplugin/velocity/commands/util/teleport/TeleportHistory.java b/velocity/src/main/java/net/paradisu/velocity/commands/util/teleport/TeleportHistory.java similarity index 93% rename from velocity/src/main/java/net/paradisu/paradisuplugin/velocity/commands/util/teleport/TeleportHistory.java rename to velocity/src/main/java/net/paradisu/velocity/commands/util/teleport/TeleportHistory.java index e3bde8b..4ca6f69 100644 --- a/velocity/src/main/java/net/paradisu/paradisuplugin/velocity/commands/util/teleport/TeleportHistory.java +++ b/velocity/src/main/java/net/paradisu/velocity/commands/util/teleport/TeleportHistory.java @@ -1,4 +1,4 @@ -package net.paradisu.paradisuplugin.velocity.commands.util.teleport; +package net.paradisu.velocity.commands.util.teleport; import java.util.HashMap; diff --git a/velocity/src/main/java/net/paradisu/paradisuplugin/velocity/commands/util/teleport/TeleportQueue.java b/velocity/src/main/java/net/paradisu/velocity/commands/util/teleport/TeleportQueue.java similarity index 98% rename from velocity/src/main/java/net/paradisu/paradisuplugin/velocity/commands/util/teleport/TeleportQueue.java rename to velocity/src/main/java/net/paradisu/velocity/commands/util/teleport/TeleportQueue.java index 74dbf48..b51a238 100644 --- a/velocity/src/main/java/net/paradisu/paradisuplugin/velocity/commands/util/teleport/TeleportQueue.java +++ b/velocity/src/main/java/net/paradisu/velocity/commands/util/teleport/TeleportQueue.java @@ -1,4 +1,4 @@ -package net.paradisu.paradisuplugin.velocity.commands.util.teleport; +package net.paradisu.velocity.commands.util.teleport; import java.util.Arrays; import java.util.concurrent.TimeUnit; diff --git a/velocity/src/main/java/net/paradisu/paradisuplugin/velocity/commands/util/teleport/TeleportRequestHeader.java b/velocity/src/main/java/net/paradisu/velocity/commands/util/teleport/TeleportRequestHeader.java similarity index 96% rename from velocity/src/main/java/net/paradisu/paradisuplugin/velocity/commands/util/teleport/TeleportRequestHeader.java rename to velocity/src/main/java/net/paradisu/velocity/commands/util/teleport/TeleportRequestHeader.java index 4cc7936..b576a83 100644 --- a/velocity/src/main/java/net/paradisu/paradisuplugin/velocity/commands/util/teleport/TeleportRequestHeader.java +++ b/velocity/src/main/java/net/paradisu/velocity/commands/util/teleport/TeleportRequestHeader.java @@ -1,4 +1,4 @@ -package net.paradisu.paradisuplugin.velocity.commands.util.teleport; +package net.paradisu.velocity.commands.util.teleport; import com.velocitypowered.api.proxy.Player; diff --git a/velocity/src/main/java/net/paradisu/paradisuplugin/velocity/config/ConfigManager.java b/velocity/src/main/java/net/paradisu/velocity/config/ConfigManager.java similarity index 90% rename from velocity/src/main/java/net/paradisu/paradisuplugin/velocity/config/ConfigManager.java rename to velocity/src/main/java/net/paradisu/velocity/config/ConfigManager.java index 8dcb83f..005eead 100644 --- a/velocity/src/main/java/net/paradisu/paradisuplugin/velocity/config/ConfigManager.java +++ b/velocity/src/main/java/net/paradisu/velocity/config/ConfigManager.java @@ -1,7 +1,7 @@ -package net.paradisu.paradisuplugin.velocity.config; +package net.paradisu.velocity.config; -import net.paradisu.paradisuplugin.velocity.Paradisu; -import net.paradisu.paradisuplugin.velocity.config.loader.ConfigLoader; +import net.paradisu.velocity.Paradisu; +import net.paradisu.velocity.config.loader.ConfigLoader; import org.spongepowered.configurate.ConfigurateException; import java.nio.file.Path; diff --git a/velocity/src/main/java/net/paradisu/paradisuplugin/velocity/config/MessagesConfig.java b/velocity/src/main/java/net/paradisu/velocity/config/MessagesConfig.java similarity index 99% rename from velocity/src/main/java/net/paradisu/paradisuplugin/velocity/config/MessagesConfig.java rename to velocity/src/main/java/net/paradisu/velocity/config/MessagesConfig.java index 33568cc..7b9c714 100644 --- a/velocity/src/main/java/net/paradisu/paradisuplugin/velocity/config/MessagesConfig.java +++ b/velocity/src/main/java/net/paradisu/velocity/config/MessagesConfig.java @@ -1,4 +1,4 @@ -package net.paradisu.paradisuplugin.velocity.config; +package net.paradisu.velocity.config; import java.util.List; diff --git a/velocity/src/main/java/net/paradisu/paradisuplugin/velocity/config/ParadisuConfig.java b/velocity/src/main/java/net/paradisu/velocity/config/ParadisuConfig.java similarity index 82% rename from velocity/src/main/java/net/paradisu/paradisuplugin/velocity/config/ParadisuConfig.java rename to velocity/src/main/java/net/paradisu/velocity/config/ParadisuConfig.java index ca25990..37e1c29 100644 --- a/velocity/src/main/java/net/paradisu/paradisuplugin/velocity/config/ParadisuConfig.java +++ b/velocity/src/main/java/net/paradisu/velocity/config/ParadisuConfig.java @@ -1,4 +1,4 @@ -package net.paradisu.paradisuplugin.velocity.config; +package net.paradisu.velocity.config; import org.spongepowered.configurate.objectmapping.ConfigSerializable; import org.spongepowered.configurate.objectmapping.meta.Setting; diff --git a/velocity/src/main/java/net/paradisu/paradisuplugin/velocity/config/loader/ConfigLoader.java b/velocity/src/main/java/net/paradisu/velocity/config/loader/ConfigLoader.java similarity index 96% rename from velocity/src/main/java/net/paradisu/paradisuplugin/velocity/config/loader/ConfigLoader.java rename to velocity/src/main/java/net/paradisu/velocity/config/loader/ConfigLoader.java index f67f1a6..e5d4b06 100644 --- a/velocity/src/main/java/net/paradisu/paradisuplugin/velocity/config/loader/ConfigLoader.java +++ b/velocity/src/main/java/net/paradisu/velocity/config/loader/ConfigLoader.java @@ -1,4 +1,4 @@ -package net.paradisu.paradisuplugin.velocity.config.loader; +package net.paradisu.velocity.config.loader; import org.spongepowered.configurate.CommentedConfigurationNode; import org.spongepowered.configurate.ConfigurateException; diff --git a/velocity/src/main/java/net/paradisu/paradisuplugin/velocity/locale/Messages.java b/velocity/src/main/java/net/paradisu/velocity/locale/Messages.java similarity index 94% rename from velocity/src/main/java/net/paradisu/paradisuplugin/velocity/locale/Messages.java rename to velocity/src/main/java/net/paradisu/velocity/locale/Messages.java index 167d97e..9f35ce1 100644 --- a/velocity/src/main/java/net/paradisu/paradisuplugin/velocity/locale/Messages.java +++ b/velocity/src/main/java/net/paradisu/velocity/locale/Messages.java @@ -1,4 +1,4 @@ -package net.paradisu.paradisuplugin.velocity.locale; +package net.paradisu.velocity.locale; import static net.kyori.adventure.text.Component.text; diff --git a/velocity/src/main/java/net/paradisu/paradisuplugin/velocity/locale/TranslationManager.java b/velocity/src/main/java/net/paradisu/velocity/locale/TranslationManager.java similarity index 97% rename from velocity/src/main/java/net/paradisu/paradisuplugin/velocity/locale/TranslationManager.java rename to velocity/src/main/java/net/paradisu/velocity/locale/TranslationManager.java index e089aa1..bc69f15 100644 --- a/velocity/src/main/java/net/paradisu/paradisuplugin/velocity/locale/TranslationManager.java +++ b/velocity/src/main/java/net/paradisu/velocity/locale/TranslationManager.java @@ -1,8 +1,8 @@ -package net.paradisu.paradisuplugin.velocity.locale; +package net.paradisu.velocity.locale; import com.google.common.collect.Maps; -import net.paradisu.paradisuplugin.velocity.Paradisu; -import net.paradisu.paradisuplugin.velocity.utils.FileUtils; +import net.paradisu.velocity.Paradisu; +import net.paradisu.velocity.utils.FileUtils; import net.kyori.adventure.key.Key; import net.kyori.adventure.translation.GlobalTranslator; import net.kyori.adventure.translation.TranslationRegistry; diff --git a/velocity/src/main/java/net/paradisu/paradisuplugin/velocity/utils/FileUtils.java b/velocity/src/main/java/net/paradisu/velocity/utils/FileUtils.java similarity index 96% rename from velocity/src/main/java/net/paradisu/paradisuplugin/velocity/utils/FileUtils.java rename to velocity/src/main/java/net/paradisu/velocity/utils/FileUtils.java index 3211e10..784ad67 100644 --- a/velocity/src/main/java/net/paradisu/paradisuplugin/velocity/utils/FileUtils.java +++ b/velocity/src/main/java/net/paradisu/velocity/utils/FileUtils.java @@ -1,4 +1,4 @@ -package net.paradisu.paradisuplugin.velocity.utils; +package net.paradisu.velocity.utils; import java.io.IOException; import java.nio.file.DirectoryStream; diff --git a/velocity/src/main/resources/velocity-plugin.json b/velocity/src/main/resources/velocity-plugin.json index 64f8d9f..6d18dbb 100644 --- a/velocity/src/main/resources/velocity-plugin.json +++ b/velocity/src/main/resources/velocity-plugin.json @@ -2,6 +2,6 @@ "id": "paradisuplugin", "name": "ParadisuPlugin", "version": "${minecraft.plugin.version}", - "main": "net.paradisu.paradisuplugin.velocity.Paradisu", + "main": "net.paradisu.velocity.Paradisu", "authors": ["_Kastle", "cyto"] } \ No newline at end of file