diff --git a/pom.xml b/pom.xml
index 2edf8e4..67e9f4a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,13 +4,13 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4.0.0
- com.songoda
+ com.craftaro
UltimateKits
2.7.7
UltimateKits
Creating and displaying your servers kits has never been easier
- https://songoda.com/marketplace/product/14
+ https://craftaro.com/marketplace/product/ultimatekits.14
1.8
@@ -19,14 +19,9 @@
UTF-8
-
- https://support.songoda.com/servicedesk/customer/portal/3
- Jira Service Desk
-
-
- https://github.com/songoda/UltimateKits
- scm:git:git:github.com/songoda/UltimateKits.git
+ https://github.com/craftaro/UltimateKits
+ scm:git:git:github.com/craftaro/UltimateKits.git
@@ -60,13 +55,14 @@
${project.name}-${project.version}
- false
+ false
+ true
true
- com.songoda.core
- com.songoda.epicanchors.core
+ com.craftaro.core
+ com.craftaro.ultimatestacker.core
@@ -80,6 +76,15 @@
LICENSE.**
+
+
+ com.craftaro:CraftaroCore
+ false
+
+ **/nms/v*/**
+ **/core/third_party/**
+
+
@@ -102,7 +107,7 @@
- songoda-public
+ public
https://repo.songoda.com/repository/public/
@@ -111,14 +116,14 @@
org.spigotmc
spigot-api
- 1.18-R0.1-SNAPSHOT
+ 1.20.1-R0.1-SNAPSHOT
provided
- com.songoda
- SongodaCore
- 2.6.21
+ com.craftaro
+ CraftaroCore
+ 3.0.0-SNAPSHOT
compile
diff --git a/src/main/java/com/songoda/ultimatekits/UltimateKits.java b/src/main/java/com/craftaro/ultimatekits/UltimateKits.java
similarity index 80%
rename from src/main/java/com/songoda/ultimatekits/UltimateKits.java
rename to src/main/java/com/craftaro/ultimatekits/UltimateKits.java
index 8cddb6e..101ed53 100644
--- a/src/main/java/com/songoda/ultimatekits/UltimateKits.java
+++ b/src/main/java/com/craftaro/ultimatekits/UltimateKits.java
@@ -1,56 +1,53 @@
-package com.songoda.ultimatekits;
+package com.craftaro.ultimatekits;
-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.DataMigrationManager;
-import com.songoda.core.database.DatabaseConnector;
-import com.songoda.core.database.MySQLConnector;
-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.songoda.core.utils.TextUtils;
-import com.songoda.ultimatekits.category.Category;
-import com.songoda.ultimatekits.category.CategoryManager;
-import com.songoda.ultimatekits.commands.CommandCategories;
-import com.songoda.ultimatekits.commands.CommandCrate;
-import com.songoda.ultimatekits.commands.CommandCreatekit;
-import com.songoda.ultimatekits.commands.CommandEdit;
-import com.songoda.ultimatekits.commands.CommandKey;
-import com.songoda.ultimatekits.commands.CommandKit;
-import com.songoda.ultimatekits.commands.CommandPreviewKit;
-import com.songoda.ultimatekits.commands.CommandReload;
-import com.songoda.ultimatekits.commands.CommandRemove;
-import com.songoda.ultimatekits.commands.CommandSet;
-import com.songoda.ultimatekits.commands.CommandSettings;
-import com.songoda.ultimatekits.conversion.Convert;
-import com.songoda.ultimatekits.crate.Crate;
-import com.songoda.ultimatekits.crate.CrateManager;
-import com.songoda.ultimatekits.database.DataManager;
-import com.songoda.ultimatekits.database.migrations._1_InitialMigration;
-import com.songoda.ultimatekits.database.migrations._2_DuplicateMigration;
-import com.songoda.ultimatekits.handlers.DisplayItemHandler;
-import com.songoda.ultimatekits.handlers.ParticleHandler;
-import com.songoda.ultimatekits.key.Key;
-import com.songoda.ultimatekits.key.KeyManager;
-import com.songoda.ultimatekits.kit.Kit;
-import com.songoda.ultimatekits.kit.KitAnimation;
-import com.songoda.ultimatekits.kit.KitBlockData;
-import com.songoda.ultimatekits.kit.KitItem;
-import com.songoda.ultimatekits.kit.KitManager;
-import com.songoda.ultimatekits.kit.KitType;
-import com.songoda.ultimatekits.listeners.BlockListeners;
-import com.songoda.ultimatekits.listeners.ChatListeners;
-import com.songoda.ultimatekits.listeners.ChunkListeners;
-import com.songoda.ultimatekits.listeners.EntityListeners;
-import com.songoda.ultimatekits.listeners.InteractListeners;
-import com.songoda.ultimatekits.listeners.PlayerListeners;
-import com.songoda.ultimatekits.settings.Settings;
-import com.songoda.ultimatekits.utils.ItemSerializer;
-import com.songoda.ultimatekits.utils.Methods;
+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.gui.GuiManager;
+import com.craftaro.core.hooks.EconomyManager;
+import com.craftaro.core.hooks.HologramManager;
+import com.craftaro.core.third_party.com.cryptomorin.xseries.XMaterial;
+import com.craftaro.core.utils.TextUtils;
+import com.craftaro.ultimatekits.handlers.DisplayItemHandler;
+import com.craftaro.ultimatekits.handlers.ParticleHandler;
+import com.craftaro.ultimatekits.key.KeyManager;
+import com.craftaro.ultimatekits.kit.KitItem;
+import com.craftaro.ultimatekits.kit.KitType;
+import com.craftaro.ultimatekits.category.Category;
+import com.craftaro.ultimatekits.category.CategoryManager;
+import com.craftaro.ultimatekits.commands.CommandCategories;
+import com.craftaro.ultimatekits.commands.CommandCrate;
+import com.craftaro.ultimatekits.commands.CommandCreatekit;
+import com.craftaro.ultimatekits.commands.CommandEdit;
+import com.craftaro.ultimatekits.commands.CommandKey;
+import com.craftaro.ultimatekits.commands.CommandKit;
+import com.craftaro.ultimatekits.commands.CommandPreviewKit;
+import com.craftaro.ultimatekits.commands.CommandReload;
+import com.craftaro.ultimatekits.commands.CommandRemove;
+import com.craftaro.ultimatekits.commands.CommandSet;
+import com.craftaro.ultimatekits.commands.CommandSettings;
+import com.craftaro.ultimatekits.conversion.Convert;
+import com.craftaro.ultimatekits.crate.Crate;
+import com.craftaro.ultimatekits.crate.CrateManager;
+import com.craftaro.ultimatekits.database.DataManager;
+import com.craftaro.ultimatekits.database.migrations._1_InitialMigration;
+import com.craftaro.ultimatekits.database.migrations._2_DuplicateMigration;
+import com.craftaro.ultimatekits.key.Key;
+import com.craftaro.ultimatekits.kit.Kit;
+import com.craftaro.ultimatekits.kit.KitAnimation;
+import com.craftaro.ultimatekits.kit.KitBlockData;
+import com.craftaro.ultimatekits.kit.KitManager;
+import com.craftaro.ultimatekits.listeners.BlockListeners;
+import com.craftaro.ultimatekits.listeners.ChatListeners;
+import com.craftaro.ultimatekits.listeners.ChunkListeners;
+import com.craftaro.ultimatekits.listeners.EntityListeners;
+import com.craftaro.ultimatekits.listeners.InteractListeners;
+import com.craftaro.ultimatekits.listeners.PlayerListeners;
+import com.craftaro.ultimatekits.settings.Settings;
+import com.craftaro.ultimatekits.utils.ItemSerializer;
+import com.craftaro.ultimatekits.utils.Methods;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.Location;
@@ -84,8 +81,6 @@ public class UltimateKits extends SongodaPlugin {
private KeyManager keyManager;
private CrateManager crateManager;
private CategoryManager categoryManager;
-
- private DatabaseConnector databaseConnector;
private DataManager dataManager;
private boolean loaded = false;
@@ -101,7 +96,8 @@ public class UltimateKits extends SongodaPlugin {
@Override
public void onPluginEnable() {
- SongodaCore.registerPlugin(this, 14, CompatibleMaterial.BEACON);
+ initDatabase(Arrays.asList(new _1_InitialMigration(), new _2_DuplicateMigration()));
+ SongodaCore.registerPlugin(this, 14, XMaterial.BEACON);
// Load Economy
EconomyManager.load();
@@ -115,6 +111,7 @@ public class UltimateKits extends SongodaPlugin {
// Set economy preference
EconomyManager.getManager().setPreferredHook(Settings.ECONOMY_PLUGIN.getString());
+ this.dataManager = new DataManager(this);
this.kitManager = new KitManager();
this.keyManager = new KeyManager();
this.crateManager = new CrateManager();
@@ -161,35 +158,6 @@ public class UltimateKits extends SongodaPlugin {
pluginManager.registerEvents(new InteractListeners(this, this.guiManager), this);
pluginManager.registerEvents(new PlayerListeners(), this);
- try {
- if (Settings.MYSQL_ENABLED.getBoolean()) {
- String hostname = Settings.MYSQL_HOSTNAME.getString();
- int port = Settings.MYSQL_PORT.getInt();
- String database = Settings.MYSQL_DATABASE.getString();
- String username = Settings.MYSQL_USERNAME.getString();
- String password = Settings.MYSQL_PASSWORD.getString();
- boolean useSSL = Settings.MYSQL_USE_SSL.getBoolean();
- int poolSize = Settings.MYSQL_POOL_SIZE.getInt();
-
- this.databaseConnector = new MySQLConnector(this, hostname, port, database, username, password, useSSL, poolSize);
- this.getLogger().info("Data handler connected using MySQL.");
- } else {
- this.databaseConnector = new SQLiteConnector(this);
- this.getLogger().info("Data handler connected using SQLite.");
- }
-
- this.dataManager = new DataManager(this.databaseConnector, this);
- DataMigrationManager dataMigrationManager = new DataMigrationManager(this.databaseConnector, this.dataManager,
- new _1_InitialMigration(),
- new _2_DuplicateMigration(this.databaseConnector instanceof SQLiteConnector));
- dataMigrationManager.runMigrations();
- } catch (Exception ex) {
- this.getLogger().severe("Fatal error trying to connect to database. " +
- "Please make sure all your connection settings are correct and try again. Plugin has been disabled. (" + ex.getMessage() + ")");
- emergencyStop();
- return;
- }
-
this.displayItemHandler.start();
this.particleHandler.start();
}
@@ -211,7 +179,7 @@ public class UltimateKits extends SongodaPlugin {
Category category = categoryManager.addCategory(key, section.getString("name"));
if (section.contains("material")) {
- category.setMaterial(CompatibleMaterial.getMaterial(section.getString("material")).getMaterial());
+ category.setMaterial(CompatibleMaterial.getMaterial(section.getString("material")).get().parseMaterial());
}
}
}
@@ -237,7 +205,7 @@ public class UltimateKits extends SongodaPlugin {
if (itemString.contains("{")) {
item = ItemSerializer.deserializeItemStackFromJson(itemString);
} else {
- item = CompatibleMaterial.getMaterial(itemString).getItem();
+ item = CompatibleMaterial.getMaterial(itemString).get().parseItem();
}
}
@@ -411,7 +379,7 @@ public class UltimateKits extends SongodaPlugin {
}
private List formatHologram(KitBlockData data) {
- getDataManager().updateBlockData(data);
+ getKitDataManager().updateBlockData(data);
List lines = new ArrayList<>();
@@ -599,15 +567,8 @@ public class UltimateKits extends SongodaPlugin {
return this.displayItemHandler;
}
- /**
- * @deprecated Will be made private or removed completely in the future.
- */
- @Deprecated
- public DatabaseConnector getDatabaseConnector() {
- return this.databaseConnector;
- }
- public DataManager getDataManager() {
+ public DataManager getKitDataManager() {
return this.dataManager;
}
diff --git a/src/main/java/com/songoda/ultimatekits/category/Category.java b/src/main/java/com/craftaro/ultimatekits/category/Category.java
similarity index 95%
rename from src/main/java/com/songoda/ultimatekits/category/Category.java
rename to src/main/java/com/craftaro/ultimatekits/category/Category.java
index 04340bb..f6d8355 100644
--- a/src/main/java/com/songoda/ultimatekits/category/Category.java
+++ b/src/main/java/com/craftaro/ultimatekits/category/Category.java
@@ -1,4 +1,4 @@
-package com.songoda.ultimatekits.category;
+package com.craftaro.ultimatekits.category;
import org.bukkit.Material;
diff --git a/src/main/java/com/songoda/ultimatekits/category/CategoryManager.java b/src/main/java/com/craftaro/ultimatekits/category/CategoryManager.java
similarity index 88%
rename from src/main/java/com/songoda/ultimatekits/category/CategoryManager.java
rename to src/main/java/com/craftaro/ultimatekits/category/CategoryManager.java
index 270c09f..007dec0 100644
--- a/src/main/java/com/songoda/ultimatekits/category/CategoryManager.java
+++ b/src/main/java/com/craftaro/ultimatekits/category/CategoryManager.java
@@ -1,8 +1,8 @@
-package com.songoda.ultimatekits.category;
+package com.craftaro.ultimatekits.category;
-import com.songoda.core.utils.TextUtils;
-import com.songoda.ultimatekits.UltimateKits;
-import com.songoda.ultimatekits.kit.Kit;
+import com.craftaro.core.utils.TextUtils;
+import com.craftaro.ultimatekits.UltimateKits;
+import com.craftaro.ultimatekits.kit.Kit;
import org.bukkit.ChatColor;
import java.util.LinkedHashMap;
diff --git a/src/main/java/com/songoda/ultimatekits/commands/CommandCategories.java b/src/main/java/com/craftaro/ultimatekits/commands/CommandCategories.java
similarity index 81%
rename from src/main/java/com/songoda/ultimatekits/commands/CommandCategories.java
rename to src/main/java/com/craftaro/ultimatekits/commands/CommandCategories.java
index 200610d..c995998 100644
--- a/src/main/java/com/songoda/ultimatekits/commands/CommandCategories.java
+++ b/src/main/java/com/craftaro/ultimatekits/commands/CommandCategories.java
@@ -1,9 +1,9 @@
-package com.songoda.ultimatekits.commands;
+package com.craftaro.ultimatekits.commands;
-import com.songoda.core.commands.AbstractCommand;
-import com.songoda.core.gui.GuiManager;
-import com.songoda.ultimatekits.UltimateKits;
-import com.songoda.ultimatekits.gui.CategoryEditorGui;
+import com.craftaro.core.commands.AbstractCommand;
+import com.craftaro.core.gui.GuiManager;
+import com.craftaro.ultimatekits.UltimateKits;
+import com.craftaro.ultimatekits.gui.CategoryEditorGui;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
diff --git a/src/main/java/com/songoda/ultimatekits/commands/CommandCrate.java b/src/main/java/com/craftaro/ultimatekits/commands/CommandCrate.java
similarity index 94%
rename from src/main/java/com/songoda/ultimatekits/commands/CommandCrate.java
rename to src/main/java/com/craftaro/ultimatekits/commands/CommandCrate.java
index e02fb07..3193286 100644
--- a/src/main/java/com/songoda/ultimatekits/commands/CommandCrate.java
+++ b/src/main/java/com/craftaro/ultimatekits/commands/CommandCrate.java
@@ -1,10 +1,10 @@
-package com.songoda.ultimatekits.commands;
+package com.craftaro.ultimatekits.commands;
-import com.songoda.core.commands.AbstractCommand;
-import com.songoda.ultimatekits.UltimateKits;
-import com.songoda.ultimatekits.crate.Crate;
-import com.songoda.ultimatekits.kit.Kit;
-import com.songoda.ultimatekits.utils.Methods;
+import com.craftaro.core.commands.AbstractCommand;
+import com.craftaro.ultimatekits.UltimateKits;
+import com.craftaro.ultimatekits.kit.Kit;
+import com.craftaro.ultimatekits.utils.Methods;
+import com.craftaro.ultimatekits.crate.Crate;
import org.bukkit.Bukkit;
import org.bukkit.OfflinePlayer;
import org.bukkit.command.CommandSender;
diff --git a/src/main/java/com/songoda/ultimatekits/commands/CommandCreatekit.java b/src/main/java/com/craftaro/ultimatekits/commands/CommandCreatekit.java
similarity index 85%
rename from src/main/java/com/songoda/ultimatekits/commands/CommandCreatekit.java
rename to src/main/java/com/craftaro/ultimatekits/commands/CommandCreatekit.java
index d158b1d..68c44a2 100644
--- a/src/main/java/com/songoda/ultimatekits/commands/CommandCreatekit.java
+++ b/src/main/java/com/craftaro/ultimatekits/commands/CommandCreatekit.java
@@ -1,10 +1,10 @@
-package com.songoda.ultimatekits.commands;
+package com.craftaro.ultimatekits.commands;
-import com.songoda.core.commands.AbstractCommand;
-import com.songoda.core.gui.GuiManager;
-import com.songoda.ultimatekits.UltimateKits;
-import com.songoda.ultimatekits.gui.KitEditorGui;
-import com.songoda.ultimatekits.kit.Kit;
+import com.craftaro.core.commands.AbstractCommand;
+import com.craftaro.core.gui.GuiManager;
+import com.craftaro.ultimatekits.UltimateKits;
+import com.craftaro.ultimatekits.gui.KitEditorGui;
+import com.craftaro.ultimatekits.kit.Kit;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
diff --git a/src/main/java/com/songoda/ultimatekits/commands/CommandEdit.java b/src/main/java/com/craftaro/ultimatekits/commands/CommandEdit.java
similarity index 85%
rename from src/main/java/com/songoda/ultimatekits/commands/CommandEdit.java
rename to src/main/java/com/craftaro/ultimatekits/commands/CommandEdit.java
index 9c92015..4765c43 100644
--- a/src/main/java/com/songoda/ultimatekits/commands/CommandEdit.java
+++ b/src/main/java/com/craftaro/ultimatekits/commands/CommandEdit.java
@@ -1,12 +1,12 @@
-package com.songoda.ultimatekits.commands;
+package com.craftaro.ultimatekits.commands;
-import com.songoda.core.commands.AbstractCommand;
-import com.songoda.core.gui.GuiManager;
-import com.songoda.ultimatekits.UltimateKits;
-import com.songoda.ultimatekits.gui.BlockEditorGui;
-import com.songoda.ultimatekits.gui.KitEditorGui;
-import com.songoda.ultimatekits.kit.Kit;
-import com.songoda.ultimatekits.kit.KitBlockData;
+import com.craftaro.core.commands.AbstractCommand;
+import com.craftaro.core.gui.GuiManager;
+import com.craftaro.ultimatekits.UltimateKits;
+import com.craftaro.ultimatekits.gui.BlockEditorGui;
+import com.craftaro.ultimatekits.gui.KitEditorGui;
+import com.craftaro.ultimatekits.kit.Kit;
+import com.craftaro.ultimatekits.kit.KitBlockData;
import org.bukkit.block.Block;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
diff --git a/src/main/java/com/songoda/ultimatekits/commands/CommandKey.java b/src/main/java/com/craftaro/ultimatekits/commands/CommandKey.java
similarity index 92%
rename from src/main/java/com/songoda/ultimatekits/commands/CommandKey.java
rename to src/main/java/com/craftaro/ultimatekits/commands/CommandKey.java
index 2e54f62..0976b6b 100644
--- a/src/main/java/com/songoda/ultimatekits/commands/CommandKey.java
+++ b/src/main/java/com/craftaro/ultimatekits/commands/CommandKey.java
@@ -1,11 +1,11 @@
-package com.songoda.ultimatekits.commands;
+package com.craftaro.ultimatekits.commands;
-import com.songoda.core.commands.AbstractCommand;
-import com.songoda.core.utils.PlayerUtils;
-import com.songoda.ultimatekits.UltimateKits;
-import com.songoda.ultimatekits.key.Key;
-import com.songoda.ultimatekits.kit.Kit;
-import com.songoda.ultimatekits.utils.Methods;
+import com.craftaro.core.commands.AbstractCommand;
+import com.craftaro.core.utils.PlayerUtils;
+import com.craftaro.ultimatekits.UltimateKits;
+import com.craftaro.ultimatekits.key.Key;
+import com.craftaro.ultimatekits.kit.Kit;
+import com.craftaro.ultimatekits.utils.Methods;
import org.bukkit.Bukkit;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
diff --git a/src/main/java/com/songoda/ultimatekits/commands/CommandKit.java b/src/main/java/com/craftaro/ultimatekits/commands/CommandKit.java
similarity index 92%
rename from src/main/java/com/songoda/ultimatekits/commands/CommandKit.java
rename to src/main/java/com/craftaro/ultimatekits/commands/CommandKit.java
index 3aac5c4..c56af1a 100644
--- a/src/main/java/com/songoda/ultimatekits/commands/CommandKit.java
+++ b/src/main/java/com/craftaro/ultimatekits/commands/CommandKit.java
@@ -1,11 +1,11 @@
-package com.songoda.ultimatekits.commands;
+package com.craftaro.ultimatekits.commands;
-import com.songoda.core.commands.AbstractCommand;
-import com.songoda.core.gui.GuiManager;
-import com.songoda.ultimatekits.UltimateKits;
-import com.songoda.ultimatekits.gui.CategorySelectorGui;
-import com.songoda.ultimatekits.gui.KitSelectorGui;
-import com.songoda.ultimatekits.kit.Kit;
+import com.craftaro.core.commands.AbstractCommand;
+import com.craftaro.core.gui.GuiManager;
+import com.craftaro.ultimatekits.UltimateKits;
+import com.craftaro.ultimatekits.gui.CategorySelectorGui;
+import com.craftaro.ultimatekits.gui.KitSelectorGui;
+import com.craftaro.ultimatekits.kit.Kit;
import org.bukkit.Bukkit;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
diff --git a/src/main/java/com/songoda/ultimatekits/commands/CommandPreviewKit.java b/src/main/java/com/craftaro/ultimatekits/commands/CommandPreviewKit.java
similarity index 89%
rename from src/main/java/com/songoda/ultimatekits/commands/CommandPreviewKit.java
rename to src/main/java/com/craftaro/ultimatekits/commands/CommandPreviewKit.java
index d448eee..6ba142c 100644
--- a/src/main/java/com/songoda/ultimatekits/commands/CommandPreviewKit.java
+++ b/src/main/java/com/craftaro/ultimatekits/commands/CommandPreviewKit.java
@@ -1,9 +1,9 @@
-package com.songoda.ultimatekits.commands;
+package com.craftaro.ultimatekits.commands;
-import com.songoda.core.commands.AbstractCommand;
-import com.songoda.core.gui.GuiManager;
-import com.songoda.ultimatekits.UltimateKits;
-import com.songoda.ultimatekits.kit.Kit;
+import com.craftaro.core.commands.AbstractCommand;
+import com.craftaro.core.gui.GuiManager;
+import com.craftaro.ultimatekits.UltimateKits;
+import com.craftaro.ultimatekits.kit.Kit;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
diff --git a/src/main/java/com/songoda/ultimatekits/commands/CommandReload.java b/src/main/java/com/craftaro/ultimatekits/commands/CommandReload.java
similarity index 87%
rename from src/main/java/com/songoda/ultimatekits/commands/CommandReload.java
rename to src/main/java/com/craftaro/ultimatekits/commands/CommandReload.java
index 1e42ce0..da72d0c 100644
--- a/src/main/java/com/songoda/ultimatekits/commands/CommandReload.java
+++ b/src/main/java/com/craftaro/ultimatekits/commands/CommandReload.java
@@ -1,7 +1,7 @@
-package com.songoda.ultimatekits.commands;
+package com.craftaro.ultimatekits.commands;
-import com.songoda.core.commands.AbstractCommand;
-import com.songoda.ultimatekits.UltimateKits;
+import com.craftaro.core.commands.AbstractCommand;
+import com.craftaro.ultimatekits.UltimateKits;
import org.bukkit.command.CommandSender;
import java.util.ArrayList;
diff --git a/src/main/java/com/songoda/ultimatekits/commands/CommandRemove.java b/src/main/java/com/craftaro/ultimatekits/commands/CommandRemove.java
similarity index 87%
rename from src/main/java/com/songoda/ultimatekits/commands/CommandRemove.java
rename to src/main/java/com/craftaro/ultimatekits/commands/CommandRemove.java
index 0be7f8c..a64b5c2 100644
--- a/src/main/java/com/songoda/ultimatekits/commands/CommandRemove.java
+++ b/src/main/java/com/craftaro/ultimatekits/commands/CommandRemove.java
@@ -1,9 +1,9 @@
-package com.songoda.ultimatekits.commands;
+package com.craftaro.ultimatekits.commands;
-import com.songoda.core.commands.AbstractCommand;
-import com.songoda.core.hooks.HologramManager;
-import com.songoda.ultimatekits.UltimateKits;
-import com.songoda.ultimatekits.kit.Kit;
+import com.craftaro.core.commands.AbstractCommand;
+import com.craftaro.core.hooks.HologramManager;
+import com.craftaro.ultimatekits.UltimateKits;
+import com.craftaro.ultimatekits.kit.Kit;
import org.bukkit.block.Block;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
diff --git a/src/main/java/com/songoda/ultimatekits/commands/CommandSet.java b/src/main/java/com/craftaro/ultimatekits/commands/CommandSet.java
similarity index 86%
rename from src/main/java/com/songoda/ultimatekits/commands/CommandSet.java
rename to src/main/java/com/craftaro/ultimatekits/commands/CommandSet.java
index 04ff73f..aa27a8d 100644
--- a/src/main/java/com/songoda/ultimatekits/commands/CommandSet.java
+++ b/src/main/java/com/craftaro/ultimatekits/commands/CommandSet.java
@@ -1,9 +1,9 @@
-package com.songoda.ultimatekits.commands;
+package com.craftaro.ultimatekits.commands;
-import com.songoda.core.commands.AbstractCommand;
-import com.songoda.ultimatekits.UltimateKits;
-import com.songoda.ultimatekits.kit.Kit;
-import com.songoda.ultimatekits.kit.KitBlockData;
+import com.craftaro.core.commands.AbstractCommand;
+import com.craftaro.ultimatekits.UltimateKits;
+import com.craftaro.ultimatekits.kit.Kit;
+import com.craftaro.ultimatekits.kit.KitBlockData;
import org.bukkit.block.Block;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
@@ -34,7 +34,7 @@ public class CommandSet extends AbstractCommand {
}
Block b = player.getTargetBlock(null, 200);
KitBlockData data = plugin.getKitManager().addKitToLocation(kit, b.getLocation());
- UltimateKits.getInstance().getDataManager().createBlockData(data);
+ UltimateKits.getInstance().getKitDataManager().createBlockData(data);
plugin.getLocale().newMessage("&8Kit &a" + kit.getKey() + " &8set to: &a" + b.getType().toString() + "&8.")
.sendPrefixedMessage(sender);
return ReturnType.SUCCESS;
diff --git a/src/main/java/com/songoda/ultimatekits/commands/CommandSettings.java b/src/main/java/com/craftaro/ultimatekits/commands/CommandSettings.java
similarity index 81%
rename from src/main/java/com/songoda/ultimatekits/commands/CommandSettings.java
rename to src/main/java/com/craftaro/ultimatekits/commands/CommandSettings.java
index c596d28..572bddf 100644
--- a/src/main/java/com/songoda/ultimatekits/commands/CommandSettings.java
+++ b/src/main/java/com/craftaro/ultimatekits/commands/CommandSettings.java
@@ -1,9 +1,9 @@
-package com.songoda.ultimatekits.commands;
+package com.craftaro.ultimatekits.commands;
-import com.songoda.core.commands.AbstractCommand;
-import com.songoda.core.configuration.editor.PluginConfigGui;
-import com.songoda.core.gui.GuiManager;
-import com.songoda.ultimatekits.UltimateKits;
+import com.craftaro.core.commands.AbstractCommand;
+import com.craftaro.core.configuration.editor.PluginConfigGui;
+import com.craftaro.core.gui.GuiManager;
+import com.craftaro.ultimatekits.UltimateKits;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
diff --git a/src/main/java/com/songoda/ultimatekits/conversion/Convert.java b/src/main/java/com/craftaro/ultimatekits/conversion/Convert.java
similarity index 84%
rename from src/main/java/com/songoda/ultimatekits/conversion/Convert.java
rename to src/main/java/com/craftaro/ultimatekits/conversion/Convert.java
index 1b8ae28..1e11c00 100644
--- a/src/main/java/com/songoda/ultimatekits/conversion/Convert.java
+++ b/src/main/java/com/craftaro/ultimatekits/conversion/Convert.java
@@ -1,12 +1,12 @@
-package com.songoda.ultimatekits.conversion;
+package com.craftaro.ultimatekits.conversion;
-import com.songoda.ultimatekits.UltimateKits;
-import com.songoda.ultimatekits.conversion.hooks.CMIHook;
-import com.songoda.ultimatekits.conversion.hooks.DefaultHook;
-import com.songoda.ultimatekits.conversion.hooks.EssentialsHook;
-import com.songoda.ultimatekits.conversion.hooks.UltimateCoreHook;
-import com.songoda.ultimatekits.kit.Kit;
-import com.songoda.ultimatekits.kit.KitItem;
+import com.craftaro.ultimatekits.UltimateKits;
+import com.craftaro.ultimatekits.kit.Kit;
+import com.craftaro.ultimatekits.kit.KitItem;
+import com.craftaro.ultimatekits.conversion.hooks.CMIHook;
+import com.craftaro.ultimatekits.conversion.hooks.DefaultHook;
+import com.craftaro.ultimatekits.conversion.hooks.EssentialsHook;
+import com.craftaro.ultimatekits.conversion.hooks.UltimateCoreHook;
import org.bukkit.Bukkit;
import org.bukkit.Material;
import org.bukkit.inventory.ItemStack;
diff --git a/src/main/java/com/songoda/ultimatekits/conversion/Hook.java b/src/main/java/com/craftaro/ultimatekits/conversion/Hook.java
similarity index 80%
rename from src/main/java/com/songoda/ultimatekits/conversion/Hook.java
rename to src/main/java/com/craftaro/ultimatekits/conversion/Hook.java
index 725c168..9817bc1 100644
--- a/src/main/java/com/songoda/ultimatekits/conversion/Hook.java
+++ b/src/main/java/com/craftaro/ultimatekits/conversion/Hook.java
@@ -1,4 +1,4 @@
-package com.songoda.ultimatekits.conversion;
+package com.craftaro.ultimatekits.conversion;
import org.bukkit.inventory.ItemStack;
diff --git a/src/main/java/com/songoda/ultimatekits/conversion/hooks/CMIHook.java b/src/main/java/com/craftaro/ultimatekits/conversion/hooks/CMIHook.java
similarity index 84%
rename from src/main/java/com/songoda/ultimatekits/conversion/hooks/CMIHook.java
rename to src/main/java/com/craftaro/ultimatekits/conversion/hooks/CMIHook.java
index 0ee9bca..cd20dcd 100644
--- a/src/main/java/com/songoda/ultimatekits/conversion/hooks/CMIHook.java
+++ b/src/main/java/com/craftaro/ultimatekits/conversion/hooks/CMIHook.java
@@ -1,10 +1,10 @@
-package com.songoda.ultimatekits.conversion.hooks;
+package com.craftaro.ultimatekits.conversion.hooks;
import com.Zrips.CMI.CMI;
import com.Zrips.CMI.Modules.Kits.Kit;
-import com.songoda.ultimatekits.UltimateKits;
-import com.songoda.ultimatekits.conversion.Hook;
-import com.songoda.ultimatekits.kit.type.KitContentCommand;
+import com.craftaro.ultimatekits.UltimateKits;
+import com.craftaro.ultimatekits.conversion.Hook;
+import com.craftaro.ultimatekits.kit.type.KitContentCommand;
import org.bukkit.inventory.ItemStack;
import java.util.HashSet;
diff --git a/src/main/java/com/songoda/ultimatekits/conversion/hooks/DefaultHook.java b/src/main/java/com/craftaro/ultimatekits/conversion/hooks/DefaultHook.java
similarity index 95%
rename from src/main/java/com/songoda/ultimatekits/conversion/hooks/DefaultHook.java
rename to src/main/java/com/craftaro/ultimatekits/conversion/hooks/DefaultHook.java
index 5c83620..9da266e 100644
--- a/src/main/java/com/songoda/ultimatekits/conversion/hooks/DefaultHook.java
+++ b/src/main/java/com/craftaro/ultimatekits/conversion/hooks/DefaultHook.java
@@ -1,8 +1,8 @@
-package com.songoda.ultimatekits.conversion.hooks;
+package com.craftaro.ultimatekits.conversion.hooks;
-import com.songoda.core.compatibility.ServerVersion;
-import com.songoda.ultimatekits.conversion.Hook;
-import com.songoda.ultimatekits.utils.ItemSerializer;
+import com.craftaro.core.compatibility.ServerVersion;
+import com.craftaro.ultimatekits.conversion.Hook;
+import com.craftaro.ultimatekits.utils.ItemSerializer;
import org.bukkit.inventory.ItemStack;
import java.util.HashSet;
diff --git a/src/main/java/com/songoda/ultimatekits/conversion/hooks/EssentialsHook.java b/src/main/java/com/craftaro/ultimatekits/conversion/hooks/EssentialsHook.java
similarity index 93%
rename from src/main/java/com/songoda/ultimatekits/conversion/hooks/EssentialsHook.java
rename to src/main/java/com/craftaro/ultimatekits/conversion/hooks/EssentialsHook.java
index 1c7f8b4..1637abc 100644
--- a/src/main/java/com/songoda/ultimatekits/conversion/hooks/EssentialsHook.java
+++ b/src/main/java/com/craftaro/ultimatekits/conversion/hooks/EssentialsHook.java
@@ -1,10 +1,10 @@
-package com.songoda.ultimatekits.conversion.hooks;
+package com.craftaro.ultimatekits.conversion.hooks;
+import com.craftaro.ultimatekits.UltimateKits;
+import com.craftaro.ultimatekits.conversion.Hook;
import com.earth2me.essentials.Essentials;
import com.earth2me.essentials.Kit;
import com.earth2me.essentials.MetaItemStack;
-import com.songoda.ultimatekits.UltimateKits;
-import com.songoda.ultimatekits.conversion.Hook;
import org.bukkit.configuration.ConfigurationSection;
import org.bukkit.inventory.ItemStack;
diff --git a/src/main/java/com/songoda/ultimatekits/conversion/hooks/UltimateCoreHook.java b/src/main/java/com/craftaro/ultimatekits/conversion/hooks/UltimateCoreHook.java
similarity index 88%
rename from src/main/java/com/songoda/ultimatekits/conversion/hooks/UltimateCoreHook.java
rename to src/main/java/com/craftaro/ultimatekits/conversion/hooks/UltimateCoreHook.java
index 13b334d..1817935 100644
--- a/src/main/java/com/songoda/ultimatekits/conversion/hooks/UltimateCoreHook.java
+++ b/src/main/java/com/craftaro/ultimatekits/conversion/hooks/UltimateCoreHook.java
@@ -1,8 +1,8 @@
-package com.songoda.ultimatekits.conversion.hooks;
+package com.craftaro.ultimatekits.conversion.hooks;
import bammerbom.ultimatecore.bukkit.api.UC;
import bammerbom.ultimatecore.bukkit.api.UKit;
-import com.songoda.ultimatekits.conversion.Hook;
+import com.craftaro.ultimatekits.conversion.Hook;
import org.bukkit.inventory.ItemStack;
import java.util.HashSet;
diff --git a/src/main/java/com/songoda/ultimatekits/crate/Crate.java b/src/main/java/com/craftaro/ultimatekits/crate/Crate.java
similarity index 94%
rename from src/main/java/com/songoda/ultimatekits/crate/Crate.java
rename to src/main/java/com/craftaro/ultimatekits/crate/Crate.java
index f08de1a..4351b5e 100644
--- a/src/main/java/com/songoda/ultimatekits/crate/Crate.java
+++ b/src/main/java/com/craftaro/ultimatekits/crate/Crate.java
@@ -1,8 +1,8 @@
-package com.songoda.ultimatekits.crate;
+package com.craftaro.ultimatekits.crate;
-import com.songoda.core.utils.TextUtils;
-import com.songoda.ultimatekits.UltimateKits;
-import com.songoda.ultimatekits.kit.Kit;
+import com.craftaro.core.utils.TextUtils;
+import com.craftaro.ultimatekits.UltimateKits;
+import com.craftaro.ultimatekits.kit.Kit;
import org.bukkit.ChatColor;
import org.bukkit.Material;
import org.bukkit.enchantments.Enchantment;
diff --git a/src/main/java/com/songoda/ultimatekits/crate/CrateManager.java b/src/main/java/com/craftaro/ultimatekits/crate/CrateManager.java
similarity index 96%
rename from src/main/java/com/songoda/ultimatekits/crate/CrateManager.java
rename to src/main/java/com/craftaro/ultimatekits/crate/CrateManager.java
index 59a1bc2..c7341b6 100644
--- a/src/main/java/com/songoda/ultimatekits/crate/CrateManager.java
+++ b/src/main/java/com/craftaro/ultimatekits/crate/CrateManager.java
@@ -1,4 +1,4 @@
-package com.songoda.ultimatekits.crate;
+package com.craftaro.ultimatekits.crate;
import org.bukkit.ChatColor;
import org.bukkit.Material;
diff --git a/src/main/java/com/songoda/ultimatekits/database/DataManager.java b/src/main/java/com/craftaro/ultimatekits/database/DataManager.java
similarity index 75%
rename from src/main/java/com/songoda/ultimatekits/database/DataManager.java
rename to src/main/java/com/craftaro/ultimatekits/database/DataManager.java
index b488c02..0618221 100644
--- a/src/main/java/com/songoda/ultimatekits/database/DataManager.java
+++ b/src/main/java/com/craftaro/ultimatekits/database/DataManager.java
@@ -1,15 +1,12 @@
-package com.songoda.ultimatekits.database;
+package com.craftaro.ultimatekits.database;
-import com.songoda.core.database.DataManagerAbstract;
-import com.songoda.core.database.DatabaseConnector;
-import com.songoda.ultimatekits.UltimateKits;
-import com.songoda.ultimatekits.kit.Kit;
-import com.songoda.ultimatekits.kit.KitBlockData;
-import com.songoda.ultimatekits.kit.KitType;
+import com.craftaro.ultimatekits.UltimateKits;
+import com.craftaro.ultimatekits.kit.Kit;
+import com.craftaro.ultimatekits.kit.KitBlockData;
+import com.craftaro.ultimatekits.kit.KitType;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.World;
-import org.bukkit.plugin.Plugin;
import java.sql.Connection;
import java.sql.PreparedStatement;
@@ -19,15 +16,16 @@ import java.util.HashMap;
import java.util.Map;
import java.util.function.Consumer;
-public class DataManager extends DataManagerAbstract {
+public class DataManager {
- public DataManager(DatabaseConnector databaseConnector, Plugin plugin) {
- super(databaseConnector, plugin);
+ private final UltimateKits plugin;
+ public DataManager(UltimateKits plugin) {
+ this.plugin = plugin;
}
public void bulkUpdateBlockData(Map blockData) {
- try (Connection connection = this.databaseConnector.getConnection()) {
- String updateData = "UPDATE " + this.getTablePrefix() + "blockdata SET type = ?, kit = ?, holograms = ?, " +
+ try (Connection connection = plugin.getDataManager().getDatabaseConnector().getConnection()) {
+ String updateData = "UPDATE " + plugin.getDataManager().getTablePrefix() + "blockdata SET type = ?, kit = ?, holograms = ?, " +
"displayItems = ?, particles = ?, itemOverride = ? " +
"WHERE world = ? AND x = ? AND y = ? AND z = ?";
PreparedStatement statement = connection.prepareStatement(updateData);
@@ -54,9 +52,10 @@ public class DataManager extends DataManagerAbstract {
public void updateBlockData(KitBlockData blockData) {
if (blockData.getWorld() == null) return;
- this.runAsync(() -> {
- try (Connection connection = this.databaseConnector.getConnection()) {
- String updateData = "UPDATE " + this.getTablePrefix() + "blockdata SET type = ?, kit = ?, holograms = ?, " +
+
+ Bukkit.getScheduler().runTaskAsynchronously(plugin, () -> {
+ try (Connection connection = plugin.getDataManager().getDatabaseConnector().getConnection()) {
+ String updateData = "UPDATE " + plugin.getDataManager().getTablePrefix() + "blockdata SET type = ?, kit = ?, holograms = ?, " +
"displayItems = ?, particles = ?, itemOverride = ? " +
"WHERE world = ? AND x = ? AND y = ? AND z = ?";
PreparedStatement statement = connection.prepareStatement(updateData);
@@ -79,9 +78,9 @@ public class DataManager extends DataManagerAbstract {
public void createBlockData(KitBlockData blockData) {
if (blockData.getWorld() == null) return;
- this.runAsync(() -> {
- try (Connection connection = this.databaseConnector.getConnection()) {
- String createData = "INSERT INTO " + this.getTablePrefix() + "blockdata (" +
+ Bukkit.getScheduler().runTaskAsynchronously(plugin, () -> {
+ try (Connection connection = plugin.getDataManager().getDatabaseConnector().getConnection()) {
+ String createData = "INSERT INTO " + plugin.getDataManager().getTablePrefix() + "blockdata (" +
"type, kit, holograms, displayItems, particles, itemOverride, world, x, y, z)" +
"VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)";
PreparedStatement statement = connection.prepareStatement(createData);
@@ -103,9 +102,9 @@ public class DataManager extends DataManagerAbstract {
}
public void deleteBlockData(KitBlockData blockData) {
- this.runAsync(() -> {
- try (Connection connection = this.databaseConnector.getConnection()) {
- String deleteData = "DELETE FROM " + this.getTablePrefix() + "blockdata WHERE world = ? " +
+ Bukkit.getScheduler().runTaskAsynchronously(plugin, () -> {
+ try (Connection connection = plugin.getDataManager().getDatabaseConnector().getConnection()) {
+ String deleteData = "DELETE FROM " + plugin.getDataManager().getTablePrefix() + "blockdata WHERE world = ? " +
"AND x = ? AND y = ? AND z = ?";
PreparedStatement statement = connection.prepareStatement(deleteData);
statement.setString(1, blockData.getWorld().getName());
@@ -120,9 +119,9 @@ public class DataManager extends DataManagerAbstract {
}
public void getBlockData(Consumer