Reset of LoadProperties.java to solve merge conflict.

This commit is contained in:
Grant 2012-01-31 12:08:09 -05:00
parent 6af1108300
commit e778272bc0

View File

@ -20,124 +20,112 @@ import com.gmail.nossr50.mcMMO;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import org.bukkit.configuration.file.YamlConfiguration; import org.bukkit.configuration.file.FileConfiguration;
import com.gmail.nossr50.datatypes.HUDType; import com.gmail.nossr50.datatypes.HUDType;
public class LoadProperties public class LoadProperties {
{ public static Boolean enableOnlyActivateWhenSneaking,
public static Boolean enableOnlyActivateWhenSneaking, enableAbilityMessages, enableAbilities, showDisplayName, showFaces, watch, xplockEnable, xpbar, xpicon, partybar, string, bucket, web, xprateEnable, slimeballs, spoutEnabled, enableAbilityMessages, enableAbilities, showDisplayName, showFaces,
donateMessage, chimaeraWingEnable, xpGainsMobSpawners, myspawnEnable, mccEnable, mcmmoEnable, partyEnable, inviteEnable, acceptEnable, watch, xplockEnable, xpbar, xpicon, partybar, string, bucket, web,
whoisEnable, statsEnable, addxpEnable, ptpEnable, mmoeditEnable, clearmyspawnEnable, mcgodEnable, mcabilityEnable, mctopEnable, xprateEnable, slimeballs, spoutEnabled, donateMessage,
mcrefreshEnable, enableMotd, enableMySpawn, enableRegen, enableCobbleToMossy, useMySQL, cocoabeans, mushrooms, chimaeraWingEnable, xpGainsMobSpawners, myspawnEnable, mccEnable,
toolsLoseDurabilityFromAbilities, pvpxp, miningrequirespickaxe, excavationRequiresShovel, woodcuttingrequiresaxe, eggs, apples, cake, music, diamond, glowstone, mcmmoEnable, partyEnable, inviteEnable, acceptEnable, whoisEnable,
slowsand, sulphur, netherrack, bones, coal, clay, anvilmessages, mayDowngradeEnchants, mayLoseEnchants, statsEnable, addxpEnable, ptpEnable, mmoeditEnable,
fishingDrops, leatherArmor, ironArmor, goldArmor, diamondArmor, woodenTools, stoneTools, ironTools, goldTools, diamondTools, enderPearl, blazeRod, records, glowstoneDust, fishingDiamonds; clearmyspawnEnable, mcgodEnable, mcabilityEnable, mctopEnable,
mcrefreshEnable, enableMotd, enableMySpawn, enableRegen,
enableCobbleToMossy, useMySQL, cocoabeans, mushrooms,
toolsLoseDurabilityFromAbilities, pvpxp, miningrequirespickaxe,
excavationRequiresShovel, woodcuttingrequiresaxe, eggs, apples,
cake, music, diamond, glowstone, slowsand, sulphur, netherrack,
bones, coal, clay, anvilmessages, mayDowngradeEnchants,
mayLoseEnchants, fishingDrops, leatherArmor, ironArmor, goldArmor,
diamondArmor, woodenTools, stoneTools, ironTools, goldTools,
diamondTools, enderPearl, blazeRod, records, glowstoneDust,
fishingDiamonds;
public static String xplock, MySQLtablePrefix, MySQLuserName, MySQLserverName, MySQLdbName, MySQLdbPass, mctop, addxp, public static String MySQLtablePrefix, MySQLuserName,
xprate, mcability, mcmmo, mcc, mcrefresh, mcgod, stats, mmoedit, ptp, party, myspawn, whois, invite, accept, clearmyspawn, nWood, MySQLserverName, MySQLdbName, MySQLdbPass, nWood, nStone,
nStone, nIron, nGold, nDiamond, locale, nString, nLeather; nIron, nGold, nDiamond, locale, nString, nLeather;
public static int mfishing, mwatch, xpbar_x, xpbar_y, xpicon_x, xpicon_y, mstring, mbucket, mweb, public static int mfishing, mwatch, xpbar_x, xpbar_y, xpicon_x, xpicon_y,
chimaeraId, msandstone, mcocoa, water_thunder, cure_self, cure_other, mslimeballs, mbones, msulphur, mslowsand, mstring, mbucket, mweb, chimaeraId, msandstone, mcocoa,
mmushroom2, mglowstone2, mmelon, mmusic, mdiamond2, mbase, mapple, meggs, mcake, mpine, mbirch, mspruce, mcactus, mmushroom, mflower, water_thunder, cure_self, cure_other, mslimeballs, mbones,
msugar, mpumpkin, mwheat, mgold, mdiamond, miron, mredstone, mlapis, mobsidian, mnetherrack, mglowstone, mcoal, mstone, MySQLport, msulphur, mslowsand, mmushroom2, mglowstone2, mmelon, mmusic,
xpGainMultiplier, superBreakerCooldown, greenTerraCooldown, gigaDrillBreakerCooldown, treeFellerCooldown, mdiamond2, mbase, mapple, meggs, mcake, mpine, mbirch, mspruce,
berserkCooldown, serratedStrikeCooldown, skullSplitterCooldown, abilityDurabilityLoss, mcactus, mmushroom, mflower, msugar, mpumpkin, mwheat, mgold,
feathersConsumedByChimaeraWing, bonesConsumedByCOTW, repairdiamondlevel, rWood, rStone, rIron, rGold, rDiamond, rString, rLeather, mdiamond, miron, mredstone, mlapis, mobsidian, mnetherrack,
downgradeRank1, downgradeRank2, downgradeRank3, downgradeRank4, keepEnchantsRank1, keepEnchantsRank2, keepEnchantsRank3, keepEnchantsRank4, mglowstone, mcoal, mstone, MySQLport, xpGainMultiplier,
fishingDropChanceTier1, fishingDropChanceTier2, fishingDropChanceTier3, fishingDropChanceTier4, fishingDropChanceTier5, superBreakerCooldown, greenTerraCooldown, gigaDrillBreakerCooldown,
mnetherwart, mvines, mlilypad; treeFellerCooldown, berserkCooldown, serratedStrikeCooldown,
skullSplitterCooldown, abilityDurabilityLoss,
feathersConsumedByChimaeraWing, bonesConsumedByCOTW,
repairdiamondlevel, rWood, rStone, rIron, rGold, rDiamond, rString,
rLeather, downgradeRank1, downgradeRank2, downgradeRank3,
downgradeRank4, keepEnchantsRank1, keepEnchantsRank2,
keepEnchantsRank3, keepEnchantsRank4, fishingDropChanceTier1,
fishingDropChanceTier2, fishingDropChanceTier3,
fishingDropChanceTier4, fishingDropChanceTier5, mnetherwart,
mvines, mlilypad;
public static double xpbackground_r, xpbackground_g, xpbackground_b, xpborder_r, xpborder_g, xpborder_b, fishing_r, fishing_g, fishing_b, acrobatics_r, acrobatics_g, acrobatics_b, archery_r, archery_g, archery_b, axes_r, axes_g, axes_b, public static double xpbackground_r, xpbackground_g, xpbackground_b,
excavation_r, excavation_g, excavation_b, herbalism_r, herbalism_g, herbalism_b, mining_r, mining_g, mining_b, xpborder_r, xpborder_g, xpborder_b, fishing_r, fishing_g,
repair_r, repair_g, repair_b, swords_r, swords_g, swords_b, taming_r, taming_g, taming_b, unarmed_r, unarmed_g, unarmed_b, fishing_b, acrobatics_r, acrobatics_g, acrobatics_b, archery_r,
woodcutting_r, woodcutting_g, woodcutting_b, pvpxprewardmodifier, tamingxpmodifier, miningxpmodifier, archery_g, archery_b, axes_r, axes_g, axes_b, excavation_r,
repairxpmodifier, woodcuttingxpmodifier, sorceryxpmodifier, unarmedxpmodifier, herbalismxpmodifier, excavationxpmodifier, excavation_g, excavation_b, herbalism_r, herbalism_g, herbalism_b,
archeryxpmodifier, swordsxpmodifier, axesxpmodifier, acrobaticsxpmodifier; mining_r, mining_g, mining_b, repair_r, repair_g, repair_b,
swords_r, swords_g, swords_b, taming_r, taming_g, taming_b,
unarmed_r, unarmed_g, unarmed_b, woodcutting_r, woodcutting_g,
woodcutting_b, pvpxprewardmodifier, tamingxpmodifier,
miningxpmodifier, repairxpmodifier, woodcuttingxpmodifier,
sorceryxpmodifier, unarmedxpmodifier, herbalismxpmodifier,
excavationxpmodifier, archeryxpmodifier, swordsxpmodifier,
axesxpmodifier, acrobaticsxpmodifier;
public static HUDType defaulthud; public static HUDType defaulthud;
protected static File configFile; protected static File configFile;
protected static File dataFolder; protected static File dataFolder;
protected final mcMMO plugin; protected final mcMMO plugin;
protected static YamlConfiguration config; protected static FileConfiguration config;
public LoadProperties(mcMMO plugin) public LoadProperties(mcMMO plugin) {
{
this.plugin = plugin; this.plugin = plugin;
dataFolder = plugin.getDataFolder(); dataFolder = plugin.getDataFolder();
configFile = new File(dataFolder, File.separator + "config.yml"); configFile = new File(dataFolder, File.separator + "config.yml");
config = plugin.getConfig();
} }
public void configCheck() public void load() {
{ // If not exist, copy from the jar
load(); if (!configFile.exists()) {
if(!configFile.exists()) dataFolder.mkdir();
{ plugin.saveDefaultConfig();
try }
{
configFile.getParentFile().mkdir();
configFile.createNewFile();
addDefaults(); addDefaults();
loadKeys();
} }
catch (Exception ex)
{ private Boolean readBoolean(String root, Boolean def) {
ex.printStackTrace();
}
}
else
{
loadkeys();
}
}
private void write(String root, Object x)
{
//Configuration config = load();
config.set(root, x);
}
private Boolean readBoolean(String root, Boolean def)
{
//Configuration config = load();
Boolean result = config.getBoolean(root, def); Boolean result = config.getBoolean(root, def);
saveConfig();
return result; return result;
} }
private Double readDouble(String root, Double def)
{ private Double readDouble(String root, Double def) {
Double result = config.getDouble(root, def); Double result = config.getDouble(root, def);
saveConfig();
return result; return result;
} }
private Integer readInteger(String root, Integer def)
{ private Integer readInteger(String root, Integer def) {
//Configuration config = load();
Integer result = config.getInt(root, def); Integer result = config.getInt(root, def);
saveConfig();
return result; return result;
} }
public static String readString(String root, String def) public static String readString(String root, String def) {
{
//Configuration config = load();
String result = config.getString(root, def); String result = config.getString(root, def);
saveConfig();
return result; return result;
} }
private YamlConfiguration load() private static void saveConfig() {
{
try {
config = YamlConfiguration.loadConfiguration(configFile);
return config;
} catch (Exception e) {
e.printStackTrace();
}
return null;
}
private static void saveConfig()
{
try { try {
config.save(configFile); config.save(configFile);
} catch (IOException e) { } catch (IOException e) {
@ -145,295 +133,19 @@ public class LoadProperties
} }
} }
private void addDefaults() private void addDefaults() {
{ // Load from included config.yml
System.out.println("Generating Config File..."); config.options().copyDefaults(true);
//Put in defaults
write("Spout.HUD.Default", "STANDARD");
write("Spout.XP.Bar.Enabled", true);
write("Spout.Images.URL_DIR", "http://mcmmo.rycochet.net/mcmmo/");
write("Spout.XP.Icon.Enabled", true);
write("Spout.XP.Bar.X_POS", 95);
write("Spout.XP.Bar.Y_POS", 6);
write("Spout.XP.Icon.X_POS", 78);
write("Spout.XP.Icon.Y_POS", 2);
write("Spout.Party.HUD.Enabled", true);
write("Spout.Party.HUD.Show_Faces", true);
write("Spout.Party.HUD.Show_Display_Name", false);
write("Spout.Menu.Key", "KEY_M");
write("Spout.HUD.Retro.Colors.Acrobatics.RED", 0.3);
write("Spout.HUD.Retro.Colors.Acrobatics.GREEN", 0.3);
write("Spout.HUD.Retro.Colors.Acrobatics.BLUE", 0.75);
write("Spout.HUD.Retro.Colors.Archery.RED", 0.3);
write("Spout.HUD.Retro.Colors.Archery.GREEN", 0.3);
write("Spout.HUD.Retro.Colors.Archery.BLUE", 0.75);
write("Spout.HUD.Retro.Colors.Axes.RED", 0.3);
write("Spout.HUD.Retro.Colors.Axes.GREEN", 0.3);
write("Spout.HUD.Retro.Colors.Axes.BLUE", 0.75);
write("Spout.HUD.Retro.Colors.Excavation.RED", 0.3);
write("Spout.HUD.Retro.Colors.Excavation.GREEN", 0.3);
write("Spout.HUD.Retro.Colors.Excavation.BLUE", 0.75);
write("Spout.HUD.Retro.Colors.Herbalism.RED", 0.3);
write("Spout.HUD.Retro.Colors.Herbalism.GREEN", 0.3);
write("Spout.HUD.Retro.Colors.Herbalism.BLUE", 0.75);
write("Spout.HUD.Retro.Colors.Mining.RED", 0.3);
write("Spout.HUD.Retro.Colors.Mining.GREEN", 0.3);
write("Spout.HUD.Retro.Colors.Mining.BLUE", 0.75);
write("Spout.HUD.Retro.Colors.Repair.RED", 0.3);
write("Spout.HUD.Retro.Colors.Repair.GREEN", 0.3);
write("Spout.HUD.Retro.Colors.Repair.BLUE", 0.75);
write("Spout.HUD.Retro.Colors.Swords.RED", 0.3);
write("Spout.HUD.Retro.Colors.Swords.GREEN", 0.3);
write("Spout.HUD.Retro.Colors.Swords.BLUE", 0.75);
write("Spout.HUD.Retro.Colors.Taming.RED", 0.3);
write("Spout.HUD.Retro.Colors.Taming.GREEN", 0.3);
write("Spout.HUD.Retro.Colors.Taming.BLUE", 0.75);
write("Spout.HUD.Retro.Colors.Unarmed.RED", 0.3);
write("Spout.HUD.Retro.Colors.Unarmed.GREEN", 0.3);
write("Spout.HUD.Retro.Colors.Unarmed.BLUE", 0.75);
write("Spout.HUD.Retro.Colors.Woodcutting.RED", 0.3);
write("Spout.HUD.Retro.Colors.Woodcutting.GREEN", 0.3);
write("Spout.HUD.Retro.Colors.Woodcutting.BLUE", 0.75);
write("Spout.HUD.Retro.Colors.Fishing.RED", 0.3);
write("Spout.HUD.Retro.Colors.Fishing.GREEN", 0.3);
write("Spout.HUD.Retro.Colors.Fishing.BLUE", 0.75);
write("Spout.HUD.Retro.Colors.Border.RED", 0.0);
write("Spout.HUD.Retro.Colors.Border.GREEN", 0.0);
write("Spout.HUD.Retro.Colors.Border.BLUE", 0.0);
write("Spout.HUD.Retro.Colors.Background.RED", 0.75);
write("Spout.HUD.Retro.Colors.Background.GREEN", 0.75);
write("Spout.HUD.Retro.Colors.Background.BLUE", 0.75);
write("MySQL.Enabled", false);
write("MySQL.Server.Address", "localhost");
write("MySQL.Server.Port", 3306);
write("MySQL.Database.Name", "DataBaseName");
write("MySQL.Database.User.Name", "UserName");
write("MySQL.Database.TablePrefix", "mcmmo_");
write("MySQL.Database.User.Password", "UserPassword");
write("General.Locale", "en_us");
write("General.MOTD.Enabled", true);
write("General.MySpawn.Enabled", true);
write("General.HP_Regeneration.Enabled", true);
write("Items.Chimaera_Wing.Enabled", true);
write("Items.Chimaera_Wing.Feather_Cost", 10);
write("Items.Chimaera_Wing.Item_ID", 288);
write("Experience.PVP.Rewards", true);
write("Experience.Gains.Multiplier.PVP", 1);
write("Experience.Gains.Mobspawners.Enabled", false);
write("Experience.Gains.Multiplier.Global", 1.0);
write("Experience.Formula.Multiplier.Taming", 1.0);
write("Experience.Formula.Multiplier.Mining", 1.0);
write("Experience.Formula.Multiplier.Repair", 1.0);
write("Experience.Formula.Multiplier.Woodcutting", 1.0);
write("Experience.Formula.Multiplier.Unarmed", 1.0);
write("Experience.Formula.Multiplier.Herbalism", 1.0);
write("Experience.Formula.Multiplier.Excavation", 1.0);
write("Experience.Formula.Multiplier.Swords", 1.0);
write("Experience.Formula.Multiplier.Archery", 1.0);
write("Experience.Formula.Multiplier.Axes", 1.0);
write("Experience.Formula.Multiplier.Sorcery", 1.0);
write("Experience.Formula.Multiplier.Acrobatics", 1.0);
//Mining XP values
write("Experience.Mining.Gold", 350);
write("Experience.Mining.Diamond", 750);
write("Experience.Mining.Iron", 250);
write("Experience.Mining.Redstone", 150);
write("Experience.Mining.Lapis", 400);
write("Experience.Mining.Obsidian", 150);
write("Experience.Mining.Netherrack", 30);
write("Experience.Mining.Glowstone", 30);
write("Experience.Mining.Coal", 100);
write("Experience.Mining.Stone", 30);
write("Experience.Mining.Sandstone", 30);
//Herbalism XP values
write("Experience.Herbalism.Sugar_Cane", 30);
write("Experience.Herbalism.Cactus", 30);
write("Experience.Herbalism.Pumpkin", 20);
write("Experience.Herbalism.Flowers", 100);
write("Experience.Herbalism.Wheat", 50);
write("Experience.Herbalism.Mushrooms", 150);
write("Experience.Herbalism.Melon", 20);
write("Experience.Herbalism.Nether_Wart", 50);
write("Experience.Herbalism.Lily_Pads", 100);
write("Experience.Herbalism.Vines", 10);
//Woodcutting XP values
write("Experience.Woodcutting.Pine", 90);
write("Experience.Woodcutting.Birch", 70);
write("Experience.Woodcutting.Spruce", 80);
//Excavation XP values
write("Experience.Excavation.Base", 40);
write("Experience.Excavation.Mushroom", 80);
write("Experience.Excavation.Sulphur", 30);
write("Experience.Excavation.Slowsand", 80);
write("Experience.Excavation.Glowstone", 80);
write("Experience.Excavation.Music", 3000);
write("Experience.Excavation.Bones", 30);
write("Experience.Excavation.Diamond", 1000);
write("Experience.Excavation.Apple", 100);
write("Experience.Excavation.Eggs", 100);
write("Experience.Excavation.Cake", 3000);
write("Experience.Excavation.Slimeballs", 100);
write("Experience.Excavation.Cocoa_Beans", 100);
write("Experience.Excavation.Map", 200);
write("Experience.Excavation.String", 200);
write("Experience.Excavation.Bucket", 100);
write("Experience.Excavation.Web", 150);
//Fishing XP values
write("Experience.Fishing.Base", 800);
//write("Sorcery.Spells.Water.Thunder", 75);
//write("Sorcery.Spells.Curative.Cure_Self.Mana_Cost", 5);
//write("Sorcery.Spells.Curative.Cure_Other.Mana_Cost", 5);
write("Excavation.Drops.Cocoa_Beans", true);
write("Excavation.Drops.Mushrooms", true);
write("Excavation.Drops.Glowstone", true);
write("Excavation.Drops.Eggs", true);
write("Excavation.Drops.Apples", true);
write("Excavation.Drops.Cake", true);
write("Excavation.Drops.Music", true);
write("Excavation.Drops.Diamond", true);
write("Excavation.Drops.Slowsand", true);
write("Excavation.Drops.Sulphur", true);
write("Excavation.Drops.Netherrack", true);
write("Excavation.Drops.Bones", true);
write("Excavation.Drops.Slimeballs", true);
write("Excavation.Drops.Map", true);
write("Excavation.Drops.String", true);
write("Excavation.Drops.Bucket", true);
write("Excavation.Drops.Web", true);
write("Commands.xprate.Name", "xprate");
write("Commands.xprate.Enabled", true);
write("Commands.mctop.Name", "mctop");
write("Commands.mctop.Enabled", true);
write("Commands.addxp.Name", "addxp");
write("Commands.addxp.Enabled", true);
write("Commands.mcability.Name", "mcability");
write("Commands.mcability.Enabled", true);
write("Commands.mcrefresh.Name", "mcrefresh");
write("Commands.mcrefresh.Enabled", true);
write("Commands.mcmmo.Name", "mcmmo");
write("Commands.mcmmo.Donate_Message", true);
write("Commands.mcmmo.Enabled", true);
write("Commands.mcc.Name", "mcc");
write("Commands.mcc.Enabled", true);
write("Commands.mcgod.Name", "mcgod");
write("Commands.mcgod.Enabled", true);
write("Commands.stats.Name", "stats");
write("Commands.stats.Enabled", true);
write("Commands.mmoedit.Name", "mmoedit");
write("Commands.mmoedit.Enabled", true);
write("Commands.ptp.Name", "ptp");
write("Commands.ptp.Enabled", true);
write("Commands.party.Name", "party");
write("Commands.party.Enabled", true);
write("Commands.myspawn.Name", "myspawn");
write("Commands.myspawn.Enabled", true);
write("Commands.whois.Name", "whois");
write("Commands.whois.Enabled", true);
write("Commands.invite.Name", "invite");
write("Commands.invite.Enabled", true);
write("Commands.accept.Name", "accept");
write("Commands.accept.Enabled", true);
write("Commands.clearmyspawn.Name", "clearmyspawn");
write("Commands.clearmyspawn.Enabled", true);
write("Commands.xplock.Enabled", true);
write("Commands.xplock.Name", "xplock");
write("Abilities.Tools.Durability_Loss_Enabled", true);
write("Abilities.Tools.Durability_Loss", 2);
write("Abilities.Activation.Only_Activate_When_Sneaking", false);
write("Abilities.Cooldowns.Green_Terra", 240);
write("Abilities.Cooldowns.Super_Breaker", 240);
write("Abilities.Cooldowns.Giga_Drill_Breaker", 240);
write("Abilities.Cooldowns.Tree_Feller", 240);
write("Abilities.Cooldowns.Berserk", 240);
write("Abilities.Cooldowns.Serrated_Strikes", 240);
write("Abilities.Cooldowns.Skull_Splitter", 240);
write("Abilities.Messages", true);
write("Abilities.Enabled", true);
write("Skills.Repair.Anvil_Messages", true);
write("Skills.Repair.Gold.ID", 266);
write("Skills.Repair.Gold.Name", "Gold Bars");
write("Skills.Repair.Stone.ID", 4);
write("Skills.Repair.Stone.Name", "Cobblestone");
write("Skills.Repair.Wood.ID", 5);
write("Skills.Repair.Wood.Name", "Wood Planks");
write("Skills.Repair.Diamond.ID", 264);
write("Skills.Repair.Diamond.Name", "Diamond");
write("Skills.Repair.Diamond.Level_Required", 50);
write("Skills.Repair.Iron.ID", 265);
write("Skills.Repair.Iron.Name", "Iron Bars");
write("Skills.Repair.String.ID", 287);
write("Skills.Repair.String.Name", "String");
write("Skills.Repair.Leather.ID", 334);
write("Skills.Repair.String.Name", "Leather");
write("Skills.Herbalism.Green_Thumb.Cobble_To_Mossy", true);
write("Skills.Excavation.Requires_Shovel", true);
write("Skills.Mining.Requires_Pickaxe", true);
write("Skills.Woodcutting.Requires_Axe", true);
write("Skills.Taming.Call_Of_The_Wild.Bones_Required", 10);
//Arcane Forging Config Options
write("Arcane_Forging.Downgrades.Enabled", true);
write("Arcane_Forging.Downgrades.Chance.Rank_1", 75);
write("Arcane_Forging.Downgrades.Chance.Rank_2", 50);
write("Arcane_Forging.Downgrades.Chance.Rank_3", 25);
write("Arcane_Forging.Downgrades.Chance.Rank_4", 15);
write("Arcane_Forging.May_Lose_Enchants.Enabled", true);
write("Arcane_Forging.Keep_Enchants.Chance.Rank_1", 10);
write("Arcane_Forging.Keep_Enchants.Chance.Rank_2", 20);
write("Arcane_Forging.Keep_Enchants.Chance.Rank_3", 30);
write("Arcane_Forging.Keep_Enchants.Chance.Rank_4", 40);
//Fishing Config Options
write("Fishing.Drops.Item_Drops_Enabled", true);
write("Fishing.Drops.Drop_Chance.Tier_1", 20);
write("Fishing.Drops.Drop_Chance.Tier_2", 25);
write("Fishing.Drops.Drop_Chance.Tier_3", 30);
write("Fishing.Drops.Drop_Chance.Tier_4", 35);
write("Fishing.Drops.Drop_Chance.Tier_5", 40);
write("Fishing.Drops.Leather_Armor", true);
write("Fishing.Drops.Iron_Armor", true);
write("Fishing.Drops.Gold_Armor", true);
write("Fishing.Drops.Diamond_Armor", true);
write("Fishing.Drops.Wooden_Tools", true);
write("Fishing.Drops.Stone_Tools", true);
write("Fishing.Drops.Iron_Tools", true);
write("Fishing.Drops.Gold_Tools", true);
write("Fishing.Drops.Diamond_Tools", true);
write("Fishing.Drops.Ender_Pearl", true);
write("Fishing.Drops.Blaze_Rod", true);
write("Fishing.Drops.Records", true);
write("Fishing.Drops.Glowstone_Dust", true);
write("Fishing.Drops.Diamonds", true);
saveConfig(); saveConfig();
loadkeys();
} }
private void loadkeys()
{ private void loadKeys() {
System.out.println("Loading Config File..."); plugin.getLogger().info("Loading Config File...");
// Setup default HUD // Setup default HUD
load();
String temp = readString("Spout.HUD.Default", "STANDARD"); String temp = readString("Spout.HUD.Default", "STANDARD");
for(HUDType x : HUDType.values()) for (HUDType x : HUDType.values()) {
{ if (x.toString().equalsIgnoreCase(temp)) {
if(x.toString().equalsIgnoreCase(temp))
{
defaulthud = x; defaulthud = x;
} }
} }
@ -447,7 +159,8 @@ public class LoadProperties
bonesConsumedByCOTW = readInteger("Skills.Taming.Call_Of_The_Wild.Bones_Required", 10); bonesConsumedByCOTW = readInteger("Skills.Taming.Call_Of_The_Wild.Bones_Required", 10);
xpbar = readBoolean("Spout.XP.Bar.Enabled", true); xpbar = readBoolean("Spout.XP.Bar.Enabled", true);
//web_url = readString("Spout.Images.URL_DIR", "http://mcmmo.rycochet.net/mcmmo/"); // web_url = readString("Spout.Images.URL_DIR",
// "http://mcmmo.rycochet.net/mcmmo/");
xpicon = readBoolean("Spout.XP.Icon.Enabled", true); xpicon = readBoolean("Spout.XP.Icon.Enabled", true);
xpbar_x = readInteger("Spout.XP.Bar.X_POS", 95); xpbar_x = readInteger("Spout.XP.Bar.X_POS", 95);
xpbar_y = readInteger("Spout.XP.Bar.Y_POS", 6); xpbar_y = readInteger("Spout.XP.Bar.Y_POS", 6);
@ -673,58 +386,22 @@ public class LoadProperties
glowstoneDust = readBoolean("Fishing.Drops.Glowstone_Dust", true); glowstoneDust = readBoolean("Fishing.Drops.Glowstone_Dust", true);
fishingDiamonds = readBoolean("Fishing.Drops.Diamonds", true); fishingDiamonds = readBoolean("Fishing.Drops.Diamonds", true);
xprate = readString("Commands.xprate.Name", "xprate");
xprateEnable = readBoolean("Commands.xprate.Enabled", true); xprateEnable = readBoolean("Commands.xprate.Enabled", true);
mctop = readString("Commands.mctop.Name", "mctop");
mctopEnable = readBoolean("Commands.mctop.Enabled", true); mctopEnable = readBoolean("Commands.mctop.Enabled", true);
addxp = readString("Commands.addxp.Name", "addxp");
addxpEnable = readBoolean("Commands.addxp.Enabled", true); addxpEnable = readBoolean("Commands.addxp.Enabled", true);
mcability = readString("Commands.mcability.Name", "mcability");
mcabilityEnable = readBoolean("Commands.mcability.Enabled", true); mcabilityEnable = readBoolean("Commands.mcability.Enabled", true);
mcrefresh = readString("Commands.mcrefresh.Name", "mcrefresh");
mcrefreshEnable = readBoolean("Commands.mcrefresh.Enabled", true); mcrefreshEnable = readBoolean("Commands.mcrefresh.Enabled", true);
mcmmo = readString("Commands.mcmmo.Name", "mcmmo");
mcmmoEnable = readBoolean("Commands.mcmmo.Enabled", true); mcmmoEnable = readBoolean("Commands.mcmmo.Enabled", true);
mcc = readString("Commands.mcc.Name", "mcc");
mccEnable = readBoolean("Commands.mcc.Enabled", true); mccEnable = readBoolean("Commands.mcc.Enabled", true);
mcgod = readString("Commands.mcgod.Name", "mcgod");
mcgodEnable = readBoolean("Commands.mcgod.Enabled", true); mcgodEnable = readBoolean("Commands.mcgod.Enabled", true);
stats = readString("Commands.stats.Name", "stats");
statsEnable = readBoolean("Commands.stats.Enabled", true); statsEnable = readBoolean("Commands.stats.Enabled", true);
mmoedit = readString("Commands.mmoedit.Name", "mmoedit");
mmoeditEnable = readBoolean("Commands.mmoedit.Enabled", true); mmoeditEnable = readBoolean("Commands.mmoedit.Enabled", true);
ptp = readString("Commands.ptp.Name", "ptp");
ptpEnable = readBoolean("Commands.ptp.Enabled", true); ptpEnable = readBoolean("Commands.ptp.Enabled", true);
party = readString("Commands.party.Name", "party");
partyEnable = readBoolean("Commands.party.Enabled", true); partyEnable = readBoolean("Commands.party.Enabled", true);
myspawn = readString("Commands.myspawn.Name", "myspawn");
myspawnEnable = readBoolean("Commands.myspawn.Enabled", true); myspawnEnable = readBoolean("Commands.myspawn.Enabled", true);
whois = readString("Commands.whois.Name", "whois");
whoisEnable = readBoolean("Commands.whois.Enabled", true); whoisEnable = readBoolean("Commands.whois.Enabled", true);
invite = readString("Commands.invite.Name", "invite");
inviteEnable = readBoolean("Commands.invite.Enabled", true); inviteEnable = readBoolean("Commands.invite.Enabled", true);
accept = readString("Commands.accept.Name", "accept");
acceptEnable = readBoolean("Commands.accept.Enabled", true); acceptEnable = readBoolean("Commands.accept.Enabled", true);
clearmyspawn = readString("Commands.clearmyspawn.Name", "clearmyspawn");
clearmyspawnEnable = readBoolean("Commands.clearmyspawn.Enabled", true); clearmyspawnEnable = readBoolean("Commands.clearmyspawn.Enabled", true);
xplockEnable = readBoolean("Commands.xplock.Enabled", true);
xplock = readString("Commands.xplock.Name", "xplock");
} }
} }