From aef95bb83110927d7bdf549ff0586fa863c866af Mon Sep 17 00:00:00 2001 From: Christian Koop Date: Wed, 14 Jun 2023 21:24:50 +0200 Subject: [PATCH] Migrates from SongodaCore to CraftaroCore v3.0.0-SNAPSHOT --- pom.xml | 18 ++++++++++++----- .../songoda/epicanchors/AnchorManager.java | 16 +++++++-------- .../com/songoda/epicanchors/EpicAnchors.java | 20 +++++++++---------- .../commands/EpicAnchorsCommand.java | 4 ++-- .../epicanchors/commands/sub/GiveCommand.java | 2 +- .../commands/sub/ReloadCommand.java | 2 +- .../commands/sub/SettingsCommand.java | 6 +++--- .../epicanchors/commands/sub/ShowCommand.java | 2 +- .../epicanchors/files/DataManager.java | 4 ++-- .../songoda/epicanchors/files/Settings.java | 10 +++++----- .../files/migration/AnchorMigration.java | 10 +++++----- .../files/migration/_1_InitialMigration.java | 2 +- .../songoda/epicanchors/guis/AnchorGui.java | 16 +++++++-------- .../guis/DestroyConfirmationGui.java | 10 +++++----- .../epicanchors/listener/AnchorListener.java | 6 +++--- .../epicanchors/tasks/VisualizeTask.java | 2 +- 16 files changed, 69 insertions(+), 61 deletions(-) diff --git a/pom.xml b/pom.xml index 7c1cf17..22a9eb5 100644 --- a/pom.xml +++ b/pom.xml @@ -55,18 +55,18 @@ package - shade ${project.name}-${project.version} + true true - com.songoda.core + com.craftaro.core com.songoda.epicanchors.core @@ -88,6 +88,14 @@ ** + + + com.craftaro:CraftaroCore + false + + **/nms/v*/** + + @@ -124,9 +132,9 @@ - com.songoda - SongodaCore - 2.6.20 + com.craftaro + CraftaroCore + 3.0.0-SNAPSHOT compile diff --git a/src/main/java/com/songoda/epicanchors/AnchorManager.java b/src/main/java/com/songoda/epicanchors/AnchorManager.java index ce878c9..ccae59f 100644 --- a/src/main/java/com/songoda/epicanchors/AnchorManager.java +++ b/src/main/java/com/songoda/epicanchors/AnchorManager.java @@ -1,13 +1,13 @@ package com.songoda.epicanchors; -import com.songoda.core.SongodaPlugin; -import com.songoda.core.compatibility.CompatibleMaterial; -import com.songoda.core.compatibility.CompatibleParticleHandler; -import com.songoda.core.compatibility.CompatibleSound; -import com.songoda.core.hooks.HologramManager; -import com.songoda.core.third_party.de.tr7zw.nbtapi.NBTItem; -import com.songoda.core.utils.TextUtils; -import com.songoda.core.utils.TimeUtils; +import com.craftaro.core.SongodaPlugin; +import com.craftaro.core.compatibility.CompatibleMaterial; +import com.craftaro.core.compatibility.CompatibleParticleHandler; +import com.craftaro.core.compatibility.CompatibleSound; +import com.craftaro.core.hooks.HologramManager; +import com.craftaro.core.third_party.de.tr7zw.nbtapi.NBTItem; +import com.craftaro.core.utils.TextUtils; +import com.craftaro.core.utils.TimeUtils; import com.songoda.epicanchors.api.AnchorAccessCheck; import com.songoda.epicanchors.files.DataManager; import com.songoda.epicanchors.files.Settings; diff --git a/src/main/java/com/songoda/epicanchors/EpicAnchors.java b/src/main/java/com/songoda/epicanchors/EpicAnchors.java index 862d157..533c21c 100644 --- a/src/main/java/com/songoda/epicanchors/EpicAnchors.java +++ b/src/main/java/com/songoda/epicanchors/EpicAnchors.java @@ -1,15 +1,15 @@ package com.songoda.epicanchors; -import com.songoda.core.SongodaCore; -import com.songoda.core.SongodaPlugin; -import com.songoda.core.commands.CommandManager; -import com.songoda.core.compatibility.CompatibleMaterial; -import com.songoda.core.configuration.Config; -import com.songoda.core.database.DatabaseConnector; -import com.songoda.core.database.SQLiteConnector; -import com.songoda.core.gui.GuiManager; -import com.songoda.core.hooks.EconomyManager; -import com.songoda.core.hooks.HologramManager; +import com.craftaro.core.SongodaCore; +import com.craftaro.core.SongodaPlugin; +import com.craftaro.core.commands.CommandManager; +import com.craftaro.core.compatibility.CompatibleMaterial; +import com.craftaro.core.configuration.Config; +import com.craftaro.core.database.DatabaseConnector; +import com.craftaro.core.database.SQLiteConnector; +import com.craftaro.core.gui.GuiManager; +import com.craftaro.core.hooks.EconomyManager; +import com.craftaro.core.hooks.HologramManager; import com.songoda.epicanchors.commands.EpicAnchorsCommand; import com.songoda.epicanchors.commands.sub.GiveCommand; import com.songoda.epicanchors.commands.sub.ReloadCommand; diff --git a/src/main/java/com/songoda/epicanchors/commands/EpicAnchorsCommand.java b/src/main/java/com/songoda/epicanchors/commands/EpicAnchorsCommand.java index f8cf8a3..fb31b23 100644 --- a/src/main/java/com/songoda/epicanchors/commands/EpicAnchorsCommand.java +++ b/src/main/java/com/songoda/epicanchors/commands/EpicAnchorsCommand.java @@ -1,7 +1,7 @@ package com.songoda.epicanchors.commands; -import com.songoda.core.commands.AbstractCommand; -import com.songoda.core.commands.CommandManager; +import com.craftaro.core.commands.AbstractCommand; +import com.craftaro.core.commands.CommandManager; import com.songoda.epicanchors.EpicAnchors; import org.bukkit.ChatColor; import org.bukkit.command.CommandSender; diff --git a/src/main/java/com/songoda/epicanchors/commands/sub/GiveCommand.java b/src/main/java/com/songoda/epicanchors/commands/sub/GiveCommand.java index 29f26d6..61895d6 100644 --- a/src/main/java/com/songoda/epicanchors/commands/sub/GiveCommand.java +++ b/src/main/java/com/songoda/epicanchors/commands/sub/GiveCommand.java @@ -1,6 +1,6 @@ package com.songoda.epicanchors.commands.sub; -import com.songoda.core.commands.AbstractCommand; +import com.craftaro.core.commands.AbstractCommand; import com.songoda.epicanchors.EpicAnchors; import com.songoda.epicanchors.utils.Utils; import org.bukkit.Bukkit; diff --git a/src/main/java/com/songoda/epicanchors/commands/sub/ReloadCommand.java b/src/main/java/com/songoda/epicanchors/commands/sub/ReloadCommand.java index 1258955..6afa57c 100644 --- a/src/main/java/com/songoda/epicanchors/commands/sub/ReloadCommand.java +++ b/src/main/java/com/songoda/epicanchors/commands/sub/ReloadCommand.java @@ -1,6 +1,6 @@ package com.songoda.epicanchors.commands.sub; -import com.songoda.core.commands.AbstractCommand; +import com.craftaro.core.commands.AbstractCommand; import com.songoda.epicanchors.EpicAnchors; import org.bukkit.command.CommandSender; diff --git a/src/main/java/com/songoda/epicanchors/commands/sub/SettingsCommand.java b/src/main/java/com/songoda/epicanchors/commands/sub/SettingsCommand.java index 692376b..c69148c 100644 --- a/src/main/java/com/songoda/epicanchors/commands/sub/SettingsCommand.java +++ b/src/main/java/com/songoda/epicanchors/commands/sub/SettingsCommand.java @@ -1,8 +1,8 @@ package com.songoda.epicanchors.commands.sub; -import com.songoda.core.commands.AbstractCommand; -import com.songoda.core.configuration.editor.PluginConfigGui; -import com.songoda.core.gui.GuiManager; +import com.craftaro.core.commands.AbstractCommand; +import com.craftaro.core.configuration.editor.PluginConfigGui; +import com.craftaro.core.gui.GuiManager; import com.songoda.epicanchors.EpicAnchors; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/src/main/java/com/songoda/epicanchors/commands/sub/ShowCommand.java b/src/main/java/com/songoda/epicanchors/commands/sub/ShowCommand.java index 62a5377..02c0fcd 100644 --- a/src/main/java/com/songoda/epicanchors/commands/sub/ShowCommand.java +++ b/src/main/java/com/songoda/epicanchors/commands/sub/ShowCommand.java @@ -1,6 +1,6 @@ package com.songoda.epicanchors.commands.sub; -import com.songoda.core.commands.AbstractCommand; +import com.craftaro.core.commands.AbstractCommand; import com.songoda.epicanchors.EpicAnchors; import net.md_5.bungee.api.ChatColor; import org.bukkit.command.CommandSender; diff --git a/src/main/java/com/songoda/epicanchors/files/DataManager.java b/src/main/java/com/songoda/epicanchors/files/DataManager.java index cde7a33..9cad3ed 100644 --- a/src/main/java/com/songoda/epicanchors/files/DataManager.java +++ b/src/main/java/com/songoda/epicanchors/files/DataManager.java @@ -1,7 +1,7 @@ package com.songoda.epicanchors.files; -import com.songoda.core.database.DataManagerAbstract; -import com.songoda.core.database.DatabaseConnector; +import com.craftaro.core.database.DataManagerAbstract; +import com.craftaro.core.database.DatabaseConnector; import com.songoda.epicanchors.Anchor; import com.songoda.epicanchors.files.migration.AnchorMigration; import com.songoda.epicanchors.utils.Callback; diff --git a/src/main/java/com/songoda/epicanchors/files/Settings.java b/src/main/java/com/songoda/epicanchors/files/Settings.java index 599409f..06a76a8 100644 --- a/src/main/java/com/songoda/epicanchors/files/Settings.java +++ b/src/main/java/com/songoda/epicanchors/files/Settings.java @@ -1,10 +1,10 @@ package com.songoda.epicanchors.files; -import com.songoda.core.compatibility.CompatibleMaterial; -import com.songoda.core.compatibility.CompatibleParticleHandler; -import com.songoda.core.configuration.Config; -import com.songoda.core.configuration.ConfigSetting; -import com.songoda.core.hooks.EconomyManager; +import com.craftaro.core.compatibility.CompatibleMaterial; +import com.craftaro.core.compatibility.CompatibleParticleHandler; +import com.craftaro.core.configuration.Config; +import com.craftaro.core.configuration.ConfigSetting; +import com.craftaro.core.hooks.EconomyManager; import com.songoda.epicanchors.EpicAnchors; import org.bukkit.plugin.java.JavaPlugin; diff --git a/src/main/java/com/songoda/epicanchors/files/migration/AnchorMigration.java b/src/main/java/com/songoda/epicanchors/files/migration/AnchorMigration.java index 31a65a0..8427be5 100644 --- a/src/main/java/com/songoda/epicanchors/files/migration/AnchorMigration.java +++ b/src/main/java/com/songoda/epicanchors/files/migration/AnchorMigration.java @@ -1,10 +1,10 @@ package com.songoda.epicanchors.files.migration; -import com.songoda.core.configuration.Config; -import com.songoda.core.configuration.ConfigSection; -import com.songoda.core.database.DataMigration; -import com.songoda.core.database.DataMigrationManager; -import com.songoda.core.database.DatabaseConnector; +import com.craftaro.core.configuration.Config; +import com.craftaro.core.configuration.ConfigSection; +import com.craftaro.core.database.DataMigration; +import com.craftaro.core.database.DataMigrationManager; +import com.craftaro.core.database.DatabaseConnector; import com.songoda.epicanchors.files.DataManager; import com.songoda.epicanchors.utils.ThreadSync; import org.bukkit.Location; diff --git a/src/main/java/com/songoda/epicanchors/files/migration/_1_InitialMigration.java b/src/main/java/com/songoda/epicanchors/files/migration/_1_InitialMigration.java index 2a6b88b..ebb7bdb 100644 --- a/src/main/java/com/songoda/epicanchors/files/migration/_1_InitialMigration.java +++ b/src/main/java/com/songoda/epicanchors/files/migration/_1_InitialMigration.java @@ -1,6 +1,6 @@ package com.songoda.epicanchors.files.migration; -import com.songoda.core.database.DataMigration; +import com.craftaro.core.database.DataMigration; import com.songoda.epicanchors.files.DataManager; import java.sql.Connection; diff --git a/src/main/java/com/songoda/epicanchors/guis/AnchorGui.java b/src/main/java/com/songoda/epicanchors/guis/AnchorGui.java index 86ade12..b277d65 100644 --- a/src/main/java/com/songoda/epicanchors/guis/AnchorGui.java +++ b/src/main/java/com/songoda/epicanchors/guis/AnchorGui.java @@ -1,13 +1,13 @@ package com.songoda.epicanchors.guis; -import com.songoda.core.compatibility.CompatibleMaterial; -import com.songoda.core.compatibility.CompatibleParticleHandler; -import com.songoda.core.compatibility.CompatibleSound; -import com.songoda.core.gui.Gui; -import com.songoda.core.gui.GuiUtils; -import com.songoda.core.hooks.EconomyManager; -import com.songoda.core.utils.TextUtils; -import com.songoda.core.utils.TimeUtils; +import com.craftaro.core.compatibility.CompatibleMaterial; +import com.craftaro.core.compatibility.CompatibleParticleHandler; +import com.craftaro.core.compatibility.CompatibleSound; +import com.craftaro.core.gui.Gui; +import com.craftaro.core.gui.GuiUtils; +import com.craftaro.core.hooks.EconomyManager; +import com.craftaro.core.utils.TextUtils; +import com.craftaro.core.utils.TimeUtils; import com.songoda.epicanchors.Anchor; import com.songoda.epicanchors.EpicAnchors; import com.songoda.epicanchors.files.Settings; diff --git a/src/main/java/com/songoda/epicanchors/guis/DestroyConfirmationGui.java b/src/main/java/com/songoda/epicanchors/guis/DestroyConfirmationGui.java index 69e168f..6f9b82a 100644 --- a/src/main/java/com/songoda/epicanchors/guis/DestroyConfirmationGui.java +++ b/src/main/java/com/songoda/epicanchors/guis/DestroyConfirmationGui.java @@ -1,10 +1,10 @@ package com.songoda.epicanchors.guis; -import com.songoda.core.compatibility.CompatibleMaterial; -import com.songoda.core.gui.Gui; -import com.songoda.core.gui.GuiUtils; -import com.songoda.core.gui.methods.Closable; -import com.songoda.core.utils.TextUtils; +import com.craftaro.core.compatibility.CompatibleMaterial; +import com.craftaro.core.gui.Gui; +import com.craftaro.core.gui.GuiUtils; +import com.craftaro.core.gui.methods.Closable; +import com.craftaro.core.utils.TextUtils; import com.songoda.epicanchors.Anchor; import com.songoda.epicanchors.EpicAnchors; import com.songoda.epicanchors.files.Settings; diff --git a/src/main/java/com/songoda/epicanchors/listener/AnchorListener.java b/src/main/java/com/songoda/epicanchors/listener/AnchorListener.java index d330af0..63e4f40 100644 --- a/src/main/java/com/songoda/epicanchors/listener/AnchorListener.java +++ b/src/main/java/com/songoda/epicanchors/listener/AnchorListener.java @@ -1,8 +1,8 @@ package com.songoda.epicanchors.listener; -import com.songoda.core.compatibility.CompatibleHand; -import com.songoda.core.compatibility.CompatibleParticleHandler; -import com.songoda.core.compatibility.CompatibleSound; +import com.craftaro.core.compatibility.CompatibleHand; +import com.craftaro.core.compatibility.CompatibleParticleHandler; +import com.craftaro.core.compatibility.CompatibleSound; import com.songoda.epicanchors.Anchor; import com.songoda.epicanchors.AnchorManager; import com.songoda.epicanchors.EpicAnchors; diff --git a/src/main/java/com/songoda/epicanchors/tasks/VisualizeTask.java b/src/main/java/com/songoda/epicanchors/tasks/VisualizeTask.java index 7c0e5c8..f55aa7e 100644 --- a/src/main/java/com/songoda/epicanchors/tasks/VisualizeTask.java +++ b/src/main/java/com/songoda/epicanchors/tasks/VisualizeTask.java @@ -1,6 +1,6 @@ package com.songoda.epicanchors.tasks; -import com.songoda.core.compatibility.CompatibleParticleHandler; +import com.craftaro.core.compatibility.CompatibleParticleHandler; import com.songoda.epicanchors.Anchor; import com.songoda.epicanchors.EpicAnchors; import com.songoda.epicanchors.files.Settings;