Explorar o código

Unlock levels go in advanced.yml, not config.yml

GJ %!s(int64=12) %!d(string=hai) anos
pai
achega
3e084b3b5d

+ 1 - 0
Changelog.txt

@@ -10,6 +10,7 @@ Key:
 Version 1.4.03-dev
  = Fixed bug where players were unable to salvage leather armor
  = Fixed bug with repairing using materials with byte metadata
+ ! Moved the Salvage unlock level from config.yml to advanced.yml
  - Removed option to disable Salvage via the config file. This should be handled via permissions instead.
 
 Version 1.4.02

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

@@ -178,6 +178,7 @@ public class AdvancedConfig extends AutoUpdateConfigLoader {
     public int getRepairMasteryMaxLevel() { return config.getInt("Skills.Repair.RepairMastery_MaxBonusLevel", 1000); }
     public double getSuperRepairChanceMax() { return config.getDouble("Skills.Repair.SuperRepair_ChanceMax", 100.0D); }
     public int getSuperRepairMaxLevel() { return config.getInt("Skills.Repair.SuperRepair_MaxBonusLevel", 1000); }
+    public int getSalvageUnlockLevel() { return config.getInt("Skills.Repair.Salvage_UnlockLevel", 600); }
 
     /* Arcane Forging */
     public boolean getArcaneForgingDowngradeEnabled() { return config.getBoolean("Skills.Repair.Arcane_Forging.Downgrades.Enabled", true); }

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

@@ -184,7 +184,6 @@ public class Config extends AutoUpdateConfigLoader {
     public boolean getRepairAnvilMessagesEnabled() { return config.getBoolean("Skills.Repair.Anvil_Messages", true); }
     public int getRepairAnvilId() { return config.getInt("Skills.Repair.Anvil_ID", 42); }
     public int getSalvageAnvilId() { return config.getInt("Skills.Repair.Salvage_Anvil_ID", 41); }
-    public int getSalvageUnlockLevel() { return config.getInt("Skills.Repair.Salvage_UnlockLevel", 600); }
     public boolean getSalvageTools() { return config.getBoolean("Skills.Repair.Salvage_tools", true); }
     public boolean getSalvageArmor() { return config.getBoolean("Skills.Repair.Salvage_armor", true); }
 

+ 0 - 1
src/main/java/com/gmail/nossr50/skills/repair/RepairManager.java

@@ -15,7 +15,6 @@ import org.getspout.spoutapi.SpoutManager;
 import org.getspout.spoutapi.player.SpoutPlayer;
 
 import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.events.skills.repair.McMMOPlayerRepairCheckEvent;

+ 2 - 1
src/main/java/com/gmail/nossr50/skills/repair/Salvage.java

@@ -3,11 +3,12 @@ package com.gmail.nossr50.skills.repair;
 import org.bukkit.Material;
 import org.bukkit.inventory.ItemStack;
 
+import com.gmail.nossr50.config.AdvancedConfig;
 import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.util.ItemUtils;
 
 public class Salvage {
-    public static int salvageUnlockLevel = Config.getInstance().getSalvageUnlockLevel();
+    public static int salvageUnlockLevel = AdvancedConfig.getInstance().getSalvageUnlockLevel();
     public static int anvilID = Config.getInstance().getSalvageAnvilId();
 
     /**

+ 3 - 0
src/main/resources/advanced.yml

@@ -247,6 +247,9 @@ Skills:
         SuperRepair_ChanceMax: 100.0
         SuperRepair_MaxBonusLevel: 1000
 
+        # Salvage_UnlockLevel: Level when Salvage become available
+        Salvage_UnlockLevel: 600
+
         Arcane_Forging:
             May_Lose_Enchants: true
             Rank_Levels:

+ 0 - 1
src/main/resources/config.yml

@@ -161,7 +161,6 @@ Skills:
         Anvil_Messages: true
         Anvil_ID: 42
         Salvage_Anvil_ID: 41
-        Salvage_UnlockLevel: 600
         Salvage_tools: true
         Salvage_armor: true
     Smelting: