EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-07-01 13:14:44 +02:00
Code Issues Projects Releases Wiki Activity

Repair Config pt 5

Browse Source
This commit is contained in:
nossr50
2019-03-21 23:54:55 -07:00
parent 68b32e0b9e
commit 7aea4e1d92
16 changed files with 381 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/com/gmail/nossr50/skills/repair/Repair.java
View File

@ -1,11 +1,17 @@
package com.gmail.nossr50.skills.repair;
import com.gmail.nossr50.config.MainConfig;
import com.gmail.nossr50.mcMMO;
import org.bukkit.Material;
public class Repair {
//public static int repairMasteryMaxBonusLevel = AdvancedConfig.getInstance().getRepairMasteryMaxLevel();
//public static double repairMasteryMaxBonus = AdvancedConfig.getInstance().getRepairMasteryMaxBonus();
public static Material anvilMaterial;
//public static Material anvilMaterial = MainConfig.getInstance().getRepairAnvilMaterial();
public Repair() {
anvilMaterial = mcMMO.getConfigManager().getConfigRepair().getRepairGeneral().getRepairAnvilMaterial();
}
public static Material getRepairAnvilMaterial()
{
return anvilMaterial;
}
}

19
src/main/java/com/gmail/nossr50/skills/repair/RepairManager.java
View File

