mirror of
https://github.com/mcMMO-Dev/mcMMO.git
synced 2025-03-30 08:16:25 +02:00

General Added Crossbows Skill, this skill is a WIP and feedback on discord is appreciated. Added Tridents Skill, this skill is a WIP and feedback on discord is appreciated. Added the "endgame" triple drop subskill 'Mother Lode' to Mining Added the "endgame" triple drop subskill 'Clean Cuts' to Woodcutting Added the "endgame" triple drop subskill 'Verdant Bounty' to Herbalism Added /mmopower command which simply shows your power level (aliases /mmopowerlevel /powerlevel) Config Added 'Send_To_Console' settings to chat.yml to toggle sending party or admin chat messages to console. Replaced 'Experience_Formula.Modifier' in experience.yml with 'Experience_Formula.Skill_Multiplier' which is easier to understand and less prone to divide by zero bugs. child.yml config is gone now, feel free to delete it. Tweaks Tree Feller now drops 90% less non-wood block rewards (leaves/etc) on average from Knock on Wood. Treasure drop rate from Shake, Fishing, Hylian, and Excavation now benefit from the Luck perk. Updated advanced.yml with entries for the new skills Permission nodes Added 'mcmmo.commands.mmopower' permission node for the new /mmopower command Added 'mcmmo.commands.crossbows' permission node Added 'mcmmo.ability.crossbows.crossbowslimitbreak' permission node Added 'mcmmo.ability.crossbows.trickshot' permission node Added 'mcmmo.ability.herbalism.verdantbounty' permission node Added 'mcmmo.ability.mining.motherlode' permission node Added 'mcmmo.ability.woodcutting.cleancuts' permission node Locale Added locale entries for motherlode, cleancuts, and verdant bounty. Codebase Major rewrite for how random chance was handled in the code. Many skills with RNG elements now send out a SubSkillEvent (which can be used to modify probability or cancel the results), some skills without RNG still send out this event when activated, this event is cancellable so it can be used to make a skill fail. A lot of new unit tests were added to help keep mcMMO stable as part of this update, of course, more could always be added. NOTES: One feature of this update is to provide an endgame benefits to some skills that you can grind for a long time, ideally for a long while. I will likely expand upon this idea in future updates. A few skills have these endgame-oriented subskills, these new subskills provide a small benefit at first that grows and scales up to level 10,000 (or 1,000 for Standard mode which no one uses) and does not have ranks (other than the initial rank to unlock it). These endgame sub skills unlock at level 1000 for users with default mcMMO settings, or 100 for those using the optional Standard scaling. You can tweak the benefits of these skills in advanced.yml, the default settings are meant to be a good starting point. Crossbows and Tridents are WIP skills, I would like feedback on discord about them. More info on the new Triple Drop skills (Mother Lode, Clean Cuts, Verdant Bounty): Currently these start at about 5% chance and can reach a maximum 50% chance if a player acquired 10,000 skill, you can adjust this in advanced.yml These skills respect double drop settings from config.yml just like the corresponding Double Drop skills do, if a double drop is disabled for an item, then it's disabled for triple drops too. I added a new Power Level Command, for now this just shows you your current power level. If I ever add features based on power level, this command will likely display output related to those features. Regarding Maces, I will likely add that as a WIP skill when the next Minecraft update drops.
337 lines
12 KiB
Java
337 lines
12 KiB
Java
package com.gmail.nossr50.skills.salvage;
|
|
|
|
import com.gmail.nossr50.api.ItemSpawnReason;
|
|
import com.gmail.nossr50.config.experience.ExperienceConfig;
|
|
import com.gmail.nossr50.datatypes.interactions.NotificationType;
|
|
import com.gmail.nossr50.datatypes.player.McMMOPlayer;
|
|
import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
|
|
import com.gmail.nossr50.datatypes.skills.SubSkillType;
|
|
import com.gmail.nossr50.locale.LocaleLoader;
|
|
import com.gmail.nossr50.mcMMO;
|
|
import com.gmail.nossr50.skills.SkillManager;
|
|
import com.gmail.nossr50.skills.salvage.salvageables.Salvageable;
|
|
import com.gmail.nossr50.util.EventUtils;
|
|
import com.gmail.nossr50.util.Misc;
|
|
import com.gmail.nossr50.util.Permissions;
|
|
import com.gmail.nossr50.util.player.NotificationManager;
|
|
import com.gmail.nossr50.util.random.ProbabilityUtil;
|
|
import com.gmail.nossr50.util.skills.RankUtils;
|
|
import com.gmail.nossr50.util.skills.SkillUtils;
|
|
import com.gmail.nossr50.util.sounds.SoundManager;
|
|
import com.gmail.nossr50.util.sounds.SoundType;
|
|
import com.gmail.nossr50.util.text.StringUtils;
|
|
import org.bukkit.Location;
|
|
import org.bukkit.Material;
|
|
import org.bukkit.enchantments.Enchantment;
|
|
import org.bukkit.entity.Player;
|
|
import org.bukkit.inventory.ItemStack;
|
|
import org.bukkit.inventory.meta.Damageable;
|
|
import org.bukkit.inventory.meta.EnchantmentStorageMeta;
|
|
import org.bukkit.inventory.meta.ItemMeta;
|
|
|
|
import java.util.Map;
|
|
import java.util.Map.Entry;
|
|
|
|
public class SalvageManager extends SkillManager {
|
|
private boolean placedAnvil;
|
|
private int lastClick;
|
|
|
|
public SalvageManager(McMMOPlayer mcMMOPlayer) {
|
|
super(mcMMOPlayer, PrimarySkillType.SALVAGE);
|
|
}
|
|
|
|
/**
|
|
* Handles notifications for placing an anvil.
|
|
*/
|
|
public void placedAnvilCheck() {
|
|
Player player = getPlayer();
|
|
|
|
if (getPlacedAnvil()) {
|
|
return;
|
|
}
|
|
|
|
if (mcMMO.p.getGeneralConfig().getSalvageAnvilMessagesEnabled()) {
|
|
NotificationManager.sendPlayerInformation(player, NotificationType.SUBSKILL_MESSAGE, "Salvage.Listener.Anvil");
|
|
}
|
|
|
|
if (mcMMO.p.getGeneralConfig().getSalvageAnvilPlaceSoundsEnabled()) {
|
|
SoundManager.sendSound(player, player.getLocation(), SoundType.ANVIL);
|
|
}
|
|
|
|
togglePlacedAnvil();
|
|
}
|
|
|
|
public void handleSalvage(Location location, ItemStack item) {
|
|
Player player = getPlayer();
|
|
|
|
Salvageable salvageable = mcMMO.getSalvageableManager().getSalvageable(item.getType());
|
|
ItemMeta meta = item.getItemMeta();
|
|
|
|
if (meta != null && meta.isUnbreakable()) {
|
|
NotificationManager.sendPlayerInformation(player, NotificationType.SUBSKILL_MESSAGE_FAILED, "Anvil.Unbreakable");
|
|
return;
|
|
}
|
|
|
|
// Permissions checks on material and item types
|
|
if (!Permissions.salvageItemType(player, salvageable.getSalvageItemType())) {
|
|
NotificationManager.sendPlayerInformation(player, NotificationType.NO_PERMISSION, "mcMMO.NoPermission");
|
|
return;
|
|
}
|
|
|
|
if (!Permissions.salvageMaterialType(player, salvageable.getSalvageMaterialType())) {
|
|
NotificationManager.sendPlayerInformation(player, NotificationType.NO_PERMISSION, "mcMMO.NoPermission");
|
|
return;
|
|
}
|
|
|
|
/*int skillLevel = getSkillLevel();*/
|
|
int minimumSalvageableLevel = salvageable.getMinimumLevel();
|
|
|
|
// Level check
|
|
if (getSkillLevel() < minimumSalvageableLevel) {
|
|
NotificationManager.sendPlayerInformation(player, NotificationType.REQUIREMENTS_NOT_MET,
|
|
"Salvage.Skills.Adept.Level",
|
|
String.valueOf(minimumSalvageableLevel), StringUtils.getPrettyItemString(item.getType()));
|
|
return;
|
|
}
|
|
|
|
int durability = meta instanceof Damageable ? ((Damageable) meta).getDamage(): 0;
|
|
int potentialSalvageYield = Salvage.calculateSalvageableAmount(durability, salvageable.getMaximumDurability(), salvageable.getMaximumQuantity());
|
|
|
|
if (potentialSalvageYield <= 0) {
|
|
NotificationManager.sendPlayerInformation(player, NotificationType.SUBSKILL_MESSAGE_FAILED, "Salvage.Skills.TooDamaged");
|
|
return;
|
|
}
|
|
|
|
potentialSalvageYield = Math.min(potentialSalvageYield, getSalvageLimit()); // Always get at least something back, if you're capable of salvaging it.
|
|
|
|
location.add(0.5, 1, 0.5);
|
|
|
|
Map<Enchantment, Integer> enchants = item.getEnchantments();
|
|
|
|
ItemStack enchantBook = null;
|
|
if (!enchants.isEmpty()) {
|
|
enchantBook = arcaneSalvageCheck(enchants);
|
|
}
|
|
|
|
//Lottery on Salvageable Amount
|
|
|
|
int lotteryResults = 1;
|
|
int chanceOfSuccess = 99;
|
|
|
|
for(int x = 0; x < potentialSalvageYield-1; x++) {
|
|
|
|
if(ProbabilityUtil.isStaticSkillRNGSuccessful(PrimarySkillType.SALVAGE, player, chanceOfSuccess)) {
|
|
chanceOfSuccess-=3;
|
|
chanceOfSuccess = Math.max(chanceOfSuccess, 90);
|
|
|
|
lotteryResults+=1;
|
|
}
|
|
}
|
|
|
|
ItemStack salvageResults = new ItemStack(salvageable.getSalvageMaterial(), lotteryResults);
|
|
|
|
//Call event
|
|
if (EventUtils.callSalvageCheckEvent(player, item, salvageResults, enchantBook).isCancelled()) {
|
|
return;
|
|
}
|
|
|
|
// We only send a confirmation message after processing the event (fixes #4694)
|
|
if (lotteryResults == potentialSalvageYield && potentialSalvageYield != 1 && RankUtils.isPlayerMaxRankInSubSkill(player, SubSkillType.SALVAGE_ARCANE_SALVAGE)) {
|
|
NotificationManager.sendPlayerInformationChatOnly(player, "Salvage.Skills.Lottery.Perfect", String.valueOf(lotteryResults), StringUtils.getPrettyItemString(item.getType()));
|
|
} else if (salvageable.getMaximumQuantity() == 1 || getSalvageLimit() >= salvageable.getMaximumQuantity()) {
|
|
NotificationManager.sendPlayerInformationChatOnly(player, "Salvage.Skills.Lottery.Normal", String.valueOf(lotteryResults), StringUtils.getPrettyItemString(item.getType()));
|
|
} else {
|
|
NotificationManager.sendPlayerInformationChatOnly(player, "Salvage.Skills.Lottery.Untrained", String.valueOf(lotteryResults), StringUtils.getPrettyItemString(item.getType()));
|
|
}
|
|
|
|
player.getInventory().setItemInMainHand(new ItemStack(Material.AIR));
|
|
|
|
Location anvilLoc = location.clone();
|
|
Location playerLoc = player.getLocation().clone();
|
|
double distance = anvilLoc.distance(playerLoc);
|
|
|
|
double speedLimit = .6;
|
|
double minSpeed = .3;
|
|
|
|
//Clamp the speed and vary it by distance
|
|
double vectorSpeed = Math.min(speedLimit, Math.max(minSpeed, distance * .2));
|
|
|
|
//Add a very small amount of height
|
|
anvilLoc.add(0, .1, 0);
|
|
|
|
if (enchantBook != null) {
|
|
Misc.spawnItemTowardsLocation(getPlayer(), anvilLoc.clone(), playerLoc.clone(), enchantBook, vectorSpeed, ItemSpawnReason.SALVAGE_ENCHANTMENT_BOOK);
|
|
}
|
|
|
|
Misc.spawnItemTowardsLocation(getPlayer(), anvilLoc.clone(), playerLoc.clone(), salvageResults, vectorSpeed, ItemSpawnReason.SALVAGE_MATERIALS);
|
|
|
|
// BWONG BWONG BWONG - CLUNK!
|
|
if (mcMMO.p.getGeneralConfig().getSalvageAnvilUseSoundsEnabled()) {
|
|
SoundManager.sendSound(player, player.getLocation(), SoundType.ITEM_BREAK);
|
|
}
|
|
|
|
NotificationManager.sendPlayerInformation(player, NotificationType.SUBSKILL_MESSAGE, "Salvage.Skills.Success");
|
|
}
|
|
|
|
/*public double getMaxSalvagePercentage() {
|
|
return Math.min((((Salvage.salvageMaxPercentage / Salvage.salvageMaxPercentageLevel) * getSkillLevel()) / 100.0D), Salvage.salvageMaxPercentage / 100.0D);
|
|
}*/
|
|
|
|
public int getSalvageLimit() {
|
|
return (RankUtils.getRank(getPlayer(), SubSkillType.SALVAGE_SCRAP_COLLECTOR));
|
|
}
|
|
|
|
/**
|
|
* Gets the Arcane Salvage rank
|
|
*
|
|
* @return the current Arcane Salvage rank
|
|
*/
|
|
public int getArcaneSalvageRank() {
|
|
return RankUtils.getRank(getPlayer(), SubSkillType.SALVAGE_ARCANE_SALVAGE);
|
|
}
|
|
|
|
/*public double getExtractFullEnchantChance() {
|
|
int skillLevel = getSkillLevel();
|
|
|
|
for (Tier tier : Tier.values()) {
|
|
if (skillLevel >= tier.getLevel()) {
|
|
return tier.getExtractFullEnchantChance();
|
|
}
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
public double getExtractPartialEnchantChance() {
|
|
int skillLevel = getSkillLevel();
|
|
|
|
for (Tier tier : Tier.values()) {
|
|
if (skillLevel >= tier.getLevel()) {
|
|
return tier.getExtractPartialEnchantChance();
|
|
}
|
|
}
|
|
|
|
return 0;
|
|
}*/
|
|
|
|
public double getExtractFullEnchantChance() {
|
|
if(Permissions.hasSalvageEnchantBypassPerk(getPlayer()))
|
|
return 100.0D;
|
|
|
|
return mcMMO.p.getAdvancedConfig().getArcaneSalvageExtractFullEnchantsChance(getArcaneSalvageRank());
|
|
}
|
|
|
|
public double getExtractPartialEnchantChance() {
|
|
return mcMMO.p.getAdvancedConfig().getArcaneSalvageExtractPartialEnchantsChance(getArcaneSalvageRank());
|
|
}
|
|
|
|
private ItemStack arcaneSalvageCheck(Map<Enchantment, Integer> enchants) {
|
|
Player player = getPlayer();
|
|
|
|
if (!RankUtils.hasUnlockedSubskill(player, SubSkillType.SALVAGE_ARCANE_SALVAGE) || !Permissions.arcaneSalvage(player)) {
|
|
NotificationManager.sendPlayerInformationChatOnly(player, "Salvage.Skills.ArcaneFailed");
|
|
return null;
|
|
}
|
|
|
|
ItemStack book = new ItemStack(Material.ENCHANTED_BOOK);
|
|
EnchantmentStorageMeta enchantMeta = (EnchantmentStorageMeta) book.getItemMeta();
|
|
|
|
boolean downgraded = false;
|
|
int arcaneFailureCount = 0;
|
|
|
|
for (Entry<Enchantment, Integer> enchant : enchants.entrySet()) {
|
|
|
|
int enchantLevel = enchant.getValue();
|
|
|
|
if(!ExperienceConfig.getInstance().allowUnsafeEnchantments()) {
|
|
if(enchantLevel > enchant.getKey().getMaxLevel()) {
|
|
enchantLevel = enchant.getKey().getMaxLevel();
|
|
}
|
|
}
|
|
|
|
if (!Salvage.arcaneSalvageEnchantLoss
|
|
|| Permissions.hasSalvageEnchantBypassPerk(player)
|
|
|| ProbabilityUtil.isStaticSkillRNGSuccessful(PrimarySkillType.SALVAGE, player, getExtractFullEnchantChance())) {
|
|
enchantMeta.addStoredEnchant(enchant.getKey(), enchantLevel, true);
|
|
}
|
|
else if (enchantLevel > 1
|
|
&& Salvage.arcaneSalvageDowngrades
|
|
&& ProbabilityUtil.isStaticSkillRNGSuccessful(PrimarySkillType.SALVAGE, player, getExtractPartialEnchantChance())) {
|
|
enchantMeta.addStoredEnchant(enchant.getKey(), enchantLevel - 1, true);
|
|
downgraded = true;
|
|
} else {
|
|
arcaneFailureCount++;
|
|
}
|
|
}
|
|
|
|
if(failedAllEnchants(arcaneFailureCount, enchants.entrySet().size()))
|
|
{
|
|
NotificationManager.sendPlayerInformationChatOnly(player, "Salvage.Skills.ArcaneFailed");
|
|
return null;
|
|
} else if(downgraded)
|
|
{
|
|
NotificationManager.sendPlayerInformationChatOnly(player, "Salvage.Skills.ArcanePartial");
|
|
}
|
|
|
|
book.setItemMeta(enchantMeta);
|
|
return book;
|
|
}
|
|
|
|
private boolean failedAllEnchants(int arcaneFailureCount, int size) {
|
|
return arcaneFailureCount == size;
|
|
}
|
|
|
|
/**
|
|
* Check if the player has tried to use an Anvil before.
|
|
* @param actualize
|
|
*
|
|
* @return true if the player has confirmed using an Anvil
|
|
*/
|
|
public boolean checkConfirmation(boolean actualize) {
|
|
Player player = getPlayer();
|
|
long lastUse = getLastAnvilUse();
|
|
|
|
if (!SkillUtils.cooldownExpired(lastUse, 3) || !mcMMO.p.getGeneralConfig().getSalvageConfirmRequired()) {
|
|
return true;
|
|
}
|
|
|
|
if (!actualize) {
|
|
return false;
|
|
}
|
|
|
|
actualizeLastAnvilUse();
|
|
|
|
NotificationManager.sendPlayerInformation(player, NotificationType.SUBSKILL_MESSAGE, "Skills.ConfirmOrCancel", LocaleLoader.getString("Salvage.Pretty.Name"));
|
|
|
|
return false;
|
|
}
|
|
|
|
/*
|
|
* Salvage Anvil Placement
|
|
*/
|
|
|
|
public boolean getPlacedAnvil() {
|
|
return placedAnvil;
|
|
}
|
|
|
|
public void togglePlacedAnvil() {
|
|
placedAnvil = !placedAnvil;
|
|
}
|
|
|
|
/*
|
|
* Salvage Anvil Usage
|
|
*/
|
|
|
|
public int getLastAnvilUse() {
|
|
return lastClick;
|
|
}
|
|
|
|
public void setLastAnvilUse(int value) {
|
|
lastClick = value;
|
|
}
|
|
|
|
public void actualizeLastAnvilUse() {
|
|
lastClick = (int) (System.currentTimeMillis() / Misc.TIME_CONVERSION_FACTOR);
|
|
}
|
|
}
|