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

This commit is contained in:
GJ 2013-03-06 11:05:41 -05:00
parent 2c7f931c4d
commit 3e084b3b5d
7 changed files with 7 additions and 4 deletions

View File

@ -10,6 +10,7 @@ Key:
Version 1.4.03-dev Version 1.4.03-dev
= Fixed bug where players were unable to salvage leather armor = Fixed bug where players were unable to salvage leather armor
= Fixed bug with repairing using materials with byte metadata = 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. - Removed option to disable Salvage via the config file. This should be handled via permissions instead.
Version 1.4.02 Version 1.4.02

View File

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

View File

@ -184,7 +184,6 @@ public class Config extends AutoUpdateConfigLoader {
public boolean getRepairAnvilMessagesEnabled() { return config.getBoolean("Skills.Repair.Anvil_Messages", true); } public boolean getRepairAnvilMessagesEnabled() { return config.getBoolean("Skills.Repair.Anvil_Messages", true); }
public int getRepairAnvilId() { return config.getInt("Skills.Repair.Anvil_ID", 42); } 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 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 getSalvageTools() { return config.getBoolean("Skills.Repair.Salvage_tools", true); }
public boolean getSalvageArmor() { return config.getBoolean("Skills.Repair.Salvage_armor", true); } public boolean getSalvageArmor() { return config.getBoolean("Skills.Repair.Salvage_armor", true); }

View File

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

View File

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

View File

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

View File

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