From 3a6d94e68292934ab7d709c635979a97f052a90e Mon Sep 17 00:00:00 2001 From: nossr50 Date: Mon, 13 May 2019 04:00:08 -0700 Subject: [PATCH] Cleanup --- .../config/experience/ExperienceConfig.java | 27 ------------------- .../nossr50/skills/smelting/Smelting.java | 8 ------ 2 files changed, 35 deletions(-) diff --git a/src/main/java/com/gmail/nossr50/config/experience/ExperienceConfig.java b/src/main/java/com/gmail/nossr50/config/experience/ExperienceConfig.java index 06937d443..84118ce09 100644 --- a/src/main/java/com/gmail/nossr50/config/experience/ExperienceConfig.java +++ b/src/main/java/com/gmail/nossr50/config/experience/ExperienceConfig.java @@ -112,33 +112,6 @@ public class ExperienceConfig extends ConfigValidated { return reason; } - /* - * FORMULA SETTINGS - */ - - //TODO: Rewrite this - /*public void setExperienceGainsGlobalMultiplier(double value) { - config.set(EXPERIENCE_FORMULA, MULTIPLIER, GLOBAL, value); - }*/ - - /* - * XP SETTINGS - */ - - /** - * Gets the raw XP given for breaking this block, this does not include modifiers - * - * @param skill The skill to give XP for - * @param blockType the type of block - * @return the raw amount of XP for this block before modifiers - */ - //public int getXp(PrimarySkillType skill, BlockType blockType) { - public int getXp(PrimarySkillType skill, Material blockType) { - //TODO: This is going to need to be changed, this code here is only placeholder - String[] path = new String[]{EXPERIENCE, StringUtils.getCapitalized(skill.toString()), blockType.toString()}; - return getIntValue(path); - } - /* * Experience Bar Stuff */ diff --git a/src/main/java/com/gmail/nossr50/skills/smelting/Smelting.java b/src/main/java/com/gmail/nossr50/skills/smelting/Smelting.java index 8557cc163..7e634e68b 100644 --- a/src/main/java/com/gmail/nossr50/skills/smelting/Smelting.java +++ b/src/main/java/com/gmail/nossr50/skills/smelting/Smelting.java @@ -1,17 +1,9 @@ package com.gmail.nossr50.skills.smelting; -import com.gmail.nossr50.datatypes.skills.SubSkillType; import com.gmail.nossr50.mcMMO; -import com.gmail.nossr50.util.skills.RankUtils; -import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; public class Smelting { - - public static int getRank(Player player) { - return RankUtils.getRank(player, SubSkillType.SMELTING_UNDERSTANDING_THE_ART); - } - protected static int getResourceXp(ItemStack smelting) { return mcMMO.getDynamicSettingsManager().getExperienceManager().getFurnaceItemXP(smelting.getType()); }