From 1dd7816c454bbca847430839d9cf6f07e1489652 Mon Sep 17 00:00:00 2001 From: Ajneb97 Date: Tue, 25 Jun 2024 08:45:57 -0400 Subject: [PATCH] 1.12.2 --- src/main/java/pk/ajneb97/MainCommand.java | 6 ++++-- .../pk/ajneb97/configs/MainConfigManager.java | 17 +++++++++++------ src/main/resources/config.yml | 1 + src/main/resources/plugin.yml | 2 +- 4 files changed, 17 insertions(+), 9 deletions(-) diff --git a/src/main/java/pk/ajneb97/MainCommand.java b/src/main/java/pk/ajneb97/MainCommand.java index 6128772..262fe89 100644 --- a/src/main/java/pk/ajneb97/MainCommand.java +++ b/src/main/java/pk/ajneb97/MainCommand.java @@ -312,11 +312,13 @@ public class MainCommand implements CommandExecutor, TabCompleter { return; } - boolean saveOriginalItems = false; + boolean saveOriginalItems = plugin.getConfigsManager().getMainConfigManager().isNewKitDefaultSaveModeOriginal(); if(args.length >= 3){ if(args[2].equalsIgnoreCase("original")){ saveOriginalItems = true; - }else if(!args[2].equalsIgnoreCase("configurable")){ + }else if(args[2].equalsIgnoreCase("configurable")){ + saveOriginalItems = false; + }else{ msgManager.sendMessage(player,messagesConfig.getString("commandCreateError"),true); return; } diff --git a/src/main/java/pk/ajneb97/configs/MainConfigManager.java b/src/main/java/pk/ajneb97/configs/MainConfigManager.java index 9c6578d..0144115 100644 --- a/src/main/java/pk/ajneb97/configs/MainConfigManager.java +++ b/src/main/java/pk/ajneb97/configs/MainConfigManager.java @@ -20,6 +20,7 @@ public class MainConfigManager { private boolean closeInventoryOnClaim; private boolean claimKitShortCommand; private boolean kitPreviewRequiresKitPermission; + private boolean newKitDefaultSaveModeOriginal; private String firstJoinKit; private String newKitDefaultInventory; private boolean isMySQL; @@ -29,6 +30,7 @@ public class MainConfigManager { this.plugin = plugin; this.configFile = new CustomConfig("config.yml",plugin,null, false); this.configFile.registerConfig(); + checkUpdate(); } public void configure(){ @@ -42,6 +44,7 @@ public class MainConfigManager { isMySQL = config.getBoolean("mysql_database.enabled"); updateNotify = config.getBoolean("update_notify"); claimKitShortCommand = config.getBoolean("claim_kit_short_command"); + newKitDefaultSaveModeOriginal = config.getBoolean("new_kit_default_save_mode_original"); } public boolean reloadConfig(){ @@ -60,13 +63,11 @@ public class MainConfigManager { Path pathConfig = Paths.get(configFile.getRoute()); try{ String text = new String(Files.readAllBytes(pathConfig)); - /* - if(!text.contains("register_commands:")){ - List commands = new ArrayList<>(); - getConfig().set("Config.register_commands", commands); - saveConfig(); + + if(!text.contains("new_kit_default_save_mode_original:")){ + getConfig().set("new_kit_default_save_mode_original", true); + configFile.saveConfig(); } - */ }catch(IOException e){ e.printStackTrace(); } @@ -107,4 +108,8 @@ public class MainConfigManager { public boolean isClaimKitShortCommand() { return claimKitShortCommand; } + + public boolean isNewKitDefaultSaveModeOriginal() { + return newKitDefaultSaveModeOriginal; + } } diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index 64f4f35..164a345 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -4,6 +4,7 @@ close_inventory_on_claim: false kit_preview: true kit_preview_requires_kit_permission: false first_join_kit: none +new_kit_default_save_mode_original: true new_kit_default_inventory: "main_inventory" new_kit_default_values: cooldown: 3600 diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 3464066..05ecda1 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -1,5 +1,5 @@ main: pk.ajneb97.PlayerKits2 -version: 1.12.1 +version: 1.12.2 name: PlayerKits2 api-version: 1.13 softdepend: [Vault,PlaceholderAPI]