From e822515403793262df7b2c479eeac336cde92caf Mon Sep 17 00:00:00 2001 From: TheYeti Date: Tue, 6 Mar 2012 14:50:18 -0800 Subject: [PATCH] Configuration options for MCCORE-16 --- .gitignore | 5 +++- .../gmail/nossr50/config/LoadProperties.java | 26 +++++++++++++++++-- src/main/resources/config.yml | 26 ++++++++++++++++++- 3 files changed, 53 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 6f8ccf895..9ceb119ca 100644 --- a/.gitignore +++ b/.gitignore @@ -36,4 +36,7 @@ /src/main/resources/mcMMO # Other Libraries -*.jar \ No newline at end of file +*.jar + +# Atlassian Stuff +/atlassian-ide-plugin.xml \ No newline at end of file diff --git a/src/main/java/com/gmail/nossr50/config/LoadProperties.java b/src/main/java/com/gmail/nossr50/config/LoadProperties.java index 155824400..d837fa078 100644 --- a/src/main/java/com/gmail/nossr50/config/LoadProperties.java +++ b/src/main/java/com/gmail/nossr50/config/LoadProperties.java @@ -36,7 +36,7 @@ public class LoadProperties { woodcuttingrequiresaxe, anvilmessages, mayDowngradeEnchants, mayLoseEnchants, fishingDrops, aDisplayNames, pDisplayNames, enableSmoothToMossy, enableDirtToGrass, statsTracking, eventCallback, herbalismHungerBonus, - repairArmor, repairTools; + repairArmor, repairTools, perLevelTools; public static String MySQLtablePrefix, MySQLuserName, MySQLserverName, MySQLdbName, MySQLdbPass, nWood, nStone, @@ -62,7 +62,8 @@ public class LoadProperties { levelCapSwords, levelCapTaming, levelCapUnarmed, levelCapWoodcutting, anvilID, saveInterval, fishingTier1, fishingTier2, fishingTier3, fishingTier4, fishingTier5, repairStoneLevel, repairIronLevel, repairGoldLevel, arcaneRank1, arcaneRank2, arcaneRank3, arcaneRank4, - detonatorID, fishConsumedByCOTW; + detonatorID, fishConsumedByCOTW, dAxe, dHoe, dShovel, dSword, dPickaxe, gAxe, gHoe, gShovel, gSword, gPickaxe, + iAxe, iHoe, iShovel, iSword, iPickaxe, wAxe, wHoe, wShovel, wSword, wPickaxe; public static double xpbackground_r, xpbackground_g, xpbackground_b, xpborder_r, xpborder_g, xpborder_b, fishing_r, fishing_g, @@ -277,6 +278,7 @@ public class LoadProperties { saveInterval = readInteger("General.Save_Interval", 10); statsTracking = readBoolean("General.Stats_Tracking", true); eventCallback = readBoolean("General.Event_Callback", true); + perLevelTools = readBoolean("General.Per_Level_Tools", false); enableCobbleToMossy = readBoolean("Skills.Herbalism.Green_Thumb.Cobble_To_Mossy", true); enableSmoothToMossy = readBoolean("Skills.Herbalism.Green_Thumb.SmoothBrick_To_MossyBrick", true); @@ -289,6 +291,26 @@ public class LoadProperties { feathersConsumedByChimaeraWing = readInteger("Items.Chimaera_Wing.Feather_Cost", 10); chimaeraId = readInteger("Items.Chimaera_Wing.Item_ID", 288); chimaeraWingEnable = readBoolean("Items.Chimaera_Wing.Enabled", true); + dAxe = readInteger("Items.Diamond.Axe", 750); + dHoe = readInteger("Items.Diamond.Hoe", 750); + dShovel = readInteger("Items.Diamond.Shovel", 750); + dSword = readInteger("Items.Diamond.Sword", 750); + dPickaxe = readInteger("Items.Diamond.Pickaxe", 750); + gAxe = readInteger("Items.Gold.Axe", 500); + gHoe = readInteger("Items.Gold.Hoe", 500); + gShovel = readInteger("Items.Gold.Shovel", 500); + gSword = readInteger("Items.Gold.Sword", 500); + gPickaxe = readInteger("Items.Gold.Pickaxe", 500); + iAxe = readInteger("Items.Iron.Axe", 250); + iHoe = readInteger("Items.Iron.Hoe", 250); + iShovel = readInteger("Items.Iron.Shovel", 250); + iSword = readInteger("Items.Iron.Sword", 250); + iPickaxe = readInteger("Items.Iron.Pickaxe", 250); + wAxe = readInteger("Items.Wood.Axe", 0); + wHoe = readInteger("Items.Wood.Hoe", 0); + wShovel = readInteger("Items.Wood.Shovel", 0); + wSword = readInteger("Items.Wood.Sword", 0); + wPickaxe = readInteger("Items.Wood.Pickaxe", 0); pvpxp = readBoolean("Experience.PVP.Rewards", true); pvpxprewardmodifier = readDouble("Experience.Gains.Multiplier.PVP", 1.0); diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index af9ff012f..b3c3c04e3 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -17,7 +17,7 @@ General: Stats_Tracking: true #Allow mcMMO to inform other plugins of damage being dealt Event_Callback: true - + Per_Level_Tools: false # # Settings for using a mySQL database ### @@ -41,6 +41,30 @@ Items: Enabled: true Feather_Cost: 10 Item_ID: 288 + Diamond: + Axe: 750 + Hoe: 750 + Shovel: 750 + Sword: 750 + Pickaxe: 750 + Gold: + Axe: 500 + Hoe: 500 + Shovel: 500 + Sword: 500 + Pickaxe: 500 + Iron: + Axe: 250 + Hoe: 250 + Shovel: 250 + Sword: 250 + Pickaxe: 250 + Wood: + Axe: 0 + Hoe: 0 + Shovel: 0 + Sword: 0 + Pickaxe: 0 # # Settings for Arcane Forging