Upstream/mmoitems
1
0
Fork 0
mirror of https://gitlab.com/phoenix-dvpmt/mmoitems.git synced 2025-03-12 13:19:23 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added an option to prevent players from upgrading an unusable item

Browse Source
This commit is contained in:
Indyuce 2020-05-03 00:26:26 +02:00
parent 43a1066cb2
commit 43e7dde0f8
5 changed files with 49 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/main/java/net/Indyuce/mmoitems/api/interaction/Consumable.java
View File

@ -108,6 +108,20 @@ public class Consumable extends UseItem {
return false;
}
targetSharpening.upgrade(targetMMO);
NBTItem result = targetMMO.newBuilder().buildNBT();
/*
* safe check, if the specs the item has after ugprade are too high
* for the player, then cancel upgrading because the player would
* not be able to use it.
*/
if (MMOItems.plugin.getLanguage().upgradeRequirementsCheck && !playerData.getRPG().canUse(result, false)) {
Message.UPGRADE_REQUIREMENT_SAFE_CHECK.format(ChatColor.RED).send(player);
player.playSound(player.getLocation(), Sound.ENTITY_VILLAGER_NO, 1, 2);
return true;
}
if (random.nextDouble() > consumableSharpening.getSuccess() * targetSharpening.getSuccess()) {
Message.UPGRADE_FAIL.format(ChatColor.RED).send(player);
if (targetSharpening.destroysOnFail())
@ -116,9 +130,8 @@ public class Consumable extends UseItem {
return true;
}
targetSharpening.upgrade(targetMMO);
Message.UPGRADE_SUCCESS.format(ChatColor.YELLOW, "#item#", MMOUtils.getDisplayName(event.getCurrentItem())).send(player);
event.getCurrentItem().setItemMeta(targetMMO.newBuilder().build().getItemMeta());
event.getCurrentItem().setItemMeta(result.toItem().getItemMeta());
player.playSound(player.getLocation(), Sound.ENTITY_PLAYER_LEVELUP, 1, 2);
return true;
}
@ -137,15 +150,19 @@ public class Consumable extends UseItem {
MMOItem targetMMO = new VolatileMMOItem(target);
if (targetMMO.hasData(ItemStat.SOULBOUND)) {
SoulboundData data = (SoulboundData) targetMMO.getData(ItemStat.SOULBOUND);
Message.CANT_BIND_ITEM.format(ChatColor.RED, "#player#", data.getName(), "#level#", MMOUtils.intToRoman(data.getLevel())).send(player, "soulbound");
Message.CANT_BIND_ITEM.format(ChatColor.RED, "#player#", data.getName(), "#level#", MMOUtils.intToRoman(data.getLevel())).send(player,
"soulbound");
return false;
}
if (random.nextDouble() < soulbindingChance / 100) {
int soulboundLevel = (int) Math.max(1, getNBTItem().getStat(ItemStat.SOULBOUND_LEVEL));
(targetMMO = new LiveMMOItem(target)).setData(ItemStat.SOULBOUND, ItemStat.SOULBOUND.newSoulboundData(player.getUniqueId(), player.getName(), soulboundLevel));
(targetMMO = new LiveMMOItem(target)).setData(ItemStat.SOULBOUND,
ItemStat.SOULBOUND.newSoulboundData(player.getUniqueId(), player.getName(), soulboundLevel));
target.getItem().setItemMeta(targetMMO.newBuilder().build().getItemMeta());
Message.SUCCESSFULLY_BIND_ITEM.format(ChatColor.YELLOW, "#item#", MMOUtils.getDisplayName(target.getItem()), "#level#", MMOUtils.intToRoman(soulboundLevel)).send(player, "soulbound");
Message.SUCCESSFULLY_BIND_ITEM
.format(ChatColor.YELLOW, "#item#", MMOUtils.getDisplayName(target.getItem()), "#level#", MMOUtils.intToRoman(soulboundLevel))
.send(player, "soulbound");
player.playSound(player.getLocation(), Sound.ENTITY_PLAYER_LEVELUP, 1, 2);
return true;
}
@ -181,7 +198,8 @@ public class Consumable extends UseItem {
if (random.nextDouble() < soulboundBreakChance / 100) {
(targetMMO = new LiveMMOItem(target)).removeData(ItemStat.SOULBOUND);
target.getItem().setItemMeta(targetMMO.newBuilder().build().getItemMeta());
Message.SUCCESSFULLY_BREAK_BIND.format(ChatColor.YELLOW, "#level#", MMOUtils.intToRoman(soulbound.getLevel())).send(player, "soulbound");
Message.SUCCESSFULLY_BREAK_BIND.format(ChatColor.YELLOW, "#level#", MMOUtils.intToRoman(soulbound.getLevel())).send(player,
"soulbound");
player.playSound(player.getLocation(), Sound.BLOCK_ANVIL_LAND, 1, 2);
} else {
Message.UNSUCCESSFUL_SOULBOUND_BREAK.format(ChatColor.RED).send(player, "soulbound");
@ -203,15 +221,18 @@ public class Consumable extends UseItem {
DurabilityItem durItem = new DurabilityItem(player, target);
if (durItem.getDurability() < durItem.getMaxDurability()) {
target.getItem().setItemMeta(durItem.addDurability(repairPower).toItem().getItemMeta());
Message.REPAIRED_ITEM.format(ChatColor.YELLOW, "#item#", MMOUtils.getDisplayName(target.getItem()), "#amount#", "" + repairPower).send(player);
Message.REPAIRED_ITEM.format(ChatColor.YELLOW, "#item#", MMOUtils.getDisplayName(target.getItem()), "#amount#", "" + repairPower)
.send(player);
}
return true;
}
// vanilla durability
if (!target.getBoolean("Unbreakable") && MMOLib.plugin.getVersion().getWrapper().isDamaged(target.getItem(), target.getItem().getItemMeta())) {
if (!target.getBoolean("Unbreakable")
&& MMOLib.plugin.getVersion().getWrapper().isDamaged(target.getItem(), target.getItem().getItemMeta())) {
MMOLib.plugin.getVersion().getWrapper().repair(target.getItem(), repairPower);
Message.REPAIRED_ITEM.format(ChatColor.YELLOW, "#item#", MMOUtils.getDisplayName(target.getItem()), "#amount#", "" + repairPower).send(player);
Message.REPAIRED_ITEM.format(ChatColor.YELLOW, "#item#", MMOUtils.getDisplayName(target.getItem()), "#amount#", "" + repairPower)
.send(player);
return true;
}
}
@ -258,7 +279,8 @@ public class Consumable extends UseItem {
});
if (nbtItem.hasTag("MMOITEMS_SOUND_ON_CONSUME"))
player.getWorld().playSound(player.getLocation(), nbtItem.getString("MMOITEMS_SOUND_ON_CONSUME"), (float) nbtItem.getDouble("MMOITEMS_SOUND_ON_CONSUME_VOL"), (float) nbtItem.getDouble("MMOITEMS_SOUND_ON_CONSUME_PIT"));
player.getWorld().playSound(player.getLocation(), nbtItem.getString("MMOITEMS_SOUND_ON_CONSUME"),
(float) nbtItem.getDouble("MMOITEMS_SOUND_ON_CONSUME_VOL"), (float) nbtItem.getDouble("MMOITEMS_SOUND_ON_CONSUME_PIT"));
else
player.getWorld().playSound(player.getLocation(), Sound.ENTITY_GENERIC_EAT, 1, 1);
@ -306,6 +328,7 @@ public class Consumable extends UseItem {
}
public boolean hasVanillaEating() {
return (getItem().getType().isEdible() || getItem().getType() == Material.POTION || getItem().getType() == Material.MILK_BUCKET) && getNBTItem().hasTag("MMOITEMS_VANILLA_EATING");
return (getItem().getType().isEdible() || getItem().getType() == Material.POTION || getItem().getType() == Material.MILK_BUCKET)
&& getNBTItem().hasTag("MMOITEMS_VANILLA_EATING");
}
}

11
src/main/java/net/Indyuce/mmoitems/api/item/build/MMOItemBuilder.java
View File

@ -70,8 +70,7 @@ public class MMOItemBuilder {
tags.add(itemTag);
}
public ItemStack build() {
public NBTItem buildNBT() {
for (ItemStat stat : mmoitem.getStats())
try {
stat.whenApplied(this, mmoitem.getData(stat));
@ -99,7 +98,7 @@ public class MMOItemBuilder {
meta.addAttributeModifier(Attribute.GENERIC_ATTACK_SPEED, fakeModifier);
item.setItemMeta(meta);
return MMOLib.plugin.getNMS().getNBTItem(item).addTag(tags).toItem();
return MMOLib.plugin.getNMS().getNBTItem(item).addTag(tags);
/*
* on legacy spigot, it is not required to add a fake modifier to
@ -110,7 +109,11 @@ public class MMOItemBuilder {
item.setItemMeta(meta);
@SuppressWarnings("deprecation")
NBTItem nbt = MMOLib.plugin.getNMS().getNBTItem(item).cancelVanillaAttributeModifiers();
return nbt.addTag(tags).toItem();
return nbt.addTag(tags);
}
}
public ItemStack build() {
return buildNBT().toItem();
}
}

1
src/main/java/net/Indyuce/mmoitems/api/util/message/Message.java
View File

@ -70,6 +70,7 @@ public enum Message {
WRONG_UPGRADE_REFERENCE("You cannot upgrade this item with this consumable."),
UPGRADE_SUCCESS("You successfully upgraded your &6#item#&e!"),
NOT_HAVE_ITEM_UPGRADE("You don't have the item to upgrade!"),
UPGRADE_REQUIREMENT_SAFE_CHECK("You would not meet the upgraded item requirements."),
// crafting messages
NOT_ENOUGH_MATERIALS("You do not have enough materials to craft this item."),

3
src/main/java/net/Indyuce/mmoitems/manager/ConfigManager.java
View File

@ -32,7 +32,7 @@ public class ConfigManager {
private ConfigFile abilities, items, loreFormat, messages, potionEffects, stats, attackEffects, namePlaceholders;
// cached config options
public boolean abilityPlayerDamage, dodgeKnockbackEnabled, replaceMushroomDrops, worldGenEnabled;
public boolean abilityPlayerDamage, dodgeKnockbackEnabled, replaceMushroomDrops, worldGenEnabled, upgradeRequirementsCheck;
public String healIndicatorFormat, damageIndicatorFormat, abilitySplitter;
public DecimalFormat healIndicatorDecimalFormat, damageIndicatorDecimalFormat;
@ -198,6 +198,7 @@ public class ConfigManager {
dodgeKnockbackEnabled = MMOItems.plugin.getConfig().getBoolean("mitigation.dodge.knockback.enabled");
soulboundBaseDamage = MMOItems.plugin.getConfig().getDouble("soulbound.damage.base");
soulboundPerLvlDamage = MMOItems.plugin.getConfig().getDouble("soulbound.damage.per-lvl");
upgradeRequirementsCheck = MMOItems.plugin.getConfig().getBoolean("item-upgrade-requirements-check");
for (ConfigItem item : ConfigItem.values)
item.update(items.getConfig().getConfigurationSection(item.getId()));

5
src/main/resources/config.yml
View File

@ -113,6 +113,11 @@ custom-blocks:
# of using the chat.
anvil-text-input: false
# When set to true, players CANNOT upgrade an item if the
# specs (level, profession requirements) the item WOULD
# have if it were upgraded are too high for the player.
item-upgrade-requirements-check: true
# Players can't use their weapon/abilities when holding
# two-handed item and one other item simultaneously.
# When toggled off, players still receive slow 4.