@ -1,7 +1,6 @@
package com.gmail.nossr50.skills.repair;
import com.gmail.nossr50.config.AdvancedConfig;
import com.gmail.nossr50.config.MainConfig;
import com.gmail.nossr50.config.experience.ExperienceConfig;
import com.gmail.nossr50.datatypes.experience.XPGainReason;
import com.gmail.nossr50.datatypes.interactions.NotificationType;
@ -51,11 +50,11 @@ public class RepairManager extends SkillManager {
return;
}
if (MainConfig.getInstance().getRepairAnvilMessagesEnabled()) {
if (mcMMO.getConfigManager().getConfigRepair().getRepairGeneral().isAnvilMessages()) {
NotificationManager.sendPlayerInformation(player, NotificationType.SUBSKILL_MESSAGE, "Repair.Listener.Anvil");
}
if (MainConfig.getInstance().getRepairAnvilPlaceSoundsEnabled()) {
if (mcMMO.getConfigManager().getConfigRepair().getRepairGeneral().isAnvilPlacedSounds()) {
SoundManager.sendSound(player, player.getLocation(), SoundType.ANVIL);
}
@ -94,7 +93,7 @@ public class RepairManager extends SkillManager {
PlayerInventory inventory = player.getInventory();
Material repairMaterial = repairable.getRepairMaterial();
byte repairMaterialMetadata = repairable.getRepairMaterialMetadata();
//byte repairMaterialMetadata = repairable.getRepairMaterialMetadata();
ItemStack toRemove = new ItemStack(repairMaterial);
short startDurability = item.getDurability();
@ -106,7 +105,7 @@ public class RepairManager extends SkillManager {
}
// Check if they have the proper material to repair with
if (!inventory.contains(repairMaterial)) {
/*if (!inventory.contains(repairMaterial)) {
String prettyName = repairable.getRepairMaterialPrettyName() == null ? StringUtils.getPrettyItemString(repairMaterial) : repairable.getRepairMaterialPrettyName();
String materialsNeeded = "";
@ -117,7 +116,7 @@ public class RepairManager extends SkillManager {
NotificationManager.sendPlayerInformation(player, NotificationType.SUBSKILL_MESSAGE_FAILED, "Skills.NeedMore.Extra", prettyName, materialsNeeded);
return;
}
}*/
// Do not repair stacked items
if (item.getAmount() != 1) {
@ -144,10 +143,10 @@ public class RepairManager extends SkillManager {
}
// Remove the item
if (repairMaterialMetadata == -1) {
/*if (repairMaterialMetadata == -1) {
toRemove = inventory.getItem(inventory.first(repairMaterial)).clone();
toRemove.setAmount(1);
}
}*/
inventory.removeItem(toRemove);
@ -155,7 +154,7 @@ public class RepairManager extends SkillManager {
applyXpGain((float) ((getPercentageRepaired(startDurability, newDurability, repairable.getMaximumDurability()) * repairable.getXpMultiplier()) * ExperienceConfig.getInstance().getRepairXPBase() * ExperienceConfig.getInstance().getRepairXP(repairable.getRepairMaterialType())), XPGainReason.PVE);
// BWONG BWONG BWONG
if (MainConfig.getInstance().getRepairAnvilUseSoundsEnabled()) {
if (mcMMO.getConfigManager().getConfigRepair().getRepairGeneral().isAnvilUseSounds()) {
SoundManager.sendSound(player, player.getLocation(), SoundType.ANVIL);
SoundManager.sendSound(player, player.getLocation(), SoundType.ITEM_BREAK);
}
@ -177,7 +176,7 @@ public class RepairManager extends SkillManager {
Player player = getPlayer();
long lastUse = getLastAnvilUse();
if (!SkillUtils.cooldownExpired(lastUse, 3) || !MainConfig.getInstance().getRepairConfirmRequired()) {
if (!SkillUtils.cooldownExpired(lastUse, 3) || !mcMMO.getConfigManager().getConfigRepair().getRepairGeneral().isEnchantedItemsRequireConfirm()) {
return true;
}

14
src/main/java/com/gmail/nossr50/skills/repair/repairables/Repairable.java
View File

@ -20,20 +20,6 @@ public interface Repairable {
*/
public Material getRepairMaterial();
/**
* Gets the metadata byte value of the material used to repair this item
*
* @return the byte metadata of the repair material
*/
public byte getRepairMaterialMetadata();
/**
* Gets the pretty name of the material used to repair this item
*
* @return the pretty name of the repair material
*/
public String getRepairMaterialPrettyName();
/**
* Gets the RepairItemType value for this repairable item
*

2
src/main/java/com/gmail/nossr50/skills/repair/repairables/RepairableFactory.java
View File

@ -1,3 +1,4 @@
/*
package com.gmail.nossr50.skills.repair.repairables;
import com.gmail.nossr50.datatypes.skills.ItemType;
@ -19,3 +20,4 @@ public class RepairableFactory {
return new SimpleRepairable(itemMaterial, repairMaterial, repairMetadata, repairMaterialPrettyName, minimumLevel, minimumQuantity, maximumDurability, repairItemType, repairMaterialType, xpMultiplier);
}
}
*/

77
src/main/java/com/gmail/nossr50/skills/repair/repairables/SimpleRepairable.java
View File

@ -2,23 +2,23 @@ package com.gmail.nossr50.skills.repair.repairables;
import com.gmail.nossr50.datatypes.skills.ItemType;
import com.gmail.nossr50.datatypes.skills.MaterialType;
import com.gmail.nossr50.util.ItemUtils;
import org.bukkit.Material;
import org.bukkit.inventory.ItemStack;
public class SimpleRepairable implements Repairable {
private final Material itemMaterial, repairMaterial;
private final int minimumQuantity, minimumLevel;
private final short maximumDurability, baseRepairDurability;
private final byte repairMetadata;
private String repairMaterialPrettyName;
/*private String repairMaterialPrettyName;*/
private final ItemType repairItemType;
private final MaterialType repairMaterialType;
private final double xpMultiplier;
protected SimpleRepairable(Material type, Material repairMaterial, byte repairMetadata, String repairMaterialPrettyName, int minimumLevel, int minimumQuantity, short maximumDurability, ItemType repairItemType, MaterialType repairMaterialType, double xpMultiplier) {
/* protected SimpleRepairable(Material type, Material repairMaterial, String repairMaterialPrettyName, int minimumLevel, int minimumQuantity, short maximumDurability, ItemType repairItemType, MaterialType repairMaterialType, double xpMultiplier) {
this.itemMaterial = type;
this.repairMaterial = repairMaterial;
this.repairMetadata = repairMetadata;
this.repairMaterialPrettyName = repairMaterialPrettyName;
this.repairItemType = repairItemType;
this.repairMaterialType = repairMaterialType;
@ -27,6 +27,65 @@ public class SimpleRepairable implements Repairable {
this.maximumDurability = maximumDurability;
this.baseRepairDurability = (short) (maximumDurability / minimumQuantity);
this.xpMultiplier = xpMultiplier;
}*/
public SimpleRepairable(Material itemMaterial, Material repairMaterial, int minimumQuantity, int minimumLevel, double xpMultiplier) {
this.itemMaterial = itemMaterial;
this.repairMaterial = repairMaterial;
this.minimumQuantity = minimumQuantity;
this.minimumLevel = minimumLevel;
this.xpMultiplier = xpMultiplier;
this.maximumDurability = itemMaterial.getMaxDurability();
this.baseRepairDurability = (short) (maximumDurability / minimumQuantity);
this.repairItemType = determineItemType(itemMaterial);
this.repairMaterialType = determineMaterialType(repairMaterial);
}
public MaterialType determineMaterialType(Material material) {
switch (material) {
case STRING:
return MaterialType.STRING;
case LEATHER:
return MaterialType.LEATHER;
case ACACIA_PLANKS:
case BIRCH_PLANKS:
case DARK_OAK_PLANKS:
case JUNGLE_PLANKS:
case OAK_PLANKS:
case SPRUCE_PLANKS:
return MaterialType.WOOD;
case STONE:
return MaterialType.STONE;
case IRON_INGOT:
return MaterialType.IRON;
case GOLD_INGOT:
return MaterialType.GOLD;
case DIAMOND:
return MaterialType.DIAMOND;
default:
return MaterialType.OTHER;
}
}
private ItemType determineItemType(Material material)
{
if (ItemUtils.isMinecraftTool(new ItemStack(material))) {
return ItemType.TOOL;
}
else if (ItemUtils.isArmor(new ItemStack((material)))) {
return ItemType.ARMOR;
} else {
return ItemType.OTHER;
}
}
@Override
@ -39,16 +98,6 @@ public class SimpleRepairable implements Repairable {
return repairMaterial;
}
@Override
public byte getRepairMaterialMetadata() {
return repairMetadata;
}
@Override
public String getRepairMaterialPrettyName() {
return repairMaterialPrettyName;
}
@Override
public ItemType getRepairItemType() {
return repairItemType;

19
src/main/java/com/gmail/nossr50/skills/salvage/Salvage.java
View File

@ -1,19 +1,18 @@
package com.gmail.nossr50.skills.salvage;
import com.gmail.nossr50.config.AdvancedConfig;
import com.gmail.nossr50.config.MainConfig;
import com.gmail.nossr50.mcMMO;
import org.bukkit.Material;
public class Salvage {
public static Material anvilMaterial = MainConfig.getInstance().getSalvageAnvilMaterial();
/*public static int salvageMaxPercentageLevel = AdvancedConfig.getInstance().getSalvageMaxPercentageLevel();
public static double salvageMaxPercentage = AdvancedConfig.getInstance().getSalvageMaxPercentage();
public static int advancedSalvageUnlockLevel = RankUtils.getRankUnlockLevel(SubSkillType.SALVAGE_ADVANCED_SALVAGE, 1);*/
public static boolean arcaneSalvageDowngrades = AdvancedConfig.getInstance().getArcaneSalvageEnchantDowngradeEnabled();
public static boolean arcaneSalvageEnchantLoss = AdvancedConfig.getInstance().getArcaneSalvageEnchantLossEnabled();
public Salvage() {
anvilMaterial = mcMMO.getConfigManager().getConfigSalvage().getGeneral().getSalvageAnvilMaterial();
arcaneSalvageDowngrades = mcMMO.getConfigManager().getConfigSalvage().getConfigArcaneSalvage().isDowngradesEnabled();
arcaneSalvageEnchantLoss = mcMMO.getConfigManager().getConfigSalvage().getConfigArcaneSalvage().isMayLoseEnchants();
}
public static Material anvilMaterial;
public static boolean arcaneSalvageDowngrades;
public static boolean arcaneSalvageEnchantLoss;
protected static int calculateSalvageableAmount(short currentDurability, short maxDurability, int baseAmount) {
double percentDamaged = (maxDurability <= 0) ? 1D : (double) (maxDurability - currentDurability) / maxDurability;

9
src/main/java/com/gmail/nossr50/skills/salvage/SalvageManager.java
View File

@ -1,7 +1,6 @@
package com.gmail.nossr50.skills.salvage;
import com.gmail.nossr50.config.AdvancedConfig;
import com.gmail.nossr50.config.MainConfig;
import com.gmail.nossr50.datatypes.interactions.NotificationType;
import com.gmail.nossr50.datatypes.player.McMMOPlayer;
import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
@ -49,11 +48,11 @@ public class SalvageManager extends SkillManager {
return;
}
if (MainConfig.getInstance().getSalvageAnvilMessagesEnabled()) {
if (mcMMO.getConfigManager().getConfigSalvage().getGeneral().isAnvilMessages()) {
NotificationManager.sendPlayerInformation(player, NotificationType.SUBSKILL_MESSAGE, "Salvage.Listener.Anvil");
}
if (MainConfig.getInstance().getSalvageAnvilPlaceSoundsEnabled()) {
if (mcMMO.getConfigManager().getConfigSalvage().getGeneral().isAnvilPlacedSounds()) {
SoundManager.sendSound(player, player.getLocation(), SoundType.ANVIL);
}
@ -130,7 +129,7 @@ public class SalvageManager extends SkillManager {
Misc.dropItems(location, salvageResults, 1);
// BWONG BWONG BWONG - CLUNK!
if (MainConfig.getInstance().getSalvageAnvilUseSoundsEnabled()) {
if (mcMMO.getConfigManager().getConfigSalvage().getGeneral().isAnvilUseSounds()) {
SoundManager.sendSound(player, player.getLocation(), SoundType.ANVIL);
SoundManager.sendSound(player, player.getLocation(), SoundType.ITEM_BREAK);
@ -253,7 +252,7 @@ public class SalvageManager extends SkillManager {
Player player = getPlayer();
long lastUse = getLastAnvilUse();
if (!SkillUtils.cooldownExpired(lastUse, 3) || !MainConfig.getInstance().getSalvageConfirmRequired()) {
if (!SkillUtils.cooldownExpired(lastUse, 3) || !mcMMO.getConfigManager().getConfigSalvage().getGeneral().isEnchantedItemsRequireConfirm()) {
return true;
}