diff --git a/build.gradle.kts b/build.gradle.kts index d8bf739d..8ca65452 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -38,11 +38,11 @@ dependencies { compileOnly("com.github.LoneDev6:API-ItemsAdder:3.5.0b") compileOnly("com.github.oraxen:oraxen:1.160.0") compileOnly("io.lumine:Mythic-Dist:5.3.5") - implementation("com.crypticlib:CrypticLib:0.3.7") + implementation("com.crypticlib:CrypticLib:0.4.0") } group = "com.github.yufiriamazenta" -version = "1.5.2-beta3" +version = "1.5.2-beta4" var pluginVersion: String = version.toString() + "-" + SimpleDateFormat("yyyyMMdd").format(System.currentTimeMillis()) java.sourceCompatibility = JavaVersion.VERSION_1_8 java.targetCompatibility = JavaVersion.VERSION_1_8 diff --git a/src/main/java/com/github/yufiriamazenta/craftorithm/Craftorithm.java b/src/main/java/com/github/yufiriamazenta/craftorithm/Craftorithm.java index 085bbc06..5a7356a7 100644 --- a/src/main/java/com/github/yufiriamazenta/craftorithm/Craftorithm.java +++ b/src/main/java/com/github/yufiriamazenta/craftorithm/Craftorithm.java @@ -30,11 +30,6 @@ public Craftorithm() { @Override public void enable() { - saveDefaultConfig(); -// ConfigUpdater.INSTANCE.updateConfig(); - PluginConfigs.reloadConfigs(); - Languages.reloadLanguages(); - ItemManager.reloadItemManager(); regListeners(); initArcenciel(); diff --git a/src/main/java/com/github/yufiriamazenta/craftorithm/arcenciel/ArcencielDispatcher.java b/src/main/java/com/github/yufiriamazenta/craftorithm/arcenciel/ArcencielDispatcher.java index 12cb7714..019dff05 100644 --- a/src/main/java/com/github/yufiriamazenta/craftorithm/arcenciel/ArcencielDispatcher.java +++ b/src/main/java/com/github/yufiriamazenta/craftorithm/arcenciel/ArcencielDispatcher.java @@ -7,7 +7,7 @@ import com.github.yufiriamazenta.craftorithm.arcenciel.obj.ReturnObj; import com.github.yufiriamazenta.craftorithm.arcenciel.token.*; import com.github.yufiriamazenta.craftorithm.util.PluginHookUtil; -import crypticlib.config.impl.YamlConfigWrapper; +import crypticlib.config.wrapper.YamlConfigWrapper; import org.bukkit.entity.Player; import java.util.List; diff --git a/src/main/java/com/github/yufiriamazenta/craftorithm/cmd/sub/CreateRecipeCommand.java b/src/main/java/com/github/yufiriamazenta/craftorithm/cmd/sub/CreateRecipeCommand.java index fe40d922..9ea40128 100644 --- a/src/main/java/com/github/yufiriamazenta/craftorithm/cmd/sub/CreateRecipeCommand.java +++ b/src/main/java/com/github/yufiriamazenta/craftorithm/cmd/sub/CreateRecipeCommand.java @@ -8,7 +8,7 @@ import com.github.yufiriamazenta.craftorithm.util.ItemUtils; import com.github.yufiriamazenta.craftorithm.util.LangUtil; import crypticlib.CrypticLib; -import crypticlib.config.impl.YamlConfigWrapper; +import crypticlib.config.wrapper.YamlConfigWrapper; import crypticlib.ui.display.Icon; import crypticlib.ui.display.MenuDisplay; import crypticlib.ui.display.MenuLayout; diff --git a/src/main/java/com/github/yufiriamazenta/craftorithm/cmd/sub/ReloadCommand.java b/src/main/java/com/github/yufiriamazenta/craftorithm/cmd/sub/ReloadCommand.java index 2c218c52..ebd1691e 100644 --- a/src/main/java/com/github/yufiriamazenta/craftorithm/cmd/sub/ReloadCommand.java +++ b/src/main/java/com/github/yufiriamazenta/craftorithm/cmd/sub/ReloadCommand.java @@ -1,5 +1,6 @@ package com.github.yufiriamazenta.craftorithm.cmd.sub; +import com.github.yufiriamazenta.craftorithm.Craftorithm; import com.github.yufiriamazenta.craftorithm.arcenciel.ArcencielDispatcher; import com.github.yufiriamazenta.craftorithm.config.Languages; import com.github.yufiriamazenta.craftorithm.config.PluginConfigs; @@ -39,8 +40,7 @@ public static void reloadPlugin() { } public static void reloadConfigs() { - PluginConfigs.reloadConfigs(); - Languages.reloadLanguages(); + Craftorithm.instance().reloadConfig(); ItemUtils.reloadCannotCraftLore(); ArcencielDispatcher.INSTANCE.functionFile().reloadConfig(); } diff --git a/src/main/java/com/github/yufiriamazenta/craftorithm/config/Languages.java b/src/main/java/com/github/yufiriamazenta/craftorithm/config/Languages.java index 0fbc25ee..38bf3af9 100644 --- a/src/main/java/com/github/yufiriamazenta/craftorithm/config/Languages.java +++ b/src/main/java/com/github/yufiriamazenta/craftorithm/config/Languages.java @@ -1,12 +1,9 @@ package com.github.yufiriamazenta.craftorithm.config; -import com.github.yufiriamazenta.craftorithm.config.entry.StringConfigEntry; -import com.github.yufiriamazenta.craftorithm.util.LangUtil; -import crypticlib.config.impl.YamlConfigWrapper; -import org.bukkit.configuration.file.YamlConfiguration; - -import java.lang.reflect.Field; +import crypticlib.config.YamlConfigHandler; +import crypticlib.config.entry.StringConfigEntry; +@YamlConfigHandler(path = "lang.yml") public class Languages { public static final StringConfigEntry prefix = new StringConfigEntry("prefix", "&8[&3Craftorithm&8]"); @@ -81,21 +78,4 @@ public class Languages { public static final StringConfigEntry loadMythicMobsHook = new StringConfigEntry("load.mythic_mobs_hook", " &a发现MythicMobs,已挂钩"); public static final StringConfigEntry loadMythicMobsNotExist = new StringConfigEntry("load.mythic_mobs_exist", " &c未发现MythicMobs"); - public static void reloadLanguages() { - YamlConfigWrapper langConfig = LangUtil.langConfigFile(); - langConfig.reloadConfig(); - YamlConfiguration config = langConfig.config(); - try { - for (Field field : Languages.class.getFields()) { - Object object = field.get(null); - if (object instanceof StringConfigEntry) { - ((StringConfigEntry) object).load(config); - } - } - } catch (IllegalAccessException e) { - e.printStackTrace(); - } - langConfig.saveConfig(); - } - } diff --git a/src/main/java/com/github/yufiriamazenta/craftorithm/config/PluginConfigs.java b/src/main/java/com/github/yufiriamazenta/craftorithm/config/PluginConfigs.java index d8b940fe..467389b9 100644 --- a/src/main/java/com/github/yufiriamazenta/craftorithm/config/PluginConfigs.java +++ b/src/main/java/com/github/yufiriamazenta/craftorithm/config/PluginConfigs.java @@ -1,10 +1,11 @@ package com.github.yufiriamazenta.craftorithm.config; import com.github.yufiriamazenta.craftorithm.Craftorithm; -import com.github.yufiriamazenta.craftorithm.config.entry.BooleanConfigEntry; -import com.github.yufiriamazenta.craftorithm.config.entry.StringConfigEntry; -import org.bukkit.configuration.file.YamlConfiguration; +import crypticlib.config.YamlConfigHandler; +import crypticlib.config.entry.BooleanConfigEntry; +import crypticlib.config.entry.StringConfigEntry; +@YamlConfigHandler(path = "config.yml") public class PluginConfigs { public final static StringConfigEntry version = new StringConfigEntry("version", Craftorithm.instance().getDescription().getVersion()); @@ -15,17 +16,4 @@ public class PluginConfigs { public final static BooleanConfigEntry bStats = new BooleanConfigEntry("bstats", true); public final static BooleanConfigEntry releaseDefaultRecipes = new BooleanConfigEntry("release_default_recipes", true); - public static void reloadConfigs() { - Craftorithm.instance().reloadConfig(); - YamlConfiguration config = (YamlConfiguration) Craftorithm.instance().getConfig(); - version.load(config); - checkUpdate.load(config); - removeAllVanillaRecipe.load(config); - loreCannotCraft.load(config); - allRecipeUnlocked.load(config); - bStats.load(config); - releaseDefaultRecipes.load(config); - Craftorithm.instance().saveConfig(); - } - } diff --git a/src/main/java/com/github/yufiriamazenta/craftorithm/config/entry/BooleanConfigEntry.java b/src/main/java/com/github/yufiriamazenta/craftorithm/config/entry/BooleanConfigEntry.java deleted file mode 100644 index c3fdd073..00000000 --- a/src/main/java/com/github/yufiriamazenta/craftorithm/config/entry/BooleanConfigEntry.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.github.yufiriamazenta.craftorithm.config.entry; - -import org.bukkit.configuration.ConfigurationSection; - -public class BooleanConfigEntry extends ConfigEntry { - - public BooleanConfigEntry(String key, Boolean def) { - super(key, def); - } - - @Override - public void load(ConfigurationSection config) { - if (!config.contains(key())) { - config.set(key(), value()); - setValue(def()); - return; - } - setValue(config.getBoolean(key())); - } - -} diff --git a/src/main/java/com/github/yufiriamazenta/craftorithm/config/entry/ConfigEntry.java b/src/main/java/com/github/yufiriamazenta/craftorithm/config/entry/ConfigEntry.java deleted file mode 100644 index 51d8264d..00000000 --- a/src/main/java/com/github/yufiriamazenta/craftorithm/config/entry/ConfigEntry.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.github.yufiriamazenta.craftorithm.config.entry; - -import org.bukkit.configuration.ConfigurationSection; - -public abstract class ConfigEntry { - - private String key; - private T value; - private final T def; - - ConfigEntry(String key, T def) { - this.key = key; - this.def = def; - } - - public T value() { - return value; - } - - public ConfigEntry setValue(T value) { - this.value = value; - return this; - } - - public T def() { - return def; - } - - public String key() { - return key; - } - - public ConfigEntry setKey(String key) { - this.key = key; - return this; - } - - public void saveDef(ConfigurationSection config) { - if (config.contains(key)) - return; - config.set(key, def); - } - - public abstract void load(ConfigurationSection config); - -} diff --git a/src/main/java/com/github/yufiriamazenta/craftorithm/config/entry/StringConfigEntry.java b/src/main/java/com/github/yufiriamazenta/craftorithm/config/entry/StringConfigEntry.java deleted file mode 100644 index 90a4a6e9..00000000 --- a/src/main/java/com/github/yufiriamazenta/craftorithm/config/entry/StringConfigEntry.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.github.yufiriamazenta.craftorithm.config.entry; - -import org.bukkit.configuration.ConfigurationSection; - -public class StringConfigEntry extends ConfigEntry { - public StringConfigEntry(String key, String def) { - super(key, def); - } - - @Override - public void load(ConfigurationSection config) { - if (!config.contains(key())) { - config.set(key(), def()); - setValue(def()); - return; - } - setValue(config.getString(key())); - } - -} diff --git a/src/main/java/com/github/yufiriamazenta/craftorithm/item/ItemManager.java b/src/main/java/com/github/yufiriamazenta/craftorithm/item/ItemManager.java index 2288bcf3..e2d12eb4 100644 --- a/src/main/java/com/github/yufiriamazenta/craftorithm/item/ItemManager.java +++ b/src/main/java/com/github/yufiriamazenta/craftorithm/item/ItemManager.java @@ -5,7 +5,7 @@ import com.github.yufiriamazenta.craftorithm.util.CollectionsUtil; import com.github.yufiriamazenta.craftorithm.util.LangUtil; import com.github.yufiriamazenta.craftorithm.util.PluginHookUtil; -import crypticlib.config.impl.YamlConfigWrapper; +import crypticlib.config.wrapper.YamlConfigWrapper; import crypticlib.nms.item.Item; import crypticlib.nms.item.ItemFactory; import crypticlib.util.FileUtil; diff --git a/src/main/java/com/github/yufiriamazenta/craftorithm/recipe/RecipeManager.java b/src/main/java/com/github/yufiriamazenta/craftorithm/recipe/RecipeManager.java index 25157fa0..be308c0d 100644 --- a/src/main/java/com/github/yufiriamazenta/craftorithm/recipe/RecipeManager.java +++ b/src/main/java/com/github/yufiriamazenta/craftorithm/recipe/RecipeManager.java @@ -8,7 +8,7 @@ import com.github.yufiriamazenta.craftorithm.util.CollectionsUtil; import com.github.yufiriamazenta.craftorithm.util.LangUtil; import crypticlib.CrypticLib; -import crypticlib.config.impl.YamlConfigWrapper; +import crypticlib.config.wrapper.YamlConfigWrapper; import crypticlib.util.FileUtil; import org.bukkit.Bukkit; import org.bukkit.Keyed; diff --git a/src/main/java/com/github/yufiriamazenta/craftorithm/util/LangUtil.java b/src/main/java/com/github/yufiriamazenta/craftorithm/util/LangUtil.java index e906b80c..c3af9085 100644 --- a/src/main/java/com/github/yufiriamazenta/craftorithm/util/LangUtil.java +++ b/src/main/java/com/github/yufiriamazenta/craftorithm/util/LangUtil.java @@ -2,7 +2,6 @@ import com.github.yufiriamazenta.craftorithm.Craftorithm; import com.github.yufiriamazenta.craftorithm.config.Languages; -import crypticlib.config.impl.YamlConfigWrapper; import crypticlib.util.TextUtil; import org.bukkit.Bukkit; import org.bukkit.command.CommandSender; @@ -13,17 +12,6 @@ public class LangUtil { - private static final YamlConfigWrapper langConfigFile; - private static final Map defaultFormatMap; - - static { - langConfigFile = new YamlConfigWrapper(Craftorithm.instance(), "lang.yml"); - Languages.reloadLanguages(); - defaultFormatMap = new HashMap<>(); - defaultFormatMap.put("", Languages.prefix.value()); - defaultFormatMap.put("", Craftorithm.instance().getDescription().getVersion()); - } - public static void sendLang(CommandSender receiver, String msgKey) { sendLang(receiver, msgKey, new HashMap<>()); } @@ -32,7 +20,8 @@ public static void sendLang(CommandSender receiver, String message, Map", Languages.prefix.value()); + formatMap.put("", Craftorithm.instance().getDescription().getVersion()); for (String formatStr : formatMap.keySet()) { message = message.replace(formatStr, formatMap.get(formatStr)); @@ -50,8 +39,4 @@ public static void info(String message, Map map) { sendLang(Bukkit.getConsoleSender(), message, map); } - public static YamlConfigWrapper langConfigFile() { - return langConfigFile; - } - }