EpicKnarvik97/ArmoredElytra
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #6 from PimvanderLoos/fix-unbreakable

Browse Source 
Consider Unbreakable in DurabilityManager
This commit is contained in:
Pim van der Loos
2022-04-08 19:20:54 +02:00
committed by GitHub
parent bdb005a3c8 294f4d1cf3
commit 2af028a074
4 changed files with 79 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/nl/pim16aap2/armoredElytra/handlers/EventHandlers.java
View File

@ -96,7 +96,7 @@ public class EventHandlers implements Listener
// Even when we don't subtract durability, we still want to update the durability, so just subtract 0.
final int durabilityLoss = removeDurability ? (int) Math.max(1, e.getDamage() / 4) : 0;
final int newDurability = durabilityManager.removeDurability(elytra, durabilityLoss, armorTier);
if (newDurability >= durabilityManager.getMaxDurability(armorTier))
if (durabilityManager.isBroken(newDurability, armorTier))
Util.moveChestplateToInventory(p);
}

2
src/main/java/nl/pim16aap2/armoredElytra/handlers/FlyDurabilityHandler.java
View File

@ -44,7 +44,7 @@ public class FlyDurabilityHandler implements Listener
return;
final int newDurability = durabilityManager.removeDurability(e.getItem(), e.getDamage(), armorTier);
if (newDurability >= durabilityManager.getMaxDurability(armorTier))
if (durabilityManager.isBroken(newDurability, armorTier))
Util.moveChestplateToInventory(e.getPlayer());
}
}

73
src/main/java/nl/pim16aap2/armoredElytra/nbtEditor/DurabilityManager.java
View File

