diff --git a/src/main/java/com/gmail/nossr50/config/ConfigManager.java b/src/main/java/com/gmail/nossr50/config/ConfigManager.java index 91982db81..78ab6634a 100644 --- a/src/main/java/com/gmail/nossr50/config/ConfigManager.java +++ b/src/main/java/com/gmail/nossr50/config/ConfigManager.java @@ -1,6 +1,5 @@ package com.gmail.nossr50.config; -import com.gmail.nossr50.config.experience.ExperienceConfig; import com.gmail.nossr50.config.hocon.*; import com.gmail.nossr50.config.hocon.admin.ConfigAdmin; import com.gmail.nossr50.config.hocon.antiexploit.ConfigExploitPrevention; @@ -123,7 +122,6 @@ public final class ConfigManager { private FishingTreasureConfig fishingTreasureConfig; private ExcavationTreasureConfig excavationTreasureConfig; private HerbalismTreasureConfig herbalismTreasureConfig; - private ExperienceConfig experienceConfig; private AdvancedConfig advancedConfig; private CoreSkillsConfig coreSkillsConfig; private SoundConfig soundConfig; @@ -340,10 +338,6 @@ public final class ConfigManager { return rankConfig; } - public ExperienceConfig getExperienceConfig() { - return experienceConfig; - } - public ConfigDatabase getConfigDatabase() { return configDatabase.getConfig(); } diff --git a/src/main/java/com/gmail/nossr50/config/experience/ExperienceConfig.java b/src/main/java/com/gmail/nossr50/config/experience/ExperienceConfig.java deleted file mode 100644 index f16102176..000000000 --- a/src/main/java/com/gmail/nossr50/config/experience/ExperienceConfig.java +++ /dev/null @@ -1,122 +0,0 @@ -package com.gmail.nossr50.config.experience; - -import com.gmail.nossr50.config.ConfigConstants; -import com.gmail.nossr50.config.ConfigValidated; -import com.gmail.nossr50.datatypes.skills.ItemMaterialCategory; -import com.gmail.nossr50.datatypes.skills.PrimarySkillType; -import com.gmail.nossr50.mcMMO; -import com.gmail.nossr50.util.StringUtils; -import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; -import org.bukkit.boss.BarColor; -import org.bukkit.boss.BarStyle; - -import java.util.ArrayList; -import java.util.List; - -@ConfigSerializable -public class ExperienceConfig extends ConfigValidated { - public static final String EXPLOIT_FIX = "ExploitFix"; - public static final String ENDERMAN_ENDERMITE_FARMS = "EndermanEndermiteFarms"; - public static final String EXPERIENCE = "Experience"; - public static final String EXPERIENCE_FORMULA = EXPERIENCE + "_Formula"; - public static final String CURVE = "Curve"; - public static final String VALUES = "_Values"; - //public static final String MULTIPLIER = "multiplier"; - public static final String BASE = "base"; - public static final String EXPONENT = "exponent"; - public static final String MULTIPLIER = "Multiplier"; - public static final String GLOBAL = "Global"; - public static final String MOBSPAWNERS = "Mobspawners"; - public static final String BREEDING = "Breeding"; - public static final String MODIFIER = "Modifier"; - public static final String CUSTOM_XP_PERK = "Custom_XP_Perk"; - public static final String BOOST = "Boost"; - public static final String DIMISHED_RETURNS = "Dimished_Returns"; - public static final String GUARANTEED_MINIMUM_PERCENTAGE = "Guaranteed_Minimum_Percentage"; - public static final String DIMINISHED_RETURNS = "Diminished_Returns"; - public static final String ENABLE = "Enable"; - public static final String ENABLED = ENABLE + "d"; - public static final String TIME_INTERVAL = "Time_Interval"; - public static final String CONVERSION = "Conversion"; - public static final String EXP = "Exp_"; - public static final String PVP = "PVP"; - public static final String REWARDS = "Rewards"; - public static final String COMBAT = "Combat"; - public static final String ANIMALS = "Animals"; - public static final String BARS = "_Bars"; - public static final String UPDATE = "Update"; - public static final String PASSIVE = "Passive"; - public static final String THIS_MAY_CAUSE_LAG = "ThisMayCauseLag"; - public static final String ALWAYS = "Always"; - public static final String TITLES_WHEN_XPIS_GAINED = "TitlesWhenXPIsGained"; - public static final String EXTRA_DETAILS = "ExtraDetails"; - public static final String COLOR = "Color"; - public static final String BAR_STYLE = "BarStyle"; - public static final String ACROBATICS = "Acrobatics"; - public static final String DODGE = "Dodge"; - public static final String ROLL = "Roll"; - public static final String FALL = "Fall"; - public static final String FEATHER = "Feather"; - public static final String ALCHEMY = "Alchemy"; - public static final String POTION_STAGE = "Potion_Stage_"; - public static final String ARCHERY = "Archery"; - public static final String DISTANCE = "Distance_"; - public static final String FISHING = "Fishing"; - public static final String SHAKE = "Shake"; - public static final String REPAIR = "Repair"; - public static final String BASE1 = "Base"; - public static final String TAMING = "Taming"; - public static final String ANIMAL_TAMING = "Animal_Taming"; - public static final String PARTY = "Party"; - public static final String THRESHOLD = "Threshold"; - public static final String CUMULATIVE = "Cumulative_"; - public static final String OCELOT = "Ocelot"; - public static final String WOLF = "Wolf"; - public static final String FEATHER_FALL_MULTIPLIER = "FeatherFall_Multiplier"; - private static final String PISTONS = "Pistons"; - - //TODO: Should merge be false? Seems okay to leave it as true.. - public ExperienceConfig() { - //super(McmmoCore.getDataFolderPath().getAbsoluteFile(), "experience.yml", true); - super("experience", mcMMO.p.getDataFolder().getAbsoluteFile(), ConfigConstants.RELATIVE_PATH_CONFIG_DIR, true, false, true, false); - } - - /** - * This grabs an instance of this config class from the Config Manager - * This method is deprecated and will be removed in the future - * - * @return the instance of this config - * @see mcMMO#getConfigManager() - * @deprecated Please use mcMMO.getConfigManager() to grab a specific config instead - */ - @Deprecated - public static ExperienceConfig getInstance() { - return mcMMO.getConfigManager().getExperienceConfig(); - } - - /** - * The version of this config - * - * @return - */ - @Override - public double getConfigVersion() { - return 1; - } - - @Override - public List validateKeys() { - List reason = new ArrayList<>(); - - return reason; - } - - /* Repair */ - public double getRepairXPBase() { - return getDoubleValue(EXPERIENCE, REPAIR, BASE1); - } - - public double getRepairXP(ItemMaterialCategory repairItemMaterialCategory) { - return getDoubleValue(EXPERIENCE, REPAIR, StringUtils.getCapitalized(repairItemMaterialCategory.toString())); - } -} diff --git a/src/main/java/com/gmail/nossr50/datatypes/player/McMMOPlayer.java b/src/main/java/com/gmail/nossr50/datatypes/player/McMMOPlayer.java index f8a8042bb..4816540ac 100644 --- a/src/main/java/com/gmail/nossr50/datatypes/player/McMMOPlayer.java +++ b/src/main/java/com/gmail/nossr50/datatypes/player/McMMOPlayer.java @@ -3,7 +3,6 @@ package com.gmail.nossr50.datatypes.player; import com.gmail.nossr50.config.AdvancedConfig; import com.gmail.nossr50.config.MainConfig; import com.gmail.nossr50.config.WorldBlacklist; -import com.gmail.nossr50.config.experience.ExperienceConfig; import com.gmail.nossr50.datatypes.chat.ChatMode; import com.gmail.nossr50.datatypes.experience.XPGainReason; import com.gmail.nossr50.datatypes.experience.XPGainSource; diff --git a/src/main/java/com/gmail/nossr50/listeners/BlockListener.java b/src/main/java/com/gmail/nossr50/listeners/BlockListener.java index fe2169897..5e6c5c672 100644 --- a/src/main/java/com/gmail/nossr50/listeners/BlockListener.java +++ b/src/main/java/com/gmail/nossr50/listeners/BlockListener.java @@ -2,7 +2,6 @@ package com.gmail.nossr50.listeners; import com.gmail.nossr50.config.MainConfig; import com.gmail.nossr50.config.WorldBlacklist; -import com.gmail.nossr50.config.experience.ExperienceConfig; import com.gmail.nossr50.core.MetadataConstants; import com.gmail.nossr50.datatypes.meta.BonusDropMeta; import com.gmail.nossr50.datatypes.player.McMMOPlayer; diff --git a/src/main/java/com/gmail/nossr50/skills/repair/RepairManager.java b/src/main/java/com/gmail/nossr50/skills/repair/RepairManager.java index 4f0bfe92b..0f3af0128 100644 --- a/src/main/java/com/gmail/nossr50/skills/repair/RepairManager.java +++ b/src/main/java/com/gmail/nossr50/skills/repair/RepairManager.java @@ -1,7 +1,6 @@ package com.gmail.nossr50.skills.repair; import com.gmail.nossr50.config.AdvancedConfig; -import com.gmail.nossr50.config.experience.ExperienceConfig; import com.gmail.nossr50.datatypes.experience.XPGainReason; import com.gmail.nossr50.datatypes.interactions.NotificationType; import com.gmail.nossr50.datatypes.player.McMMOPlayer; diff --git a/src/main/java/com/gmail/nossr50/util/experience/ExperienceBarManager.java b/src/main/java/com/gmail/nossr50/util/experience/ExperienceBarManager.java index f9be2fabe..dc7493ab2 100644 --- a/src/main/java/com/gmail/nossr50/util/experience/ExperienceBarManager.java +++ b/src/main/java/com/gmail/nossr50/util/experience/ExperienceBarManager.java @@ -1,6 +1,5 @@ package com.gmail.nossr50.util.experience; -import com.gmail.nossr50.config.experience.ExperienceConfig; import com.gmail.nossr50.datatypes.player.McMMOPlayer; import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.mcMMO; diff --git a/src/main/java/com/gmail/nossr50/util/experience/ExperienceBarWrapper.java b/src/main/java/com/gmail/nossr50/util/experience/ExperienceBarWrapper.java index 017251824..b86ea25ba 100644 --- a/src/main/java/com/gmail/nossr50/util/experience/ExperienceBarWrapper.java +++ b/src/main/java/com/gmail/nossr50/util/experience/ExperienceBarWrapper.java @@ -1,6 +1,5 @@ package com.gmail.nossr50.util.experience; -import com.gmail.nossr50.config.experience.ExperienceConfig; import com.gmail.nossr50.datatypes.player.McMMOPlayer; import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.locale.LocaleLoader;