2
0
bm01 13 жил өмнө
parent
commit
51ca29ab9f

+ 1 - 0
src/main/java/com/gmail/nossr50/config/Config.java

@@ -12,6 +12,7 @@ public class Config extends ConfigLoader {
     private Config() {
     private Config() {
         super("config.yml");
         super("config.yml");
         xpGainMultiplier = getExperienceGainsGlobalMultiplier();
         xpGainMultiplier = getExperienceGainsGlobalMultiplier();
+        loadKeys();
     }
     }
 
 
     public static Config getInstance() {
     public static Config getInstance() {

+ 3 - 3
src/main/java/com/gmail/nossr50/config/ConfigLoader.java

@@ -19,16 +19,16 @@ public abstract class ConfigLoader {
     public ConfigLoader(String relativePath, String fileName){
     public ConfigLoader(String relativePath, String fileName){
         this.fileName = fileName;
         this.fileName = fileName;
         configFile = new File(plugin.getDataFolder(), relativePath + File.separator + fileName);
         configFile = new File(plugin.getDataFolder(), relativePath + File.separator + fileName);
-        load();
+        loadFile();
     }
     }
 
 
     public ConfigLoader(String fileName){
     public ConfigLoader(String fileName){
         this.fileName = fileName;
         this.fileName = fileName;
         configFile = new File(plugin.getDataFolder(), fileName);
         configFile = new File(plugin.getDataFolder(), fileName);
-        load();
+        loadFile();
     }
     }
 
 
-    protected void load() {
+    protected void loadFile() {
         if (!configFile.exists()) {
         if (!configFile.exists()) {
             plugin.getLogger().info("Creating mcMMO " + fileName + " File...");
             plugin.getLogger().info("Creating mcMMO " + fileName + " File...");
             createFile();
             createFile();

+ 1 - 0
src/main/java/com/gmail/nossr50/config/SpoutConfig.java

@@ -8,6 +8,7 @@ public class SpoutConfig extends ConfigLoader {
 
 
     private SpoutConfig() {
     private SpoutConfig() {
         super("spout.yml");
         super("spout.yml");
+        loadKeys();
     }
     }
 
 
     public static SpoutConfig getInstance() {
     public static SpoutConfig getInstance() {

+ 1 - 0
src/main/java/com/gmail/nossr50/config/TreasuresConfig.java

@@ -32,6 +32,7 @@ public class TreasuresConfig extends ConfigLoader{
 
 
     private TreasuresConfig() {
     private TreasuresConfig() {
         super("treasures.yml");
         super("treasures.yml");
+        loadKeys();
     }
     }
 
 
     public static TreasuresConfig getInstance() {
     public static TreasuresConfig getInstance() {

+ 1 - 0
src/main/java/com/gmail/nossr50/config/mods/CustomArmorConfig.java

@@ -26,6 +26,7 @@ public class CustomArmorConfig extends ConfigLoader{
 
 
     public CustomArmorConfig() {
     public CustomArmorConfig() {
         super("ModConfigs", "armor.yml");
         super("ModConfigs", "armor.yml");
+        loadKeys();
     }
     }
 
 
     public static CustomArmorConfig getInstance() {
     public static CustomArmorConfig getInstance() {

+ 1 - 0
src/main/java/com/gmail/nossr50/config/mods/CustomBlocksConfig.java

@@ -26,6 +26,7 @@ public class CustomBlocksConfig extends ConfigLoader {
 
 
     public CustomBlocksConfig() {
     public CustomBlocksConfig() {
         super("ModConfigs", "blocks.yml");
         super("ModConfigs", "blocks.yml");
+        loadKeys();
     }
     }
 
 
     public static CustomBlocksConfig getInstance() {
     public static CustomBlocksConfig getInstance() {

+ 1 - 0
src/main/java/com/gmail/nossr50/config/mods/CustomToolsConfig.java

@@ -28,6 +28,7 @@ public class CustomToolsConfig extends ConfigLoader {
 
 
     private CustomToolsConfig() {
     private CustomToolsConfig() {
         super("ModConfigs", "tools.yml");
         super("ModConfigs", "tools.yml");
+        loadKeys();
     }
     }
 
 
     public static CustomToolsConfig getInstance() {
     public static CustomToolsConfig getInstance() {

+ 1 - 2
src/main/java/com/gmail/nossr50/config/repair/RepairConfig.java

@@ -5,7 +5,6 @@ import java.util.List;
 import java.util.Set;
 import java.util.Set;
 
 
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.configuration.ConfigurationSection;
-import org.bukkit.configuration.file.YamlConfiguration;
 
 
 import com.gmail.nossr50.config.ConfigLoader;
 import com.gmail.nossr50.config.ConfigLoader;
 import com.gmail.nossr50.skills.repair.RepairItemType;
 import com.gmail.nossr50.skills.repair.RepairItemType;
@@ -18,7 +17,7 @@ public class RepairConfig extends ConfigLoader {
 
 
     public RepairConfig(String fileName) {
     public RepairConfig(String fileName) {
         super(fileName);
         super(fileName);
-        this.config = YamlConfiguration.loadConfiguration(this.configFile);
+        loadKeys();
     }
     }
 
 
     @Override
     @Override