@ -42,6 +42,9 @@ public class DurabilityManager
public int setCombinedDurability(ItemStack armoredElytraOut, ItemStack armoredElytraIn, ItemStack other,
ArmorTier currentTier, ArmorTier targetTier)
{
if (nbtEditor.isUnbreakable(armoredElytraIn))
return 0;
final int combinedDurability = getCombinedDurability(armoredElytraIn, other, currentTier, targetTier);
setDurability(armoredElytraOut, combinedDurability, targetTier);
return combinedDurability;
@ -60,15 +63,17 @@ public class DurabilityManager
public int getCombinedDurability(ItemStack armoredElytra, ItemStack other,
ArmorTier currentTier, ArmorTier targetTier)
{
if (nbtEditor.isUnbreakable(armoredElytra))
return 0;
final ArmorTier otherTier = nbtEditor.getArmorTier(other);
final int currentMaxDurability = getMaxDurability(currentTier);
final int targetMaxDurability = getMaxDurability(targetTier);
final int otherMaxDurability = otherTier != ArmorTier.NONE ?
getMaxDurability(otherTier) : other.getType().getMaxDurability();
//noinspection deprecation
final int otherDurability = other.getType().equals(Material.ELYTRA) ?
getRealDurability(other, null) : other.getDurability();
getRealDurability(other, null) : getItemDurability(other);
final int currentDurability = getRealDurability(armoredElytra, currentTier);
final int combinedDurability = targetMaxDurability -
@ -89,6 +94,9 @@ public class DurabilityManager
*/
public int removeDurability(ItemStack armoredElytra, int durabilityLoss, @Nullable ArmorTier providedTier)
{
if (nbtEditor.isUnbreakable(armoredElytra))
return 0;
final ArmorTier currentTier = providedTier == null ? nbtEditor.getArmorTier(armoredElytra) : providedTier;
final int currentDurability = getRealDurability(armoredElytra, currentTier);
final int newDurability = Util.between(currentDurability + durabilityLoss, 0, getMaxDurability(currentTier));
@ -109,6 +117,9 @@ public class DurabilityManager
*/
public int getFullRepairItemCount(ItemStack armoredElytra, @Nullable ArmorTier providedTier)
{
if (nbtEditor.isUnbreakable(armoredElytra))
return 0;
final ArmorTier currentTier = providedTier == null ? nbtEditor.getArmorTier(armoredElytra) : providedTier;
final int repairableDurability = getMaxDurability(currentTier) - getRealDurability(armoredElytra, currentTier);
return (int) Math.ceil((float) repairableDurability / getRepairAmount(currentTier));
@ -126,6 +137,9 @@ public class DurabilityManager
*/
public int getRepairedDurability(ItemStack armoredElytra, int repairCount, @Nullable ArmorTier providedTier)
{
if (nbtEditor.isUnbreakable(armoredElytra))
return 0;
final ArmorTier currentTier = providedTier == null ? nbtEditor.getArmorTier(armoredElytra) : providedTier;
final int restoredDurability = repairCount * getRepairAmount(currentTier);
final int currentDurability = getRealDurability(armoredElytra, currentTier);
@ -147,8 +161,10 @@ public class DurabilityManager
final ArmorTier currentTier = providedTier == null ? nbtEditor.getArmorTier(item) : providedTier;
if (currentTier == ArmorTier.NONE)
//noinspection deprecation
return item.getDurability();
return getItemDurability(item);
if (nbtEditor.isUnbreakable(item))
return 0;
final int realDurability = nbtEditor.getRealDurability(item, currentTier);
return realDurability == -1 ? upgradeArmoredElytraToDurability(item, currentTier) : realDurability;
@ -164,6 +180,9 @@ public class DurabilityManager
*/
public void setDurability(ItemStack item, int durability, @Nullable ArmorTier providedTier)
{
if (nbtEditor.isUnbreakable(item))
return;
final ArmorTier currentTier = providedTier == null ? nbtEditor.getArmorTier(item) : providedTier;
final int oldMaxDurability = getMaxDurability(currentTier);
final int rawDurability = getRemappedDurability(durability, oldMaxDurability, ELYTRA_MAX_DURABILITY);
@ -183,8 +202,7 @@ public class DurabilityManager
private int upgradeArmoredElytraToDurability(ItemStack armoredElytra, ArmorTier currentTier)
{
final int maxDurability = getMaxDurability(currentTier);
//noinspection deprecation
final int rawDurability = armoredElytra.getDurability();
final int rawDurability = getItemDurability(armoredElytra);
final int realDurability = maxDurability == ELYTRA_MAX_DURABILITY ?
rawDurability :
@ -208,13 +226,40 @@ public class DurabilityManager
return ArmorTier.getMaxDurability(armorTier);
}
/**
* Checks if an armored elytra should be considered 'broken'.
*
* @param durability The current 'real' durability. See {@link #getRealDurability(ItemStack, ArmorTier)}.
* @param armorTier The armor tier for which to check.
* @return True if the provided durability should be considered 'broken' for the provided armor tier.
*/
public boolean isBroken(int durability, ArmorTier armorTier)
{
return durability >= getMaxDurability(armorTier);
}
/**
* Checks if an armored elytra should be considered 'broken'.
*
* @param armoredElytra The armored elytra to check.
* @param armorTier The armor tier for which to check.
* @return True if the provided armored elytra should be considered 'broken'.
*/
public boolean isBroken(ItemStack armoredElytra, @Nullable ArmorTier armorTier)
{
final int realDurability = getRealDurability(armoredElytra, armorTier);
if (realDurability == 0)
return false;
return isBroken(realDurability, armorTier == null ? nbtEditor.getArmorTier(armoredElytra) : armorTier);
}
/**
* Gets the maximum durability for a given armor tier.
*
* @param armorTier The armor tier for which to get the maximum durability.
* @return The maximum durability of the given armor tier.
*/
public int getMaxDurability(ArmorTier armorTier)
private int getMaxDurability(ArmorTier armorTier)
{
return maxDurabilities[armorTier.ordinal()];
}
@ -225,7 +270,7 @@ public class DurabilityManager
* @param armorTier The armor tier.
* @return The amount of durability restored per repair step for the given armor tier.
*/
public int getRepairAmount(ArmorTier armorTier)
private int getRepairAmount(ArmorTier armorTier)
{
return repairAmounts[armorTier.ordinal()];
}
@ -266,4 +311,16 @@ public class DurabilityManager
repairAmounts[idx] = (int) Math.ceil((float) maxDurability / steps);
}
}
/**
* Gets the durability of an item. See {@link ItemStack#getDurability()}.
*
* @param item The item to analyze.
* @return The durability of the item.
*/
@SuppressWarnings("deprecation")
private int getItemDurability(ItemStack item)
{
return item.getDurability();
}
}

12
src/main/java/nl/pim16aap2/armoredElytra/nbtEditor/NBTEditor.java
View File

@ -166,6 +166,18 @@ public class NBTEditor
return getArmorTier(item.getItemMeta());
}
/**
* Checks if an item is unbreakable.
*
* @param item The item to check. This may or may not be an armored elytra.
* @return True if the item exists and is unbreakable. Otherwise, false.
*/
public boolean isUnbreakable(@Nullable ItemStack item)
{
final @Nullable ItemMeta meta = item == null ? null : item.getItemMeta();
return meta != null && meta.isUnbreakable();
}
/**
* Gets the Color of an armored elytra.
* <p>