From ac1d556895a1d4d9db2d315c452b48252ad22d81 Mon Sep 17 00:00:00 2001 From: TfT_02 Date: Mon, 4 Feb 2013 16:36:47 +0100 Subject: [PATCH] Moved this a bit + minor cleanup --- .../java/com/gmail/nossr50/config/Config.java | 22 +++++++++---------- src/main/resources/config.yml | 2 +- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/gmail/nossr50/config/Config.java b/src/main/java/com/gmail/nossr50/config/Config.java index fe72417ca..27c4e57b4 100644 --- a/src/main/java/com/gmail/nossr50/config/Config.java +++ b/src/main/java/com/gmail/nossr50/config/Config.java @@ -77,17 +77,23 @@ public class Config extends ConfigLoader { public boolean getArmorModsEnabled() { return config.getBoolean("Mods.Tool_Mods_Enabled", false); } public boolean getBlockModsEnabled() { return config.getBoolean("Mods.Block_Mods_Enabled", false); } + /* Items */ + public int getChimaeraCost() { return config.getInt("Items.Chimaera_Wing.Feather_Cost", 10); } + public int getChimaeraItemId() { return config.getInt("Items.Chimaera_Wing.Item_ID", 288); } + public boolean getChimaeraEnabled() { return config.getBoolean("Items.Chimaera_Wing.Enabled", true); } + + /* PARTY SETTINGS */ + public boolean getExpShareEnabled() { return config.getBoolean("Party.Sharing.ExpShare_enabled", true); } + public double getPartyShareBonus() { return config.getDouble("Party.Sharing.ExpShare_bonus", 1.1); } + public boolean getItemShareEnabled() { return config.getBoolean("Party.Sharing.ItemShare_enabled", true); } + public double getPartyShareRange() { return config.getDouble("Party.Sharing.Range", 75.0); } + /* Party Teleport Settings */ public int getPTPCommandCooldown() { return config.getInt("Commands.ptp.Cooldown", 30); } public int getPTPCommandTimeout() { return config.getInt("Commands.ptp.Request_Timeout", 300); } public boolean getPTPCommandConfirmRequired() { return config.getBoolean("Commands.ptp.Confirm_Required", true); } public boolean getPTPCommandWorldPermissions() { return config.getBoolean("Commands.ptp.World_Based_Permissions", false); } - /* Items */ - public int getChimaeraCost() { return config.getInt("Items.Chimaera_Wing.Feather_Cost", 10); } - public int getChimaeraItemId() { return config.getInt("Items.Chimaera_Wing.Item_ID", 288); } - public boolean getChimaeraEnabled() { return config.getBoolean("Items.Chimaera_Wing.Enabled", true); } - /* * ABILITY SETTINGS */ @@ -407,10 +413,4 @@ public class Config extends ConfigLoader { int cap = config.getInt(configString, 0); return ((cap <= 0) ? Integer.MAX_VALUE : cap); } - - /* Party Settings */ - public boolean getExpShareEnabled() { return config.getBoolean("Party.Sharing.ExpShare_enabled", true); } - public double getPartyShareBonus() { return config.getDouble("Party.Sharing.ExpShare_bonus", 1.1); } - public boolean getItemShareEnabled() { return config.getBoolean("Party.Sharing.ItemShare_enabled", true); } - public double getPartyShareRange() { return config.getDouble("Party.Sharing.Range", 75.0); } } diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index e0df8726a..abafdac1f 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -67,7 +67,7 @@ Items: # # Settings for Parties -### +### Party: Sharing: ExpShare_enabled: true