mirror of
https://github.com/mcMMO-Dev/mcMMO.git
synced 2025-06-27 11:14:44 +02:00
Well this should fix the issues with config, but I hate it.
This commit is contained in:
nossr50
@ -66,7 +66,7 @@ public class Excavation {
|
||||
|
||||
List<ExcavationTreasure> treasures = new ArrayList<ExcavationTreasure>();
|
||||
|
||||
int xp = Config.getExcavationBaseXP();
|
||||
int xp = Config.getInstance().getExcavationBaseXP();
|
||||
|
||||
if (mcPermissions.getInstance().excavationTreasures(player)) {
|
||||
switch (type) {
|
||||
@ -131,7 +131,7 @@ public class Excavation {
|
||||
* @param block The block to check
|
||||
*/
|
||||
public static void gigaDrillBreaker(Player player, Block block) {
|
||||
Skills.abilityDurabilityLoss(player.getItemInHand(), Config.getAbilityToolDamage());
|
||||
Skills.abilityDurabilityLoss(player.getItemInHand(), Config.getInstance().getAbilityToolDamage());
|
||||
|
||||
if (!block.hasMetadata("mcmmoPlacedBlock")) {
|
||||
FakePlayerAnimationEvent armswing = new FakePlayerAnimationEvent(player);
|
||||
@ -141,7 +141,7 @@ public class Excavation {
|
||||
Excavation.excavationProcCheck(block, player);
|
||||
}
|
||||
|
||||
if (Config.spoutEnabled) {
|
||||
if (Config.getInstance().spoutEnabled) {
|
||||
SpoutSounds.playSoundForPlayer(SoundEffect.POP, player, block.getLocation());
|
||||
}
|
||||
}
|
||||
|
||||
@ -42,16 +42,16 @@ public class Fishing {
|
||||
int level = PP.getSkillLevel(SkillType.FISHING);
|
||||
int fishingTier;
|
||||
|
||||
if (level >= Config.getFishingTierLevelsTier5()) {
|
||||
if (level >= Config.getInstance().getFishingTierLevelsTier5()) {
|
||||
fishingTier = 5;
|
||||
}
|
||||
else if (level >= Config.getFishingTierLevelsTier4()) {
|
||||
else if (level >= Config.getInstance().getFishingTierLevelsTier4()) {
|
||||
fishingTier = 4;
|
||||
}
|
||||
else if (level >= Config.getFishingTierLevelsTier3()) {
|
||||
else if (level >= Config.getInstance().getFishingTierLevelsTier3()) {
|
||||
fishingTier = 3;
|
||||
}
|
||||
else if (level >= Config.getFishingTierLevelsTier2()) {
|
||||
else if (level >= Config.getInstance().getFishingTierLevelsTier2()) {
|
||||
fishingTier = 2;
|
||||
}
|
||||
else {
|
||||
@ -97,7 +97,7 @@ public class Fishing {
|
||||
break;
|
||||
}
|
||||
|
||||
if (Config.getFishingDropsEnabled() && rewards.size() > 0) {
|
||||
if (Config.getInstance().getFishingDropsEnabled() && rewards.size() > 0) {
|
||||
FishingTreasure treasure = rewards.get(random.nextInt(rewards.size()));
|
||||
|
||||
if (random.nextDouble() * 100 <= treasure.getDropChance()) {
|
||||
@ -115,7 +115,7 @@ public class Fishing {
|
||||
theCatch.getItemStack().setDurability((short) (random.nextInt(maxDurability))); //Change durability to random value
|
||||
}
|
||||
|
||||
PP.addXP(SkillType.FISHING, Config.getFishingBaseXP());
|
||||
PP.addXP(SkillType.FISHING, Config.getInstance().getFishingBaseXP());
|
||||
Skills.XpCheckSkill(SkillType.FISHING, player);
|
||||
}
|
||||
|
||||
|
||||
@ -45,13 +45,13 @@ public class Herbalism {
|
||||
player.updateInventory();
|
||||
|
||||
if (m.blockBreakSimulate(block, player, false)) {
|
||||
if (Config.getHerbalismGreenThumbSmoothbrickToMossy() && type.equals(Material.SMOOTH_BRICK)) {
|
||||
if (Config.getInstance().getHerbalismGreenThumbSmoothbrickToMossy() && type.equals(Material.SMOOTH_BRICK)) {
|
||||
block.setData((byte) 0x1); //Set type of the brick to mossy
|
||||
}
|
||||
else if (Config.getHerbalismGreenThumbDirtToGrass() && type.equals(Material.DIRT)) {
|
||||
else if (Config.getInstance().getHerbalismGreenThumbDirtToGrass() && type.equals(Material.DIRT)) {
|
||||
block.setType(Material.GRASS);
|
||||
}
|
||||
else if (Config.getHerbalismGreenThumbCobbleToMossy() && type.equals(Material.COBBLESTONE)) {
|
||||
else if (Config.getInstance().getHerbalismGreenThumbCobbleToMossy() && type.equals(Material.COBBLESTONE)) {
|
||||
block.setType(Material.MOSSY_COBBLESTONE);
|
||||
}
|
||||
}
|
||||
@ -132,7 +132,7 @@ public class Herbalism {
|
||||
case RED_MUSHROOM:
|
||||
if (!block.hasMetadata("mcmmoPlacedBlock")) {
|
||||
mat = Material.getMaterial(id);
|
||||
xp = Config.getHerbalismXPMushrooms();
|
||||
xp = Config.getInstance().getHerbalismXPMushrooms();
|
||||
}
|
||||
break;
|
||||
|
||||
@ -145,7 +145,7 @@ public class Herbalism {
|
||||
if (herbLevel > MAX_BONUS_LEVEL || random.nextInt(1000) <= herbLevel) {
|
||||
catciDrops++;
|
||||
}
|
||||
xp += Config.getHerbalismXPCactus();
|
||||
xp += Config.getInstance().getHerbalismXPCactus();
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -154,9 +154,9 @@ public class Herbalism {
|
||||
case CROPS:
|
||||
if (data == CropState.RIPE.getData()) {
|
||||
mat = Material.WHEAT;
|
||||
xp = Config.getHerbalismXPWheat();
|
||||
xp = Config.getInstance().getHerbalismXPWheat();
|
||||
|
||||
if (Config.getHerbalismWheatRegrowth() && mcPermissions.getInstance().greenThumbWheat(player)) {
|
||||
if (Config.getInstance().getHerbalismWheatRegrowth() && mcPermissions.getInstance().greenThumbWheat(player)) {
|
||||
greenThumbWheat(block, player, event, plugin);
|
||||
}
|
||||
}
|
||||
@ -165,14 +165,14 @@ public class Herbalism {
|
||||
case MELON_BLOCK:
|
||||
if (!block.hasMetadata("mcmmoPlacedBlock")) {
|
||||
mat = Material.MELON;
|
||||
xp = Config.getHerbalismXPMelon();
|
||||
xp = Config.getInstance().getHerbalismXPMelon();
|
||||
}
|
||||
break;
|
||||
|
||||
case NETHER_WARTS:
|
||||
if (data == (byte) 0x3) {
|
||||
mat = Material.NETHER_STALK;
|
||||
xp = Config.getHerbalismXPNetherWart();
|
||||
xp = Config.getInstance().getHerbalismXPNetherWart();
|
||||
}
|
||||
break;
|
||||
|
||||
@ -180,7 +180,7 @@ public class Herbalism {
|
||||
case JACK_O_LANTERN:
|
||||
if (!block.hasMetadata("mcmmoPlacedBlock")) {
|
||||
mat = Material.getMaterial(id);
|
||||
xp = Config.getHerbalismXPPumpkin();
|
||||
xp = Config.getInstance().getHerbalismXPPumpkin();
|
||||
}
|
||||
break;
|
||||
|
||||
@ -188,7 +188,7 @@ public class Herbalism {
|
||||
case YELLOW_FLOWER:
|
||||
if (!block.hasMetadata("mcmmoPlacedBlock")) {
|
||||
mat = Material.getMaterial(id);
|
||||
xp = Config.getHerbalismXPFlowers();
|
||||
xp = Config.getInstance().getHerbalismXPFlowers();
|
||||
}
|
||||
break;
|
||||
|
||||
@ -201,7 +201,7 @@ public class Herbalism {
|
||||
if (herbLevel > MAX_BONUS_LEVEL || random.nextInt(1000) <= herbLevel) {
|
||||
caneDrops++;
|
||||
}
|
||||
xp += Config.getHerbalismXPSugarCane();
|
||||
xp += Config.getInstance().getHerbalismXPSugarCane();
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -210,14 +210,14 @@ public class Herbalism {
|
||||
case VINE:
|
||||
if (!block.hasMetadata("mcmmoPlacedBlock")) {
|
||||
mat = type;
|
||||
xp = Config.getHerbalismXPVines();
|
||||
xp = Config.getInstance().getHerbalismXPVines();
|
||||
}
|
||||
break;
|
||||
|
||||
case WATER_LILY:
|
||||
if (!block.hasMetadata("mcmmoPlacedBlock")) {
|
||||
mat = type;
|
||||
xp = Config.getHerbalismXPLilyPads();
|
||||
xp = Config.getInstance().getHerbalismXPLilyPads();
|
||||
}
|
||||
break;
|
||||
|
||||
|
||||
@ -15,8 +15,8 @@ import com.gmail.nossr50.Users;
|
||||
import com.gmail.nossr50.m;
|
||||
import com.gmail.nossr50.mcMMO;
|
||||
import com.gmail.nossr50.mcPermissions;
|
||||
import com.gmail.nossr50.config.Config;
|
||||
import com.gmail.nossr50.spout.SpoutSounds;
|
||||
import com.gmail.nossr50.config.Config;
|
||||
import com.gmail.nossr50.datatypes.PlayerProfile;
|
||||
import com.gmail.nossr50.datatypes.SkillType;
|
||||
import com.gmail.nossr50.events.fake.FakePlayerAnimationEvent;
|
||||
@ -89,56 +89,56 @@ public class Mining {
|
||||
|
||||
switch (type) {
|
||||
case COAL_ORE:
|
||||
xp += Config.getMiningXPCoalOre();
|
||||
xp += Config.getInstance().getMiningXPCoalOre();
|
||||
break;
|
||||
|
||||
case DIAMOND_ORE:
|
||||
xp += Config.getMiningXPDiamondOre();
|
||||
xp += Config.getInstance().getMiningXPDiamondOre();
|
||||
break;
|
||||
|
||||
case ENDER_STONE:
|
||||
xp += Config.getMiningXPEndStone();
|
||||
xp += Config.getInstance().getMiningXPEndStone();
|
||||
break;
|
||||
|
||||
case GLOWING_REDSTONE_ORE:
|
||||
case REDSTONE_ORE:
|
||||
xp += Config.getMiningXPRedstoneOre();
|
||||
xp += Config.getInstance().getMiningXPRedstoneOre();
|
||||
break;
|
||||
|
||||
case GLOWSTONE:
|
||||
xp += Config.getMiningXPGlowstone();
|
||||
xp += Config.getInstance().getMiningXPGlowstone();
|
||||
break;
|
||||
|
||||
case GOLD_ORE:
|
||||
xp += Config.getMiningXPGoldOre();
|
||||
xp += Config.getInstance().getMiningXPGoldOre();
|
||||
break;
|
||||
|
||||
case IRON_ORE:
|
||||
xp += Config.getMiningXPIronOre();
|
||||
xp += Config.getInstance().getMiningXPIronOre();
|
||||
break;
|
||||
|
||||
case LAPIS_ORE:
|
||||
xp += Config.getMiningXPLapisOre();
|
||||
xp += Config.getInstance().getMiningXPLapisOre();
|
||||
break;
|
||||
|
||||
case MOSSY_COBBLESTONE:
|
||||
xp += Config.getMiningXPMossyStone();
|
||||
xp += Config.getInstance().getMiningXPMossyStone();
|
||||
break;
|
||||
|
||||
case NETHERRACK:
|
||||
xp += Config.getMiningXPNetherrack();
|
||||
xp += Config.getInstance().getMiningXPNetherrack();
|
||||
break;
|
||||
|
||||
case OBSIDIAN:
|
||||
xp += Config.getMiningXPObsidian();
|
||||
xp += Config.getInstance().getMiningXPObsidian();
|
||||
break;
|
||||
|
||||
case SANDSTONE:
|
||||
xp += Config.getMiningXPSandstone();
|
||||
xp += Config.getInstance().getMiningXPSandstone();
|
||||
break;
|
||||
|
||||
case STONE:
|
||||
xp += Config.getMiningXPStone();
|
||||
xp += Config.getInstance().getMiningXPStone();
|
||||
break;
|
||||
|
||||
default:
|
||||
@ -216,7 +216,7 @@ public class Mining {
|
||||
public static void SuperBreakerBlockCheck(Player player, Block block) {
|
||||
Material type = block.getType();
|
||||
int tier = m.getTier(player.getItemInHand());
|
||||
int durabilityLoss = Config.getAbilityToolDamage();
|
||||
int durabilityLoss = Config.getInstance().getAbilityToolDamage();
|
||||
FakePlayerAnimationEvent armswing = new FakePlayerAnimationEvent(player);
|
||||
|
||||
switch (type) {
|
||||
@ -259,7 +259,7 @@ public class Mining {
|
||||
|
||||
miningBlockCheck(player, block);
|
||||
|
||||
if (Config.spoutEnabled) {
|
||||
if (Config.getInstance().spoutEnabled) {
|
||||
SpoutSounds.playSoundForPlayer(SoundEffect.POP, player, block.getLocation());
|
||||
}
|
||||
}
|
||||
|
||||
@ -47,21 +47,21 @@ public class Repair {
|
||||
/*
|
||||
* REPAIR ARMOR
|
||||
*/
|
||||
if (ItemChecks.isArmor(is) && Config.getRepairArmorAllowed() && mcPermissions.getInstance().armorRepair(player)) {
|
||||
if (ItemChecks.isDiamondArmor(is) && inventory.contains(Config.getRepairDiamondMaterial()) && skillLevel >= Config.getRepairDiamondLevelRequirement() && mcPermissions.getInstance().diamondRepair(player)) {
|
||||
repairItem(player, is, new ItemStack(Config.getRepairDiamondMaterial()));
|
||||
if (ItemChecks.isArmor(is) && Config.getInstance().getRepairArmorAllowed() && mcPermissions.getInstance().armorRepair(player)) {
|
||||
if (ItemChecks.isDiamondArmor(is) && inventory.contains(Config.getInstance().getRepairDiamondMaterial()) && skillLevel >= Config.getInstance().getRepairDiamondLevelRequirement() && mcPermissions.getInstance().diamondRepair(player)) {
|
||||
repairItem(player, is, new ItemStack(Config.getInstance().getRepairDiamondMaterial()));
|
||||
xpHandler(player, PP, is, durabilityBefore, 6, true);
|
||||
}
|
||||
else if (ItemChecks.isIronArmor(is) && inventory.contains(Config.getRepairIronMaterial()) && skillLevel >= Config.getRepairIronLevelRequirement() && mcPermissions.getInstance().ironRepair(player)) {
|
||||
repairItem(player, is, new ItemStack(Config.getRepairIronMaterial()));
|
||||
else if (ItemChecks.isIronArmor(is) && inventory.contains(Config.getInstance().getRepairIronMaterial()) && skillLevel >= Config.getInstance().getRepairIronLevelRequirement() && mcPermissions.getInstance().ironRepair(player)) {
|
||||
repairItem(player, is, new ItemStack(Config.getInstance().getRepairIronMaterial()));
|
||||
xpHandler(player, PP, is, durabilityBefore, 2, true);
|
||||
}
|
||||
else if (ItemChecks.isGoldArmor(is) && inventory.contains(Config.getRepairGoldMaterial()) && skillLevel >= Config.getRepairGoldLevelRequirement() && mcPermissions.getInstance().goldRepair(player)) {
|
||||
repairItem(player, is, new ItemStack(Config.getRepairGoldMaterial()));
|
||||
else if (ItemChecks.isGoldArmor(is) && inventory.contains(Config.getInstance().getRepairGoldMaterial()) && skillLevel >= Config.getInstance().getRepairGoldLevelRequirement() && mcPermissions.getInstance().goldRepair(player)) {
|
||||
repairItem(player, is, new ItemStack(Config.getInstance().getRepairGoldMaterial()));
|
||||
xpHandler(player, PP, is, durabilityBefore, 4, true);
|
||||
}
|
||||
else if (ItemChecks.isLeatherArmor(is) && inventory.contains(Config.getRepairLeatherMaterial()) && mcPermissions.getInstance().leatherRepair(player)) {
|
||||
repairItem(player, is, new ItemStack(Config.getRepairLeatherMaterial()));
|
||||
else if (ItemChecks.isLeatherArmor(is) && inventory.contains(Config.getInstance().getRepairLeatherMaterial()) && mcPermissions.getInstance().leatherRepair(player)) {
|
||||
repairItem(player, is, new ItemStack(Config.getInstance().getRepairLeatherMaterial()));
|
||||
xpHandler(player, PP, is, durabilityBefore, 1, true);
|
||||
}
|
||||
else {
|
||||
@ -72,29 +72,29 @@ public class Repair {
|
||||
/*
|
||||
* REPAIR TOOLS
|
||||
*/
|
||||
else if (ItemChecks.isTool(is) && Config.getRepairToolsAllowed() && mcPermissions.getInstance().toolRepair(player)) {
|
||||
if (ItemChecks.isStoneTool(is) && inventory.contains(Config.getRepairStoneMaterial()) && skillLevel >= Config.getRepairStoneLevelRequirement() && mcPermissions.getInstance().stoneRepair(player)) {
|
||||
repairItem(player, is, new ItemStack(Config.getRepairStoneMaterial()));
|
||||
else if (ItemChecks.isTool(is) && Config.getInstance().getRepairToolsAllowed() && mcPermissions.getInstance().toolRepair(player)) {
|
||||
if (ItemChecks.isStoneTool(is) && inventory.contains(Config.getInstance().getRepairStoneMaterial()) && skillLevel >= Config.getInstance().getRepairStoneLevelRequirement() && mcPermissions.getInstance().stoneRepair(player)) {
|
||||
repairItem(player, is, new ItemStack(Config.getInstance().getRepairStoneMaterial()));
|
||||
xpHandler(player, PP, is, durabilityBefore, 2, false);
|
||||
}
|
||||
else if (ItemChecks.isWoodTool(is) && inventory.contains(Config.getRepairWoodMaterial()) && mcPermissions.getInstance().woodRepair(player)) {
|
||||
repairItem(player, is, new ItemStack(Config.getRepairWoodMaterial()));
|
||||
else if (ItemChecks.isWoodTool(is) && inventory.contains(Config.getInstance().getRepairWoodMaterial()) && mcPermissions.getInstance().woodRepair(player)) {
|
||||
repairItem(player, is, new ItemStack(Config.getInstance().getRepairWoodMaterial()));
|
||||
xpHandler(player, PP, is, durabilityBefore, 2, false);
|
||||
}
|
||||
else if (ItemChecks.isIronTool(is) && inventory.contains(Config.getRepairIronMaterial()) && skillLevel >= Config.getRepairIronLevelRequirement() && mcPermissions.getInstance().ironRepair(player)) {
|
||||
repairItem(player, is, new ItemStack(Config.getRepairIronMaterial()));
|
||||
else if (ItemChecks.isIronTool(is) && inventory.contains(Config.getInstance().getRepairIronMaterial()) && skillLevel >= Config.getInstance().getRepairIronLevelRequirement() && mcPermissions.getInstance().ironRepair(player)) {
|
||||
repairItem(player, is, new ItemStack(Config.getInstance().getRepairIronMaterial()));
|
||||
xpHandler(player, PP, is, durabilityBefore, 1, true);
|
||||
}
|
||||
else if (ItemChecks.isDiamondTool(is) && inventory.contains(Config.getRepairDiamondMaterial()) && skillLevel >= Config.getRepairDiamondLevelRequirement() && mcPermissions.getInstance().diamondRepair(player)) {
|
||||
repairItem(player, is, new ItemStack(Config.getRepairDiamondMaterial()));
|
||||
else if (ItemChecks.isDiamondTool(is) && inventory.contains(Config.getInstance().getRepairDiamondMaterial()) && skillLevel >= Config.getInstance().getRepairDiamondLevelRequirement() && mcPermissions.getInstance().diamondRepair(player)) {
|
||||
repairItem(player, is, new ItemStack(Config.getInstance().getRepairDiamondMaterial()));
|
||||
xpHandler(player, PP, is, durabilityBefore, 1, true);
|
||||
}
|
||||
else if (ItemChecks.isGoldTool(is) && inventory.contains(Config.getRepairGoldMaterial()) && skillLevel >= Config.getRepairGoldLevelRequirement() && mcPermissions.getInstance().goldRepair(player)) {
|
||||
repairItem(player, is, new ItemStack(Config.getRepairGoldMaterial()));
|
||||
else if (ItemChecks.isGoldTool(is) && inventory.contains(Config.getInstance().getRepairGoldMaterial()) && skillLevel >= Config.getInstance().getRepairGoldLevelRequirement() && mcPermissions.getInstance().goldRepair(player)) {
|
||||
repairItem(player, is, new ItemStack(Config.getInstance().getRepairGoldMaterial()));
|
||||
xpHandler(player, PP, is, durabilityBefore, 8, true);
|
||||
}
|
||||
else if (ItemChecks.isStringTool(is) && inventory.contains(Config.getRepairStringMaterial()) && skillLevel >= Config.getRepairStringLevelRequirement() && mcPermissions.getInstance().stringRepair(player)){
|
||||
repairItem(player, is, new ItemStack(Config.getRepairStringMaterial()));
|
||||
else if (ItemChecks.isStringTool(is) && inventory.contains(Config.getInstance().getRepairStringMaterial()) && skillLevel >= Config.getInstance().getRepairStringLevelRequirement() && mcPermissions.getInstance().stringRepair(player)){
|
||||
repairItem(player, is, new ItemStack(Config.getInstance().getRepairStringMaterial()));
|
||||
xpHandler(player, PP, is, durabilityBefore, 2, false);
|
||||
}
|
||||
else {
|
||||
@ -142,7 +142,7 @@ public class Repair {
|
||||
Skills.XpCheckSkill(SkillType.REPAIR, player);
|
||||
|
||||
//CLANG CLANG
|
||||
if (Config.spoutEnabled) {
|
||||
if (Config.getInstance().spoutEnabled) {
|
||||
SpoutSounds.playRepairNoise(player, mcMMO.p);
|
||||
}
|
||||
}
|
||||
@ -156,16 +156,16 @@ public class Repair {
|
||||
public static int getArcaneForgingRank(PlayerProfile PP) {
|
||||
int skillLevel = PP.getSkillLevel(SkillType.REPAIR);
|
||||
|
||||
if (skillLevel >= Config.getArcaneForgingRankLevels4()) {
|
||||
if (skillLevel >= Config.getInstance().getArcaneForgingRankLevels4()) {
|
||||
return 4;
|
||||
}
|
||||
else if (skillLevel >= Config.getArcaneForgingRankLevels3()) {
|
||||
else if (skillLevel >= Config.getInstance().getArcaneForgingRankLevels3()) {
|
||||
return 3;
|
||||
}
|
||||
else if (skillLevel >= Config.getArcaneForgingRankLevels2()) {
|
||||
else if (skillLevel >= Config.getInstance().getArcaneForgingRankLevels2()) {
|
||||
return 2;
|
||||
}
|
||||
else if (skillLevel >= Config.getArcaneForgingRankLevels1()) {
|
||||
else if (skillLevel >= Config.getInstance().getArcaneForgingRankLevels1()) {
|
||||
return 1;
|
||||
}
|
||||
else {
|
||||
@ -204,7 +204,7 @@ public class Repair {
|
||||
if (random.nextInt(100) <= getEnchantChance(rank)) {
|
||||
int enchantLevel = enchant.getValue();
|
||||
|
||||
if (Config.getArcaneForgingDowngradeEnabled() && enchantLevel > 1) {
|
||||
if (Config.getInstance().getArcaneForgingDowngradeEnabled() && enchantLevel > 1) {
|
||||
if (random.nextInt(100) <= getDowngradeChance(rank)) {
|
||||
is.addEnchantment(enchantment, enchantLevel--);
|
||||
downgraded = true;
|
||||
@ -238,16 +238,16 @@ public class Repair {
|
||||
public static int getEnchantChance(int rank) {
|
||||
switch (rank) {
|
||||
case 4:
|
||||
return Config.getArcaneForgingKeepEnchantsChanceRank4();
|
||||
return Config.getInstance().getArcaneForgingKeepEnchantsChanceRank4();
|
||||
|
||||
case 3:
|
||||
return Config.getArcaneForgingKeepEnchantsChanceRank3();
|
||||
return Config.getInstance().getArcaneForgingKeepEnchantsChanceRank3();
|
||||
|
||||
case 2:
|
||||
return Config.getArcaneForgingKeepEnchantsChanceRank2();
|
||||
return Config.getInstance().getArcaneForgingKeepEnchantsChanceRank2();
|
||||
|
||||
case 1:
|
||||
return Config.getArcaneForgingKeepEnchantsChanceRank1();
|
||||
return Config.getInstance().getArcaneForgingKeepEnchantsChanceRank1();
|
||||
|
||||
default:
|
||||
return 0;
|
||||
@ -263,16 +263,16 @@ public class Repair {
|
||||
public static int getDowngradeChance(int rank) {
|
||||
switch (rank) {
|
||||
case 4:
|
||||
return Config.getArcaneForgingDowngradeChanceRank4();
|
||||
return Config.getInstance().getArcaneForgingDowngradeChanceRank4();
|
||||
|
||||
case 3:
|
||||
return Config.getArcaneForgingDowngradeChanceRank3();
|
||||
return Config.getInstance().getArcaneForgingDowngradeChanceRank3();
|
||||
|
||||
case 2:
|
||||
return Config.getArcaneForgingDowngradeChanceRank2();
|
||||
return Config.getInstance().getArcaneForgingDowngradeChanceRank2();
|
||||
|
||||
case 1:
|
||||
return Config.getArcaneForgingDowngradeChanceRank1();
|
||||
return Config.getInstance().getArcaneForgingDowngradeChanceRank1();
|
||||
|
||||
default:
|
||||
return 100;
|
||||
@ -356,45 +356,45 @@ public class Repair {
|
||||
}
|
||||
else {
|
||||
if (ItemChecks.isDiamondTool(is) || ItemChecks.isDiamondArmor(is)) {
|
||||
if (skillLevel < Config.getRepairDiamondLevelRequirement()) {
|
||||
if (skillLevel < Config.getInstance().getRepairDiamondLevelRequirement()) {
|
||||
player.sendMessage(mcLocale.getString("Repair.Skills.AdeptDiamond"));
|
||||
}
|
||||
else {
|
||||
player.sendMessage(mcLocale.getString("Skills.NeedMore") + " " + ChatColor.BLUE + m.prettyItemString(Config.getRepairDiamondMaterial()));
|
||||
player.sendMessage(mcLocale.getString("Skills.NeedMore") + " " + ChatColor.BLUE + m.prettyItemString(Config.getInstance().getRepairDiamondMaterial()));
|
||||
}
|
||||
}
|
||||
else if (ItemChecks.isIronTool(is) || ItemChecks.isIronArmor(is)) {
|
||||
if (skillLevel < Config.getRepairIronLevelRequirement()) {
|
||||
if (skillLevel < Config.getInstance().getRepairIronLevelRequirement()) {
|
||||
player.sendMessage(mcLocale.getString("Repair.Skills.AdeptIron"));
|
||||
}
|
||||
else {
|
||||
player.sendMessage(mcLocale.getString("Skills.NeedMore")+ " " + ChatColor.GRAY + m.prettyItemString(Config.getRepairIronMaterial()));
|
||||
player.sendMessage(mcLocale.getString("Skills.NeedMore")+ " " + ChatColor.GRAY + m.prettyItemString(Config.getInstance().getRepairIronMaterial()));
|
||||
}
|
||||
}
|
||||
else if (ItemChecks.isGoldTool(is) || ItemChecks.isGoldArmor(is)) {
|
||||
if (skillLevel < Config.getRepairGoldLevelRequirement()) {
|
||||
if (skillLevel < Config.getInstance().getRepairGoldLevelRequirement()) {
|
||||
player.sendMessage(mcLocale.getString("Repair.Skills.AdeptGold"));
|
||||
}
|
||||
else {
|
||||
player.sendMessage(mcLocale.getString("Skills.NeedMore") + " " + ChatColor.GOLD + m.prettyItemString(Config.getRepairGoldMaterial()));
|
||||
player.sendMessage(mcLocale.getString("Skills.NeedMore") + " " + ChatColor.GOLD + m.prettyItemString(Config.getInstance().getRepairGoldMaterial()));
|
||||
}
|
||||
}
|
||||
else if (ItemChecks.isStoneTool(is)) {
|
||||
if (skillLevel < Config.getRepairStoneLevelRequirement()) {
|
||||
if (skillLevel < Config.getInstance().getRepairStoneLevelRequirement()) {
|
||||
player.sendMessage(mcLocale.getString("Repair.Skills.AdeptStone"));
|
||||
}
|
||||
else {
|
||||
player.sendMessage(mcLocale.getString("Skills.NeedMore") + " " + ChatColor.GRAY + m.prettyItemString(Config.getRepairStoneMaterial()));
|
||||
player.sendMessage(mcLocale.getString("Skills.NeedMore") + " " + ChatColor.GRAY + m.prettyItemString(Config.getInstance().getRepairStoneMaterial()));
|
||||
}
|
||||
}
|
||||
else if (ItemChecks.isWoodTool(is)) {
|
||||
player.sendMessage(mcLocale.getString("Skills.NeedMore") + " " + ChatColor.DARK_GREEN + m.prettyItemString(Config.getRepairWoodMaterial()));
|
||||
player.sendMessage(mcLocale.getString("Skills.NeedMore") + " " + ChatColor.DARK_GREEN + m.prettyItemString(Config.getInstance().getRepairWoodMaterial()));
|
||||
}
|
||||
else if (ItemChecks.isLeatherArmor(is)) {
|
||||
player.sendMessage(mcLocale.getString("Skills.NeedMore") + " " + ChatColor.YELLOW + m.prettyItemString(Config.getRepairLeatherMaterial()));
|
||||
player.sendMessage(mcLocale.getString("Skills.NeedMore") + " " + ChatColor.YELLOW + m.prettyItemString(Config.getInstance().getRepairLeatherMaterial()));
|
||||
}
|
||||
else if (ItemChecks.isStringTool(is)) {
|
||||
player.sendMessage(mcLocale.getString("Skills.NeedMore") + " " + ChatColor.YELLOW + m.prettyItemString(Config.getRepairStringMaterial()));
|
||||
player.sendMessage(mcLocale.getString("Skills.NeedMore") + " " + ChatColor.YELLOW + m.prettyItemString(Config.getInstance().getRepairStringMaterial()));
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -445,7 +445,7 @@ public class Repair {
|
||||
}
|
||||
|
||||
/* Handle the enchants */
|
||||
if (Config.getArcaneForgingEnchantLossEnabled() && !mcPermissions.getInstance().arcaneBypass(player)) {
|
||||
if (Config.getInstance().getArcaneForgingEnchantLossEnabled() && !mcPermissions.getInstance().arcaneBypass(player)) {
|
||||
addEnchants(player, item);
|
||||
}
|
||||
|
||||
@ -462,7 +462,7 @@ public class Repair {
|
||||
PlayerProfile PP = Users.getProfile(player);
|
||||
|
||||
if (!PP.getPlacedAnvil()) {
|
||||
if (Config.spoutEnabled) {
|
||||
if (Config.getInstance().spoutEnabled) {
|
||||
SpoutPlayer sPlayer = SpoutManager.getPlayer(player);
|
||||
|
||||
if (sPlayer.isSpoutCraftEnabled()) {
|
||||
|
||||
@ -80,7 +80,7 @@ public class Skills {
|
||||
* @param skill The skill the ability is tied to
|
||||
*/
|
||||
public static void activationCheck(Player player, SkillType skill) {
|
||||
if (Config.getAbilitiesOnlyActivateWhenSneaking() && !player.isSneaking()) {
|
||||
if (Config.getInstance().getAbilitiesOnlyActivateWhenSneaking() && !player.isSneaking()) {
|
||||
return;
|
||||
}
|
||||
|
||||
@ -111,7 +111,7 @@ public class Skills {
|
||||
}
|
||||
}
|
||||
|
||||
if (Config.getAbilityMessagesEnabled()) {
|
||||
if (Config.getInstance().getAbilityMessagesEnabled()) {
|
||||
player.sendMessage(tool.getRaiseTool());
|
||||
}
|
||||
|
||||
@ -201,7 +201,7 @@ public class Skills {
|
||||
}
|
||||
}
|
||||
|
||||
if (!Config.getUseMySQL()) {
|
||||
if (!Config.getInstance().getUseMySQL()) {
|
||||
ProcessLeaderboardUpdate(skillType, player);
|
||||
ProcessLeaderboardUpdate(SkillType.ALL, player);
|
||||
}
|
||||
@ -209,18 +209,18 @@ public class Skills {
|
||||
String capitalized = m.getCapitalized(skillType.toString());
|
||||
|
||||
/* Spout Stuff */
|
||||
if (Config.spoutEnabled && player instanceof SpoutPlayer) {
|
||||
if (Config.getInstance().spoutEnabled && player instanceof SpoutPlayer) {
|
||||
SpoutPlayer sPlayer = SpoutManager.getPlayer(player);
|
||||
|
||||
if (sPlayer.isSpoutCraftEnabled()) {
|
||||
if (Config.getSpoutXPBarEnabled()) {
|
||||
if (Config.getInstance().getSpoutXPBarEnabled()) {
|
||||
SpoutStuff.updateXpBar(player);
|
||||
}
|
||||
|
||||
SpoutStuff.levelUpNotification(skillType, sPlayer);
|
||||
|
||||
/* Update custom titles */
|
||||
if (Config.getShowPowerLevelForSpout()) {
|
||||
if (Config.getInstance().getShowPowerLevelForSpout()) {
|
||||
sPlayer.setTitle(sPlayer.getName()+ "\n" + ChatColor.YELLOW + "P" + ChatColor.GOLD + "lvl" + ChatColor.WHITE + "." + ChatColor.GREEN + String.valueOf(PP.getPowerLevel()));
|
||||
}
|
||||
}
|
||||
@ -234,10 +234,10 @@ public class Skills {
|
||||
}
|
||||
|
||||
/* Always update XP Bar (Check if no levels were gained first to remove redundancy) */
|
||||
if (skillups == 0 && Config.spoutEnabled && player instanceof SpoutPlayer) {
|
||||
if (skillups == 0 && Config.getInstance().spoutEnabled && player instanceof SpoutPlayer) {
|
||||
SpoutPlayer sPlayer = (SpoutPlayer) player;
|
||||
if (sPlayer.isSpoutCraftEnabled()) {
|
||||
if (Config.getSpoutXPBarEnabled()) {
|
||||
if (Config.getInstance().getSpoutXPBarEnabled()) {
|
||||
SpoutStuff.updateXpBar(player);
|
||||
}
|
||||
}
|
||||
@ -349,7 +349,7 @@ public class Skills {
|
||||
* @param durabilityLoss The durability to remove from the item
|
||||
*/
|
||||
public static void abilityDurabilityLoss(ItemStack inhand, int durabilityLoss) {
|
||||
if (Config.getAbilitiesDamageTools()) {
|
||||
if (Config.getInstance().getAbilitiesDamageTools()) {
|
||||
if (!inhand.containsEnchantment(Enchantment.DURABILITY)) {
|
||||
inhand.setDurability((short) (inhand.getDurability() + durabilityLoss));
|
||||
}
|
||||
|
||||
@ -214,12 +214,12 @@ public class Taming {
|
||||
switch (type) {
|
||||
case WOLF:
|
||||
summonItem = Material.BONE;
|
||||
summonAmount = Config.getTamingCOTWWolfCost();
|
||||
summonAmount = Config.getInstance().getTamingCOTWWolfCost();
|
||||
break;
|
||||
|
||||
case OCELOT:
|
||||
summonItem = Material.RAW_FISH;
|
||||
summonAmount = Config.getTamingCOTWOcelotCost();
|
||||
summonAmount = Config.getInstance().getTamingCOTWOcelotCost();
|
||||
break;
|
||||
|
||||
default:
|
||||
|
||||
@ -53,7 +53,7 @@ public class WoodCutting {
|
||||
* @param PP The PlayerProfile of the player
|
||||
*/
|
||||
private static void removeBlocks(ArrayList<Block> toBeFelled, Player player, PlayerProfile PP) {
|
||||
if (toBeFelled.size() >= Config.getTreeFellerThreshold()) {
|
||||
if (toBeFelled.size() >= Config.getInstance().getTreeFellerThreshold()) {
|
||||
player.sendMessage(mcLocale.getString("Woodcutting.Skills.TreeFellerThreshold"));
|
||||
return;
|
||||
}
|
||||
@ -116,19 +116,19 @@ public class WoodCutting {
|
||||
|
||||
switch (species) {
|
||||
case GENERIC:
|
||||
xp += Config.getWoodcuttingXPOak();
|
||||
xp += Config.getInstance().getWoodcuttingXPOak();
|
||||
break;
|
||||
|
||||
case REDWOOD:
|
||||
xp += Config.getWoodcuttingXPSpruce();
|
||||
xp += Config.getInstance().getWoodcuttingXPSpruce();
|
||||
break;
|
||||
|
||||
case BIRCH:
|
||||
xp += Config.getWoodcuttingXPBirch();
|
||||
xp += Config.getInstance().getWoodcuttingXPBirch();
|
||||
break;
|
||||
|
||||
case JUNGLE:
|
||||
xp += Config.getWoodcuttingXPJungle() / 4; //Nerf XP from Jungle Trees when using Tree Feller
|
||||
xp += Config.getInstance().getWoodcuttingXPJungle() / 4; //Nerf XP from Jungle Trees when using Tree Feller
|
||||
break;
|
||||
|
||||
default:
|
||||
@ -187,7 +187,7 @@ public class WoodCutting {
|
||||
private static void processTreeFelling(Block currentBlock, ArrayList<Block> toBeFelled) {
|
||||
Material type = currentBlock.getType();
|
||||
|
||||
if(toBeFelled.size() >= Config.getTreeFellerThreshold()) {
|
||||
if(toBeFelled.size() >= Config.getInstance().getTreeFellerThreshold()) {
|
||||
return;
|
||||
}
|
||||
|
||||
@ -281,19 +281,19 @@ public class WoodCutting {
|
||||
|
||||
switch (species) {
|
||||
case GENERIC:
|
||||
xp += Config.getWoodcuttingXPOak();
|
||||
xp += Config.getInstance().getWoodcuttingXPOak();
|
||||
break;
|
||||
|
||||
case REDWOOD:
|
||||
xp += Config.getWoodcuttingXPSpruce();
|
||||
xp += Config.getInstance().getWoodcuttingXPSpruce();
|
||||
break;
|
||||
|
||||
case BIRCH:
|
||||
xp += Config.getWoodcuttingXPBirch();
|
||||
xp += Config.getInstance().getWoodcuttingXPBirch();
|
||||
break;
|
||||
|
||||
case JUNGLE:
|
||||
xp += Config.getWoodcuttingXPJungle();
|
||||
xp += Config.getInstance().getWoodcuttingXPJungle();
|
||||
break;
|
||||
|
||||
default:
|
||||
@ -315,11 +315,11 @@ public class WoodCutting {
|
||||
FakePlayerAnimationEvent armswing = new FakePlayerAnimationEvent(player);
|
||||
mcMMO.p.getServer().getPluginManager().callEvent(armswing);
|
||||
|
||||
if (Config.getWoodcuttingRequiresTool()) {
|
||||
Skills.abilityDurabilityLoss(player.getItemInHand(), Config.getAbilityToolDamage());
|
||||
if (Config.getInstance().getWoodcuttingRequiresTool()) {
|
||||
Skills.abilityDurabilityLoss(player.getItemInHand(), Config.getInstance().getAbilityToolDamage());
|
||||
}
|
||||
|
||||
if (Config.spoutEnabled) {
|
||||
if (Config.getInstance().spoutEnabled) {
|
||||
SpoutSounds.playSoundForPlayer(SoundEffect.POP, player, block.getLocation());
|
||||
}
|
||||
}
|
||||
@ -329,7 +329,7 @@ public class WoodCutting {
|
||||
for (Block x : toBeFelled) {
|
||||
if (x.getType().equals(Material.LOG)) {
|
||||
durabilityLoss++;
|
||||
durabilityLoss = durabilityLoss + Config.getAbilityToolDamage();
|
||||
durabilityLoss = durabilityLoss + Config.getInstance().getAbilityToolDamage();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user