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

- Rewrote all anvil related stuff. Cleaner and better now.

Browse Source
This commit is contained in:
Pim van der Loos
2018-01-19 12:08:04 +01:00
parent acee288927
commit 1ae0b3309d
5 changed files with 257 additions and 199 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>nl.pim16aap2</groupId> <groupId>nl.pim16aap2</groupId>
<artifactId>ArmoredElytra</artifactId> <artifactId>ArmoredElytra</artifactId>
<version>2.0.1-SNAPSHOT</version> <version>2.0.9-SNAPSHOT</version>
<repositories> <repositories>

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

@ -1,5 +1,6 @@
package nl.pim16aap2.armoredElytra.handlers; package nl.pim16aap2.armoredElytra.handlers;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Random; import java.util.Random;
@ -24,22 +25,23 @@ import org.bukkit.scheduler.BukkitRunnable;
import nl.pim16aap2.armoredElytra.ArmoredElytra; import nl.pim16aap2.armoredElytra.ArmoredElytra;
import nl.pim16aap2.armoredElytra.nms.NBTEditor; import nl.pim16aap2.armoredElytra.nms.NBTEditor;
import nl.pim16aap2.armoredElytra.util.Action;
import nl.pim16aap2.armoredElytra.util.ArmorTier; import nl.pim16aap2.armoredElytra.util.ArmorTier;
import nl.pim16aap2.armoredElytra.util.Util; import nl.pim16aap2.armoredElytra.util.Util;
public class EventHandlers implements Listener public class EventHandlers implements Listener
{ {
private int DIAMONDS_TO_FULL; private int DIAMONDS_TO_FULL;
private int LEATHER_TO_FULL; private int LEATHER_TO_FULL;
private int GOLD_TO_FULL; private int GOLD_TO_FULL;
private int IRON_TO_FULL; private int IRON_TO_FULL;
private boolean cursesAllowed; private boolean cursesAllowed;
private NBTEditor nbtEditor; private NBTEditor nbtEditor;
private final ArmoredElytra plugin; private final ArmoredElytra plugin;
private List<String> allowedEnchantments; private List<String> allowedEnchantments;
private String[] cursedEnchantments = {"MENDING", private String[] cursedEnchantments = { "MENDING" ,
"VANISHING_CURSE", "VANISHING_CURSE" ,
"BINDING_CURSE"}; "BINDING_CURSE" };
public EventHandlers(ArmoredElytra plugin, NBTEditor nbtEditor) public EventHandlers(ArmoredElytra plugin, NBTEditor nbtEditor)
{ {
@ -63,6 +65,12 @@ public class EventHandlers implements Listener
anvilInventory.getItem(2).setAmount(0); anvilInventory.getItem(2).setAmount(0);
} }
// Accessor for this.plugin
public ArmoredElytra getPlugin()
{
return this.plugin;
}
// Check if the enchantment is allowed on elytras. // Check if the enchantment is allowed on elytras.
public boolean isAllowedEnchantment(Enchantment enchant) public boolean isAllowedEnchantment(Enchantment enchant)
{ {
@ -82,95 +90,74 @@ public class EventHandlers implements Listener
return false; return false;
} }
// Copy enchants of 2 items to one item. // Combine 2 maps of enchantments (and remove any invalid ones).
public ItemStack addEnchants(ItemStack itemOne, ItemStack itemTwo, Player player) public Map<Enchantment, Integer> combineEnchantments(Map<Enchantment, Integer> enchantments0, Map<Enchantment, Integer> enchantments1)
{ {
ItemStack result = itemOne.clone(); fixEnchantments(enchantments0);
Map<Enchantment, Integer> combined = new HashMap<Enchantment, Integer>(enchantments0);
Map<Enchantment, Integer> newEnchantments = itemTwo.getEnchantments(); if (enchantments1 != null)
// Enchants from enchanted books have to be accessed in a different way.
if (itemTwo.getType() == Material.ENCHANTED_BOOK && (nbtEditor.getArmorTier(itemOne) != ArmorTier.NONE))
{
EnchantmentStorageMeta meta = (EnchantmentStorageMeta)itemTwo.getItemMeta();
newEnchantments = meta.getStoredEnchants();
}
// Copy enchantments from item1 to result.
if (newEnchantments!=null)
{ {
fixEnchantments(enchantments1);
// Loop through the enchantments of item1. // Loop through the enchantments of item1.
for (Map.Entry<Enchantment, Integer > entry : newEnchantments.entrySet()) for (Map.Entry<Enchantment, Integer > entry : enchantments1.entrySet())
{ {
Integer enchantLevel = enchantments0.get(entry.getKey());
// If the enchantment is a curse and if the result does not already have it. // If the enchantment is a curse and if the result does not already have it.
if (isCursedEnchantment(entry.getKey()) && !result.containsEnchantment(entry.getKey())) if (isCursedEnchantment(entry.getKey()) && !enchantments0.containsKey(entry.getKey()))
combined.put(entry.getKey(), entry.getValue());
// If the enchantment is already on the list...
else if (enchantLevel != null)
{ {
// If curses are allowed, apply the curse to the result. if (entry.getValue() == enchantLevel && entry.getValue() < entry.getKey().getMaxLevel())
if (cursesAllowed) enchantLevel = entry.getValue() + 1;
result.addEnchantment(entry.getKey(), entry.getValue()); else if (entry.getValue() > enchantLevel)
} enchantLevel = entry.getValue();
else if (isAllowedEnchantment(entry.getKey()))
{ // If the enchantment level has changed,
int enchantLevel = entry.getValue(); if (enchantLevel != enchantments0.get(entry.getKey()))
// If item0 and item1 both have the same enchantment at the same level, result has level+1.
// If item0 and item1 both have the same enchantment at different levels, give the highest level to result.
if (newEnchantments != null)
{ {
// Loop through the enchantments of item0 (which are already on the result). combined.remove(entry.getKey());
for (Map.Entry<Enchantment, Integer > rentry : newEnchantments.entrySet()) combined.put(entry.getKey(), enchantLevel);
{
if (entry.getKey().getName() == rentry.getKey().getName())
{
// If they both have the same level of the same enchantment, the result will have that enchantment 1 level higher (if possible).
if (entry.getValue() == rentry.getValue() && entry.getValue() < entry.getKey().getMaxLevel())
enchantLevel = entry.getValue() + 1;
else if (entry.getValue() < rentry.getValue())
enchantLevel = rentry.getValue();
}
}
} }
result.addUnsafeEnchantment(entry.getKey(), enchantLevel);
} }
else if (enchantLevel == null)
combined.put(entry.getKey(), entry.getValue());
} }
} }
return result; return combined;
} }
// Copy enchants of 2 items to one item. // Repair an Armored Elytra
public ItemStack repairItem(ItemStack one, ItemStack two) public short repairItem(short curDur, ItemStack repairItem)
{ {
// Create the resulting item.
ItemStack result = one.clone();
// Get the multiplier for the repair items. // Get the multiplier for the repair items.
double mult = 0.01; double mult = 0.01;
if (two.getType() == Material.LEATHER) if (repairItem.getType() == Material.LEATHER)
mult *= (100/LEATHER_TO_FULL); mult *= (100/LEATHER_TO_FULL);
else if (two.getType() == Material.GOLD_INGOT) else if (repairItem.getType() == Material.GOLD_INGOT)
mult *= (100/GOLD_TO_FULL); mult *= (100/GOLD_TO_FULL);
else if (two.getType() == Material.IRON_INGOT) else if (repairItem.getType() == Material.IRON_INGOT)
mult *= (100/IRON_TO_FULL); mult *= (100/IRON_TO_FULL);
else if (two.getType() == Material.DIAMOND) else if (repairItem.getType() == Material.DIAMOND)
mult *= (100/DIAMONDS_TO_FULL); mult *= (100/DIAMONDS_TO_FULL);
int maxDurability = one.getType().getMaxDurability(); int maxDurability = Material.ELYTRA.getMaxDurability();
int durability = one.getDurability(); int newDurability = (int) (curDur - (maxDurability * mult));
int newDurability = (int) (durability - (maxDurability * mult)); return (short) (newDurability <= 0 ? 0 : newDurability);
result.setDurability((short) (newDurability <= 0 ? 0 : newDurability));
return result;
} }
// Check if there aren't any disallowed enchantments / curses in the map.
public boolean verifyEnchants(Map<Enchantment, Integer> enchantments) public boolean verifyEnchants(Map<Enchantment, Integer> enchantments)
{ {
for (Map.Entry<Enchantment, Integer > entry : enchantments.entrySet()) for (Map.Entry<Enchantment, Integer > entry : enchantments.entrySet())
{ {
// If it's a cursed enchantment, while it's not allowed, it's false. // If it's a cursed enchantment, while it's not allowed, it's false.
if (isCursedEnchantment(entry.getKey())) if (isCursedEnchantment(entry.getKey()) && !cursesAllowed)
if (!cursesAllowed) return false;
return false;
// If the enchantment is not allowed, it's false. // If the enchantment is not allowed, it's false.
else if (!isAllowedEnchantment(entry.getKey())) else if (!isAllowedEnchantment(entry.getKey()))
return false; return false;
@ -178,7 +165,18 @@ public class EventHandlers implements Listener
return true; return true;
} }
public ItemStack fixEnchants(ItemStack item) // Remove any disallowed enchantments / curses in the map.
public Map<Enchantment, Integer> fixEnchantments(Map<Enchantment, Integer> enchantments)
{
Map<Enchantment, Integer> ret = new HashMap<Enchantment, Integer>(enchantments);
for (Map.Entry<Enchantment, Integer> entry : enchantments.entrySet())
if (isAllowedEnchantment(entry.getKey()) == false && (cursesAllowed && isCursedEnchantment(entry.getKey())) == false)
ret.remove(entry.getKey());
return ret;
}
// Fix enchantments on an item.
public ItemStack fixEnchantments(ItemStack item)
{ {
ItemStack result = item.clone(); ItemStack result = item.clone();
for (Map.Entry<Enchantment, Integer> entry : result.getEnchantments().entrySet()) for (Map.Entry<Enchantment, Integer> entry : result.getEnchantments().entrySet())
@ -187,6 +185,99 @@ public class EventHandlers implements Listener
return result; return result;
} }
// Get the armor tier from a chest plate.
public ArmorTier armorToTier(Material item)
{
ArmorTier ret = ArmorTier.NONE;
switch (item)
{
case LEATHER_CHESTPLATE:
ret = ArmorTier.LEATHER;
break;
case GOLD_CHESTPLATE:
ret = ArmorTier.GOLD;
break;
case CHAINMAIL_CHESTPLATE:
ret = ArmorTier.CHAIN;
break;
case IRON_CHESTPLATE:
ret = ArmorTier.IRON;
break;
case DIAMOND_CHESTPLATE:
ret = ArmorTier.DIAMOND;
break;
default:
break;
}
return ret;
}
// Check if mat is a chest plate.
public boolean isChestPlate(Material mat)
{
if (mat == Material.LEATHER_CHESTPLATE || mat == Material.GOLD_CHESTPLATE ||
mat == Material.CHAINMAIL_CHESTPLATE || mat == Material.IRON_CHESTPLATE ||
mat == Material.DIAMOND_CHESTPLATE)
return true;
return false;
}
/*
* Valid inputs:
* - Elytra (armored or not) + chestplate -> Create Armored Elytra
* - Elytra (armored) + enchanted book -> Enchant
* - Elytra (armored) + its repair item -> Repair
* - Elytra (armored) + other elytra (armored) -> Combine (Enchant + Repair)
* ! Elytra (armored, !leather) + leather -> Block
*
* Ignoring:
* - Elytra (not armored) + !chestplate -> None
* - * + * -> None
*/
public Action isValidInput(ItemStack itemOne, ItemStack itemTwo)
{
if (itemOne == null || itemTwo == null)
return Action.NONE;
// If itemTwo is the elytra, while itemOne isn't, switch itemOne and itemTwo.
if (itemTwo.getType() == Material.ELYTRA && itemOne.getType() != Material.ELYTRA)
{
ItemStack tmp = itemOne;
itemOne = itemTwo;
itemTwo = tmp;
}
Material matTwo = itemTwo.getType();
// If the elytra is to be combined with chest armor...
if (isChestPlate(matTwo))
return Action.CREATE;
ArmorTier tier = nbtEditor.getArmorTier(itemOne);
if (tier != ArmorTier.NONE)
{
// If the armored elytra is to be enchanted using an enchanted book...
if (matTwo == Material.ENCHANTED_BOOK)
return Action.ENCHANT;
// If the armored elytra is to be repaired using its repair item...
if (ArmorTier.getRepairItem(tier) == matTwo)
return Action.REPAIR;
// If the armored elytra is to be combined with another armored elytra of the same tier...
if (nbtEditor.getArmorTier(itemTwo) == tier)
return Action.COMBINE;
// If the armored elytra is not of the leather tier, but itemTwo is leather,
// Pick the block action, as that would repair the elytra by default (vanilla).
if (tier != ArmorTier.LEATHER && matTwo == Material.LEATHER)
return Action.BLOCK;
}
return Action.NONE;
}
// Handle the anvil related parts. // Handle the anvil related parts.
@EventHandler @EventHandler
public void onInventoryClick(InventoryClickEvent e) public void onInventoryClick(InventoryClickEvent e)
@ -214,49 +305,47 @@ public class EventHandlers implements Listener
int slot = e.getRawSlot(); // Get slot int slot = e.getRawSlot(); // Get slot
if (slot == 2 && anvilInventory.getItem(2) != null) if (slot == 2 && anvilInventory.getItem(0) != null && anvilInventory.getItem(1) != null && anvilInventory.getItem(2) != null)
{ {
// If there is an elytra in the final slot (it is unenchantable by default, so we can reasonably expect it to be an enchanted elytra) // If there's an armored elytra in the final slot...
// and the player selects it, let the player transfer it to their inventory. if (anvilInventory.getItem(2).getType() == Material.ELYTRA && nbtEditor.getArmorTier(anvilInventory.getItem(2)) != ArmorTier.NONE)
// Verify the end result first, to prevent glitches. If the end result is invalid, remove the item and update the player's inventory.
if (anvilInventory.getItem(2).getType() == Material.ELYTRA &&
anvilInventory.getItem(0) != null &&
anvilInventory.getItem(1) != null)
{ {
if (!verifyEnchants(anvilInventory.getItem(2).getEnchantments())) Action action = isValidInput(anvilInventory.getItem(0), anvilInventory.getItem(1));
// If there is no action to be taken, take no action...
if (action == Action.NONE)
return;
// If the action is to block... Well, Block! (get rid of the end result!)
// Also check if there are any disallowed enchantments/curses on the result, delete the result.
if (action == Action.BLOCK)
{ {
anvilInventory.getItem(2).setAmount(0); // Send message to player that the recipe is invalid, as clearing the inventory doesn't work properly.
plugin.messagePlayer(p, ChatColor.RED, "Invalid recipe!");
anvilInventory.setItem(2, null);
anvilInventory.clear(2);
p.updateInventory();
p.updateInventory();
p.updateInventory(); p.updateInventory();
return; return;
} }
// If the elytra is armored with any tier other than leather and the other item is leather, remove the elytra.
if ((nbtEditor.getArmorTier(anvilInventory.getItem(0)) != ArmorTier.LEATHER || // Give the result to the player and clear the anvil's inventory.
nbtEditor.getArmorTier(anvilInventory.getItem(1)) != ArmorTier.LEATHER) && if (e.isShiftClick())
(anvilInventory.getItem(0).getType() == Material.LEATHER || p.getInventory().addItem(fixEnchantments(anvilInventory.getItem(2)));
anvilInventory.getItem(1).getType() == Material.LEATHER) &&
(nbtEditor.getArmorTier(anvilInventory.getItem(0)) != ArmorTier.NONE ||
nbtEditor.getArmorTier(anvilInventory.getItem(1)) != ArmorTier.NONE))
{
anvilInventory.getItem(2).setAmount(0);
p.updateInventory();
return;
}
else if (e.isShiftClick())
p.getInventory().addItem(anvilInventory.getItem(2));
else else
p.setItemOnCursor(anvilInventory.getItem(2)); p.setItemOnCursor(fixEnchantments(anvilInventory.getItem(2)));
// Clean the anvil's inventory after transferring the items. // Clean the anvil's inventory after transferring the items.
cleanAnvil(anvilInventory); cleanAnvil(anvilInventory);
return;
} }
} }
new BukkitRunnable() new BukkitRunnable()
{ {
@Override @Override
public void run() public void run()
{ {
ItemStack itemA = anvilInventory.getItem(0); ItemStack itemA = anvilInventory.getItem(0);
ItemStack itemB = anvilInventory.getItem(1); ItemStack itemB = anvilInventory.getItem(1);
ItemStack result = null; ItemStack result = null;
if (itemA != null && itemB != null) if (itemA != null && itemB != null)
{ {
@ -273,94 +362,52 @@ public class EventHandlers implements Listener
// Check if there are items in both input slots. // Check if there are items in both input slots.
if (itemA != null && itemB != null) if (itemA != null && itemB != null)
{ {
// Check if the first input slot contains an elytra. Action action = isValidInput(itemA, itemB);
if (itemA.getType() == Material.ELYTRA) ArmorTier newTier = ArmorTier.NONE;
{ ArmorTier curTier = nbtEditor.getArmorTier(itemA);
ArmorTier armorTier = ArmorTier.NONE; short durability = 0;
ArmorTier currentArmorTier = nbtEditor.getArmorTier(itemA); Map<Enchantment, Integer> enchantments = itemA.getEnchantments();
enchantments = fixEnchantments(enchantments);
if (currentArmorTier == ArmorTier.NONE && itemB.getType() == Material.LEATHER) switch (action)
return; {
case REPAIR:
newTier = curTier;
durability = repairItem(itemA.getDurability(), itemB);
break;
case ENCHANT:
EnchantmentStorageMeta meta = (EnchantmentStorageMeta) itemB.getItemMeta();
newTier = curTier;
durability = itemA.getDurability();
enchantments = combineEnchantments(enchantments, meta.getStoredEnchants());
break;
case COMBINE:
newTier = curTier;
durability = (short) (- itemA.getType().getMaxDurability() - itemA.getDurability() - itemB.getDurability());
durability = durability < 0 ? 0 : durability;
enchantments = combineEnchantments(enchantments, itemB.getEnchantments());
break;
case CREATE:
newTier = armorToTier(itemB.getType());
durability = 0;
enchantments = combineEnchantments(enchantments, itemB.getEnchantments());
break;
case BLOCK:
if (anvilInventory.getItem(2) != null)
anvilInventory.getItem(2).setAmount(0);
p.updateInventory();
case NONE:
return;
}
// Check if the second input slot contains a diamond chestplate. result = new ItemStack(Material.ELYTRA, 1);
else if (itemB.getType() == Material.LEATHER_CHESTPLATE || if (enchantments != null)
itemB.getType() == Material.GOLD_CHESTPLATE || result.addUnsafeEnchantments(enchantments);
itemB.getType() == Material.CHAINMAIL_CHESTPLATE || result.setDurability(durability);
itemB.getType() == Material.IRON_CHESTPLATE || result = nbtEditor.addArmorNBTTags(result, newTier, plugin.getConfigLoader().getBool("unbreakable"));
itemB.getType() == Material.DIAMOND_CHESTPLATE) anvilInventory.setItem(2, result);
{
// Combine the enchantments of the two items in the input slots.
result = addEnchants(itemA, itemB, p);
if (itemB.getType() == Material.LEATHER_CHESTPLATE)
armorTier = ArmorTier.LEATHER;
else if (itemB.getType() == Material.GOLD_CHESTPLATE)
armorTier = ArmorTier.GOLD;
else if (itemB.getType() == Material.CHAINMAIL_CHESTPLATE)
armorTier = ArmorTier.CHAIN;
else if (itemB.getType() == Material.IRON_CHESTPLATE)
armorTier = ArmorTier.IRON;
else if (itemB.getType() == Material.DIAMOND_CHESTPLATE)
armorTier = ArmorTier.DIAMOND;
short durability = (short) (- itemA.getType().getMaxDurability() - itemA.getDurability() - itemB.getDurability());
durability = durability < 0 ? 0 : durability;
result.setDurability(durability);
}
// If the player tries to repair an armored elytra. Check if the armor tier and the repair item match.
// If the repair item is leather it can only repair
else if ((itemB.getType() == Material.LEATHER && currentArmorTier == ArmorTier.LEATHER) ||
(itemB.getType() == Material.GOLD_INGOT && currentArmorTier == ArmorTier.GOLD ) ||
(itemB.getType() == Material.IRON_INGOT && currentArmorTier == ArmorTier.IRON ) ||
(itemB.getType() == Material.IRON_INGOT && currentArmorTier == ArmorTier.CHAIN ) ||
(itemB.getType() == Material.DIAMOND && currentArmorTier == ArmorTier.DIAMOND))
{
// Repair the item in the first input slot with items from the second input slot.
result = repairItem(itemA, itemB);
}
// Check if it is an enchanted book for itemB.
else if (itemB.getType() == Material.ENCHANTED_BOOK)
result = addEnchants(itemA, itemB, p);
// If itemA and itemB are both armored elytras of the same armor tier, repair + share enchantments
else if (itemB.getType() == Material.ELYTRA)
{
if (nbtEditor.getArmorTier(itemB) != ArmorTier.NONE && nbtEditor.getArmorTier(itemA) == nbtEditor.getArmorTier(itemB))
{
result = addEnchants(itemA, itemB, p);
short durability = (short) (- itemA.getType().getMaxDurability() - itemA.getDurability() - itemB.getDurability());
durability = durability < 0 ? 0 : durability;
result.setDurability(durability);
}
}
// Otherwise, remove the item in the result slot (slot2).
else if (anvilInventory.getItem(2) != null)
anvilInventory.getItem(2).setAmount(0);
// Put the created item in the second slot of the anvil.
if (result!=null)
{
if (itemB.getType() == Material.LEATHER_CHESTPLATE ||
itemB.getType() == Material.GOLD_CHESTPLATE ||
itemB.getType() == Material.CHAINMAIL_CHESTPLATE ||
itemB.getType() == Material.IRON_CHESTPLATE ||
itemB.getType() == Material.DIAMOND_CHESTPLATE)
// Add the NBT Tags for the elytra, to give it armorTier tier of armor protection.
result = nbtEditor.addArmorNBTTags(result, armorTier, plugin.getConfigLoader().getBool("unbreakable"));
else if ((nbtEditor.getArmorTier(itemA) != ArmorTier.NONE) &&
(nbtEditor.getArmorTier(result) != ArmorTier.NONE))
{
armorTier = nbtEditor.getArmorTier(itemA);
result = nbtEditor.addArmorNBTTags(result, armorTier, plugin.getConfigLoader().getBool("unbreakable"));
}
result = fixEnchants(result);
anvilInventory.setItem(2, result);
}
else if (anvilInventory.getItem(2) != null)
anvilInventory.getItem(2).setAmount(0);
}
} }
// Check if either itemA or itemB is unoccupied. // Check if either itemA or itemB is unoccupied.
if (itemA == null || itemB == null) if (itemA == null || itemB == null)
// If Item2 is occupied despite Item1 not being occupied. // If Item2 is occupied despite Item1 not being occupied.
@ -470,7 +517,7 @@ public class EventHandlers implements Listener
Random r = new Random(); Random r = new Random();
int randomInt = r.nextInt(101); int randomInt = r.nextInt(101);
int enchantLevel = p.getInventory().getChestplate().getEnchantmentLevel(Enchantment.DURABILITY); int enchantLevel = p.getInventory().getChestplate().getEnchantmentLevel(Enchantment.DURABILITY);
int durabilityDelta = (100/(enchantLevel+1)) < randomInt ? 0 : 1; int durabilityDelta = (100 / (enchantLevel + 1)) < randomInt ? 0 : 1;
if (durability >= maxDurability) if (durability >= maxDurability)
Util.unenquipChestPlayer(p); Util.unenquipChestPlayer(p);
else else

6
src/main/java/nl/pim16aap2/armoredElytra/util/Action.java Normal file
View File

@ -0,0 +1,6 @@
package nl.pim16aap2.armoredElytra.util;
public enum Action
{
NONE, REPAIR, ENCHANT, COMBINE, CREATE, BLOCK
}

29
src/main/java/nl/pim16aap2/armoredElytra/util/ArmorTier.java
View File

@ -5,36 +5,41 @@ import org.bukkit.Material;
public enum ArmorTier public enum ArmorTier
{ {
// Tier: tier armor-value, tier armor-toughness, tier name color , tier name. // Tier: tier armor-value, tier armor-toughness, tier name color , tier name , repair
NONE (0 , 0 , ChatColor.WHITE , "Unarmored"), NONE (0 , 0 , ChatColor.WHITE , "Unarmored", null ),
LEATHER (3 , 0 , ChatColor.DARK_GREEN, "Leather" ), LEATHER (3 , 0 , ChatColor.DARK_GREEN, "Leather" , Material.LEATHER ),
GOLD (5 , 0 , ChatColor.YELLOW , "Gold" ), GOLD (5 , 0 , ChatColor.YELLOW , "Gold" , Material.GOLD_INGOT),
CHAIN (5 , 0 , ChatColor.DARK_GRAY , "Chain" ), CHAIN (5 , 0 , ChatColor.DARK_GRAY , "Chain" , Material.IRON_INGOT),
IRON (6 , 0 , ChatColor.GRAY , "Iron" ), IRON (6 , 0 , ChatColor.GRAY , "Iron" , Material.IRON_INGOT),
DIAMOND (8 , 2 , ChatColor.AQUA , "Diamond" ); DIAMOND (8 , 2 , ChatColor.AQUA , "Diamond" , Material.DIAMOND );
private int armor; private int armor;
private int toughness; private int toughness;
private ChatColor color; private ChatColor color;
private String name; private String name;
private Material repair;
private ArmorTier (int armor, int toughness, ChatColor color, String name) private ArmorTier (int armor, int toughness, ChatColor color, String name, Material repair)
{ {
this.armor = armor; this.armor = armor;
this.color = color; this.color = color;
this.toughness = toughness; this.toughness = toughness;
this.name = name; this.name = name;
this.repair = repair;
} }
// return the armor value of a tier. // return the armor value of a tier.
public static int getArmor (ArmorTier item) { return item.armor; } public static int getArmor (ArmorTier tier) { return tier.armor; }
// return the armor toughness of a tier. // return the armor toughness of a tier.
public static int getToughness (ArmorTier item) { return item.toughness; } public static int getToughness (ArmorTier tier) { return tier.toughness; }
// return the color of a tier. // return the color of a tier.
public static ChatColor getColor (ArmorTier item) { return item.color; } public static ChatColor getColor (ArmorTier tier) { return tier.color; }
// return the name of a tier. // return the name of a tier.
public static String getArmorName (ArmorTier item) { return item.name; } public static String getArmorName (ArmorTier tier) { return tier.name; }
// return the repair item of a tier
public static Material getRepairItem (ArmorTier tier) { return tier.repair; }
} }

2
src/main/resources/plugin.yml
View File

@ -1,6 +1,6 @@
name: ArmoredElytra name: ArmoredElytra
main: nl.pim16aap2.armoredElytra.ArmoredElytra main: nl.pim16aap2.armoredElytra.ArmoredElytra
version: 2.0.1 version: 2.0.9
author: Pim author: Pim
commands: commands:
ArmoredElytra: ArmoredElytra: