From ffe2c009099449a46ae2cfd2069b6b1d91dbeeda Mon Sep 17 00:00:00 2001 From: CarmJos Date: Mon, 28 Feb 2022 18:28:56 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../timereward/configuration/PluginConfig.java | 2 +- .../timereward/database/DBConfiguration.java | 14 +++++++------- .../plugin/timereward/manager/ConfigManager.java | 1 - 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/main/java/cc/carm/plugin/timereward/configuration/PluginConfig.java b/src/main/java/cc/carm/plugin/timereward/configuration/PluginConfig.java index 81bc5f9..35c5790 100644 --- a/src/main/java/cc/carm/plugin/timereward/configuration/PluginConfig.java +++ b/src/main/java/cc/carm/plugin/timereward/configuration/PluginConfig.java @@ -7,13 +7,13 @@ import cc.carm.plugin.timereward.data.RewardContents; import java.util.HashMap; import java.util.LinkedHashMap; -import java.util.Map; public class PluginConfig { public static final ConfigValue DEBUG = new ConfigValue<>( "debug", Boolean.class, false ); + public static final ConfigSectionCast> REWARDS = new ConfigSectionCast<>( "rewards", TimeRewardAPI.getRewardManager()::readRewards, new LinkedHashMap<>() ); diff --git a/src/main/java/cc/carm/plugin/timereward/database/DBConfiguration.java b/src/main/java/cc/carm/plugin/timereward/database/DBConfiguration.java index 8dae397..60b7acc 100644 --- a/src/main/java/cc/carm/plugin/timereward/database/DBConfiguration.java +++ b/src/main/java/cc/carm/plugin/timereward/database/DBConfiguration.java @@ -5,37 +5,37 @@ import cc.carm.lib.easyplugin.configuration.values.ConfigValue; public class DBConfiguration { protected static final ConfigValue DRIVER_NAME = new ConfigValue<>( - "storage.mysql.driver", String.class, + "database.driver", String.class, "com.mysql.cj.jdbc.Driver" ); protected static final ConfigValue HOST = new ConfigValue<>( - "storage.mysql.host", String.class, + "database.host", String.class, "127.0.0.1" ); protected static final ConfigValue PORT = new ConfigValue<>( - "storage.mysql.port", Integer.class, + "database.port", Integer.class, 3306 ); protected static final ConfigValue DATABASE = new ConfigValue<>( - "storage.mysql.database", String.class, + "database.database", String.class, "minecraft" ); protected static final ConfigValue USERNAME = new ConfigValue<>( - "storage.mysql.username", String.class, + "database.username", String.class, "root" ); protected static final ConfigValue PASSWORD = new ConfigValue<>( - "storage.mysql.password", String.class, + "database.password", String.class, "password" ); protected static final ConfigValue ADDITIONAL = new ConfigValue<>( - "storage.mysql.additional", String.class, + "database.additional", String.class, "?useSSL=false" ); diff --git a/src/main/java/cc/carm/plugin/timereward/manager/ConfigManager.java b/src/main/java/cc/carm/plugin/timereward/manager/ConfigManager.java index 7d56ec5..9e2b361 100644 --- a/src/main/java/cc/carm/plugin/timereward/manager/ConfigManager.java +++ b/src/main/java/cc/carm/plugin/timereward/manager/ConfigManager.java @@ -10,7 +10,6 @@ import cc.carm.plugin.timereward.configuration.PluginMessages; public class ConfigManager { private FileConfig pluginConfiguration; - private MessagesConfig messageConfiguration; public boolean initConfig() {