diff --git a/.gitattributes b/.gitattributes deleted file mode 100644 index dfe0770..0000000 --- a/.gitattributes +++ /dev/null @@ -1,2 +0,0 @@ -# Auto detect text files and perform LF normalization -* text=auto diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 085705a..0000000 --- a/.gitignore +++ /dev/null @@ -1,42 +0,0 @@ - -*.class - - -*.log - - -*.ctxt - - -.mtj.tmp/ - - -*.jar -*.war -*.nar -*.ear -*.zip -*.tar.gz -*.rar -*.iml - - -hs_err_pid* - - -.metadata -bin/ -tmp/ -*.tmp -*.bak -*.swp -*~.nib -*.classpath -*.project -local.properties -.settings/ -.loadpath -dependency-reduced-pom.xml -.recommenders -.idea/ -target/ diff --git a/README.md b/README.md index f78c534..22cc801 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,3 @@ -# PlayerKits2 -https://www.spigotmc.org/resources/playerkits-2-fully-configurable-kits-1-8-1-20.112616/ - +# PlayerKitsF + +Original made by [Ajneb97](https://github.com/Ajneb97), Modified to work with Folia by bunchy7s \ No newline at end of file diff --git a/pom.xml b/pom.xml index fb483aa..617a554 100644 --- a/pom.xml +++ b/pom.xml @@ -4,9 +4,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - pk.ajneb97 - PlayerKits2 - 1.23.1 + dr.bunchy7s + PlayerKitsF + 1.23.2 21 @@ -25,7 +25,7 @@ placeholderapi - https://repo.extendedclip.com/content/repositories/placeholderapi/ + https://repo.extendedclip.com/releases/ jitpack.io @@ -53,7 +53,7 @@ me.clip placeholderapi - 2.11.1 + 2.11.6 provided @@ -112,7 +112,7 @@ com.zaxxer.hikari - pk.ajneb97.libs.hikaricp + dr.bunchy7s.libs.hikaricp com.zaxxer.hikari.** diff --git a/src/main/java/pk/ajneb97/MainCommand.java b/src/main/java/dr/bunchy7s/MainCommand.java similarity index 97% rename from src/main/java/pk/ajneb97/MainCommand.java rename to src/main/java/dr/bunchy7s/MainCommand.java index 6453b45..31db1bf 100644 --- a/src/main/java/pk/ajneb97/MainCommand.java +++ b/src/main/java/dr/bunchy7s/MainCommand.java @@ -1,4 +1,4 @@ -package pk.ajneb97; +package dr.bunchy7s; import org.bukkit.Bukkit; import org.bukkit.command.Command; @@ -7,23 +7,23 @@ import org.bukkit.command.CommandSender; import org.bukkit.command.TabCompleter; import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.entity.Player; -import pk.ajneb97.configs.MainConfigManager; -import pk.ajneb97.managers.MessagesManager; -import pk.ajneb97.managers.PlayerDataManager; -import pk.ajneb97.model.Kit; -import pk.ajneb97.model.internal.GiveKitInstructions; -import pk.ajneb97.model.internal.PlayerKitsMessageResult; -import pk.ajneb97.model.inventory.InventoryPlayer; -import pk.ajneb97.model.inventory.KitInventory; -import pk.ajneb97.utils.PlayerUtils; +import dr.bunchy7s.configs.MainConfigManager; +import dr.bunchy7s.managers.MessagesManager; +import dr.bunchy7s.managers.PlayerDataManager; +import dr.bunchy7s.model.Kit; +import dr.bunchy7s.model.internal.GiveKitInstructions; +import dr.bunchy7s.model.internal.PlayerKitsMessageResult; +import dr.bunchy7s.model.inventory.InventoryPlayer; +import dr.bunchy7s.model.inventory.KitInventory; +import dr.bunchy7s.utils.PlayerUtils; import java.util.ArrayList; import java.util.List; public class MainCommand implements CommandExecutor, TabCompleter { - private PlayerKits2 plugin; - public MainCommand(PlayerKits2 plugin) { + private PlayerKitsF plugin; + public MainCommand(PlayerKitsF plugin) { this.plugin = plugin; } @@ -150,7 +150,7 @@ public class MainCommand implements CommandExecutor, TabCompleter { } if(!plugin.getConfigsManager().reload()){ - sender.sendMessage(PlayerKits2.prefix+MessagesManager.getLegacyColoredMessage(" &cThere was an error reloading the config, check the console.")); + sender.sendMessage(PlayerKitsF.prefix+MessagesManager.getLegacyColoredMessage(" &cThere was an error reloading the config, check the console.")); return; } msgManager.sendMessage(sender,messagesConfig.getString("commandReload"),true); diff --git a/src/main/java/pk/ajneb97/PlayerKits2.java b/src/main/java/dr/bunchy7s/PlayerKitsF.java similarity index 79% rename from src/main/java/pk/ajneb97/PlayerKits2.java rename to src/main/java/dr/bunchy7s/PlayerKitsF.java index ac2e0e5..02a2d6c 100644 --- a/src/main/java/pk/ajneb97/PlayerKits2.java +++ b/src/main/java/dr/bunchy7s/PlayerKitsF.java @@ -1,30 +1,31 @@ -package pk.ajneb97; +package dr.bunchy7s; import org.bukkit.Bukkit; import org.bukkit.plugin.PluginManager; import org.bukkit.plugin.java.JavaPlugin; -import pk.ajneb97.api.ExpansionPlayerKits; -import pk.ajneb97.api.PlayerKitsAPI; -import pk.ajneb97.configs.ConfigsManager; -import pk.ajneb97.database.MySQLConnection; -import pk.ajneb97.listeners.InventoryEditListener; -import pk.ajneb97.listeners.OtherListener; -import pk.ajneb97.listeners.PlayerListener; -import pk.ajneb97.managers.*; -import pk.ajneb97.managers.dependencies.Metrics; -import pk.ajneb97.managers.edit.InventoryEditManager; -import pk.ajneb97.model.internal.UpdateCheckerResult; -import pk.ajneb97.tasks.InventoryUpdateTaskManager; -import pk.ajneb97.tasks.PlayerDataSaveTask; -import pk.ajneb97.versions.NMSManager; -import pk.ajneb97.utils.ServerVersion; +import dr.bunchy7s.api.ExpansionPlayerKits; +import dr.bunchy7s.api.PlayerKitsAPI; +import dr.bunchy7s.configs.ConfigsManager; +import dr.bunchy7s.database.MySQLConnection; +import dr.bunchy7s.libs.FoliaScheduler; +import dr.bunchy7s.listeners.InventoryEditListener; +import dr.bunchy7s.listeners.OtherListener; +import dr.bunchy7s.listeners.PlayerListener; +import dr.bunchy7s.managers.*; +import dr.bunchy7s.managers.dependencies.Metrics; +import dr.bunchy7s.managers.edit.InventoryEditManager; +import dr.bunchy7s.tasks.InventoryUpdateTaskManager; +import dr.bunchy7s.tasks.PlayerDataSaveTask; +import dr.bunchy7s.versions.NMSManager; +import dr.bunchy7s.utils.ServerVersion; -public class PlayerKits2 extends JavaPlugin { +public class PlayerKitsF extends JavaPlugin { public String version = getDescription().getVersion(); public static String prefix; public static ServerVersion serverVersion; + public static boolean isFolia; private KitItemManager kitItemManager; private KitsManager kitsManager; @@ -35,7 +36,6 @@ public class PlayerKits2 extends JavaPlugin { private InventoryManager inventoryManager; private InventoryEditManager inventoryEditManager; private NMSManager nmsManager; - private UpdateCheckerManager updateCheckerManager; private VerifyManager verifyManager; private MigrationManager migrationManager; @@ -44,6 +44,7 @@ public class PlayerKits2 extends JavaPlugin { private MySQLConnection mySQLConnection; public void onEnable(){ + isFolia = FoliaScheduler.isFolia(); setVersion(); setPrefix(); registerCommands(); @@ -83,9 +84,6 @@ public class PlayerKits2 extends JavaPlugin { Bukkit.getConsoleSender().sendMessage(MessagesManager.getLegacyColoredMessage(prefix+"&eHas been enabled! &fVersion: "+version)); Bukkit.getConsoleSender().sendMessage(MessagesManager.getLegacyColoredMessage(prefix+"&eThanks for using my plugin! &f~Ajneb97")); - - updateCheckerManager = new UpdateCheckerManager(version); - updateMessage(updateCheckerManager.check()); } public void onDisable(){ @@ -113,7 +111,7 @@ public class PlayerKits2 extends JavaPlugin { } public void setPrefix(){ - prefix = MessagesManager.getLegacyColoredMessage("&8[&bPlayerKits&a²&8] "); + prefix = MessagesManager.getLegacyColoredMessage("&8[&bPlayerKits&dF&8] "); } public void setVersion(){ @@ -211,10 +209,6 @@ public class PlayerKits2 extends JavaPlugin { return nmsManager; } - public UpdateCheckerManager getUpdateCheckerManager() { - return updateCheckerManager; - } - public VerifyManager getVerifyManager() { return verifyManager; } @@ -222,17 +216,4 @@ public class PlayerKits2 extends JavaPlugin { public MigrationManager getMigrationManager() { return migrationManager; } - - public void updateMessage(UpdateCheckerResult result){ - if(!result.isError()){ - String latestVersion = result.getLatestVersion(); - if(latestVersion != null){ - Bukkit.getConsoleSender().sendMessage(MessagesManager.getLegacyColoredMessage("&cThere is a new version available. &e(&7"+latestVersion+"&e)")); - Bukkit.getConsoleSender().sendMessage(MessagesManager.getLegacyColoredMessage("&cYou can download it at: &fhttps://modrinth.com/plugin/playerkits-2")); - } - }else{ - Bukkit.getConsoleSender().sendMessage(MessagesManager.getLegacyColoredMessage(prefix+"&cError while checking update.")); - } - - } } diff --git a/src/main/java/pk/ajneb97/api/ExpansionPlayerKits.java b/src/main/java/dr/bunchy7s/api/ExpansionPlayerKits.java similarity index 90% rename from src/main/java/pk/ajneb97/api/ExpansionPlayerKits.java rename to src/main/java/dr/bunchy7s/api/ExpansionPlayerKits.java index 2c9a0e3..122b542 100644 --- a/src/main/java/pk/ajneb97/api/ExpansionPlayerKits.java +++ b/src/main/java/dr/bunchy7s/api/ExpansionPlayerKits.java @@ -1,15 +1,15 @@ -package pk.ajneb97.api; +package dr.bunchy7s.api; import me.clip.placeholderapi.expansion.PlaceholderExpansion; import org.bukkit.entity.Player; -import pk.ajneb97.PlayerKits2; +import dr.bunchy7s.PlayerKitsF; public class ExpansionPlayerKits extends PlaceholderExpansion { // We get an instance of the plugin later. - private PlayerKits2 plugin; + private PlayerKitsF plugin; - public ExpansionPlayerKits(PlayerKits2 plugin) { + public ExpansionPlayerKits(PlayerKitsF plugin) { this.plugin = plugin; } diff --git a/src/main/java/pk/ajneb97/api/PlayerKitsAPI.java b/src/main/java/dr/bunchy7s/api/PlayerKitsAPI.java similarity index 79% rename from src/main/java/pk/ajneb97/api/PlayerKitsAPI.java rename to src/main/java/dr/bunchy7s/api/PlayerKitsAPI.java index 0347c8e..aedcfc6 100644 --- a/src/main/java/pk/ajneb97/api/PlayerKitsAPI.java +++ b/src/main/java/dr/bunchy7s/api/PlayerKitsAPI.java @@ -1,20 +1,20 @@ -package pk.ajneb97.api; +package dr.bunchy7s.api; import org.bukkit.entity.Player; -import pk.ajneb97.PlayerKits2; -import pk.ajneb97.managers.MessagesManager; -import pk.ajneb97.managers.PlayerDataManager; -import pk.ajneb97.model.Kit; -import pk.ajneb97.utils.PlayerUtils; +import dr.bunchy7s.PlayerKitsF; +import dr.bunchy7s.managers.MessagesManager; +import dr.bunchy7s.managers.PlayerDataManager; +import dr.bunchy7s.model.Kit; +import dr.bunchy7s.utils.PlayerUtils; public class PlayerKitsAPI { - private static PlayerKits2 plugin; - public PlayerKitsAPI(PlayerKits2 plugin){ + private static PlayerKitsF plugin; + public PlayerKitsAPI(PlayerKitsF plugin){ this.plugin = plugin; } - public static PlayerKits2 getPlugin() { + public static PlayerKitsF getPlugin() { return plugin; } diff --git a/src/main/java/pk/ajneb97/configs/ConfigsManager.java b/src/main/java/dr/bunchy7s/configs/ConfigsManager.java similarity index 93% rename from src/main/java/pk/ajneb97/configs/ConfigsManager.java rename to src/main/java/dr/bunchy7s/configs/ConfigsManager.java index 7a6ae5f..bd3c8e2 100644 --- a/src/main/java/pk/ajneb97/configs/ConfigsManager.java +++ b/src/main/java/dr/bunchy7s/configs/ConfigsManager.java @@ -1,10 +1,10 @@ -package pk.ajneb97.configs; +package dr.bunchy7s.configs; -import pk.ajneb97.PlayerKits2; +import dr.bunchy7s.PlayerKitsF; public class ConfigsManager { - private PlayerKits2 plugin; + private PlayerKitsF plugin; private KitsConfigManager kitsConfigManager; private MessagesConfigManager messagesConfigManager; @@ -12,7 +12,7 @@ public class ConfigsManager { private PlayersConfigManager playersConfigManager; private InventoryConfigManager inventoryConfigManager; - public ConfigsManager(PlayerKits2 plugin){ + public ConfigsManager(PlayerKitsF plugin){ this.plugin = plugin; this.kitsConfigManager = new KitsConfigManager(plugin,"kits"); this.messagesConfigManager = new MessagesConfigManager(plugin); diff --git a/src/main/java/pk/ajneb97/configs/DataFolderConfigManager.java b/src/main/java/dr/bunchy7s/configs/DataFolderConfigManager.java similarity index 90% rename from src/main/java/pk/ajneb97/configs/DataFolderConfigManager.java rename to src/main/java/dr/bunchy7s/configs/DataFolderConfigManager.java index 23a6213..07a0753 100644 --- a/src/main/java/pk/ajneb97/configs/DataFolderConfigManager.java +++ b/src/main/java/dr/bunchy7s/configs/DataFolderConfigManager.java @@ -1,17 +1,17 @@ -package pk.ajneb97.configs; +package dr.bunchy7s.configs; -import pk.ajneb97.PlayerKits2; -import pk.ajneb97.configs.model.CommonConfig; +import dr.bunchy7s.PlayerKitsF; +import dr.bunchy7s.configs.model.CommonConfig; import java.io.File; import java.util.ArrayList; public abstract class DataFolderConfigManager { protected String folderName; - protected PlayerKits2 plugin; + protected PlayerKitsF plugin; - public DataFolderConfigManager(PlayerKits2 plugin, String folderName){ + public DataFolderConfigManager(PlayerKitsF plugin, String folderName){ this.plugin = plugin; this.folderName = folderName; } diff --git a/src/main/java/pk/ajneb97/configs/InventoryConfigManager.java b/src/main/java/dr/bunchy7s/configs/InventoryConfigManager.java similarity index 93% rename from src/main/java/pk/ajneb97/configs/InventoryConfigManager.java rename to src/main/java/dr/bunchy7s/configs/InventoryConfigManager.java index 92bfb79..f7c9a75 100644 --- a/src/main/java/pk/ajneb97/configs/InventoryConfigManager.java +++ b/src/main/java/dr/bunchy7s/configs/InventoryConfigManager.java @@ -1,23 +1,23 @@ -package pk.ajneb97.configs; +package dr.bunchy7s.configs; import org.bukkit.configuration.file.FileConfiguration; -import pk.ajneb97.PlayerKits2; -import pk.ajneb97.configs.model.CommonConfig; -import pk.ajneb97.managers.KitItemManager; -import pk.ajneb97.model.inventory.ItemKitInventory; -import pk.ajneb97.model.inventory.KitInventory; -import pk.ajneb97.model.item.KitItem; -import pk.ajneb97.utils.OtherUtils; +import dr.bunchy7s.PlayerKitsF; +import dr.bunchy7s.configs.model.CommonConfig; +import dr.bunchy7s.managers.KitItemManager; +import dr.bunchy7s.model.inventory.ItemKitInventory; +import dr.bunchy7s.model.inventory.KitInventory; +import dr.bunchy7s.model.item.KitItem; +import dr.bunchy7s.utils.OtherUtils; import java.util.ArrayList; import java.util.List; public class InventoryConfigManager { - private PlayerKits2 plugin; + private PlayerKitsF plugin; private CommonConfig configFile; - public InventoryConfigManager(PlayerKits2 plugin){ + public InventoryConfigManager(PlayerKitsF plugin){ this.plugin = plugin; this.configFile = new CommonConfig("inventory.yml",plugin,null, false); this.configFile.registerConfig(); diff --git a/src/main/java/pk/ajneb97/configs/KitsConfigManager.java b/src/main/java/dr/bunchy7s/configs/KitsConfigManager.java similarity index 96% rename from src/main/java/pk/ajneb97/configs/KitsConfigManager.java rename to src/main/java/dr/bunchy7s/configs/KitsConfigManager.java index c6c9b21..3ad238e 100644 --- a/src/main/java/pk/ajneb97/configs/KitsConfigManager.java +++ b/src/main/java/dr/bunchy7s/configs/KitsConfigManager.java @@ -1,20 +1,20 @@ -package pk.ajneb97.configs; +package dr.bunchy7s.configs; import org.bukkit.configuration.file.FileConfiguration; -import pk.ajneb97.PlayerKits2; -import pk.ajneb97.configs.model.CommonConfig; -import pk.ajneb97.managers.KitItemManager; -import pk.ajneb97.model.Kit; -import pk.ajneb97.model.KitAction; -import pk.ajneb97.model.KitRequirements; -import pk.ajneb97.model.item.KitItem; +import dr.bunchy7s.PlayerKitsF; +import dr.bunchy7s.configs.model.CommonConfig; +import dr.bunchy7s.managers.KitItemManager; +import dr.bunchy7s.model.Kit; +import dr.bunchy7s.model.KitAction; +import dr.bunchy7s.model.KitRequirements; +import dr.bunchy7s.model.item.KitItem; import java.io.File; import java.util.ArrayList; import java.util.List; public class KitsConfigManager extends DataFolderConfigManager{ - public KitsConfigManager(PlayerKits2 plugin, String folderName){ + public KitsConfigManager(PlayerKitsF plugin, String folderName){ super(plugin, folderName); } @@ -134,7 +134,7 @@ public class KitsConfigManager extends DataFolderConfigManager{ } // mainPath must include a "." at the end - public static Kit getKitFromConfig(FileConfiguration config, PlayerKits2 plugin, String name, String mainPath){ + public static Kit getKitFromConfig(FileConfiguration config, PlayerKitsF plugin, String name, String mainPath){ KitItemManager kitItemManager = plugin.getKitItemManager(); int cooldown = config.contains(mainPath+"cooldown") ? config.getInt(mainPath+"cooldown") : 0; boolean permissionRequired = config.contains(mainPath+"permission_required") ? config.getBoolean(mainPath+"permission_required") : false; diff --git a/src/main/java/pk/ajneb97/configs/MainConfigManager.java b/src/main/java/dr/bunchy7s/configs/MainConfigManager.java similarity index 91% rename from src/main/java/pk/ajneb97/configs/MainConfigManager.java rename to src/main/java/dr/bunchy7s/configs/MainConfigManager.java index a51a679..4e49857 100644 --- a/src/main/java/pk/ajneb97/configs/MainConfigManager.java +++ b/src/main/java/dr/bunchy7s/configs/MainConfigManager.java @@ -1,9 +1,9 @@ -package pk.ajneb97.configs; +package dr.bunchy7s.configs; import org.bukkit.configuration.file.FileConfiguration; -import pk.ajneb97.PlayerKits2; -import pk.ajneb97.configs.model.CommonConfig; -import pk.ajneb97.model.Kit; +import dr.bunchy7s.PlayerKitsF; +import dr.bunchy7s.configs.model.CommonConfig; +import dr.bunchy7s.model.Kit; import java.io.IOException; import java.nio.file.Files; @@ -12,7 +12,7 @@ import java.nio.file.Paths; public class MainConfigManager { - private PlayerKits2 plugin; + private PlayerKitsF plugin; private CommonConfig configFile; //Options @@ -25,10 +25,9 @@ public class MainConfigManager { private String firstJoinKit; private String newKitDefaultInventory; private boolean isMySQL; - private boolean updateNotify; private boolean useMiniMessage; - public MainConfigManager(PlayerKits2 plugin){ + public MainConfigManager(PlayerKitsF plugin){ this.plugin = plugin; this.configFile = new CommonConfig("config.yml",plugin,null, false); this.configFile.registerConfig(); @@ -44,7 +43,6 @@ public class MainConfigManager { firstJoinKit = config.getString("first_join_kit"); newKitDefaultInventory = config.getString("new_kit_default_inventory"); isMySQL = config.getBoolean("mysql_database.enabled"); - updateNotify = config.getBoolean("update_notify"); claimKitShortCommand = config.getBoolean("claim_kit_short_command"); useMiniMessage = config.getBoolean("use_minimessage"); newKitDefaultSaveModeOriginal = config.getBoolean("new_kit_default_save_mode_original"); @@ -114,10 +112,6 @@ public class MainConfigManager { return isMySQL; } - public boolean isUpdateNotify() { - return updateNotify; - } - public boolean isClaimKitShortCommand() { return claimKitShortCommand; } diff --git a/src/main/java/pk/ajneb97/configs/MessagesConfigManager.java b/src/main/java/dr/bunchy7s/configs/MessagesConfigManager.java similarity index 93% rename from src/main/java/pk/ajneb97/configs/MessagesConfigManager.java rename to src/main/java/dr/bunchy7s/configs/MessagesConfigManager.java index 77ea39e..07ef3d6 100644 --- a/src/main/java/pk/ajneb97/configs/MessagesConfigManager.java +++ b/src/main/java/dr/bunchy7s/configs/MessagesConfigManager.java @@ -1,9 +1,9 @@ -package pk.ajneb97.configs; +package dr.bunchy7s.configs; import org.bukkit.configuration.file.FileConfiguration; -import pk.ajneb97.PlayerKits2; -import pk.ajneb97.configs.model.CommonConfig; -import pk.ajneb97.managers.MessagesManager; +import dr.bunchy7s.PlayerKitsF; +import dr.bunchy7s.configs.model.CommonConfig; +import dr.bunchy7s.managers.MessagesManager; import java.io.IOException; import java.nio.file.Files; @@ -12,10 +12,10 @@ import java.nio.file.Paths; public class MessagesConfigManager { - private PlayerKits2 plugin; + private PlayerKitsF plugin; private CommonConfig configFile; - public MessagesConfigManager(PlayerKits2 plugin){ + public MessagesConfigManager(PlayerKitsF plugin){ this.plugin = plugin; this.configFile = new CommonConfig("messages.yml",plugin,null, false); this.configFile.registerConfig(); diff --git a/src/main/java/dr/bunchy7s/configs/PlayersConfigManager.java b/src/main/java/dr/bunchy7s/configs/PlayersConfigManager.java new file mode 100644 index 0000000..09c112e --- /dev/null +++ b/src/main/java/dr/bunchy7s/configs/PlayersConfigManager.java @@ -0,0 +1,104 @@ +package dr.bunchy7s.configs; + +import org.bukkit.configuration.file.FileConfiguration; +import dr.bunchy7s.PlayerKitsF; +import dr.bunchy7s.configs.model.CommonConfig; +import dr.bunchy7s.libs.FoliaScheduler; +import dr.bunchy7s.model.PlayerData; +import dr.bunchy7s.model.PlayerDataKit; +import dr.bunchy7s.model.internal.GenericCallback; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Map; +import java.util.UUID; + +public class PlayersConfigManager extends DataFolderConfigManager{ + + public PlayersConfigManager(PlayerKitsF plugin, String folderName){ + super(plugin, folderName); + } + + @Override + public void createFiles() { + + } + + @Override + public void loadConfigs(){ + // No use for player config + } + + public void loadConfig(UUID uuid, GenericCallback callback) { + FoliaScheduler.runTaskAsynchronously(plugin, () -> { + PlayerData playerData = null; + CommonConfig playerConfig = getConfigFile(uuid+".yml",false); + if(playerConfig != null) { + // If config exists + FileConfiguration config = playerConfig.getConfig(); + String name = config.getString("name"); + ArrayList playerDataKits = new ArrayList<>(); + if (config.contains("kits")) { + for (String key : config.getConfigurationSection("kits").getKeys(false)) { + long cooldown = config.getLong("kits." + key + ".cooldown"); + boolean oneTime = config.getBoolean("kits." + key + ".one_time"); + boolean bought = config.getBoolean("kits." + key + ".bought"); + + PlayerDataKit playerDataKit = new PlayerDataKit(key); + playerDataKit.setCooldown(cooldown); + playerDataKit.setOneTime(oneTime); + playerDataKit.setBought(bought); + + playerDataKits.add(playerDataKit); + } + } + + playerData = new PlayerData(uuid, name); + playerData.setKits(playerDataKits); + } + + PlayerData finalPlayer = playerData; + + FoliaScheduler.runTask(plugin, () -> callback.onDone(finalPlayer)); + }); + } + + public void saveConfig(PlayerData playerData){ + String playerName = playerData.getName(); + CommonConfig playerConfig = getConfigFile(playerData.getUuid()+".yml",true); + FileConfiguration config = playerConfig.getConfig(); + + config.set("name", playerName); + config.set("kits",null); + + for(PlayerDataKit playerDataKit : playerData.getKits()){ + String kitName = playerDataKit.getName(); + config.set("kits."+kitName+".cooldown",playerDataKit.getCooldown()); + config.set("kits."+kitName+".one_time",playerDataKit.isOneTime()); + config.set("kits."+kitName+".bought",playerDataKit.isBought()); + } + + playerConfig.saveConfig(); + } + + @Override + public void saveConfigs(){ + Map players = plugin.getPlayerDataManager().getPlayers(); + boolean isMySQL = plugin.getConfigsManager().getMainConfigManager().isMySQL(); + if(!isMySQL){ + for(Map.Entry entry : players.entrySet()) { + PlayerData playerData = entry.getValue(); + if(playerData.isModified()){ + saveConfig(playerData); + } + } + } + } + + // Other methods... + public void resetKitForAllPlayers(String kitName){ + for(Map.Entry entry : plugin.getPlayerDataManager().getPlayers().entrySet()){ + entry.getValue().resetKit(kitName); + } + } +} diff --git a/src/main/java/pk/ajneb97/configs/model/CommonConfig.java b/src/main/java/dr/bunchy7s/configs/model/CommonConfig.java similarity index 94% rename from src/main/java/pk/ajneb97/configs/model/CommonConfig.java rename to src/main/java/dr/bunchy7s/configs/model/CommonConfig.java index dbfb080..6d2e5c0 100644 --- a/src/main/java/pk/ajneb97/configs/model/CommonConfig.java +++ b/src/main/java/dr/bunchy7s/configs/model/CommonConfig.java @@ -1,9 +1,9 @@ -package pk.ajneb97.configs.model; +package dr.bunchy7s.configs.model; import org.bukkit.configuration.InvalidConfigurationException; import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.configuration.file.YamlConfiguration; -import pk.ajneb97.PlayerKits2; +import dr.bunchy7s.PlayerKitsF; import java.io.File; import java.io.IOException; @@ -14,12 +14,12 @@ public class CommonConfig { private FileConfiguration fileConfiguration = null; private File file = null; private String route; - private PlayerKits2 plugin; + private PlayerKitsF plugin; private String folderName; private boolean newFile; private boolean isFirstTime; - public CommonConfig(String fileName, PlayerKits2 plugin, String folderName, boolean newFile){ + public CommonConfig(String fileName, PlayerKitsF plugin, String folderName, boolean newFile){ this.fileName = fileName; this.plugin = plugin; this.newFile = newFile; diff --git a/src/main/java/pk/ajneb97/database/HikariConnection.java b/src/main/java/dr/bunchy7s/database/HikariConnection.java similarity index 98% rename from src/main/java/pk/ajneb97/database/HikariConnection.java rename to src/main/java/dr/bunchy7s/database/HikariConnection.java index d9ddea5..f1f3fe0 100644 --- a/src/main/java/pk/ajneb97/database/HikariConnection.java +++ b/src/main/java/dr/bunchy7s/database/HikariConnection.java @@ -1,4 +1,4 @@ -package pk.ajneb97.database; +package dr.bunchy7s.database; import com.zaxxer.hikari.HikariConfig; import com.zaxxer.hikari.HikariDataSource; diff --git a/src/main/java/dr/bunchy7s/database/MySQLConnection.java b/src/main/java/dr/bunchy7s/database/MySQLConnection.java new file mode 100644 index 0000000..401b407 --- /dev/null +++ b/src/main/java/dr/bunchy7s/database/MySQLConnection.java @@ -0,0 +1,211 @@ +package dr.bunchy7s.database; + +import org.bukkit.Bukkit; +import org.bukkit.configuration.file.FileConfiguration; +import dr.bunchy7s.PlayerKitsF; +import dr.bunchy7s.libs.FoliaScheduler; +import dr.bunchy7s.managers.MessagesManager; +import dr.bunchy7s.model.PlayerData; +import dr.bunchy7s.model.PlayerDataKit; +import dr.bunchy7s.model.internal.GenericCallback; +import dr.bunchy7s.model.internal.SimpleCallback; + +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.util.*; + +public class MySQLConnection { + + private PlayerKitsF plugin; + private HikariConnection connection; + + public MySQLConnection(PlayerKitsF plugin){ + this.plugin = plugin; + } + + public void setupMySql(){ + FileConfiguration config = plugin.getConfigsManager().getMainConfigManager().getConfig(); + try { + connection = new HikariConnection(config); + connection.getHikari().getConnection(); + createTables(); + Bukkit.getConsoleSender().sendMessage(MessagesManager.getLegacyColoredMessage(plugin.prefix+" &aSuccessfully connected to the Database.")); + }catch(Exception e) { + Bukkit.getConsoleSender().sendMessage(MessagesManager.getLegacyColoredMessage(plugin.prefix+" &cError while connecting to the Database.")); + } + } + + public Connection getConnection() { + try { + return connection.getHikari().getConnection(); + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + + public void createTables() { + try(Connection connection = getConnection()){ + PreparedStatement statement1 = connection.prepareStatement( + "CREATE TABLE IF NOT EXISTS playerkits_players" + + " (UUID varchar(200) NOT NULL, " + + " PLAYER_NAME varchar(50), " + + " PRIMARY KEY ( UUID ))" + ); + statement1.executeUpdate(); + PreparedStatement statement2 = connection.prepareStatement( + "CREATE TABLE IF NOT EXISTS playerkits_players_kits" + + " (ID int NOT NULL AUTO_INCREMENT, " + + " UUID varchar(200) NOT NULL, " + + " NAME varchar(100), " + + " COOLDOWN BIGINT, " + + " ONE_TIME BOOLEAN, " + + " BOUGHT BOOLEAN, " + + " PRIMARY KEY ( ID ), " + + " FOREIGN KEY (UUID) REFERENCES playerkits_players(UUID))"); + statement2.executeUpdate(); + } catch (SQLException e) { + e.printStackTrace(); + } + } + + public void getPlayer(String uuid, GenericCallback callback){ + FoliaScheduler.runTaskAsynchronously(plugin, () -> { + PlayerData player = null; + try(Connection connection = getConnection()){ + PreparedStatement statement = connection.prepareStatement( + "SELECT playerkits_players.UUID, playerkits_players.PLAYER_NAME, " + + "playerkits_players_kits.NAME, " + + "playerkits_players_kits.COOLDOWN, " + + "playerkits_players_kits.ONE_TIME, " + + "playerkits_players_kits.BOUGHT " + + "FROM playerkits_players LEFT JOIN playerkits_players_kits " + + "ON playerkits_players.UUID = playerkits_players_kits.UUID " + + "WHERE playerkits_players.UUID = ?"); + + statement.setString(1, uuid); + ResultSet result = statement.executeQuery(); + + boolean firstFind = true; + while(result.next()){ + UUID resultUuid = UUID.fromString(result.getString("UUID")); + String playerName = result.getString("PLAYER_NAME"); + String kitName = result.getString("NAME"); + long cooldown = result.getLong("COOLDOWN"); + boolean oneTime = result.getBoolean("ONE_TIME"); + boolean bought = result.getBoolean("BOUGHT"); + if(player == null){ + player = new PlayerData(resultUuid,playerName); + } + if(kitName != null){ + PlayerDataKit playerDataKit = new PlayerDataKit(kitName); + playerDataKit.setCooldown(cooldown); + playerDataKit.setOneTime(oneTime); + playerDataKit.setBought(bought); + player.addKit(playerDataKit); + } + } + + PlayerData finalPlayer = player; + FoliaScheduler.runTask(plugin, () -> callback.onDone(finalPlayer)); + } catch (SQLException e) { + e.printStackTrace(); + } + }); + } + + public void createPlayer(PlayerData player, SimpleCallback callback){ + FoliaScheduler.runTaskAsynchronously(plugin, () -> { + try(Connection connection = getConnection()){ + PreparedStatement statement = connection.prepareStatement( + "INSERT INTO playerkits_players " + + "(UUID, PLAYER_NAME) VALUE (?,?)"); + + statement.setString(1, player.getUuid().toString()); + statement.setString(2, player.getName()); + statement.executeUpdate(); + + FoliaScheduler.runTask(plugin, callback::onDone); + } catch (SQLException e) { + e.printStackTrace(); + } + }); + } + + public void updatePlayerName(PlayerData player){ + FoliaScheduler.runTaskAsynchronously(plugin, () -> { + try(Connection connection = getConnection()){ + PreparedStatement statement = connection.prepareStatement( + "UPDATE playerkits_players SET " + + "PLAYER_NAME=? WHERE UUID=?"); + + statement.setString(1, player.getName()); + statement.setString(2, player.getUuid().toString()); + statement.executeUpdate(); + } catch (SQLException e) { + e.printStackTrace(); + } + }); + } + + public void updateKit(PlayerData player,PlayerDataKit kit,boolean mustCreate){ + FoliaScheduler.runTaskAsynchronously(plugin, () -> { + try(Connection connection = getConnection()){ + PreparedStatement statement = null; + if(mustCreate){ + // Insert + statement = connection.prepareStatement( + "INSERT INTO playerkits_players_kits " + + "(UUID, NAME, COOLDOWN, ONE_TIME, BOUGHT) VALUE (?,?,?,?,?)"); + + statement.setString(1, player.getUuid().toString()); + statement.setString(2, kit.getName()); + statement.setLong(3, kit.getCooldown()); + statement.setBoolean(4, kit.isOneTime()); + statement.setBoolean(5, kit.isBought()); + }else{ + // Update + statement = connection.prepareStatement( + "UPDATE playerkits_players_kits SET " + + "COOLDOWN=?, ONE_TIME=?, BOUGHT=? WHERE UUID=? AND NAME=?"); + + statement.setLong(1, kit.getCooldown()); + statement.setBoolean(2, kit.isOneTime()); + statement.setBoolean(3, kit.isBought()); + statement.setString(4, player.getUuid().toString()); + statement.setString(5, kit.getName()); + } + statement.executeUpdate(); + } catch (SQLException e) { + e.printStackTrace(); + } + }); + } + + public void resetKit(String uuid,String kitName,boolean all){ + FoliaScheduler.runTaskAsynchronously(plugin, () -> { + try(Connection connection = getConnection()){ + PreparedStatement statement; + if(all){ + statement = connection.prepareStatement( + "DELETE FROM playerkits_players_kits " + + "WHERE NAME=?"); + statement.setString(1, kitName); + }else{ + statement = connection.prepareStatement( + "DELETE FROM playerkits_players_kits " + + "WHERE UUID=? AND NAME=?"); + + statement.setString(1, uuid); + statement.setString(2, kitName); + } + statement.executeUpdate(); + + } catch (SQLException e) { + e.printStackTrace(); + } + }); + } +} diff --git a/src/main/java/dr/bunchy7s/libs/FoliaScheduler.java b/src/main/java/dr/bunchy7s/libs/FoliaScheduler.java new file mode 100644 index 0000000..1d88634 --- /dev/null +++ b/src/main/java/dr/bunchy7s/libs/FoliaScheduler.java @@ -0,0 +1,143 @@ +package dr.bunchy7s.libs; + +import org.bukkit.Bukkit; +import org.bukkit.plugin.Plugin; +import org.bukkit.scheduler.BukkitTask; + +import java.util.concurrent.TimeUnit; +import java.util.function.Consumer; + +/** + * A scheduler utility that provides Folia-compatible task scheduling. + * Uses Paper's region scheduler API which works on both Folia and non-Folia Paper servers. + * On non-Folia servers, the global region scheduler behaves like the main thread scheduler. + */ +public class FoliaScheduler { + + private static final boolean FOLIA = checkFolia(); + + private static boolean checkFolia() { + try { + Class.forName("io.papermc.paper.threadedregions.RegionizedServer"); + return true; + } catch (ClassNotFoundException e) { + return false; + } + } + + /** + * @return true if the server is running Folia + */ + public static boolean isFolia() { + return FOLIA; + } + + /** + * Runs a task on the global region thread (main thread equivalent). + * Replaces {@code Bukkit.getScheduler().runTask(plugin, task)}. + */ + public static void runTask(Plugin plugin, Runnable runnable) { + Bukkit.getGlobalRegionScheduler().run(plugin, task -> runnable.run()); + } + + /** + * Runs a task on the global region thread after a delay (in ticks). + * Folia requires delay >= 1, so delay 0 is bumped to 1. + * Replaces {@code Bukkit.getScheduler().runTaskLater(plugin, task, delay)}. + */ + public static void runTaskLater(Plugin plugin, Runnable runnable, long delay) { + long safeDelay = Math.max(delay, 1L); + Bukkit.getGlobalRegionScheduler().runDelayed(plugin, task -> runnable.run(), safeDelay); + } + + /** + * Runs a repeating task on the global region thread. + * Folia requires delay >= 1, so delay 0 is bumped to 1. + * Replaces {@code Bukkit.getScheduler().runTaskTimer(plugin, task, delay, period)}. + */ + public static BukkitTask runTaskTimer(Plugin plugin, Runnable runnable, long delay, long period) { + long safeDelay = Math.max(delay, 1L); + long safePeriod = Math.max(period, 1L); + io.papermc.paper.threadedregions.scheduler.ScheduledTask scheduledTask = + Bukkit.getGlobalRegionScheduler().runAtFixedRate(plugin, task -> runnable.run(), safeDelay, safePeriod); + return new BukkitTaskWrapper(scheduledTask); + } + + /** + * Runs a task asynchronously. + * Replaces {@code Bukkit.getScheduler().runTaskAsynchronously(plugin, task)}. + */ + public static void runTaskAsynchronously(Plugin plugin, Runnable runnable) { + Bukkit.getAsyncScheduler().runNow(plugin, task -> runnable.run()); + } + + /** + * Runs a task asynchronously after a delay (in ticks). + * The async scheduler uses milliseconds internally, so ticks are converted (1 tick = 50ms). + * Folia requires delay >= 50ms (1 tick), so delay 0 is bumped to 50ms. + * Replaces {@code Bukkit.getScheduler().runTaskLaterAsynchronously(plugin, task, delay)}. + */ + public static void runTaskLaterAsynchronously(Plugin plugin, Runnable runnable, long delayTicks) { + long delayMillis = Math.max(delayTicks * 50L, 50L); + Bukkit.getAsyncScheduler().runDelayed(plugin, task -> runnable.run(), delayMillis, TimeUnit.MILLISECONDS); + } + + /** + * Runs a repeating task asynchronously. + * The async scheduler uses milliseconds internally, so ticks are converted (1 tick = 50ms). + * Folia requires delay >= 50ms (1 tick), so delay/period 0 is bumped to 50ms. + * Replaces {@code Bukkit.getScheduler().runTaskTimerAsynchronously(plugin, task, delay, period)}. + */ + public static BukkitTask runTaskTimerAsynchronously(Plugin plugin, Runnable runnable, long delayTicks, long periodTicks) { + long delayMillis = Math.max(delayTicks * 50L, 50L); + long periodMillis = Math.max(periodTicks * 50L, 50L); + io.papermc.paper.threadedregions.scheduler.ScheduledTask scheduledTask = + Bukkit.getAsyncScheduler().runAtFixedRate(plugin, task -> runnable.run(), delayMillis, periodMillis, TimeUnit.MILLISECONDS); + return new BukkitTaskWrapper(scheduledTask); + } + + /** + * Cancels all tasks for the given plugin on both the global region and async schedulers. + * Replaces {@code Bukkit.getScheduler().cancelTasks(plugin)}. + */ + public static void cancelTasks(Plugin plugin) { + Bukkit.getGlobalRegionScheduler().cancelTasks(plugin); + Bukkit.getAsyncScheduler().cancelTasks(plugin); + } + + /** + * Wraps a Folia {@code ScheduledTask} into a {@code BukkitTask} for backward compatibility. + */ + private static class BukkitTaskWrapper implements BukkitTask { + private final io.papermc.paper.threadedregions.scheduler.ScheduledTask scheduledTask; + + BukkitTaskWrapper(io.papermc.paper.threadedregions.scheduler.ScheduledTask scheduledTask) { + this.scheduledTask = scheduledTask; + } + + @Override + public int getTaskId() { + return scheduledTask.hashCode(); + } + + @Override + public Plugin getOwner() { + return null; + } + + @Override + public boolean isSync() { + return true; + } + + @Override + public boolean isCancelled() { + return scheduledTask.isCancelled(); + } + + @Override + public void cancel() { + scheduledTask.cancel(); + } + } +} \ No newline at end of file diff --git a/src/main/java/pk/ajneb97/libs/actionbar/ActionBarAPI.java b/src/main/java/dr/bunchy7s/libs/actionbar/ActionBarAPI.java similarity index 86% rename from src/main/java/pk/ajneb97/libs/actionbar/ActionBarAPI.java rename to src/main/java/dr/bunchy7s/libs/actionbar/ActionBarAPI.java index 4c0a3f0..7edd5c1 100644 --- a/src/main/java/pk/ajneb97/libs/actionbar/ActionBarAPI.java +++ b/src/main/java/dr/bunchy7s/libs/actionbar/ActionBarAPI.java @@ -1,15 +1,15 @@ -package pk.ajneb97.libs.actionbar; +package dr.bunchy7s.libs.actionbar; import net.md_5.bungee.api.ChatMessageType; import net.md_5.bungee.api.chat.TextComponent; import org.bukkit.Bukkit; import org.bukkit.entity.Player; -import org.bukkit.scheduler.BukkitRunnable; -import pk.ajneb97.PlayerKits2; -import pk.ajneb97.api.PlayerKitsAPI; -import pk.ajneb97.managers.MessagesManager; -import pk.ajneb97.utils.MiniMessageUtils; -import pk.ajneb97.utils.OtherUtils; +import dr.bunchy7s.PlayerKitsF; +import dr.bunchy7s.api.PlayerKitsAPI; +import dr.bunchy7s.libs.FoliaScheduler; +import dr.bunchy7s.managers.MessagesManager; +import dr.bunchy7s.utils.MiniMessageUtils; +import dr.bunchy7s.utils.OtherUtils; import java.lang.reflect.Field; import java.lang.reflect.Method; @@ -81,28 +81,18 @@ public class ActionBarAPI } } - public static void sendActionBar(final Player player, final String message, int duration, PlayerKits2 plugin) { + public static void sendActionBar(final Player player, final String message, int duration, PlayerKitsF plugin) { sendActionBar(player, message); if (duration > 0) { // Sends empty message at the end of the duration. Allows messages shorter than 3 seconds, ensures precision. - new BukkitRunnable() { - @Override - public void run() { - sendActionBar(player, ""); - } - }.runTaskLater(plugin, duration + 1); + FoliaScheduler.runTaskLater(plugin, () -> sendActionBar(player, ""), duration + 1); } // Re-sends the messages every 3 seconds so it doesn't go away from the player's screen. while (duration > 40) { duration -= 40; - new BukkitRunnable() { - @Override - public void run() { - sendActionBar(player, message); - } - }.runTaskLater(plugin, (long) duration); + FoliaScheduler.runTaskLater(plugin, () -> sendActionBar(player, message), duration); } } diff --git a/src/main/java/pk/ajneb97/libs/titles/TitleAPI.java b/src/main/java/dr/bunchy7s/libs/titles/TitleAPI.java similarity index 96% rename from src/main/java/pk/ajneb97/libs/titles/TitleAPI.java rename to src/main/java/dr/bunchy7s/libs/titles/TitleAPI.java index 13913f9..3403ccb 100644 --- a/src/main/java/pk/ajneb97/libs/titles/TitleAPI.java +++ b/src/main/java/dr/bunchy7s/libs/titles/TitleAPI.java @@ -1,13 +1,13 @@ -package pk.ajneb97.libs.titles; +package dr.bunchy7s.libs.titles; import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.entity.Player; import org.bukkit.event.Listener; -import pk.ajneb97.api.PlayerKitsAPI; -import pk.ajneb97.managers.MessagesManager; -import pk.ajneb97.utils.MiniMessageUtils; -import pk.ajneb97.utils.OtherUtils; +import dr.bunchy7s.api.PlayerKitsAPI; +import dr.bunchy7s.managers.MessagesManager; +import dr.bunchy7s.utils.MiniMessageUtils; +import dr.bunchy7s.utils.OtherUtils; import java.lang.reflect.Constructor; diff --git a/src/main/java/pk/ajneb97/listeners/InventoryEditListener.java b/src/main/java/dr/bunchy7s/listeners/InventoryEditListener.java similarity index 84% rename from src/main/java/pk/ajneb97/listeners/InventoryEditListener.java rename to src/main/java/dr/bunchy7s/listeners/InventoryEditListener.java index ea5be53..388110b 100644 --- a/src/main/java/pk/ajneb97/listeners/InventoryEditListener.java +++ b/src/main/java/dr/bunchy7s/listeners/InventoryEditListener.java @@ -1,4 +1,4 @@ -package pk.ajneb97.listeners; +package dr.bunchy7s.listeners; import org.bukkit.ChatColor; import org.bukkit.entity.Player; @@ -9,16 +9,16 @@ import org.bukkit.event.inventory.ClickType; import org.bukkit.event.inventory.InventoryClickEvent; import org.bukkit.event.inventory.InventoryCloseEvent; import org.bukkit.event.player.AsyncPlayerChatEvent; -import org.bukkit.scheduler.BukkitRunnable; -import pk.ajneb97.PlayerKits2; -import pk.ajneb97.managers.edit.InventoryEditManager; -import pk.ajneb97.model.inventory.InventoryPlayer; -import pk.ajneb97.utils.InventoryUtils; +import dr.bunchy7s.PlayerKitsF; +import dr.bunchy7s.libs.FoliaScheduler; +import dr.bunchy7s.managers.edit.InventoryEditManager; +import dr.bunchy7s.model.inventory.InventoryPlayer; +import dr.bunchy7s.utils.InventoryUtils; public class InventoryEditListener implements Listener { - private PlayerKits2 plugin; - public InventoryEditListener(PlayerKits2 plugin){ + private PlayerKitsF plugin; + public InventoryEditListener(PlayerKitsF plugin){ this.plugin = plugin; } @EventHandler @@ -76,12 +76,9 @@ public class InventoryEditListener implements Listener { InventoryPlayer inventoryPlayer = invManager.getInventoryPlayer(player); if(inventoryPlayer != null) { event.setCancelled(true); - new BukkitRunnable(){ - @Override - public void run() { - invManager.writeChat(inventoryPlayer, ChatColor.stripColor(event.getMessage())); - } - }.runTaskLater(plugin,1L); + FoliaScheduler.runTaskLater(plugin, () -> { + invManager.writeChat(inventoryPlayer, ChatColor.stripColor(event.getMessage())); + }, 1L); } } } diff --git a/src/main/java/pk/ajneb97/listeners/OtherListener.java b/src/main/java/dr/bunchy7s/listeners/OtherListener.java similarity index 95% rename from src/main/java/pk/ajneb97/listeners/OtherListener.java rename to src/main/java/dr/bunchy7s/listeners/OtherListener.java index 20eb2eb..c157bac 100644 --- a/src/main/java/pk/ajneb97/listeners/OtherListener.java +++ b/src/main/java/dr/bunchy7s/listeners/OtherListener.java @@ -1,4 +1,4 @@ -package pk.ajneb97.listeners; +package dr.bunchy7s.listeners; import org.bukkit.entity.Entity; import org.bukkit.entity.EntityType; diff --git a/src/main/java/pk/ajneb97/listeners/PlayerListener.java b/src/main/java/dr/bunchy7s/listeners/PlayerListener.java similarity index 66% rename from src/main/java/pk/ajneb97/listeners/PlayerListener.java rename to src/main/java/dr/bunchy7s/listeners/PlayerListener.java index cc93000..10fdfb5 100644 --- a/src/main/java/pk/ajneb97/listeners/PlayerListener.java +++ b/src/main/java/dr/bunchy7s/listeners/PlayerListener.java @@ -1,4 +1,4 @@ -package pk.ajneb97.listeners; +package dr.bunchy7s.listeners; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; @@ -8,16 +8,15 @@ import org.bukkit.event.inventory.InventoryClickEvent; import org.bukkit.event.inventory.InventoryCloseEvent; import org.bukkit.event.player.PlayerJoinEvent; import org.bukkit.event.player.PlayerQuitEvent; -import pk.ajneb97.PlayerKits2; -import pk.ajneb97.managers.InventoryManager; -import pk.ajneb97.managers.MessagesManager; -import pk.ajneb97.model.inventory.InventoryPlayer; -import pk.ajneb97.utils.InventoryUtils; +import dr.bunchy7s.PlayerKitsF; +import dr.bunchy7s.managers.InventoryManager; +import dr.bunchy7s.model.inventory.InventoryPlayer; +import dr.bunchy7s.utils.InventoryUtils; public class PlayerListener implements Listener { - private PlayerKits2 plugin; - public PlayerListener(PlayerKits2 plugin){ + private PlayerKitsF plugin; + public PlayerListener(PlayerKitsF plugin){ this.plugin = plugin; } @@ -25,13 +24,6 @@ public class PlayerListener implements Listener { public void onJoin(PlayerJoinEvent event){ Player player = event.getPlayer(); plugin.getPlayerDataManager().manageJoin(player); - - //Update notification - String latestVersion = plugin.getUpdateCheckerManager().getLatestVersion(); - if(player.isOp() && plugin.getConfigsManager().getMainConfigManager().isUpdateNotify() && !plugin.version.equals(latestVersion)){ - player.sendMessage(MessagesManager.getLegacyColoredMessage(plugin.prefix+"&cThere is a new version available. &e(&7"+latestVersion+"&e)")); - player.sendMessage(MessagesManager.getLegacyColoredMessage("&cYou can download it at: &ahttps://modrinth.com/plugin/playerkits-2")); - } } @EventHandler diff --git a/src/main/java/pk/ajneb97/managers/DependencyManager.java b/src/main/java/dr/bunchy7s/managers/DependencyManager.java similarity index 88% rename from src/main/java/pk/ajneb97/managers/DependencyManager.java rename to src/main/java/dr/bunchy7s/managers/DependencyManager.java index e11a95b..2ae3a72 100644 --- a/src/main/java/pk/ajneb97/managers/DependencyManager.java +++ b/src/main/java/dr/bunchy7s/managers/DependencyManager.java @@ -1,19 +1,19 @@ -package pk.ajneb97.managers; +package dr.bunchy7s.managers; import net.milkbowl.vault.economy.Economy; import org.bukkit.Bukkit; import org.bukkit.plugin.RegisteredServiceProvider; -import pk.ajneb97.PlayerKits2; +import dr.bunchy7s.PlayerKitsF; public class DependencyManager { - private PlayerKits2 plugin; + private PlayerKitsF plugin; private boolean isPlaceholderAPI; private Economy vaultEconomy; private boolean isPaper; - public DependencyManager(PlayerKits2 plugin){ + public DependencyManager(PlayerKitsF plugin){ this.plugin = plugin; if(Bukkit.getServer().getPluginManager().getPlugin("PlaceholderAPI") != null){ diff --git a/src/main/java/pk/ajneb97/managers/InventoryManager.java b/src/main/java/dr/bunchy7s/managers/InventoryManager.java similarity index 95% rename from src/main/java/pk/ajneb97/managers/InventoryManager.java rename to src/main/java/dr/bunchy7s/managers/InventoryManager.java index ec4c77b..0d5b915 100644 --- a/src/main/java/pk/ajneb97/managers/InventoryManager.java +++ b/src/main/java/dr/bunchy7s/managers/InventoryManager.java @@ -1,4 +1,4 @@ -package pk.ajneb97.managers; +package dr.bunchy7s.managers; import org.bukkit.Bukkit; import org.bukkit.configuration.file.FileConfiguration; @@ -7,19 +7,19 @@ import org.bukkit.event.inventory.ClickType; import org.bukkit.inventory.Inventory; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.ItemMeta; -import pk.ajneb97.PlayerKits2; -import pk.ajneb97.configs.MainConfigManager; -import pk.ajneb97.model.Kit; -import pk.ajneb97.model.KitAction; -import pk.ajneb97.model.internal.GiveKitInstructions; -import pk.ajneb97.model.internal.KitPosition; -import pk.ajneb97.model.internal.KitVariable; -import pk.ajneb97.model.internal.PlayerKitsMessageResult; -import pk.ajneb97.model.inventory.InventoryPlayer; -import pk.ajneb97.model.inventory.ItemKitInventory; -import pk.ajneb97.model.inventory.KitInventory; -import pk.ajneb97.model.item.KitItem; -import pk.ajneb97.utils.*; +import dr.bunchy7s.PlayerKitsF; +import dr.bunchy7s.configs.MainConfigManager; +import dr.bunchy7s.model.Kit; +import dr.bunchy7s.model.KitAction; +import dr.bunchy7s.model.internal.GiveKitInstructions; +import dr.bunchy7s.model.internal.KitPosition; +import dr.bunchy7s.model.internal.KitVariable; +import dr.bunchy7s.model.internal.PlayerKitsMessageResult; +import dr.bunchy7s.model.inventory.InventoryPlayer; +import dr.bunchy7s.model.inventory.ItemKitInventory; +import dr.bunchy7s.model.inventory.KitInventory; +import dr.bunchy7s.model.item.KitItem; +import dr.bunchy7s.utils.*; import java.util.ArrayList; import java.util.Arrays; @@ -27,11 +27,11 @@ import java.util.List; public class InventoryManager { - private PlayerKits2 plugin; + private PlayerKitsF plugin; private ArrayList inventories; private ArrayList players; private InventoryRequirementsManager inventoryRequirementsManager; - public InventoryManager(PlayerKits2 plugin){ + public InventoryManager(PlayerKitsF plugin){ this.plugin = plugin; this.players = new ArrayList<>(); this.inventoryRequirementsManager = new InventoryRequirementsManager(plugin,this); diff --git a/src/main/java/pk/ajneb97/managers/InventoryRequirementsManager.java b/src/main/java/dr/bunchy7s/managers/InventoryRequirementsManager.java similarity index 91% rename from src/main/java/pk/ajneb97/managers/InventoryRequirementsManager.java rename to src/main/java/dr/bunchy7s/managers/InventoryRequirementsManager.java index ce4f9a3..20e2ff8 100644 --- a/src/main/java/pk/ajneb97/managers/InventoryRequirementsManager.java +++ b/src/main/java/dr/bunchy7s/managers/InventoryRequirementsManager.java @@ -1,26 +1,26 @@ -package pk.ajneb97.managers; +package dr.bunchy7s.managers; import me.clip.placeholderapi.PlaceholderAPI; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.ItemMeta; -import pk.ajneb97.PlayerKits2; -import pk.ajneb97.model.Kit; -import pk.ajneb97.model.KitRequirements; -import pk.ajneb97.model.internal.GiveKitInstructions; -import pk.ajneb97.model.internal.PlayerKitsMessageResult; -import pk.ajneb97.model.inventory.InventoryPlayer; -import pk.ajneb97.utils.MiniMessageUtils; -import pk.ajneb97.utils.PlayerUtils; +import dr.bunchy7s.PlayerKitsF; +import dr.bunchy7s.model.Kit; +import dr.bunchy7s.model.KitRequirements; +import dr.bunchy7s.model.internal.GiveKitInstructions; +import dr.bunchy7s.model.internal.PlayerKitsMessageResult; +import dr.bunchy7s.model.inventory.InventoryPlayer; +import dr.bunchy7s.utils.MiniMessageUtils; +import dr.bunchy7s.utils.PlayerUtils; import java.util.ArrayList; import java.util.List; public class InventoryRequirementsManager { - private PlayerKits2 plugin; + private PlayerKitsF plugin; private InventoryManager inventoryManager; - public InventoryRequirementsManager(PlayerKits2 plugin, InventoryManager inventoryManager){ + public InventoryRequirementsManager(PlayerKitsF plugin, InventoryManager inventoryManager){ this.plugin = plugin; this.inventoryManager = inventoryManager; } diff --git a/src/main/java/pk/ajneb97/managers/KitItemManager.java b/src/main/java/dr/bunchy7s/managers/KitItemManager.java similarity index 98% rename from src/main/java/pk/ajneb97/managers/KitItemManager.java rename to src/main/java/dr/bunchy7s/managers/KitItemManager.java index 2f4bcc5..c2d52e4 100644 --- a/src/main/java/pk/ajneb97/managers/KitItemManager.java +++ b/src/main/java/dr/bunchy7s/managers/KitItemManager.java @@ -1,4 +1,4 @@ -package pk.ajneb97.managers; +package dr.bunchy7s.managers; import org.bukkit.Color; import org.bukkit.NamespacedKey; @@ -11,22 +11,22 @@ import org.bukkit.inventory.meta.EnchantmentStorageMeta; import org.bukkit.inventory.meta.ItemMeta; import org.bukkit.inventory.meta.LeatherArmorMeta; import org.bukkit.inventory.meta.components.CustomModelDataComponent; -import pk.ajneb97.PlayerKits2; -import pk.ajneb97.model.Kit; -import pk.ajneb97.model.internal.KitVariable; -import pk.ajneb97.model.item.*; -import pk.ajneb97.utils.ItemUtils; -import pk.ajneb97.utils.MiniMessageUtils; -import pk.ajneb97.utils.OtherUtils; -import pk.ajneb97.utils.ServerVersion; +import dr.bunchy7s.PlayerKitsF; +import dr.bunchy7s.model.Kit; +import dr.bunchy7s.model.internal.KitVariable; +import dr.bunchy7s.model.item.*; +import dr.bunchy7s.utils.ItemUtils; +import dr.bunchy7s.utils.MiniMessageUtils; +import dr.bunchy7s.utils.OtherUtils; +import dr.bunchy7s.utils.ServerVersion; import java.util.*; import java.util.stream.Collectors; public class KitItemManager { - private PlayerKits2 plugin; - public KitItemManager(PlayerKits2 plugin){ + private PlayerKitsF plugin; + public KitItemManager(PlayerKitsF plugin){ this.plugin = plugin; } @@ -42,7 +42,7 @@ public class KitItemManager { kitItem.setDurability(item.getDurability()); } - ServerVersion serverVersion = PlayerKits2.serverVersion; + ServerVersion serverVersion = PlayerKitsF.serverVersion; boolean useMiniMessage = plugin.getConfigsManager().getMainConfigManager().isUseMiniMessage(); boolean isPaper = plugin.getDependencyManager().isPaper(); @@ -258,7 +258,7 @@ public class KitItemManager { meta.setCustomModelData(customModelData); } - ServerVersion serverVersion = PlayerKits2.serverVersion; + ServerVersion serverVersion = PlayerKitsF.serverVersion; if(serverVersion.serverVersionGreaterEqualThan(serverVersion,ServerVersion.v1_21_R3)){ KitItemCustomModelComponentData kitItemCustomModelComponentData = kitItem.getCustomModelComponentData(); if(kitItemCustomModelComponentData != null){ diff --git a/src/main/java/pk/ajneb97/managers/KitsManager.java b/src/main/java/dr/bunchy7s/managers/KitsManager.java similarity index 96% rename from src/main/java/pk/ajneb97/managers/KitsManager.java rename to src/main/java/dr/bunchy7s/managers/KitsManager.java index 887a8a7..5aa4e3d 100644 --- a/src/main/java/pk/ajneb97/managers/KitsManager.java +++ b/src/main/java/dr/bunchy7s/managers/KitsManager.java @@ -1,4 +1,4 @@ -package pk.ajneb97.managers; +package dr.bunchy7s.managers; import net.milkbowl.vault.economy.Economy; import org.bukkit.Bukkit; @@ -8,34 +8,34 @@ import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.PlayerInventory; -import pk.ajneb97.PlayerKits2; -import pk.ajneb97.configs.MainConfigManager; -import pk.ajneb97.model.Kit; -import pk.ajneb97.model.KitAction; -import pk.ajneb97.model.KitRequirements; -import pk.ajneb97.model.internal.GiveKitInstructions; -import pk.ajneb97.model.internal.PlayerKitsMessageResult; -import pk.ajneb97.model.inventory.KitInventory; -import pk.ajneb97.model.item.KitItem; -import pk.ajneb97.utils.ActionUtils; -import pk.ajneb97.utils.OtherUtils; -import pk.ajneb97.utils.PlayerUtils; +import dr.bunchy7s.PlayerKitsF; +import dr.bunchy7s.configs.MainConfigManager; +import dr.bunchy7s.model.Kit; +import dr.bunchy7s.model.KitAction; +import dr.bunchy7s.model.KitRequirements; +import dr.bunchy7s.model.internal.GiveKitInstructions; +import dr.bunchy7s.model.internal.PlayerKitsMessageResult; +import dr.bunchy7s.model.inventory.KitInventory; +import dr.bunchy7s.model.item.KitItem; +import dr.bunchy7s.utils.ActionUtils; +import dr.bunchy7s.utils.OtherUtils; +import dr.bunchy7s.utils.PlayerUtils; import java.util.ArrayList; import java.util.List; public class KitsManager { - private PlayerKits2 plugin; + private PlayerKitsF plugin; private ArrayList kits; - public KitsManager(PlayerKits2 plugin){ + public KitsManager(PlayerKitsF plugin){ this.plugin = plugin; } - public PlayerKits2 getPlugin() { + public PlayerKitsF getPlugin() { return plugin; } - public void setPlugin(PlayerKits2 plugin) { + public void setPlugin(PlayerKitsF plugin) { this.plugin = plugin; } diff --git a/src/main/java/pk/ajneb97/managers/MessagesManager.java b/src/main/java/dr/bunchy7s/managers/MessagesManager.java similarity index 95% rename from src/main/java/pk/ajneb97/managers/MessagesManager.java rename to src/main/java/dr/bunchy7s/managers/MessagesManager.java index feeafcf..2463ccf 100644 --- a/src/main/java/pk/ajneb97/managers/MessagesManager.java +++ b/src/main/java/dr/bunchy7s/managers/MessagesManager.java @@ -1,10 +1,10 @@ -package pk.ajneb97.managers; +package dr.bunchy7s.managers; import net.md_5.bungee.api.ChatColor; import org.bukkit.command.CommandSender; -import pk.ajneb97.api.PlayerKitsAPI; -import pk.ajneb97.utils.MiniMessageUtils; -import pk.ajneb97.utils.OtherUtils; +import dr.bunchy7s.api.PlayerKitsAPI; +import dr.bunchy7s.utils.MiniMessageUtils; +import dr.bunchy7s.utils.OtherUtils; import java.util.regex.Matcher; import java.util.regex.Pattern; diff --git a/src/main/java/pk/ajneb97/managers/MigrationManager.java b/src/main/java/dr/bunchy7s/managers/MigrationManager.java similarity index 86% rename from src/main/java/pk/ajneb97/managers/MigrationManager.java rename to src/main/java/dr/bunchy7s/managers/MigrationManager.java index 001526b..487e2d1 100644 --- a/src/main/java/pk/ajneb97/managers/MigrationManager.java +++ b/src/main/java/dr/bunchy7s/managers/MigrationManager.java @@ -1,14 +1,14 @@ -package pk.ajneb97.managers; +package dr.bunchy7s.managers; import org.bukkit.command.CommandSender; import org.bukkit.configuration.file.YamlConfiguration; -import org.bukkit.scheduler.BukkitRunnable; -import pk.ajneb97.PlayerKits2; -import pk.ajneb97.configs.KitsConfigManager; -import pk.ajneb97.configs.PlayersConfigManager; -import pk.ajneb97.model.*; -import pk.ajneb97.model.item.KitItem; -import pk.ajneb97.model.item.KitItemSkullData; +import dr.bunchy7s.PlayerKitsF; +import dr.bunchy7s.configs.KitsConfigManager; +import dr.bunchy7s.configs.PlayersConfigManager; +import dr.bunchy7s.libs.FoliaScheduler; +import dr.bunchy7s.model.*; +import dr.bunchy7s.model.item.KitItem; +import dr.bunchy7s.model.item.KitItemSkullData; import java.io.File; import java.util.ArrayList; @@ -17,28 +17,25 @@ import java.util.UUID; public class MigrationManager { - private PlayerKits2 plugin; - public MigrationManager(PlayerKits2 plugin){ + private PlayerKitsF plugin; + public MigrationManager(PlayerKitsF plugin){ this.plugin = plugin; } public void migrate(CommandSender sender){ - new BukkitRunnable(){ - @Override - public void run() { - migrateKits(sender); - migratePlayers(sender); + FoliaScheduler.runTaskAsynchronously(plugin, () -> { + migrateKits(sender); + migratePlayers(sender); - sender.sendMessage(PlayerKits2.prefix+MessagesManager.getLegacyColoredMessage(" &aMigration completed.")); - } - }.runTaskAsynchronously(plugin); + sender.sendMessage(PlayerKitsF.prefix+MessagesManager.getLegacyColoredMessage(" &aMigration completed.")); + }); } public void migrateKits(CommandSender sender){ File bStatsFolder = new File(plugin.getDataFolder().getParentFile(), "PlayerKits"); File configFile = new File(bStatsFolder, "kits.yml"); if(!configFile.exists()){ - sender.sendMessage(PlayerKits2.prefix+MessagesManager.getLegacyColoredMessage(" &cPlayerKits1 kits.yml file not found.")); + sender.sendMessage(PlayerKitsF.prefix+MessagesManager.getLegacyColoredMessage(" &cPlayerKits1 kits.yml file not found.")); return; } @@ -99,15 +96,15 @@ public class MigrationManager { kitsConfigManager.saveConfig(kit); - sender.sendMessage(PlayerKits2.prefix+MessagesManager.getLegacyColoredMessage(" &aKit &7"+kitName+" &amigrated.")); + sender.sendMessage(PlayerKitsF.prefix+MessagesManager.getLegacyColoredMessage(" &aKit &7"+kitName+" &amigrated.")); }catch(Exception e){ - sender.sendMessage(PlayerKits2.prefix+MessagesManager.getLegacyColoredMessage(" &cError while trying to migrate kit &7"+kitName+"&c, check console.")); + sender.sendMessage(PlayerKitsF.prefix+MessagesManager.getLegacyColoredMessage(" &cError while trying to migrate kit &7"+kitName+"&c, check console.")); e.printStackTrace(); } } }else{ - sender.sendMessage(PlayerKits2.prefix+MessagesManager.getLegacyColoredMessage(" &cNo kits found.")); + sender.sendMessage(PlayerKitsF.prefix+MessagesManager.getLegacyColoredMessage(" &cNo kits found.")); return; } @@ -119,7 +116,7 @@ public class MigrationManager { File bStatsFolder = new File(plugin.getDataFolder().getParentFile(), "PlayerKits"); File configFile = new File(bStatsFolder, "players.yml"); if(!configFile.exists()){ - sender.sendMessage(PlayerKits2.prefix+MessagesManager.getLegacyColoredMessage(" &cPlayerKits1 players.yml file not found.")); + sender.sendMessage(PlayerKitsF.prefix+MessagesManager.getLegacyColoredMessage(" &cPlayerKits1 players.yml file not found.")); return; } @@ -146,9 +143,9 @@ public class MigrationManager { playersConfigManager.saveConfig(playerData); - sender.sendMessage(PlayerKits2.prefix+MessagesManager.getLegacyColoredMessage(" &aPlayer &7"+name+" &amigrated.")); + sender.sendMessage(PlayerKitsF.prefix+MessagesManager.getLegacyColoredMessage(" &aPlayer &7"+name+" &amigrated.")); } catch (Exception e) { - sender.sendMessage(PlayerKits2.prefix + MessagesManager.getLegacyColoredMessage(" &cError while trying to migrate player data with uuid &7" + uuid + "&c, check console.")); + sender.sendMessage(PlayerKitsF.prefix + MessagesManager.getLegacyColoredMessage(" &cError while trying to migrate player data with uuid &7" + uuid + "&c, check console.")); e.printStackTrace(); } } diff --git a/src/main/java/pk/ajneb97/managers/PlayerDataManager.java b/src/main/java/dr/bunchy7s/managers/PlayerDataManager.java similarity index 81% rename from src/main/java/pk/ajneb97/managers/PlayerDataManager.java rename to src/main/java/dr/bunchy7s/managers/PlayerDataManager.java index 42e31bd..68bc003 100644 --- a/src/main/java/pk/ajneb97/managers/PlayerDataManager.java +++ b/src/main/java/dr/bunchy7s/managers/PlayerDataManager.java @@ -1,15 +1,15 @@ -package pk.ajneb97.managers; +package dr.bunchy7s.managers; import org.bukkit.Bukkit; import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.entity.Player; -import org.bukkit.scheduler.BukkitRunnable; -import pk.ajneb97.PlayerKits2; -import pk.ajneb97.configs.PlayersConfigManager; -import pk.ajneb97.database.MySQLConnection; -import pk.ajneb97.model.PlayerData; -import pk.ajneb97.model.internal.GenericCallback; -import pk.ajneb97.model.internal.PlayerKitsMessageResult; -import pk.ajneb97.utils.OtherUtils; +import dr.bunchy7s.PlayerKitsF; +import dr.bunchy7s.configs.PlayersConfigManager; +import dr.bunchy7s.database.MySQLConnection; +import dr.bunchy7s.libs.FoliaScheduler; +import dr.bunchy7s.model.PlayerData; +import dr.bunchy7s.model.internal.GenericCallback; +import dr.bunchy7s.model.internal.PlayerKitsMessageResult; +import dr.bunchy7s.utils.OtherUtils; import java.util.ArrayList; import java.util.HashMap; @@ -18,11 +18,11 @@ import java.util.UUID; public class PlayerDataManager { - private PlayerKits2 plugin; + private PlayerKitsF plugin; private Map players; private Map playerNames; - public PlayerDataManager(PlayerKits2 plugin){ + public PlayerDataManager(PlayerKitsF plugin){ this.plugin = plugin; this.players = new HashMap<>(); this.playerNames = new HashMap<>(); @@ -159,28 +159,22 @@ public class PlayerDataManager { public void resetKitForAllPlayers(String kitName, GenericCallback callback){ - new BukkitRunnable() { - @Override - public void run() { - MySQLConnection mySQLConnection = plugin.getMySQLConnection(); - if (mySQLConnection == null) { - PlayersConfigManager playerConfigsManager = plugin.getConfigsManager().getPlayersConfigManager(); - playerConfigsManager.resetKitForAllPlayers(kitName); + FoliaScheduler.runTaskAsynchronously(plugin, () -> { + MySQLConnection mySQLConnection = plugin.getMySQLConnection(); + if (mySQLConnection == null) { + PlayersConfigManager playerConfigsManager = plugin.getConfigsManager().getPlayersConfigManager(); + playerConfigsManager.resetKitForAllPlayers(kitName); + } + + FoliaScheduler.runTask(plugin, () -> { + players.values().forEach(p -> p.resetKit(kitName)); + if(plugin.getMySQLConnection() != null){ + plugin.getMySQLConnection().resetKit(null,kitName,true); } - new BukkitRunnable() { - @Override - public void run() { - players.values().forEach(p -> p.resetKit(kitName)); - if(plugin.getMySQLConnection() != null){ - plugin.getMySQLConnection().resetKit(null,kitName,true); - } - - callback.onDone(PlayerKitsMessageResult.success()); - } - }.runTask(plugin); - } - }.runTaskAsynchronously(plugin); + callback.onDone(PlayerKitsMessageResult.success()); + }); + }); } public void manageJoin(Player player){ @@ -233,12 +227,9 @@ public class PlayerDataManager { if(playerData != null){ if(plugin.getMySQLConnection() == null) { if(playerData.isModified()){ - new BukkitRunnable(){ - @Override - public void run() { - plugin.getConfigsManager().getPlayersConfigManager().saveConfig(playerData); - } - }.runTaskAsynchronously(plugin); + FoliaScheduler.runTaskAsynchronously(plugin, () -> { + plugin.getConfigsManager().getPlayersConfigManager().saveConfig(playerData); + }); } } diff --git a/src/main/java/pk/ajneb97/managers/VerifyManager.java b/src/main/java/dr/bunchy7s/managers/VerifyManager.java similarity index 93% rename from src/main/java/pk/ajneb97/managers/VerifyManager.java rename to src/main/java/dr/bunchy7s/managers/VerifyManager.java index b79e5bb..56b8001 100644 --- a/src/main/java/pk/ajneb97/managers/VerifyManager.java +++ b/src/main/java/dr/bunchy7s/managers/VerifyManager.java @@ -1,24 +1,24 @@ -package pk.ajneb97.managers; +package dr.bunchy7s.managers; import org.bukkit.entity.Player; -import pk.ajneb97.PlayerKits2; -import pk.ajneb97.model.Kit; -import pk.ajneb97.model.KitAction; -import pk.ajneb97.model.inventory.InventoryPlayer; -import pk.ajneb97.model.inventory.ItemKitInventory; -import pk.ajneb97.model.inventory.KitInventory; -import pk.ajneb97.model.item.KitItem; -import pk.ajneb97.model.verify.*; -import pk.ajneb97.utils.ItemUtils; +import dr.bunchy7s.PlayerKitsF; +import dr.bunchy7s.model.Kit; +import dr.bunchy7s.model.KitAction; +import dr.bunchy7s.model.inventory.InventoryPlayer; +import dr.bunchy7s.model.inventory.ItemKitInventory; +import dr.bunchy7s.model.inventory.KitInventory; +import dr.bunchy7s.model.item.KitItem; +import dr.bunchy7s.model.verify.*; +import dr.bunchy7s.utils.ItemUtils; import java.util.ArrayList; import java.util.List; public class VerifyManager { - private PlayerKits2 plugin; + private PlayerKitsF plugin; private ArrayList errors; private boolean criticalErrors; - public VerifyManager(PlayerKits2 plugin) { + public VerifyManager(PlayerKitsF plugin) { this.plugin = plugin; this.errors = new ArrayList(); this.criticalErrors = false; diff --git a/src/main/java/pk/ajneb97/managers/dependencies/Metrics.java b/src/main/java/dr/bunchy7s/managers/dependencies/Metrics.java similarity index 99% rename from src/main/java/pk/ajneb97/managers/dependencies/Metrics.java rename to src/main/java/dr/bunchy7s/managers/dependencies/Metrics.java index 7e17704..31df201 100644 --- a/src/main/java/pk/ajneb97/managers/dependencies/Metrics.java +++ b/src/main/java/dr/bunchy7s/managers/dependencies/Metrics.java @@ -1,4 +1,4 @@ -package pk.ajneb97.managers.dependencies; +package dr.bunchy7s.managers.dependencies; /* * This Metrics class was auto-generated and can be copied into your project if you are diff --git a/src/main/java/pk/ajneb97/managers/edit/InventoryEditActionsEditManager.java b/src/main/java/dr/bunchy7s/managers/edit/InventoryEditActionsEditManager.java similarity index 93% rename from src/main/java/pk/ajneb97/managers/edit/InventoryEditActionsEditManager.java rename to src/main/java/dr/bunchy7s/managers/edit/InventoryEditActionsEditManager.java index 6c95307..714910c 100644 --- a/src/main/java/pk/ajneb97/managers/edit/InventoryEditActionsEditManager.java +++ b/src/main/java/dr/bunchy7s/managers/edit/InventoryEditActionsEditManager.java @@ -1,4 +1,4 @@ -package pk.ajneb97.managers.edit; +package dr.bunchy7s.managers.edit; import org.bukkit.Bukkit; import org.bukkit.Material; @@ -7,23 +7,23 @@ import org.bukkit.event.inventory.ClickType; import org.bukkit.inventory.Inventory; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.ItemMeta; -import pk.ajneb97.PlayerKits2; -import pk.ajneb97.managers.MessagesManager; -import pk.ajneb97.model.Kit; -import pk.ajneb97.model.KitAction; -import pk.ajneb97.model.inventory.InventoryPlayer; -import pk.ajneb97.utils.InventoryItem; -import pk.ajneb97.utils.OtherUtils; +import dr.bunchy7s.PlayerKitsF; +import dr.bunchy7s.managers.MessagesManager; +import dr.bunchy7s.model.Kit; +import dr.bunchy7s.model.KitAction; +import dr.bunchy7s.model.inventory.InventoryPlayer; +import dr.bunchy7s.utils.InventoryItem; +import dr.bunchy7s.utils.OtherUtils; import java.util.ArrayList; import java.util.List; public class InventoryEditActionsEditManager { - private PlayerKits2 plugin; + private PlayerKitsF plugin; private InventoryEditActionsManager inventoryEditActionsManager; - public InventoryEditActionsEditManager(PlayerKits2 plugin, InventoryEditActionsManager inventoryEditActionsManager) { + public InventoryEditActionsEditManager(PlayerKitsF plugin, InventoryEditActionsManager inventoryEditActionsManager) { this.plugin = plugin; this.inventoryEditActionsManager = inventoryEditActionsManager; } @@ -143,8 +143,8 @@ public class InventoryEditActionsEditManager { public void clickEditAction(InventoryPlayer inventoryPlayer){ Player player = inventoryPlayer.getPlayer(); - player.sendMessage(MessagesManager.getLegacyColoredMessage(PlayerKits2.prefix+"&7Write the new action to set.")); - player.sendMessage(MessagesManager.getLegacyColoredMessage(PlayerKits2.prefix+"&fCheck all actions on the wiki: &bhttps://ajneb97.gitbook.io/playerkits-2/actions")); + player.sendMessage(MessagesManager.getLegacyColoredMessage(PlayerKitsF.prefix+"&7Write the new action to set.")); + player.sendMessage(MessagesManager.getLegacyColoredMessage(PlayerKitsF.prefix+"&fCheck all actions on the wiki: &bhttps://ajneb97.gitbook.io/playerkits-2/actions")); player.closeInventory(); inventoryPlayer.setInventoryName("edit_chat_action_slot_" + getType(inventoryPlayer) + "_" + getActionSlot(inventoryPlayer)); diff --git a/src/main/java/pk/ajneb97/managers/edit/InventoryEditActionsManager.java b/src/main/java/dr/bunchy7s/managers/edit/InventoryEditActionsManager.java similarity index 92% rename from src/main/java/pk/ajneb97/managers/edit/InventoryEditActionsManager.java rename to src/main/java/dr/bunchy7s/managers/edit/InventoryEditActionsManager.java index 0b6f68b..716ef55 100644 --- a/src/main/java/pk/ajneb97/managers/edit/InventoryEditActionsManager.java +++ b/src/main/java/dr/bunchy7s/managers/edit/InventoryEditActionsManager.java @@ -1,4 +1,4 @@ -package pk.ajneb97.managers.edit; +package dr.bunchy7s.managers.edit; import org.bukkit.Bukkit; import org.bukkit.Material; @@ -7,23 +7,23 @@ import org.bukkit.event.inventory.ClickType; import org.bukkit.inventory.Inventory; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.ItemMeta; -import pk.ajneb97.PlayerKits2; -import pk.ajneb97.managers.MessagesManager; -import pk.ajneb97.model.Kit; -import pk.ajneb97.model.KitAction; -import pk.ajneb97.model.inventory.InventoryPlayer; -import pk.ajneb97.utils.InventoryItem; -import pk.ajneb97.utils.OtherUtils; +import dr.bunchy7s.PlayerKitsF; +import dr.bunchy7s.managers.MessagesManager; +import dr.bunchy7s.model.Kit; +import dr.bunchy7s.model.KitAction; +import dr.bunchy7s.model.inventory.InventoryPlayer; +import dr.bunchy7s.utils.InventoryItem; +import dr.bunchy7s.utils.OtherUtils; import java.util.ArrayList; import java.util.List; public class InventoryEditActionsManager { - private PlayerKits2 plugin; + private PlayerKitsF plugin; private InventoryEditManager inventoryEditManager; private InventoryEditActionsEditManager inventoryEditActionsEditManager; - public InventoryEditActionsManager(PlayerKits2 plugin, InventoryEditManager inventoryEditManager){ + public InventoryEditActionsManager(PlayerKitsF plugin, InventoryEditManager inventoryEditManager){ this.plugin = plugin; this.inventoryEditManager = inventoryEditManager; this.inventoryEditActionsEditManager = new InventoryEditActionsEditManager(plugin,this); @@ -109,8 +109,8 @@ public class InventoryEditActionsManager { public void clickAddAction(InventoryPlayer inventoryPlayer){ Player player = inventoryPlayer.getPlayer(); - player.sendMessage(MessagesManager.getLegacyColoredMessage(PlayerKits2.prefix+"&7Write the new action to add.")); - player.sendMessage(MessagesManager.getLegacyColoredMessage(PlayerKits2.prefix+"&fCheck all actions on the wiki: &bhttps://ajneb97.gitbook.io/playerkits-2/actions")); + player.sendMessage(MessagesManager.getLegacyColoredMessage(PlayerKitsF.prefix+"&7Write the new action to add.")); + player.sendMessage(MessagesManager.getLegacyColoredMessage(PlayerKitsF.prefix+"&fCheck all actions on the wiki: &bhttps://ajneb97.gitbook.io/playerkits-2/actions")); player.closeInventory(); String type = inventoryPlayer.getInventoryName().replace("edit_actions_",""); diff --git a/src/main/java/pk/ajneb97/managers/edit/InventoryEditDisplayManager.java b/src/main/java/dr/bunchy7s/managers/edit/InventoryEditDisplayManager.java similarity index 93% rename from src/main/java/pk/ajneb97/managers/edit/InventoryEditDisplayManager.java rename to src/main/java/dr/bunchy7s/managers/edit/InventoryEditDisplayManager.java index bc665e8..d4efc1c 100644 --- a/src/main/java/pk/ajneb97/managers/edit/InventoryEditDisplayManager.java +++ b/src/main/java/dr/bunchy7s/managers/edit/InventoryEditDisplayManager.java @@ -1,4 +1,4 @@ -package pk.ajneb97.managers.edit; +package dr.bunchy7s.managers.edit; import org.bukkit.Bukkit; import org.bukkit.Material; @@ -6,24 +6,24 @@ import org.bukkit.event.inventory.ClickType; import org.bukkit.event.inventory.InventoryClickEvent; import org.bukkit.inventory.Inventory; import org.bukkit.inventory.ItemStack; -import pk.ajneb97.PlayerKits2; -import pk.ajneb97.managers.MessagesManager; -import pk.ajneb97.model.Kit; -import pk.ajneb97.model.KitAction; -import pk.ajneb97.model.inventory.InventoryPlayer; -import pk.ajneb97.model.item.KitItem; -import pk.ajneb97.utils.InventoryItem; -import pk.ajneb97.utils.InventoryUtils; -import pk.ajneb97.utils.OtherUtils; +import dr.bunchy7s.PlayerKitsF; +import dr.bunchy7s.managers.MessagesManager; +import dr.bunchy7s.model.Kit; +import dr.bunchy7s.model.KitAction; +import dr.bunchy7s.model.inventory.InventoryPlayer; +import dr.bunchy7s.model.item.KitItem; +import dr.bunchy7s.utils.InventoryItem; +import dr.bunchy7s.utils.InventoryUtils; +import dr.bunchy7s.utils.OtherUtils; import java.util.ArrayList; import java.util.List; public class InventoryEditDisplayManager { - private PlayerKits2 plugin; + private PlayerKitsF plugin; private InventoryEditManager inventoryEditManager; - public InventoryEditDisplayManager(PlayerKits2 plugin, InventoryEditManager inventoryEditManager){ + public InventoryEditDisplayManager(PlayerKitsF plugin, InventoryEditManager inventoryEditManager){ this.plugin = plugin; this.inventoryEditManager = inventoryEditManager; } @@ -157,7 +157,7 @@ public class InventoryEditDisplayManager { } }else if(slot == 26){ saveKitItem(inventoryPlayer); - inventoryPlayer.getPlayer().sendMessage(MessagesManager.getLegacyColoredMessage(PlayerKits2.prefix+"&aDisplay item saved.")); + inventoryPlayer.getPlayer().sendMessage(MessagesManager.getLegacyColoredMessage(PlayerKitsF.prefix+"&aDisplay item saved.")); } } } diff --git a/src/main/java/pk/ajneb97/managers/edit/InventoryEditKitItemsManager.java b/src/main/java/dr/bunchy7s/managers/edit/InventoryEditKitItemsManager.java similarity index 92% rename from src/main/java/pk/ajneb97/managers/edit/InventoryEditKitItemsManager.java rename to src/main/java/dr/bunchy7s/managers/edit/InventoryEditKitItemsManager.java index 9b6caf7..aaab318 100644 --- a/src/main/java/pk/ajneb97/managers/edit/InventoryEditKitItemsManager.java +++ b/src/main/java/dr/bunchy7s/managers/edit/InventoryEditKitItemsManager.java @@ -1,4 +1,4 @@ -package pk.ajneb97.managers.edit; +package dr.bunchy7s.managers.edit; import org.bukkit.Bukkit; import org.bukkit.Material; @@ -7,22 +7,22 @@ import org.bukkit.event.inventory.InventoryClickEvent; import org.bukkit.inventory.Inventory; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.ItemMeta; -import pk.ajneb97.PlayerKits2; -import pk.ajneb97.managers.KitItemManager; -import pk.ajneb97.managers.MessagesManager; -import pk.ajneb97.model.Kit; -import pk.ajneb97.model.inventory.InventoryPlayer; -import pk.ajneb97.model.item.KitItem; -import pk.ajneb97.utils.*; +import dr.bunchy7s.PlayerKitsF; +import dr.bunchy7s.managers.KitItemManager; +import dr.bunchy7s.managers.MessagesManager; +import dr.bunchy7s.model.Kit; +import dr.bunchy7s.model.inventory.InventoryPlayer; +import dr.bunchy7s.model.item.KitItem; +import dr.bunchy7s.utils.*; import java.util.ArrayList; import java.util.List; public class InventoryEditKitItemsManager { - private PlayerKits2 plugin; + private PlayerKitsF plugin; private InventoryEditManager inventoryEditManager; - public InventoryEditKitItemsManager(PlayerKits2 plugin, InventoryEditManager inventoryEditManager){ + public InventoryEditKitItemsManager(PlayerKitsF plugin, InventoryEditManager inventoryEditManager){ this.plugin = plugin; this.inventoryEditManager = inventoryEditManager; } @@ -84,9 +84,9 @@ public class InventoryEditKitItemsManager { } public void clickOffHand(InventoryPlayer inventoryPlayer, Inventory inv, ItemStack clickedItem, int clickedSlot){ - ServerVersion serverVersion = PlayerKits2.serverVersion; + ServerVersion serverVersion = PlayerKitsF.serverVersion; if(!serverVersion.serverVersionGreaterEqualThan(serverVersion,ServerVersion.v1_9_R1)) { - inventoryPlayer.getPlayer().sendMessage(MessagesManager.getLegacyColoredMessage(PlayerKits2.prefix+"&cOffhand only works on 1.9+.")); + inventoryPlayer.getPlayer().sendMessage(MessagesManager.getLegacyColoredMessage(PlayerKitsF.prefix+"&cOffhand only works on 1.9+.")); return; } String offhand = ItemUtils.getTagStringItem(plugin,clickedItem,"playerkits_offhand"); @@ -191,7 +191,7 @@ public class InventoryEditKitItemsManager { inventoryEditManager.openInventory(inventoryPlayer); }else if(slot == 53){ saveKitItems(inventoryPlayer); - inventoryPlayer.getPlayer().sendMessage(MessagesManager.getLegacyColoredMessage(PlayerKits2.prefix+"&aKit Items saved.")); + inventoryPlayer.getPlayer().sendMessage(MessagesManager.getLegacyColoredMessage(PlayerKitsF.prefix+"&aKit Items saved.")); } }else if(clickType.isRightClick()){ event.setCancelled(true); diff --git a/src/main/java/pk/ajneb97/managers/edit/InventoryEditManager.java b/src/main/java/dr/bunchy7s/managers/edit/InventoryEditManager.java similarity index 96% rename from src/main/java/pk/ajneb97/managers/edit/InventoryEditManager.java rename to src/main/java/dr/bunchy7s/managers/edit/InventoryEditManager.java index 2485ed7..e7071a7 100644 --- a/src/main/java/pk/ajneb97/managers/edit/InventoryEditManager.java +++ b/src/main/java/dr/bunchy7s/managers/edit/InventoryEditManager.java @@ -1,4 +1,4 @@ -package pk.ajneb97.managers.edit; +package dr.bunchy7s.managers.edit; import org.bukkit.Bukkit; import org.bukkit.Material; @@ -6,29 +6,29 @@ import org.bukkit.entity.Player; import org.bukkit.event.inventory.ClickType; import org.bukkit.inventory.Inventory; import org.bukkit.inventory.ItemStack; -import pk.ajneb97.PlayerKits2; -import pk.ajneb97.managers.MessagesManager; -import pk.ajneb97.model.Kit; -import pk.ajneb97.model.KitAction; -import pk.ajneb97.model.internal.KitPosition; -import pk.ajneb97.model.inventory.InventoryPlayer; -import pk.ajneb97.model.item.KitItem; -import pk.ajneb97.utils.InventoryItem; -import pk.ajneb97.utils.OtherUtils; +import dr.bunchy7s.PlayerKitsF; +import dr.bunchy7s.managers.MessagesManager; +import dr.bunchy7s.model.Kit; +import dr.bunchy7s.model.KitAction; +import dr.bunchy7s.model.internal.KitPosition; +import dr.bunchy7s.model.inventory.InventoryPlayer; +import dr.bunchy7s.model.item.KitItem; +import dr.bunchy7s.utils.InventoryItem; +import dr.bunchy7s.utils.OtherUtils; import java.util.ArrayList; import java.util.List; public class InventoryEditManager { - private PlayerKits2 plugin; + private PlayerKitsF plugin; private ArrayList players; private InventoryEditActionsManager inventoryEditActionsManager; private InventoryEditDisplayManager inventoryEditDisplayManager; private InventoryEditKitItemsManager inventoryEditKitItemsManager; private InventoryEditPositionManager inventoryEditPositionManager; private InventoryEditRequirementsManager inventoryEditRequirementsManager; - public InventoryEditManager(PlayerKits2 plugin){ + public InventoryEditManager(PlayerKitsF plugin){ this.plugin = plugin; this.players = new ArrayList<>(); this.inventoryEditActionsManager = new InventoryEditActionsManager(plugin,this); @@ -319,7 +319,7 @@ public class InventoryEditManager { public void clickCooldown(InventoryPlayer inventoryPlayer){ Player player = inventoryPlayer.getPlayer(); - player.sendMessage(MessagesManager.getLegacyColoredMessage(PlayerKits2.prefix+"&7Write the new cooldown of the kit (in seconds).")); + player.sendMessage(MessagesManager.getLegacyColoredMessage(PlayerKitsF.prefix+"&7Write the new cooldown of the kit (in seconds).")); player.closeInventory(); inventoryPlayer.setInventoryName("edit_chat_cooldown"); @@ -339,7 +339,7 @@ public class InventoryEditManager { return; } }catch(Exception e){} - player.sendMessage(MessagesManager.getLegacyColoredMessage(PlayerKits2.prefix+"&cYou must use a valid number.")); + player.sendMessage(MessagesManager.getLegacyColoredMessage(PlayerKitsF.prefix+"&cYou must use a valid number.")); } public void clickInventory(InventoryPlayer inventoryPlayer, ItemStack item, int slot, ClickType clickType) { diff --git a/src/main/java/pk/ajneb97/managers/edit/InventoryEditPositionManager.java b/src/main/java/dr/bunchy7s/managers/edit/InventoryEditPositionManager.java similarity index 86% rename from src/main/java/pk/ajneb97/managers/edit/InventoryEditPositionManager.java rename to src/main/java/dr/bunchy7s/managers/edit/InventoryEditPositionManager.java index f8e9212..04ab7ea 100644 --- a/src/main/java/pk/ajneb97/managers/edit/InventoryEditPositionManager.java +++ b/src/main/java/dr/bunchy7s/managers/edit/InventoryEditPositionManager.java @@ -1,4 +1,4 @@ -package pk.ajneb97.managers.edit; +package dr.bunchy7s.managers.edit; import org.bukkit.Bukkit; import org.bukkit.Material; @@ -7,29 +7,29 @@ import org.bukkit.event.inventory.InventoryClickEvent; import org.bukkit.inventory.Inventory; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.ItemMeta; -import org.bukkit.scheduler.BukkitRunnable; -import pk.ajneb97.PlayerKits2; -import pk.ajneb97.configs.MainConfigManager; -import pk.ajneb97.managers.*; -import pk.ajneb97.model.Kit; -import pk.ajneb97.model.internal.KitVariable; -import pk.ajneb97.model.inventory.InventoryPlayer; -import pk.ajneb97.model.inventory.ItemKitInventory; -import pk.ajneb97.model.inventory.KitInventory; -import pk.ajneb97.model.item.KitItem; -import pk.ajneb97.utils.InventoryItem; -import pk.ajneb97.utils.InventoryUtils; -import pk.ajneb97.utils.ItemUtils; -import pk.ajneb97.utils.MiniMessageUtils; +import dr.bunchy7s.PlayerKitsF; +import dr.bunchy7s.configs.MainConfigManager; +import dr.bunchy7s.libs.FoliaScheduler; +import dr.bunchy7s.managers.*; +import dr.bunchy7s.model.Kit; +import dr.bunchy7s.model.internal.KitVariable; +import dr.bunchy7s.model.inventory.InventoryPlayer; +import dr.bunchy7s.model.inventory.ItemKitInventory; +import dr.bunchy7s.model.inventory.KitInventory; +import dr.bunchy7s.model.item.KitItem; +import dr.bunchy7s.utils.InventoryItem; +import dr.bunchy7s.utils.InventoryUtils; +import dr.bunchy7s.utils.ItemUtils; +import dr.bunchy7s.utils.MiniMessageUtils; import java.util.ArrayList; import java.util.List; public class InventoryEditPositionManager { - private PlayerKits2 plugin; + private PlayerKitsF plugin; private InventoryEditManager inventoryEditManager; - public InventoryEditPositionManager(PlayerKits2 plugin, InventoryEditManager inventoryEditManager){ + public InventoryEditPositionManager(PlayerKitsF plugin, InventoryEditManager inventoryEditManager){ this.plugin = plugin; this.inventoryEditManager = inventoryEditManager; } @@ -147,7 +147,7 @@ public class InventoryEditPositionManager { if(item == null || item.getType().equals(Material.AIR)){ //Update position setPosition(inventoryPlayer,slot); - inventoryPlayer.getPlayer().sendMessage(MessagesManager.getLegacyColoredMessage(PlayerKits2.prefix+"&aKit position updated.")); + inventoryPlayer.getPlayer().sendMessage(MessagesManager.getLegacyColoredMessage(PlayerKitsF.prefix+"&aKit position updated.")); return; } @@ -156,20 +156,17 @@ public class InventoryEditPositionManager { openInventory(inventoryPlayer,openInventory); return; } - inventoryPlayer.getPlayer().sendMessage(MessagesManager.getLegacyColoredMessage(PlayerKits2.prefix+"&cThis position is occupied.")); + inventoryPlayer.getPlayer().sendMessage(MessagesManager.getLegacyColoredMessage(PlayerKitsF.prefix+"&cThis position is occupied.")); } } public void closeInventory(InventoryPlayer inventoryPlayer){ boolean mustReturn = Boolean.parseBoolean(inventoryPlayer.getInventoryName().split(";")[2]); if(mustReturn){ - new BukkitRunnable(){ - @Override - public void run() { - inventoryPlayer.restoreSavedInventoryContents(); - inventoryEditManager.openInventory(inventoryPlayer); - } - }.runTaskLater(plugin,1L); + FoliaScheduler.runTaskLater(plugin, () -> { + inventoryPlayer.restoreSavedInventoryContents(); + inventoryEditManager.openInventory(inventoryPlayer); + }, 1L); } } } diff --git a/src/main/java/pk/ajneb97/managers/edit/InventoryEditRequirementsManager.java b/src/main/java/dr/bunchy7s/managers/edit/InventoryEditRequirementsManager.java similarity index 90% rename from src/main/java/pk/ajneb97/managers/edit/InventoryEditRequirementsManager.java rename to src/main/java/dr/bunchy7s/managers/edit/InventoryEditRequirementsManager.java index 1cae7bf..0c3f346 100644 --- a/src/main/java/pk/ajneb97/managers/edit/InventoryEditRequirementsManager.java +++ b/src/main/java/dr/bunchy7s/managers/edit/InventoryEditRequirementsManager.java @@ -1,4 +1,4 @@ -package pk.ajneb97.managers.edit; +package dr.bunchy7s.managers.edit; import org.bukkit.Bukkit; import org.bukkit.Material; @@ -6,21 +6,21 @@ import org.bukkit.entity.Player; import org.bukkit.event.inventory.ClickType; import org.bukkit.inventory.Inventory; import org.bukkit.inventory.ItemStack; -import pk.ajneb97.PlayerKits2; -import pk.ajneb97.managers.MessagesManager; -import pk.ajneb97.model.Kit; -import pk.ajneb97.model.KitRequirements; -import pk.ajneb97.model.inventory.InventoryPlayer; -import pk.ajneb97.utils.InventoryItem; +import dr.bunchy7s.PlayerKitsF; +import dr.bunchy7s.managers.MessagesManager; +import dr.bunchy7s.model.Kit; +import dr.bunchy7s.model.KitRequirements; +import dr.bunchy7s.model.inventory.InventoryPlayer; +import dr.bunchy7s.utils.InventoryItem; import java.util.ArrayList; import java.util.List; public class InventoryEditRequirementsManager { - private PlayerKits2 plugin; + private PlayerKitsF plugin; private InventoryEditManager inventoryEditManager; - public InventoryEditRequirementsManager(PlayerKits2 plugin, InventoryEditManager inventoryEditManager){ + public InventoryEditRequirementsManager(PlayerKitsF plugin, InventoryEditManager inventoryEditManager){ this.plugin = plugin; this.inventoryEditManager = inventoryEditManager; } @@ -87,7 +87,7 @@ public class InventoryEditRequirementsManager { public void clickPrice(InventoryPlayer inventoryPlayer){ Player player = inventoryPlayer.getPlayer(); - player.sendMessage(MessagesManager.getLegacyColoredMessage(PlayerKits2.prefix+"&7Write the new price of the kit.")); + player.sendMessage(MessagesManager.getLegacyColoredMessage(PlayerKitsF.prefix+"&7Write the new price of the kit.")); player.closeInventory(); inventoryPlayer.setInventoryName("edit_chat_price"); @@ -112,7 +112,7 @@ public class InventoryEditRequirementsManager { return; } }catch(Exception e){} - player.sendMessage(MessagesManager.getLegacyColoredMessage(PlayerKits2.prefix+"&cYou must use a valid number.")); + player.sendMessage(MessagesManager.getLegacyColoredMessage(PlayerKitsF.prefix+"&cYou must use a valid number.")); } public void clickInventory(InventoryPlayer inventoryPlayer, ItemStack item, int slot, ClickType clickType) { diff --git a/src/main/java/pk/ajneb97/model/Kit.java b/src/main/java/dr/bunchy7s/model/Kit.java similarity index 98% rename from src/main/java/pk/ajneb97/model/Kit.java rename to src/main/java/dr/bunchy7s/model/Kit.java index bad7bfe..a71228c 100644 --- a/src/main/java/pk/ajneb97/model/Kit.java +++ b/src/main/java/dr/bunchy7s/model/Kit.java @@ -1,8 +1,8 @@ -package pk.ajneb97.model; +package dr.bunchy7s.model; import org.bukkit.command.CommandSender; -import pk.ajneb97.model.item.KitItem; -import pk.ajneb97.utils.PlayerUtils; +import dr.bunchy7s.model.item.KitItem; +import dr.bunchy7s.utils.PlayerUtils; import java.util.ArrayList; diff --git a/src/main/java/pk/ajneb97/model/KitAction.java b/src/main/java/dr/bunchy7s/model/KitAction.java similarity index 95% rename from src/main/java/pk/ajneb97/model/KitAction.java rename to src/main/java/dr/bunchy7s/model/KitAction.java index 6683144..0525014 100644 --- a/src/main/java/pk/ajneb97/model/KitAction.java +++ b/src/main/java/dr/bunchy7s/model/KitAction.java @@ -1,6 +1,6 @@ -package pk.ajneb97.model; +package dr.bunchy7s.model; -import pk.ajneb97.model.item.KitItem; +import dr.bunchy7s.model.item.KitItem; public class KitAction { private String action; diff --git a/src/main/java/pk/ajneb97/model/KitRequirements.java b/src/main/java/dr/bunchy7s/model/KitRequirements.java similarity index 98% rename from src/main/java/pk/ajneb97/model/KitRequirements.java rename to src/main/java/dr/bunchy7s/model/KitRequirements.java index 39ea82d..a46c11e 100644 --- a/src/main/java/pk/ajneb97/model/KitRequirements.java +++ b/src/main/java/dr/bunchy7s/model/KitRequirements.java @@ -1,4 +1,4 @@ -package pk.ajneb97.model; +package dr.bunchy7s.model; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/pk/ajneb97/model/PlayerData.java b/src/main/java/dr/bunchy7s/model/PlayerData.java similarity index 99% rename from src/main/java/pk/ajneb97/model/PlayerData.java rename to src/main/java/dr/bunchy7s/model/PlayerData.java index 1b3cb7b..cf94cd6 100644 --- a/src/main/java/pk/ajneb97/model/PlayerData.java +++ b/src/main/java/dr/bunchy7s/model/PlayerData.java @@ -1,4 +1,4 @@ -package pk.ajneb97.model; +package dr.bunchy7s.model; import java.util.ArrayList; import java.util.UUID; diff --git a/src/main/java/pk/ajneb97/model/PlayerDataKit.java b/src/main/java/dr/bunchy7s/model/PlayerDataKit.java similarity index 97% rename from src/main/java/pk/ajneb97/model/PlayerDataKit.java rename to src/main/java/dr/bunchy7s/model/PlayerDataKit.java index 4991d19..95e9ff6 100644 --- a/src/main/java/pk/ajneb97/model/PlayerDataKit.java +++ b/src/main/java/dr/bunchy7s/model/PlayerDataKit.java @@ -1,4 +1,4 @@ -package pk.ajneb97.model; +package dr.bunchy7s.model; public class PlayerDataKit { diff --git a/src/main/java/pk/ajneb97/model/internal/GenericCallback.java b/src/main/java/dr/bunchy7s/model/internal/GenericCallback.java similarity index 65% rename from src/main/java/pk/ajneb97/model/internal/GenericCallback.java rename to src/main/java/dr/bunchy7s/model/internal/GenericCallback.java index a5b33a1..3fb1978 100644 --- a/src/main/java/pk/ajneb97/model/internal/GenericCallback.java +++ b/src/main/java/dr/bunchy7s/model/internal/GenericCallback.java @@ -1,4 +1,4 @@ -package pk.ajneb97.model.internal; +package dr.bunchy7s.model.internal; public interface GenericCallback { diff --git a/src/main/java/pk/ajneb97/model/internal/GiveKitInstructions.java b/src/main/java/dr/bunchy7s/model/internal/GiveKitInstructions.java similarity index 97% rename from src/main/java/pk/ajneb97/model/internal/GiveKitInstructions.java rename to src/main/java/dr/bunchy7s/model/internal/GiveKitInstructions.java index ee347b8..5e752d5 100644 --- a/src/main/java/pk/ajneb97/model/internal/GiveKitInstructions.java +++ b/src/main/java/dr/bunchy7s/model/internal/GiveKitInstructions.java @@ -1,4 +1,4 @@ -package pk.ajneb97.model.internal; +package dr.bunchy7s.model.internal; public class GiveKitInstructions { diff --git a/src/main/java/pk/ajneb97/model/internal/KitPosition.java b/src/main/java/dr/bunchy7s/model/internal/KitPosition.java similarity index 93% rename from src/main/java/pk/ajneb97/model/internal/KitPosition.java rename to src/main/java/dr/bunchy7s/model/internal/KitPosition.java index 1b97c45..19a81fd 100644 --- a/src/main/java/pk/ajneb97/model/internal/KitPosition.java +++ b/src/main/java/dr/bunchy7s/model/internal/KitPosition.java @@ -1,4 +1,4 @@ -package pk.ajneb97.model.internal; +package dr.bunchy7s.model.internal; public class KitPosition { diff --git a/src/main/java/pk/ajneb97/model/internal/KitVariable.java b/src/main/java/dr/bunchy7s/model/internal/KitVariable.java similarity index 93% rename from src/main/java/pk/ajneb97/model/internal/KitVariable.java rename to src/main/java/dr/bunchy7s/model/internal/KitVariable.java index b70fcb6..ac47d9a 100644 --- a/src/main/java/pk/ajneb97/model/internal/KitVariable.java +++ b/src/main/java/dr/bunchy7s/model/internal/KitVariable.java @@ -1,4 +1,4 @@ -package pk.ajneb97.model.internal; +package dr.bunchy7s.model.internal; public class KitVariable { private String variable; diff --git a/src/main/java/pk/ajneb97/model/internal/PlayerKitsMessageResult.java b/src/main/java/dr/bunchy7s/model/internal/PlayerKitsMessageResult.java similarity index 96% rename from src/main/java/pk/ajneb97/model/internal/PlayerKitsMessageResult.java rename to src/main/java/dr/bunchy7s/model/internal/PlayerKitsMessageResult.java index fda4f0e..01806b7 100644 --- a/src/main/java/pk/ajneb97/model/internal/PlayerKitsMessageResult.java +++ b/src/main/java/dr/bunchy7s/model/internal/PlayerKitsMessageResult.java @@ -1,4 +1,4 @@ -package pk.ajneb97.model.internal; +package dr.bunchy7s.model.internal; public class PlayerKitsMessageResult { diff --git a/src/main/java/pk/ajneb97/model/internal/SimpleCallback.java b/src/main/java/dr/bunchy7s/model/internal/SimpleCallback.java similarity index 61% rename from src/main/java/pk/ajneb97/model/internal/SimpleCallback.java rename to src/main/java/dr/bunchy7s/model/internal/SimpleCallback.java index 65f35e8..f6b82c2 100644 --- a/src/main/java/pk/ajneb97/model/internal/SimpleCallback.java +++ b/src/main/java/dr/bunchy7s/model/internal/SimpleCallback.java @@ -1,4 +1,4 @@ -package pk.ajneb97.model.internal; +package dr.bunchy7s.model.internal; public interface SimpleCallback { diff --git a/src/main/java/pk/ajneb97/model/inventory/InventoryPlayer.java b/src/main/java/dr/bunchy7s/model/inventory/InventoryPlayer.java similarity index 97% rename from src/main/java/pk/ajneb97/model/inventory/InventoryPlayer.java rename to src/main/java/dr/bunchy7s/model/inventory/InventoryPlayer.java index 3536000..f552379 100644 --- a/src/main/java/pk/ajneb97/model/inventory/InventoryPlayer.java +++ b/src/main/java/dr/bunchy7s/model/inventory/InventoryPlayer.java @@ -1,4 +1,4 @@ -package pk.ajneb97.model.inventory; +package dr.bunchy7s.model.inventory; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; diff --git a/src/main/java/pk/ajneb97/model/inventory/ItemKitInventory.java b/src/main/java/dr/bunchy7s/model/inventory/ItemKitInventory.java similarity index 96% rename from src/main/java/pk/ajneb97/model/inventory/ItemKitInventory.java rename to src/main/java/dr/bunchy7s/model/inventory/ItemKitInventory.java index e541681..ededd80 100644 --- a/src/main/java/pk/ajneb97/model/inventory/ItemKitInventory.java +++ b/src/main/java/dr/bunchy7s/model/inventory/ItemKitInventory.java @@ -1,6 +1,6 @@ -package pk.ajneb97.model.inventory; +package dr.bunchy7s.model.inventory; -import pk.ajneb97.model.item.KitItem; +import dr.bunchy7s.model.item.KitItem; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/pk/ajneb97/model/inventory/KitInventory.java b/src/main/java/dr/bunchy7s/model/inventory/KitInventory.java similarity index 97% rename from src/main/java/pk/ajneb97/model/inventory/KitInventory.java rename to src/main/java/dr/bunchy7s/model/inventory/KitInventory.java index 0055a19..cff1c8f 100644 --- a/src/main/java/pk/ajneb97/model/inventory/KitInventory.java +++ b/src/main/java/dr/bunchy7s/model/inventory/KitInventory.java @@ -1,4 +1,4 @@ -package pk.ajneb97.model.inventory; +package dr.bunchy7s.model.inventory; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/pk/ajneb97/model/item/KitItem.java b/src/main/java/dr/bunchy7s/model/item/KitItem.java similarity index 98% rename from src/main/java/pk/ajneb97/model/item/KitItem.java rename to src/main/java/dr/bunchy7s/model/item/KitItem.java index 3f9ebc3..a3fa985 100644 --- a/src/main/java/pk/ajneb97/model/item/KitItem.java +++ b/src/main/java/dr/bunchy7s/model/item/KitItem.java @@ -1,9 +1,9 @@ -package pk.ajneb97.model.item; +package dr.bunchy7s.model.item; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.ItemMeta; -import pk.ajneb97.PlayerKits2; -import pk.ajneb97.utils.ItemUtils; +import dr.bunchy7s.PlayerKitsF; +import dr.bunchy7s.utils.ItemUtils; import java.util.ArrayList; import java.util.List; @@ -275,7 +275,7 @@ public class KitItem{ this.previewSlot = previewSlot; } - public void removeOffHandFromEditInventory(PlayerKits2 plugin){ + public void removeOffHandFromEditInventory(PlayerKitsF plugin){ //Assumes that has the lore and the nbt if(originalItem != null){ ItemMeta meta = originalItem.getItemMeta(); diff --git a/src/main/java/pk/ajneb97/model/item/KitItemBannerData.java b/src/main/java/dr/bunchy7s/model/item/KitItemBannerData.java similarity index 95% rename from src/main/java/pk/ajneb97/model/item/KitItemBannerData.java rename to src/main/java/dr/bunchy7s/model/item/KitItemBannerData.java index 2cd91b9..03f2b2f 100644 --- a/src/main/java/pk/ajneb97/model/item/KitItemBannerData.java +++ b/src/main/java/dr/bunchy7s/model/item/KitItemBannerData.java @@ -1,4 +1,4 @@ -package pk.ajneb97.model.item; +package dr.bunchy7s.model.item; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/pk/ajneb97/model/item/KitItemBookData.java b/src/main/java/dr/bunchy7s/model/item/KitItemBookData.java similarity index 97% rename from src/main/java/pk/ajneb97/model/item/KitItemBookData.java rename to src/main/java/dr/bunchy7s/model/item/KitItemBookData.java index 2460a3e..927ebd8 100644 --- a/src/main/java/pk/ajneb97/model/item/KitItemBookData.java +++ b/src/main/java/dr/bunchy7s/model/item/KitItemBookData.java @@ -1,4 +1,4 @@ -package pk.ajneb97.model.item; +package dr.bunchy7s.model.item; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/pk/ajneb97/model/item/KitItemCustomModelComponentData.java b/src/main/java/dr/bunchy7s/model/item/KitItemCustomModelComponentData.java similarity index 97% rename from src/main/java/pk/ajneb97/model/item/KitItemCustomModelComponentData.java rename to src/main/java/dr/bunchy7s/model/item/KitItemCustomModelComponentData.java index 8ffc0c7..addad16 100644 --- a/src/main/java/pk/ajneb97/model/item/KitItemCustomModelComponentData.java +++ b/src/main/java/dr/bunchy7s/model/item/KitItemCustomModelComponentData.java @@ -1,4 +1,4 @@ -package pk.ajneb97.model.item; +package dr.bunchy7s.model.item; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/pk/ajneb97/model/item/KitItemFireworkData.java b/src/main/java/dr/bunchy7s/model/item/KitItemFireworkData.java similarity index 97% rename from src/main/java/pk/ajneb97/model/item/KitItemFireworkData.java rename to src/main/java/dr/bunchy7s/model/item/KitItemFireworkData.java index aa46ac4..8d5b924 100644 --- a/src/main/java/pk/ajneb97/model/item/KitItemFireworkData.java +++ b/src/main/java/dr/bunchy7s/model/item/KitItemFireworkData.java @@ -1,4 +1,4 @@ -package pk.ajneb97.model.item; +package dr.bunchy7s.model.item; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/pk/ajneb97/model/item/KitItemPotionData.java b/src/main/java/dr/bunchy7s/model/item/KitItemPotionData.java similarity index 98% rename from src/main/java/pk/ajneb97/model/item/KitItemPotionData.java rename to src/main/java/dr/bunchy7s/model/item/KitItemPotionData.java index f629e80..39cb45d 100644 --- a/src/main/java/pk/ajneb97/model/item/KitItemPotionData.java +++ b/src/main/java/dr/bunchy7s/model/item/KitItemPotionData.java @@ -1,4 +1,4 @@ -package pk.ajneb97.model.item; +package dr.bunchy7s.model.item; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/pk/ajneb97/model/item/KitItemSkullData.java b/src/main/java/dr/bunchy7s/model/item/KitItemSkullData.java similarity index 96% rename from src/main/java/pk/ajneb97/model/item/KitItemSkullData.java rename to src/main/java/dr/bunchy7s/model/item/KitItemSkullData.java index 0504b90..9200302 100644 --- a/src/main/java/pk/ajneb97/model/item/KitItemSkullData.java +++ b/src/main/java/dr/bunchy7s/model/item/KitItemSkullData.java @@ -1,4 +1,4 @@ -package pk.ajneb97.model.item; +package dr.bunchy7s.model.item; public class KitItemSkullData { diff --git a/src/main/java/pk/ajneb97/model/item/KitItemTrimData.java b/src/main/java/dr/bunchy7s/model/item/KitItemTrimData.java similarity index 94% rename from src/main/java/pk/ajneb97/model/item/KitItemTrimData.java rename to src/main/java/dr/bunchy7s/model/item/KitItemTrimData.java index effd046..82acf67 100644 --- a/src/main/java/pk/ajneb97/model/item/KitItemTrimData.java +++ b/src/main/java/dr/bunchy7s/model/item/KitItemTrimData.java @@ -1,4 +1,4 @@ -package pk.ajneb97.model.item; +package dr.bunchy7s.model.item; public class KitItemTrimData { diff --git a/src/main/java/pk/ajneb97/model/verify/PKBaseError.java b/src/main/java/dr/bunchy7s/model/verify/PKBaseError.java similarity index 97% rename from src/main/java/pk/ajneb97/model/verify/PKBaseError.java rename to src/main/java/dr/bunchy7s/model/verify/PKBaseError.java index a4a3e4f..8cca3f5 100644 --- a/src/main/java/pk/ajneb97/model/verify/PKBaseError.java +++ b/src/main/java/dr/bunchy7s/model/verify/PKBaseError.java @@ -1,4 +1,4 @@ -package pk.ajneb97.model.verify; +package dr.bunchy7s.model.verify; import org.bukkit.entity.Player; diff --git a/src/main/java/pk/ajneb97/model/verify/PKInvalidItem.java b/src/main/java/dr/bunchy7s/model/verify/PKInvalidItem.java similarity index 92% rename from src/main/java/pk/ajneb97/model/verify/PKInvalidItem.java rename to src/main/java/dr/bunchy7s/model/verify/PKInvalidItem.java index f67ea5f..ca31321 100644 --- a/src/main/java/pk/ajneb97/model/verify/PKInvalidItem.java +++ b/src/main/java/dr/bunchy7s/model/verify/PKInvalidItem.java @@ -1,7 +1,7 @@ -package pk.ajneb97.model.verify; +package dr.bunchy7s.model.verify; import org.bukkit.entity.Player; -import pk.ajneb97.utils.JSONMessage; +import dr.bunchy7s.utils.JSONMessage; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/pk/ajneb97/model/verify/PKInventoryDefaultNotExistsError.java b/src/main/java/dr/bunchy7s/model/verify/PKInventoryDefaultNotExistsError.java similarity index 93% rename from src/main/java/pk/ajneb97/model/verify/PKInventoryDefaultNotExistsError.java rename to src/main/java/dr/bunchy7s/model/verify/PKInventoryDefaultNotExistsError.java index 57f7a9f..3deb3a9 100644 --- a/src/main/java/pk/ajneb97/model/verify/PKInventoryDefaultNotExistsError.java +++ b/src/main/java/dr/bunchy7s/model/verify/PKInventoryDefaultNotExistsError.java @@ -1,7 +1,7 @@ -package pk.ajneb97.model.verify; +package dr.bunchy7s.model.verify; import org.bukkit.entity.Player; -import pk.ajneb97.utils.JSONMessage; +import dr.bunchy7s.utils.JSONMessage; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/pk/ajneb97/model/verify/PKInventoryInvalidKitError.java b/src/main/java/dr/bunchy7s/model/verify/PKInventoryInvalidKitError.java similarity index 93% rename from src/main/java/pk/ajneb97/model/verify/PKInventoryInvalidKitError.java rename to src/main/java/dr/bunchy7s/model/verify/PKInventoryInvalidKitError.java index a593a91..8305470 100644 --- a/src/main/java/pk/ajneb97/model/verify/PKInventoryInvalidKitError.java +++ b/src/main/java/dr/bunchy7s/model/verify/PKInventoryInvalidKitError.java @@ -1,7 +1,7 @@ -package pk.ajneb97.model.verify; +package dr.bunchy7s.model.verify; import org.bukkit.entity.Player; -import pk.ajneb97.utils.JSONMessage; +import dr.bunchy7s.utils.JSONMessage; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/pk/ajneb97/model/verify/PKInventoryInvalidSlotError.java b/src/main/java/dr/bunchy7s/model/verify/PKInventoryInvalidSlotError.java similarity index 93% rename from src/main/java/pk/ajneb97/model/verify/PKInventoryInvalidSlotError.java rename to src/main/java/dr/bunchy7s/model/verify/PKInventoryInvalidSlotError.java index 93aa24c..b155430 100644 --- a/src/main/java/pk/ajneb97/model/verify/PKInventoryInvalidSlotError.java +++ b/src/main/java/dr/bunchy7s/model/verify/PKInventoryInvalidSlotError.java @@ -1,7 +1,7 @@ -package pk.ajneb97.model.verify; +package dr.bunchy7s.model.verify; import org.bukkit.entity.Player; -import pk.ajneb97.utils.JSONMessage; +import dr.bunchy7s.utils.JSONMessage; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/pk/ajneb97/model/verify/PKInventoryNotExistsError.java b/src/main/java/dr/bunchy7s/model/verify/PKInventoryNotExistsError.java similarity index 93% rename from src/main/java/pk/ajneb97/model/verify/PKInventoryNotExistsError.java rename to src/main/java/dr/bunchy7s/model/verify/PKInventoryNotExistsError.java index 34fa075..0c30ab0 100644 --- a/src/main/java/pk/ajneb97/model/verify/PKInventoryNotExistsError.java +++ b/src/main/java/dr/bunchy7s/model/verify/PKInventoryNotExistsError.java @@ -1,7 +1,7 @@ -package pk.ajneb97.model.verify; +package dr.bunchy7s.model.verify; import org.bukkit.entity.Player; -import pk.ajneb97.utils.JSONMessage; +import dr.bunchy7s.utils.JSONMessage; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/pk/ajneb97/model/verify/PKKitActionError.java b/src/main/java/dr/bunchy7s/model/verify/PKKitActionError.java similarity index 94% rename from src/main/java/pk/ajneb97/model/verify/PKKitActionError.java rename to src/main/java/dr/bunchy7s/model/verify/PKKitActionError.java index 32c094e..5cbc3a5 100644 --- a/src/main/java/pk/ajneb97/model/verify/PKKitActionError.java +++ b/src/main/java/dr/bunchy7s/model/verify/PKKitActionError.java @@ -1,7 +1,7 @@ -package pk.ajneb97.model.verify; +package dr.bunchy7s.model.verify; import org.bukkit.entity.Player; -import pk.ajneb97.utils.JSONMessage; +import dr.bunchy7s.utils.JSONMessage; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/pk/ajneb97/model/verify/PKKitDisplayItemError.java b/src/main/java/dr/bunchy7s/model/verify/PKKitDisplayItemError.java similarity index 91% rename from src/main/java/pk/ajneb97/model/verify/PKKitDisplayItemError.java rename to src/main/java/dr/bunchy7s/model/verify/PKKitDisplayItemError.java index 2e1ec36..4538641 100644 --- a/src/main/java/pk/ajneb97/model/verify/PKKitDisplayItemError.java +++ b/src/main/java/dr/bunchy7s/model/verify/PKKitDisplayItemError.java @@ -1,7 +1,7 @@ -package pk.ajneb97.model.verify; +package dr.bunchy7s.model.verify; import org.bukkit.entity.Player; -import pk.ajneb97.utils.JSONMessage; +import dr.bunchy7s.utils.JSONMessage; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/pk/ajneb97/tasks/InventoryUpdateTaskManager.java b/src/main/java/dr/bunchy7s/tasks/InventoryUpdateTaskManager.java similarity index 73% rename from src/main/java/pk/ajneb97/tasks/InventoryUpdateTaskManager.java rename to src/main/java/dr/bunchy7s/tasks/InventoryUpdateTaskManager.java index 53be133..bcd6517 100644 --- a/src/main/java/pk/ajneb97/tasks/InventoryUpdateTaskManager.java +++ b/src/main/java/dr/bunchy7s/tasks/InventoryUpdateTaskManager.java @@ -1,31 +1,26 @@ -package pk.ajneb97.tasks; +package dr.bunchy7s.tasks; import org.bukkit.Material; import org.bukkit.inventory.Inventory; import org.bukkit.inventory.ItemStack; -import org.bukkit.scheduler.BukkitRunnable; -import pk.ajneb97.PlayerKits2; -import pk.ajneb97.managers.*; -import pk.ajneb97.model.inventory.InventoryPlayer; -import pk.ajneb97.utils.InventoryUtils; -import pk.ajneb97.utils.ItemUtils; +import dr.bunchy7s.PlayerKitsF; +import dr.bunchy7s.libs.FoliaScheduler; +import dr.bunchy7s.managers.*; +import dr.bunchy7s.model.inventory.InventoryPlayer; +import dr.bunchy7s.utils.InventoryUtils; +import dr.bunchy7s.utils.ItemUtils; import java.util.ArrayList; public class InventoryUpdateTaskManager { - private PlayerKits2 plugin; - public InventoryUpdateTaskManager(PlayerKits2 plugin){ + private PlayerKitsF plugin; + public InventoryUpdateTaskManager(PlayerKitsF plugin){ this.plugin = plugin; } public void start(){ - new BukkitRunnable(){ - @Override - public void run() { - execute(); - } - }.runTaskTimer(plugin,0L,20L); + FoliaScheduler.runTaskTimer(plugin, this::execute, 0L, 20L); } public void execute(){ diff --git a/src/main/java/dr/bunchy7s/tasks/PlayerDataSaveTask.java b/src/main/java/dr/bunchy7s/tasks/PlayerDataSaveTask.java new file mode 100644 index 0000000..9f88de0 --- /dev/null +++ b/src/main/java/dr/bunchy7s/tasks/PlayerDataSaveTask.java @@ -0,0 +1,34 @@ +package dr.bunchy7s.tasks; + +import dr.bunchy7s.PlayerKitsF; +import dr.bunchy7s.libs.FoliaScheduler; + +public class PlayerDataSaveTask { + + private PlayerKitsF plugin; + private boolean end; + public PlayerDataSaveTask(PlayerKitsF plugin) { + this.plugin = plugin; + this.end = false; + } + + public void end() { + end = true; + } + + public void start(int seconds) { + long ticks = seconds * 20L; + + FoliaScheduler.runTaskTimerAsynchronously(plugin, () -> { + if (end) { + return; // The task will naturally stop being re-scheduled by the timer wrapper + } else { + execute(); + } + }, 0L, ticks); + } + + public void execute() { + plugin.getConfigsManager().getPlayersConfigManager().saveConfigs(); + } +} diff --git a/src/main/java/pk/ajneb97/utils/ActionUtils.java b/src/main/java/dr/bunchy7s/utils/ActionUtils.java similarity index 88% rename from src/main/java/pk/ajneb97/utils/ActionUtils.java rename to src/main/java/dr/bunchy7s/utils/ActionUtils.java index 6dd592a..827610d 100644 --- a/src/main/java/pk/ajneb97/utils/ActionUtils.java +++ b/src/main/java/dr/bunchy7s/utils/ActionUtils.java @@ -1,4 +1,4 @@ -package pk.ajneb97.utils; +package dr.bunchy7s.utils; import org.bukkit.*; import org.bukkit.command.ConsoleCommandSender; @@ -7,11 +7,12 @@ import org.bukkit.entity.Firework; import org.bukkit.entity.Player; import org.bukkit.inventory.meta.FireworkMeta; import org.bukkit.metadata.FixedMetadataValue; -import pk.ajneb97.PlayerKits2; -import pk.ajneb97.api.PlayerKitsAPI; -import pk.ajneb97.libs.actionbar.ActionBarAPI; -import pk.ajneb97.libs.titles.TitleAPI; -import pk.ajneb97.managers.MessagesManager; +import dr.bunchy7s.PlayerKitsF; +import dr.bunchy7s.api.PlayerKitsAPI; +import dr.bunchy7s.libs.FoliaScheduler; +import dr.bunchy7s.libs.actionbar.ActionBarAPI; +import dr.bunchy7s.libs.titles.TitleAPI; +import dr.bunchy7s.managers.MessagesManager; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; @@ -28,8 +29,11 @@ public class ActionUtils { } public static void consoleCommand(String actionLine){ - ConsoleCommandSender sender = Bukkit.getConsoleSender(); - Bukkit.dispatchCommand(sender, actionLine); + // On Folia, dispatchCommand must run on the global region thread + FoliaScheduler.runTask(PlayerKitsAPI.getPlugin(), () -> { + ConsoleCommandSender sender = Bukkit.getConsoleSender(); + Bukkit.dispatchCommand(sender, actionLine); + }); } public static void playerCommand(Player player, String actionLine){ @@ -46,7 +50,7 @@ public class ActionUtils { volume = Integer.valueOf(sep[1]); pitch = Float.valueOf(sep[2]); }catch(Exception e ) { - Bukkit.getConsoleSender().sendMessage(PlayerKits2.prefix+ + Bukkit.getConsoleSender().sendMessage(PlayerKitsF.prefix+ MessagesManager.getLegacyColoredMessage("&7Sound Name: &c"+sep[0]+" &7is not valid. Change it in the config!")); return; } @@ -72,7 +76,7 @@ public class ActionUtils { } } - public static void actionbar(Player player, String actionLine, PlayerKits2 plugin){ + public static void actionbar(Player player, String actionLine, PlayerKitsF plugin){ String[] sep = actionLine.split(";"); String text = sep[0]; int duration = Integer.valueOf(sep[1]); @@ -96,7 +100,7 @@ public class ActionUtils { TitleAPI.sendTitle(player,fadeIn,stay,fadeOut,title,subtitle); } - public static void firework(Player player,String actionLine,PlayerKits2 plugin){ + public static void firework(Player player,String actionLine,PlayerKitsF plugin){ ArrayList colors = new ArrayList(); FireworkEffect.Type type = null; ArrayList fadeColors = new ArrayList(); @@ -127,7 +131,7 @@ public class ActionUtils { Location location = player.getLocation(); - ServerVersion serverVersion = PlayerKits2.serverVersion; + ServerVersion serverVersion = PlayerKitsF.serverVersion; EntityType entityType = null; if(serverVersion.serverVersionGreaterEqualThan(serverVersion,ServerVersion.v1_20_R4)){ entityType = EntityType.FIREWORK_ROCKET; diff --git a/src/main/java/pk/ajneb97/utils/InventoryItem.java b/src/main/java/dr/bunchy7s/utils/InventoryItem.java similarity index 93% rename from src/main/java/pk/ajneb97/utils/InventoryItem.java rename to src/main/java/dr/bunchy7s/utils/InventoryItem.java index e71440a..3cc5ce5 100644 --- a/src/main/java/pk/ajneb97/utils/InventoryItem.java +++ b/src/main/java/dr/bunchy7s/utils/InventoryItem.java @@ -1,4 +1,4 @@ -package pk.ajneb97.utils; +package dr.bunchy7s.utils; import org.bukkit.Material; import org.bukkit.enchantments.Enchantment; @@ -6,8 +6,8 @@ import org.bukkit.inventory.Inventory; import org.bukkit.inventory.ItemFlag; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.ItemMeta; -import pk.ajneb97.managers.MessagesManager; -import pk.ajneb97.model.item.KitItemSkullData; +import dr.bunchy7s.managers.MessagesManager; +import dr.bunchy7s.model.item.KitItemSkullData; import java.util.List; diff --git a/src/main/java/pk/ajneb97/utils/InventoryUtils.java b/src/main/java/dr/bunchy7s/utils/InventoryUtils.java similarity index 98% rename from src/main/java/pk/ajneb97/utils/InventoryUtils.java rename to src/main/java/dr/bunchy7s/utils/InventoryUtils.java index f42b25b..85458b1 100644 --- a/src/main/java/pk/ajneb97/utils/InventoryUtils.java +++ b/src/main/java/dr/bunchy7s/utils/InventoryUtils.java @@ -1,4 +1,4 @@ -package pk.ajneb97.utils; +package dr.bunchy7s.utils; import org.bukkit.entity.Player; import org.bukkit.event.inventory.InventoryEvent; diff --git a/src/main/java/pk/ajneb97/utils/ItemUtils.java b/src/main/java/dr/bunchy7s/utils/ItemUtils.java similarity index 96% rename from src/main/java/pk/ajneb97/utils/ItemUtils.java rename to src/main/java/dr/bunchy7s/utils/ItemUtils.java index 0a11919..833b3dc 100644 --- a/src/main/java/pk/ajneb97/utils/ItemUtils.java +++ b/src/main/java/dr/bunchy7s/utils/ItemUtils.java @@ -1,4 +1,4 @@ -package pk.ajneb97.utils; +package dr.bunchy7s.utils; import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; @@ -37,8 +37,8 @@ import net.md_5.bungee.api.chat.BaseComponent; import net.md_5.bungee.chat.ComponentSerializer; import org.bukkit.profile.PlayerProfile; import org.bukkit.profile.PlayerTextures; -import pk.ajneb97.PlayerKits2; -import pk.ajneb97.model.item.*; +import dr.bunchy7s.PlayerKitsF; +import dr.bunchy7s.model.item.*; public class ItemUtils { @@ -61,26 +61,26 @@ public class ItemUtils { return stack; } - public static ItemStack setTagStringItem(PlayerKits2 plugin, ItemStack item, String key, String value) { + public static ItemStack setTagStringItem(PlayerKitsF plugin, ItemStack item, String key, String value) { return plugin.getNmsManager().setTagStringItem(item,key,value); } - public static String getTagStringItem(PlayerKits2 plugin, ItemStack item, String key) { + public static String getTagStringItem(PlayerKitsF plugin, ItemStack item, String key) { if(item == null || item.getType().equals(Material.AIR)){ return null; } return plugin.getNmsManager().getTagStringItem(item,key); } - public static ItemStack removeTagItem(PlayerKits2 plugin, ItemStack item, String key) { + public static ItemStack removeTagItem(PlayerKitsF plugin, ItemStack item, String key) { return plugin.getNmsManager().removeTagItem(item,key); } - public static List getNBT(PlayerKits2 plugin, ItemStack item){ + public static List getNBT(PlayerKitsF plugin, ItemStack item){ return plugin.getNmsManager().getNBT(item); } - public static ItemStack setNBT(PlayerKits2 plugin, ItemStack item, List nbtList){ + public static ItemStack setNBT(PlayerKitsF plugin, ItemStack item, List nbtList){ return plugin.getNmsManager().setNBT(item,nbtList); } @@ -96,7 +96,7 @@ public class ItemUtils { } SkullMeta skullMeta = (SkullMeta) item.getItemMeta(); - ServerVersion serverVersion = PlayerKits2.serverVersion; + ServerVersion serverVersion = PlayerKitsF.serverVersion; if(serverVersion.serverVersionGreaterEqualThan(serverVersion,ServerVersion.v1_21_R1)){ PlayerProfile profile = skullMeta.getOwnerProfile(); if(profile != null){ @@ -179,7 +179,7 @@ public class ItemUtils { } if(texture != null){ - ServerVersion serverVersion = PlayerKits2.serverVersion; + ServerVersion serverVersion = PlayerKitsF.serverVersion; if(serverVersion.serverVersionGreaterEqualThan(serverVersion,ServerVersion.v1_20_R2)){ UUID uuid = id != null ? UUID.fromString(id) : UUID.randomUUID(); PlayerProfile profile = Bukkit.createPlayerProfile(uuid,"playerkits"); @@ -249,7 +249,7 @@ public class ItemUtils { potionEffectsList.add(type+";"+amplifier+";"+duration); } } - ServerVersion serverVersion = PlayerKits2.serverVersion; + ServerVersion serverVersion = PlayerKitsF.serverVersion; if(serverVersion.serverVersionGreaterEqualThan(serverVersion,ServerVersion.v1_9_R1)) { if(meta.hasColor()) { potionColor = meta.getColor().asRGB(); @@ -299,7 +299,7 @@ public class ItemUtils { } } - ServerVersion serverVersion = PlayerKits2.serverVersion; + ServerVersion serverVersion = PlayerKitsF.serverVersion; if(serverVersion.serverVersionGreaterEqualThan(serverVersion,ServerVersion.v1_9_R1)) { int color = potionData.getPotionColor(); if(color != 0) { @@ -520,12 +520,12 @@ public class ItemUtils { .withColor(colorsList).withFade(fadeColorsList).build(); } - public static List getAttributes(PlayerKits2 plugin, ItemStack item){ + public static List getAttributes(PlayerKitsF plugin, ItemStack item){ if(OtherUtils.isLegacy()) { return plugin.getNmsManager().getAttributes(item); }else { //1.13+ - ServerVersion serverVersion = PlayerKits2.serverVersion; + ServerVersion serverVersion = PlayerKitsF.serverVersion; boolean newSystem = serverVersion.serverVersionGreaterEqualThan(serverVersion,ServerVersion.v1_21_R1); ItemMeta meta = item.getItemMeta(); @@ -559,7 +559,7 @@ public class ItemUtils { return null; } - public static ItemStack setAttributes(PlayerKits2 plugin, ItemStack item, List attributes) { + public static ItemStack setAttributes(PlayerKitsF plugin, ItemStack item, List attributes) { if(attributes == null) { return item; } @@ -568,7 +568,7 @@ public class ItemUtils { return plugin.getNmsManager().setAttributes(item,attributes); }else { //1.13+ - ServerVersion serverVersion = PlayerKits2.serverVersion; + ServerVersion serverVersion = PlayerKitsF.serverVersion; boolean newSystem = serverVersion.serverVersionGreaterEqualThan(serverVersion,ServerVersion.v1_21_R1); try{ @@ -617,10 +617,10 @@ public class ItemUtils { } // 1.21+ only - public static void addDummyAttribute(ItemMeta meta,PlayerKits2 plugin){ + public static void addDummyAttribute(ItemMeta meta,PlayerKitsF plugin){ try{ AttributeModifier modifier = new AttributeModifier(new NamespacedKey(plugin,"dummy_attribute"),0,AttributeModifier.Operation.ADD_NUMBER,EquipmentSlotGroup.FEET); - ServerVersion serverVersion = PlayerKits2.serverVersion; + ServerVersion serverVersion = PlayerKitsF.serverVersion; if(serverVersion.serverVersionGreaterEqualThan(serverVersion,ServerVersion.v1_21_R2)){ meta.addAttributeModifier(Attribute.GRAVITY, modifier); }else{ diff --git a/src/main/java/pk/ajneb97/utils/JSONMessage.java b/src/main/java/dr/bunchy7s/utils/JSONMessage.java similarity index 98% rename from src/main/java/pk/ajneb97/utils/JSONMessage.java rename to src/main/java/dr/bunchy7s/utils/JSONMessage.java index e73af42..92134a0 100644 --- a/src/main/java/pk/ajneb97/utils/JSONMessage.java +++ b/src/main/java/dr/bunchy7s/utils/JSONMessage.java @@ -1,4 +1,4 @@ -package pk.ajneb97.utils; +package dr.bunchy7s.utils; import net.md_5.bungee.api.chat.BaseComponent; import net.md_5.bungee.api.chat.ClickEvent; diff --git a/src/main/java/pk/ajneb97/utils/MiniMessageUtils.java b/src/main/java/dr/bunchy7s/utils/MiniMessageUtils.java similarity index 93% rename from src/main/java/pk/ajneb97/utils/MiniMessageUtils.java rename to src/main/java/dr/bunchy7s/utils/MiniMessageUtils.java index 93f5d33..b90b7a3 100644 --- a/src/main/java/pk/ajneb97/utils/MiniMessageUtils.java +++ b/src/main/java/dr/bunchy7s/utils/MiniMessageUtils.java @@ -1,4 +1,4 @@ -package pk.ajneb97.utils; +package dr.bunchy7s.utils; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.TextReplacementConfig; @@ -12,11 +12,11 @@ import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import org.bukkit.inventory.Inventory; import org.bukkit.inventory.meta.ItemMeta; -import pk.ajneb97.PlayerKits2; -import pk.ajneb97.managers.InventoryRequirementsManager; -import pk.ajneb97.managers.MessagesManager; -import pk.ajneb97.model.internal.KitVariable; -import pk.ajneb97.model.item.KitItem; +import dr.bunchy7s.PlayerKitsF; +import dr.bunchy7s.managers.InventoryRequirementsManager; +import dr.bunchy7s.managers.MessagesManager; +import dr.bunchy7s.model.internal.KitVariable; +import dr.bunchy7s.model.item.KitItem; import java.util.ArrayList; import java.util.List; @@ -74,7 +74,7 @@ public class MiniMessageUtils { meta.displayName(MiniMessage.miniMessage().deserialize(name).decoration(TextDecoration.ITALIC, false)); } - public static void setItemLore(ItemMeta meta, List lore, Player player, PlayerKits2 plugin){ + public static void setItemLore(ItemMeta meta, List lore, Player player, PlayerKitsF plugin){ List loreComponent = new ArrayList<>(); for(int i=0;i callback) { - new BukkitRunnable() { - @Override - public void run() { - PlayerData playerData = null; - CommonConfig playerConfig = getConfigFile(uuid+".yml",false); - if(playerConfig != null) { - // If config exists - FileConfiguration config = playerConfig.getConfig(); - String name = config.getString("name"); - ArrayList playerDataKits = new ArrayList<>(); - if (config.contains("kits")) { - for (String key : config.getConfigurationSection("kits").getKeys(false)) { - long cooldown = config.getLong("kits." + key + ".cooldown"); - boolean oneTime = config.getBoolean("kits." + key + ".one_time"); - boolean bought = config.getBoolean("kits." + key + ".bought"); - - PlayerDataKit playerDataKit = new PlayerDataKit(key); - playerDataKit.setCooldown(cooldown); - playerDataKit.setOneTime(oneTime); - playerDataKit.setBought(bought); - - playerDataKits.add(playerDataKit); - } - } - - playerData = new PlayerData(uuid, name); - playerData.setKits(playerDataKits); - } - - PlayerData finalPlayer = playerData; - - new BukkitRunnable(){ - @Override - public void run() { - callback.onDone(finalPlayer); - } - }.runTask(plugin); - } - }.runTaskAsynchronously(plugin); - } - - public void saveConfig(PlayerData playerData){ - String playerName = playerData.getName(); - CommonConfig playerConfig = getConfigFile(playerData.getUuid()+".yml",true); - FileConfiguration config = playerConfig.getConfig(); - - config.set("name", playerName); - config.set("kits",null); - - for(PlayerDataKit playerDataKit : playerData.getKits()){ - String kitName = playerDataKit.getName(); - config.set("kits."+kitName+".cooldown",playerDataKit.getCooldown()); - config.set("kits."+kitName+".one_time",playerDataKit.isOneTime()); - config.set("kits."+kitName+".bought",playerDataKit.isBought()); - } - - playerConfig.saveConfig(); - } - - @Override - public void saveConfigs(){ - Map players = plugin.getPlayerDataManager().getPlayers(); - boolean isMySQL = plugin.getConfigsManager().getMainConfigManager().isMySQL(); - if(!isMySQL){ - for(Map.Entry entry : players.entrySet()) { - PlayerData playerData = entry.getValue(); - if(playerData.isModified()){ - saveConfig(playerData); - } - playerData.setModified(false); - } - } - } - - public void resetKitForAllPlayers(String kitName){ - ArrayList configs = getConfigs(); - for(CommonConfig commonConfig : configs) { - FileConfiguration config = commonConfig.getConfig(); - if(!config.contains("kits."+kitName)){ - continue; - } - config.set("kits."+kitName,null); - - commonConfig.saveConfig(); - } - } -} diff --git a/src/main/java/pk/ajneb97/database/MySQLConnection.java b/src/main/java/pk/ajneb97/database/MySQLConnection.java deleted file mode 100644 index 22a5b94..0000000 --- a/src/main/java/pk/ajneb97/database/MySQLConnection.java +++ /dev/null @@ -1,236 +0,0 @@ -package pk.ajneb97.database; - -import org.bukkit.Bukkit; -import org.bukkit.configuration.file.FileConfiguration; -import org.bukkit.scheduler.BukkitRunnable; -import pk.ajneb97.PlayerKits2; -import pk.ajneb97.managers.MessagesManager; -import pk.ajneb97.model.PlayerData; -import pk.ajneb97.model.PlayerDataKit; -import pk.ajneb97.model.internal.GenericCallback; -import pk.ajneb97.model.internal.SimpleCallback; - -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.util.*; - -public class MySQLConnection { - - private PlayerKits2 plugin; - private HikariConnection connection; - - public MySQLConnection(PlayerKits2 plugin){ - this.plugin = plugin; - } - - public void setupMySql(){ - FileConfiguration config = plugin.getConfigsManager().getMainConfigManager().getConfig(); - try { - connection = new HikariConnection(config); - connection.getHikari().getConnection(); - createTables(); - Bukkit.getConsoleSender().sendMessage(MessagesManager.getLegacyColoredMessage(plugin.prefix+" &aSuccessfully connected to the Database.")); - }catch(Exception e) { - Bukkit.getConsoleSender().sendMessage(MessagesManager.getLegacyColoredMessage(plugin.prefix+" &cError while connecting to the Database.")); - } - } - - public Connection getConnection() { - try { - return connection.getHikari().getConnection(); - } catch (Exception e) { - e.printStackTrace(); - return null; - } - } - - public void createTables() { - try(Connection connection = getConnection()){ - PreparedStatement statement1 = connection.prepareStatement( - "CREATE TABLE IF NOT EXISTS playerkits_players" + - " (UUID varchar(200) NOT NULL, " + - " PLAYER_NAME varchar(50), " + - " PRIMARY KEY ( UUID ))" - ); - statement1.executeUpdate(); - PreparedStatement statement2 = connection.prepareStatement( - "CREATE TABLE IF NOT EXISTS playerkits_players_kits" + - " (ID int NOT NULL AUTO_INCREMENT, " + - " UUID varchar(200) NOT NULL, " + - " NAME varchar(100), " + - " COOLDOWN BIGINT, " + - " ONE_TIME BOOLEAN, " + - " BOUGHT BOOLEAN, " + - " PRIMARY KEY ( ID ), " + - " FOREIGN KEY (UUID) REFERENCES playerkits_players(UUID))"); - statement2.executeUpdate(); - } catch (SQLException e) { - e.printStackTrace(); - } - } - - public void getPlayer(String uuid, GenericCallback callback){ - new BukkitRunnable(){ - @Override - public void run() { - PlayerData player = null; - try(Connection connection = getConnection()){ - PreparedStatement statement = connection.prepareStatement( - "SELECT playerkits_players.UUID, playerkits_players.PLAYER_NAME, " + - "playerkits_players_kits.NAME, " + - "playerkits_players_kits.COOLDOWN, " + - "playerkits_players_kits.ONE_TIME, " + - "playerkits_players_kits.BOUGHT " + - "FROM playerkits_players LEFT JOIN playerkits_players_kits " + - "ON playerkits_players.UUID = playerkits_players_kits.UUID " + - "WHERE playerkits_players.UUID = ?"); - - statement.setString(1, uuid); - ResultSet result = statement.executeQuery(); - - boolean firstFind = true; - while(result.next()){ - UUID uuid = UUID.fromString(result.getString("UUID")); - String playerName = result.getString("PLAYER_NAME"); - String kitName = result.getString("NAME"); - long cooldown = result.getLong("COOLDOWN"); - boolean oneTime = result.getBoolean("ONE_TIME"); - boolean bought = result.getBoolean("BOUGHT"); - if(player == null){ - player = new PlayerData(uuid,playerName); - } - if(kitName != null){ - PlayerDataKit playerDataKit = new PlayerDataKit(kitName); - playerDataKit.setCooldown(cooldown); - playerDataKit.setOneTime(oneTime); - playerDataKit.setBought(bought); - player.addKit(playerDataKit); - } - } - - PlayerData finalPlayer = player; - new BukkitRunnable(){ - @Override - public void run() { - callback.onDone(finalPlayer); - } - }.runTask(plugin); - } catch (SQLException e) { - e.printStackTrace(); - } - } - }.runTaskAsynchronously(plugin); - } - - public void createPlayer(PlayerData player, SimpleCallback callback){ - new BukkitRunnable(){ - @Override - public void run() { - try(Connection connection = getConnection()){ - PreparedStatement statement = connection.prepareStatement( - "INSERT INTO playerkits_players " + - "(UUID, PLAYER_NAME) VALUE (?,?)"); - - statement.setString(1, player.getUuid().toString()); - statement.setString(2, player.getName()); - statement.executeUpdate(); - - new BukkitRunnable(){ - @Override - public void run() { - callback.onDone(); - } - }.runTask(plugin); - } catch (SQLException e) { - e.printStackTrace(); - } - } - }.runTaskAsynchronously(plugin); - } - - public void updatePlayerName(PlayerData player){ - new BukkitRunnable(){ - @Override - public void run() { - try(Connection connection = getConnection()){ - PreparedStatement statement = connection.prepareStatement( - "UPDATE playerkits_players SET " + - "PLAYER_NAME=? WHERE UUID=?"); - - statement.setString(1, player.getName()); - statement.setString(2, player.getUuid().toString()); - statement.executeUpdate(); - } catch (SQLException e) { - e.printStackTrace(); - } - } - }.runTaskAsynchronously(plugin); - } - - public void updateKit(PlayerData player,PlayerDataKit kit,boolean mustCreate){ - new BukkitRunnable(){ - @Override - public void run() { - try(Connection connection = getConnection()){ - PreparedStatement statement = null; - if(mustCreate){ - // Insert - statement = connection.prepareStatement( - "INSERT INTO playerkits_players_kits " + - "(UUID, NAME, COOLDOWN, ONE_TIME, BOUGHT) VALUE (?,?,?,?,?)"); - - statement.setString(1, player.getUuid().toString()); - statement.setString(2, kit.getName()); - statement.setLong(3, kit.getCooldown()); - statement.setBoolean(4, kit.isOneTime()); - statement.setBoolean(5, kit.isBought()); - }else{ - // Update - statement = connection.prepareStatement( - "UPDATE playerkits_players_kits SET " + - "COOLDOWN=?, ONE_TIME=?, BOUGHT=? WHERE UUID=? AND NAME=?"); - - statement.setLong(1, kit.getCooldown()); - statement.setBoolean(2, kit.isOneTime()); - statement.setBoolean(3, kit.isBought()); - statement.setString(4, player.getUuid().toString()); - statement.setString(5, kit.getName()); - } - statement.executeUpdate(); - } catch (SQLException e) { - e.printStackTrace(); - } - } - }.runTaskAsynchronously(plugin); - } - - public void resetKit(String uuid,String kitName,boolean all){ - new BukkitRunnable(){ - @Override - public void run() { - try(Connection connection = getConnection()){ - PreparedStatement statement; - if(all){ - statement = connection.prepareStatement( - "DELETE FROM playerkits_players_kits " + - "WHERE NAME=?"); - statement.setString(1, kitName); - }else{ - statement = connection.prepareStatement( - "DELETE FROM playerkits_players_kits " + - "WHERE UUID=? AND NAME=?"); - - statement.setString(1, uuid); - statement.setString(2, kitName); - } - statement.executeUpdate(); - - } catch (SQLException e) { - e.printStackTrace(); - } - } - }.runTaskAsynchronously(plugin); - } -} diff --git a/src/main/java/pk/ajneb97/managers/UpdateCheckerManager.java b/src/main/java/pk/ajneb97/managers/UpdateCheckerManager.java deleted file mode 100644 index c49a568..0000000 --- a/src/main/java/pk/ajneb97/managers/UpdateCheckerManager.java +++ /dev/null @@ -1,42 +0,0 @@ -package pk.ajneb97.managers; - - -import pk.ajneb97.model.internal.UpdateCheckerResult; - -import java.io.BufferedReader; -import java.io.InputStreamReader; -import java.net.HttpURLConnection; -import java.net.URL; - -public class UpdateCheckerManager { - - private String version; - private String latestVersion; - - public UpdateCheckerManager(String version){ - this.version = version; - } - - public UpdateCheckerResult check(){ - try { - HttpURLConnection con = (HttpURLConnection) new URL( - "https://api.spigotmc.org/legacy/update.php?resource=112616").openConnection(); - int timed_out = 1500; - con.setConnectTimeout(timed_out); - con.setReadTimeout(timed_out); - latestVersion = new BufferedReader(new InputStreamReader(con.getInputStream())).readLine(); - if (latestVersion.length() <= 7) { - if(!version.equals(latestVersion)){ - return UpdateCheckerResult.noErrors(latestVersion); - } - } - return UpdateCheckerResult.noErrors(null); - } catch (Exception ex) { - return UpdateCheckerResult.error(); - } - } - - public String getLatestVersion() { - return latestVersion; - } -} diff --git a/src/main/java/pk/ajneb97/model/internal/UpdateCheckerResult.java b/src/main/java/pk/ajneb97/model/internal/UpdateCheckerResult.java deleted file mode 100644 index d42b418..0000000 --- a/src/main/java/pk/ajneb97/model/internal/UpdateCheckerResult.java +++ /dev/null @@ -1,28 +0,0 @@ -package pk.ajneb97.model.internal; - -public class UpdateCheckerResult { - - private String latestVersion; - private boolean error; - - public UpdateCheckerResult(String latestVersion, boolean error){ - this.latestVersion = latestVersion; - this.error = error; - } - - public String getLatestVersion() { - return latestVersion; - } - - public boolean isError() { - return error; - } - - public static UpdateCheckerResult noErrors(String latestVersion){ - return new UpdateCheckerResult(latestVersion,false); - } - - public static UpdateCheckerResult error(){ - return new UpdateCheckerResult(null,true); - } -} diff --git a/src/main/java/pk/ajneb97/tasks/PlayerDataSaveTask.java b/src/main/java/pk/ajneb97/tasks/PlayerDataSaveTask.java deleted file mode 100644 index e573487..0000000 --- a/src/main/java/pk/ajneb97/tasks/PlayerDataSaveTask.java +++ /dev/null @@ -1,38 +0,0 @@ -package pk.ajneb97.tasks; - -import org.bukkit.scheduler.BukkitRunnable; -import pk.ajneb97.PlayerKits2; - -public class PlayerDataSaveTask { - - private PlayerKits2 plugin; - private boolean end; - public PlayerDataSaveTask(PlayerKits2 plugin) { - this.plugin = plugin; - this.end = false; - } - - public void end() { - end = true; - } - - public void start(int seconds) { - long ticks = seconds* 20L; - - new BukkitRunnable() { - @Override - public void run() { - if(end) { - this.cancel(); - }else { - execute(); - } - } - - }.runTaskTimerAsynchronously(plugin, 0L, ticks); - } - - public void execute() { - plugin.getConfigsManager().getPlayersConfigManager().saveConfigs(); - } -} diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index 6f983f3..dad7090 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -42,7 +42,6 @@ new_kit_default_values: item_flags: - HIDE_ATTRIBUTES player_data_save_time: 300 -update_notify: true use_minimessage: false mysql_database: enabled: false diff --git a/src/main/resources/messages.yml b/src/main/resources/messages.yml index 5205581..4a88be1 100644 --- a/src/main/resources/messages.yml +++ b/src/main/resources/messages.yml @@ -1,4 +1,4 @@ -prefix: "&8[&bPlayerKits&a²&8] " +prefix: "&8[&bPlayerKits&dF&8] " kitDoesNotExists: "&cThe kit &7%kit% &cdoesn't exists." kitNoPermissions: "&cYou don't have permissions to claim this kit." noSpaceError: "&cYou don't have enough space in your inventory." diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 2c0f8c8..0e645cf 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -1,11 +1,12 @@ -main: pk.ajneb97.PlayerKits2 +main: dr.bunchy7s.PlayerKitsF version: ${project.version} -name: PlayerKits2 +name: PlayerKitsF api-version: 1.13 +folia-supported: true softdepend: [Vault,PlaceholderAPI] -author: Ajneb97 +author: Ajneb97/bunchy7s commands: kit: - description: Main command of PlayerKits2 - aliases: [kits,playerkits] \ No newline at end of file + description: Main command of PlayerKitsF + aliases: [kits,playerkitsf] \ No newline at end of file