Push changes for anvil.
This commit is contained in:
parent
0a4bde3866
commit
28255ca10a
@ -9895,7 +9895,7 @@ implements Listener
|
||||
}
|
||||
}
|
||||
}
|
||||
} else if (event.getInventory().getTitle().equalsIgnoreCase("Repair and Enchant")) {
|
||||
} else if (event.getInventory().getTitle().equalsIgnoreCase("Repair and Enchant")) {
|
||||
final int INPUT = 10;
|
||||
final int MATERIALS = 12;
|
||||
final int MAGIC = 14;
|
||||
@ -9972,23 +9972,23 @@ implements Listener
|
||||
event.getInventory().getItem(INPUT).setDurability((short)(event.getInventory().getItem(INPUT).getDurability() + (event.getInventory().getItem(INPUT).getType().getMaxDurability() - event.getInventory().getItem(INPUT).getDurability()) / 2));
|
||||
|
||||
// DISENCHANT BEGIN
|
||||
Map<Enchantment,Integer> map = event.getInventory().getItem(INPUT).getEnchantments();
|
||||
for (Map.Entry<Enchantment,Integer> entry : map.entrySet()) {
|
||||
event.getInventory().getItem(INPUT).removeEnchantment(entry.getKey());
|
||||
}
|
||||
if (event.getInventory().getItem(INPUT).hasItemMeta() && event.getInventory().getItem(INPUT).getItemMeta().hasLore()) {
|
||||
List<String> newlore = new ArrayList<String>();
|
||||
for (int i=0;i<event.getInventory().getItem(INPUT).getItemMeta().getLore().size();i++) {
|
||||
//Remove all lore when unenchanting.
|
||||
//Do not remove -400% durability.
|
||||
if (this.plugin.is_PermanentProperty(event.getInventory().getItem(INPUT).getItemMeta().getLore().get(i))) {
|
||||
newlore.add(event.getInventory().getItem(INPUT).getItemMeta().getLore().get(i));
|
||||
}
|
||||
}
|
||||
ItemMeta meta = event.getInventory().getItem(INPUT).getItemMeta();
|
||||
meta.setLore(newlore);
|
||||
event.getInventory().getItem(INPUT).setItemMeta(meta);
|
||||
}
|
||||
Map<Enchantment,Integer> map = event.getInventory().getItem(INPUT).getEnchantments();
|
||||
for (Map.Entry<Enchantment,Integer> entry : map.entrySet()) {
|
||||
event.getInventory().getItem(INPUT).removeEnchantment(entry.getKey());
|
||||
}
|
||||
if (event.getInventory().getItem(INPUT).hasItemMeta() && event.getInventory().getItem(INPUT).getItemMeta().hasLore()) {
|
||||
List<String> newlore = new ArrayList<String>();
|
||||
for (int i=0;i<event.getInventory().getItem(INPUT).getItemMeta().getLore().size();i++) {
|
||||
//Remove all lore when unenchanting.
|
||||
//Do not remove -400% durability.
|
||||
if (this.plugin.is_PermanentProperty(event.getInventory().getItem(INPUT).getItemMeta().getLore().get(i))) {
|
||||
newlore.add(event.getInventory().getItem(INPUT).getItemMeta().getLore().get(i));
|
||||
}
|
||||
}
|
||||
ItemMeta meta = event.getInventory().getItem(INPUT).getItemMeta();
|
||||
meta.setLore(newlore);
|
||||
event.getInventory().getItem(INPUT).setItemMeta(meta);
|
||||
}
|
||||
// DISENCHANT END
|
||||
|
||||
// Destroy the item if random() exceeds %remaining durability
|
||||
@ -10023,6 +10023,8 @@ implements Listener
|
||||
} else if (event.getInventory().getItem(OUTPUT).getType().toString().toUpperCase().contains("BOW") ||
|
||||
event.getInventory().getItem(OUTPUT).getType().toString().toUpperCase().contains("FISHING")) {
|
||||
Bukkit.getPlayer(event.getWhoClicked().getName()).playSound(Bukkit.getPlayer(event.getWhoClicked().getName()).getLocation(), Sound.ARROW_HIT, 10, 1);
|
||||
} else if (event.getInventory().getItem(OUTPUT).getType().toString().toUpperCase().contains("ENCHANTED")) {
|
||||
Bukkit.getPlayer(event.getWhoClicked().getName()).playSound(Bukkit.getPlayer(event.getWhoClicked().getName()).getLocation(), Sound.LEVEL_UP, 10, 1);
|
||||
}
|
||||
|
||||
event.getInventory().setItem(OUTPUT, new ItemStack(Material.AIR));
|
||||
@ -10056,23 +10058,23 @@ implements Listener
|
||||
event.getInventory().getItem(INPUT).setDurability((short)(event.getInventory().getItem(INPUT).getDurability() + (event.getInventory().getItem(INPUT).getType().getMaxDurability() - event.getInventory().getItem(INPUT).getDurability()) / 2));
|
||||
|
||||
// DISENCHANT BEGIN
|
||||
Map<Enchantment,Integer> map = event.getInventory().getItem(INPUT).getEnchantments();
|
||||
for (Map.Entry<Enchantment,Integer> entry : map.entrySet()) {
|
||||
event.getInventory().getItem(INPUT).removeEnchantment(entry.getKey());
|
||||
}
|
||||
if (event.getInventory().getItem(INPUT).hasItemMeta() && event.getInventory().getItem(INPUT).getItemMeta().hasLore()) {
|
||||
List<String> newlore = new ArrayList<String>();
|
||||
for (int i=0;i<event.getInventory().getItem(INPUT).getItemMeta().getLore().size();i++) {
|
||||
//Remove all lore when unenchanting.
|
||||
//Do not remove -400% durability.
|
||||
if (this.plugin.is_PermanentProperty(event.getInventory().getItem(INPUT).getItemMeta().getLore().get(i))) {
|
||||
newlore.add(event.getInventory().getItem(INPUT).getItemMeta().getLore().get(i));
|
||||
}
|
||||
}
|
||||
ItemMeta meta = event.getInventory().getItem(INPUT).getItemMeta();
|
||||
meta.setLore(newlore);
|
||||
event.getInventory().getItem(INPUT).setItemMeta(meta);
|
||||
}
|
||||
Map<Enchantment,Integer> map = event.getInventory().getItem(INPUT).getEnchantments();
|
||||
for (Map.Entry<Enchantment,Integer> entry : map.entrySet()) {
|
||||
event.getInventory().getItem(INPUT).removeEnchantment(entry.getKey());
|
||||
}
|
||||
if (event.getInventory().getItem(INPUT).hasItemMeta() && event.getInventory().getItem(INPUT).getItemMeta().hasLore()) {
|
||||
List<String> newlore = new ArrayList<String>();
|
||||
for (int i=0;i<event.getInventory().getItem(INPUT).getItemMeta().getLore().size();i++) {
|
||||
//Remove all lore when unenchanting.
|
||||
//Do not remove -400% durability.
|
||||
if (this.plugin.is_PermanentProperty(event.getInventory().getItem(INPUT).getItemMeta().getLore().get(i))) {
|
||||
newlore.add(event.getInventory().getItem(INPUT).getItemMeta().getLore().get(i));
|
||||
}
|
||||
}
|
||||
ItemMeta meta = event.getInventory().getItem(INPUT).getItemMeta();
|
||||
meta.setLore(newlore);
|
||||
event.getInventory().getItem(INPUT).setItemMeta(meta);
|
||||
}
|
||||
// DISENCHANT END
|
||||
|
||||
|
||||
@ -10105,8 +10107,11 @@ implements Listener
|
||||
} else if (event.getInventory().getItem(OUTPUT).getType().toString().toUpperCase().contains("BOW") ||
|
||||
event.getInventory().getItem(OUTPUT).getType().toString().toUpperCase().contains("FISHING")) {
|
||||
Bukkit.getPlayer(event.getWhoClicked().getName()).playSound(Bukkit.getPlayer(event.getWhoClicked().getName()).getLocation(), Sound.ARROW_HIT, 10, 1);
|
||||
} else if (event.getInventory().getItem(OUTPUT).getType().toString().toUpperCase().contains("ENCHANTED")) {
|
||||
Bukkit.getPlayer(event.getWhoClicked().getName()).playSound(Bukkit.getPlayer(event.getWhoClicked().getName()).getLocation(), Sound.LEVEL_UP, 10, 1);
|
||||
}
|
||||
|
||||
|
||||
event.getInventory().setItem(OUTPUT, new ItemStack(Material.AIR));
|
||||
Bukkit.getServer().getScheduler().scheduleSyncDelayedTask(this.plugin, new updateInventoryTask(event.getWhoClicked().getName()));
|
||||
}
|
||||
@ -10119,26 +10124,26 @@ implements Listener
|
||||
event.getInventory().getItem(INPUT).setDurability((short)(event.getInventory().getItem(INPUT).getDurability() + (event.getInventory().getItem(INPUT).getType().getMaxDurability() - event.getInventory().getItem(INPUT).getDurability()) / 2));
|
||||
|
||||
// DISENCHANT BEGIN
|
||||
Map<Enchantment,Integer> map = event.getInventory().getItem(INPUT).getEnchantments();
|
||||
for (Map.Entry<Enchantment,Integer> entry : map.entrySet()) {
|
||||
event.getInventory().getItem(INPUT).removeEnchantment(entry.getKey());
|
||||
}
|
||||
if (event.getInventory().getItem(INPUT).hasItemMeta() && event.getInventory().getItem(INPUT).getItemMeta().hasLore()) {
|
||||
List<String> newlore = new ArrayList<String>();
|
||||
for (int i=0;i<event.getInventory().getItem(INPUT).getItemMeta().getLore().size();i++) {
|
||||
//Remove all lore when unenchanting.
|
||||
//Do not remove -400% durability.
|
||||
if (this.plugin.is_PermanentProperty(event.getInventory().getItem(INPUT).getItemMeta().getLore().get(i))) {
|
||||
newlore.add(event.getInventory().getItem(INPUT).getItemMeta().getLore().get(i));
|
||||
}
|
||||
}
|
||||
ItemMeta meta = event.getInventory().getItem(INPUT).getItemMeta();
|
||||
meta.setLore(newlore);
|
||||
event.getInventory().getItem(INPUT).setItemMeta(meta);
|
||||
}
|
||||
Map<Enchantment,Integer> map = event.getInventory().getItem(INPUT).getEnchantments();
|
||||
for (Map.Entry<Enchantment,Integer> entry : map.entrySet()) {
|
||||
event.getInventory().getItem(INPUT).removeEnchantment(entry.getKey());
|
||||
}
|
||||
if (event.getInventory().getItem(INPUT).hasItemMeta() && event.getInventory().getItem(INPUT).getItemMeta().hasLore()) {
|
||||
List<String> newlore = new ArrayList<String>();
|
||||
for (int i=0;i<event.getInventory().getItem(INPUT).getItemMeta().getLore().size();i++) {
|
||||
//Remove all lore when unenchanting.
|
||||
//Do not remove -400% durability.
|
||||
if (this.plugin.is_PermanentProperty(event.getInventory().getItem(INPUT).getItemMeta().getLore().get(i))) {
|
||||
newlore.add(event.getInventory().getItem(INPUT).getItemMeta().getLore().get(i));
|
||||
}
|
||||
}
|
||||
ItemMeta meta = event.getInventory().getItem(INPUT).getItemMeta();
|
||||
meta.setLore(newlore);
|
||||
event.getInventory().getItem(INPUT).setItemMeta(meta);
|
||||
}
|
||||
// DISENCHANT END
|
||||
|
||||
// Destroy the item if random() exceeds %remaining durability
|
||||
// Destroy the item if random() exceeds %remaining durability
|
||||
if (Math.random() < (double)(event.getInventory().getItem(INPUT).getType().getMaxDurability() - event.getInventory().getItem(INPUT).getDurability()) / (double)event.getInventory().getItem(INPUT).getType().getMaxDurability()) {
|
||||
event.getInventory().setItem(INPUT, new ItemStack(Material.AIR));
|
||||
}
|
||||
@ -10168,6 +10173,8 @@ implements Listener
|
||||
} else if (event.getInventory().getItem(OUTPUT).getType().toString().toUpperCase().contains("BOW") ||
|
||||
event.getInventory().getItem(OUTPUT).getType().toString().toUpperCase().contains("FISHING")) {
|
||||
Bukkit.getPlayer(event.getWhoClicked().getName()).playSound(Bukkit.getPlayer(event.getWhoClicked().getName()).getLocation(), Sound.ARROW_HIT, 10, 1);
|
||||
} else if (event.getInventory().getItem(OUTPUT).getType().toString().toUpperCase().contains("ENCHANTED")) {
|
||||
Bukkit.getPlayer(event.getWhoClicked().getName()).playSound(Bukkit.getPlayer(event.getWhoClicked().getName()).getLocation(), Sound.LEVEL_UP, 10, 1);
|
||||
}
|
||||
|
||||
Bukkit.getServer().getScheduler().scheduleSyncDelayedTask(this.plugin, new updateInventoryTask(event.getWhoClicked().getName()));
|
||||
@ -10196,20 +10203,20 @@ implements Listener
|
||||
// Bukkit.getLogger().info("Anvil INPUT click with this item on mouse: " + event.getCursor().getType().toString());
|
||||
|
||||
/*
|
||||
if (event.getCursor().getType().toString().toUpperCase().contains("HELMET") || event.getCursor().getType().toString().toUpperCase().contains("CHESTPLATE") ||
|
||||
event.getCursor().getType().toString().toUpperCase().contains("LEGGINGS") || event.getCursor().getType().toString().toUpperCase().contains("BOOTS") ||
|
||||
event.getCursor().getType().toString().toUpperCase().contains("PICKAXE") || event.getCursor().getType().toString().toUpperCase().contains("SPADE") ||
|
||||
event.getCursor().getType().toString().toUpperCase().contains("HOE") || event.getCursor().getType().toString().toUpperCase().contains("AXE") ||
|
||||
event.getCursor().getType().toString().toUpperCase().contains("SWORD") || event.getCursor().getType().toString().toUpperCase().contains("FISHING") ||
|
||||
event.getCursor().getType().toString().toUpperCase().contentEquals("BOW")) {
|
||||
valid = true;
|
||||
}
|
||||
if (event.getCursor().getType().toString().toUpperCase().contains("HELMET") || event.getCursor().getType().toString().toUpperCase().contains("CHESTPLATE") ||
|
||||
event.getCursor().getType().toString().toUpperCase().contains("LEGGINGS") || event.getCursor().getType().toString().toUpperCase().contains("BOOTS") ||
|
||||
event.getCursor().getType().toString().toUpperCase().contains("PICKAXE") || event.getCursor().getType().toString().toUpperCase().contains("SPADE") ||
|
||||
event.getCursor().getType().toString().toUpperCase().contains("HOE") || event.getCursor().getType().toString().toUpperCase().contains("AXE") ||
|
||||
event.getCursor().getType().toString().toUpperCase().contains("SWORD") || event.getCursor().getType().toString().toUpperCase().contains("FISHING") ||
|
||||
event.getCursor().getType().toString().toUpperCase().contentEquals("BOW")) {
|
||||
valid = true;
|
||||
}
|
||||
|
||||
if (event.getCursor().getDurability() == 0)
|
||||
{
|
||||
// Can't put fully repaired item into input slot.
|
||||
valid = false;
|
||||
}
|
||||
if (event.getCursor().getDurability() == 0)
|
||||
{
|
||||
// Can't put fully repaired item into input slot.
|
||||
valid = false;
|
||||
}
|
||||
*/
|
||||
} else if (event.getSlotType() == SlotType.CONTAINER && event.getSlot() == MATERIALS) {
|
||||
|
||||
@ -10221,14 +10228,14 @@ valid = false;
|
||||
// Bukkit.getLogger().info("Anvil MATERIALS click with this item on mouse: " + event.getCursor().getType().toString());
|
||||
|
||||
/*
|
||||
if (event.getCursor().getType() == Material.LEATHER || event.getCursor().getType() == Material.IRON_INGOT ||
|
||||
event.getCursor().getType() == Material.GOLD_INGOT || event.getCursor().getType() == Material.IRON_BLOCK ||
|
||||
event.getCursor().getType() == Material.DIAMOND_BLOCK || event.getCursor().getType() == Material.DIAMOND ||
|
||||
event.getCursor().getType() == Material.WOOD || event.getCursor().getType() == Material.COBBLESTONE ||
|
||||
event.getCursor().getType() == Material.LOG || event.getCursor().getType() == Material.STONE ||
|
||||
event.getCursor().getType() == Material.STRING) {
|
||||
valid = true;
|
||||
}
|
||||
if (event.getCursor().getType() == Material.LEATHER || event.getCursor().getType() == Material.IRON_INGOT ||
|
||||
event.getCursor().getType() == Material.GOLD_INGOT || event.getCursor().getType() == Material.IRON_BLOCK ||
|
||||
event.getCursor().getType() == Material.DIAMOND_BLOCK || event.getCursor().getType() == Material.DIAMOND ||
|
||||
event.getCursor().getType() == Material.WOOD || event.getCursor().getType() == Material.COBBLESTONE ||
|
||||
event.getCursor().getType() == Material.LOG || event.getCursor().getType() == Material.STONE ||
|
||||
event.getCursor().getType() == Material.STRING) {
|
||||
valid = true;
|
||||
}
|
||||
*/
|
||||
} else if (event.getSlotType() == SlotType.CONTAINER && event.getSlot() == MAGIC) {
|
||||
|
||||
@ -10241,21 +10248,21 @@ valid = true;
|
||||
// Bukkit.getLogger().info("Anvil MAGIC click with this item on mouse: " + event.getCursor().getType().toString());
|
||||
|
||||
/*
|
||||
if (event.getCursor().getType() == Material.FLINT || event.getCursor().getType() == Material.QUARTZ ||
|
||||
event.getCursor().getType() == Material.NETHER_STAR || event.getCursor().getType() == Material.ENCHANTED_BOOK) {
|
||||
valid = true;
|
||||
}
|
||||
if (event.getCursor().getType() == Material.FLINT || event.getCursor().getType() == Material.QUARTZ ||
|
||||
event.getCursor().getType() == Material.NETHER_STAR || event.getCursor().getType() == Material.ENCHANTED_BOOK) {
|
||||
valid = true;
|
||||
}
|
||||
*/
|
||||
}
|
||||
|
||||
/*
|
||||
if (!valid) {
|
||||
event.setCancelled(true);
|
||||
} else {
|
||||
// Update the inventory if it is valid
|
||||
// Set up anvil inventory update scheduler
|
||||
Bukkit.getServer().getScheduler().scheduleSyncDelayedTask(this.plugin, new updateInventoryTask(event.getWhoClicked().getName()));
|
||||
}
|
||||
if (!valid) {
|
||||
event.setCancelled(true);
|
||||
} else {
|
||||
// Update the inventory if it is valid
|
||||
// Set up anvil inventory update scheduler
|
||||
Bukkit.getServer().getScheduler().scheduleSyncDelayedTask(this.plugin, new updateInventoryTask(event.getWhoClicked().getName()));
|
||||
}
|
||||
*/
|
||||
Bukkit.getServer().getScheduler().scheduleSyncDelayedTask(this.plugin, new updateInventoryTask(event.getWhoClicked().getName()));
|
||||
} else {
|
||||
@ -10263,7 +10270,7 @@ Bukkit.getServer().getScheduler().scheduleSyncDelayedTask(this.plugin, new updat
|
||||
}
|
||||
}
|
||||
|
||||
} else if (event.getInventory().getName().equalsIgnoreCase("Notification Options")) {
|
||||
} else if (event.getInventory().getName().equalsIgnoreCase("Notification Options")) {
|
||||
boolean optionsClicked;
|
||||
if (event.getRawSlot() < 27) {
|
||||
optionsClicked = true;
|
||||
@ -13640,9 +13647,11 @@ class updateInventoryTask implements Runnable {
|
||||
boolean isHalloweenItem = false;
|
||||
|
||||
List<String> lore = anvilInv.getItem(INPUT).getItemMeta().getLore();
|
||||
for (int i=0;i<lore.size();i++) {
|
||||
if (lore.get(i).contains(ChatColor.YELLOW+"[Halloween]")) {
|
||||
isHalloweenItem = true;
|
||||
if (lore != null) {
|
||||
for (int i=0;i<lore.size();i++) {
|
||||
if (lore.get(i).contains(ChatColor.YELLOW+"[Halloween]")) {
|
||||
isHalloweenItem = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -13899,7 +13908,7 @@ class updateInventoryTask implements Runnable {
|
||||
if (itemEnchantments.get(e) == null || bookEnchantments.get(e) > itemEnchantments.get(e)) {
|
||||
// Book enchantment is larger in magnitude. Assign it as a possible outcome.
|
||||
probableEnchantments.put(e, bookEnchantments.get(e));
|
||||
} else if (bookEnchantments.get(e) == itemEnchantments.get(e) && bookEnchantments.get(e) <= 10) {
|
||||
} else if (bookEnchantments.get(e) == itemEnchantments.get(e) && bookEnchantments.get(e) < 10) {
|
||||
// Book enchantment is same in magnitude. Upgrade by one level.
|
||||
probableEnchantments.put(e, bookEnchantments.get(e) + 1);
|
||||
}
|
||||
@ -14038,7 +14047,7 @@ class updateInventoryTask implements Runnable {
|
||||
i++;
|
||||
}
|
||||
|
||||
int cost = 0;
|
||||
int cost = anvilInv.getItem(LEVELS).getAmount();
|
||||
|
||||
if (itemBonuses.get(appliedEnchant) == null) {
|
||||
// This bonus doesn't exist. Calculate full cost.
|
||||
@ -14083,34 +14092,34 @@ class updateInventoryTask implements Runnable {
|
||||
|
||||
// Bukkit.getLogger().info("Bonus enchantment string: " + appliedEnchant);
|
||||
if (appliedEnchant.equalsIgnoreCase("Critical Chance")) {
|
||||
bonusesLore.add(ChatColor.YELLOW+"+"+magnitude+"% "+ChatColor.BLUE+"Critical Chance");
|
||||
bonusesLore.add(0, ChatColor.YELLOW+"+"+magnitude+"% "+ChatColor.BLUE+"Critical Chance");
|
||||
}
|
||||
if (appliedEnchant.equalsIgnoreCase("Armor Penetration")) {
|
||||
bonusesLore.add(ChatColor.YELLOW+"+"+magnitude+" "+ChatColor.BLUE+"Armor Penetration");
|
||||
bonusesLore.add(0, ChatColor.YELLOW+"+"+magnitude+" "+ChatColor.BLUE+"Armor Penetration");
|
||||
}
|
||||
if (appliedEnchant.equalsIgnoreCase("Life Steal")) {
|
||||
bonusesLore.add(ChatColor.YELLOW+"+"+magnitude+"% "+ChatColor.BLUE+"Life Steal");
|
||||
bonusesLore.add(0, ChatColor.YELLOW+"+"+magnitude+"% "+ChatColor.BLUE+"Life Steal");
|
||||
}
|
||||
if (appliedEnchant.equalsIgnoreCase("Attack Speed")) {
|
||||
bonusesLore.add(ChatColor.YELLOW+"+"+magnitude+"% "+ChatColor.BLUE+"Attack Speed");
|
||||
bonusesLore.add(0, ChatColor.YELLOW+"+"+magnitude+"% "+ChatColor.BLUE+"Attack Speed");
|
||||
}
|
||||
if (appliedEnchant.equalsIgnoreCase("Damage")) {
|
||||
bonusesLore.add(ChatColor.YELLOW+"+"+magnitude+" "+ChatColor.BLUE+"Damage");
|
||||
bonusesLore.add(0, ChatColor.YELLOW+"+"+magnitude+" "+ChatColor.BLUE+"Damage");
|
||||
}
|
||||
if (appliedEnchant.equalsIgnoreCase("Health")) {
|
||||
bonusesLore.add(ChatColor.YELLOW+"+"+magnitude+" "+ChatColor.BLUE+"Health");
|
||||
bonusesLore.add(0, ChatColor.YELLOW+"+"+magnitude+" "+ChatColor.BLUE+"Health");
|
||||
}
|
||||
if (appliedEnchant.equalsIgnoreCase("Damage Reduction")) {
|
||||
bonusesLore.add(ChatColor.YELLOW+"+"+magnitude+"% "+ChatColor.BLUE+"Damage Reduction");
|
||||
bonusesLore.add(0, ChatColor.YELLOW+"+"+magnitude+"% "+ChatColor.BLUE+"Damage Reduction");
|
||||
}
|
||||
if (appliedEnchant.equalsIgnoreCase("Durability")) {
|
||||
bonusesLore.add(ChatColor.YELLOW+"+"+magnitude+"% "+ChatColor.BLUE+"Durability");
|
||||
bonusesLore.add(0, ChatColor.YELLOW+"+"+magnitude+"% "+ChatColor.BLUE+"Durability");
|
||||
}
|
||||
if (appliedEnchant.equalsIgnoreCase("Block Chance")) {
|
||||
bonusesLore.add(ChatColor.YELLOW+"+"+magnitude+"% "+ChatColor.BLUE+"Block Chance");
|
||||
bonusesLore.add(0, ChatColor.YELLOW+"+"+magnitude+"% "+ChatColor.BLUE+"Block Chance");
|
||||
}
|
||||
if (appliedEnchant.equalsIgnoreCase("Speed Boost Chance")) {
|
||||
bonusesLore.add(ChatColor.YELLOW+"+"+magnitude+"% "+ChatColor.BLUE+"Speed Boost Chance");
|
||||
bonusesLore.add(0, ChatColor.YELLOW+"+"+magnitude+"% "+ChatColor.BLUE+"Speed Boost Chance");
|
||||
}
|
||||
|
||||
bonusesMeta.setLore(bonusesLore);
|
||||
@ -14119,7 +14128,7 @@ class updateInventoryTask implements Runnable {
|
||||
} else {
|
||||
// This enchantment exists. Calculate incremental cost.
|
||||
|
||||
cost += (int)(12 * itemBonuses.get(appliedEnchant) / probableBonuses.get(appliedEnchant)); // Make sure it's at least one level
|
||||
cost += (int)(12d * itemBonuses.get(appliedEnchant) / probableBonuses.get(appliedEnchant)); // Make sure it's at least one level
|
||||
cost = Math.min(60, cost);
|
||||
cost = Math.max(1, cost);
|
||||
|
||||
@ -14204,9 +14213,20 @@ class updateInventoryTask implements Runnable {
|
||||
} else if (anvilInv.getItem(MAGIC).getType() == Material.BOOK && anvilInv.getItem(INPUT).getType() != Material.ENCHANTED_BOOK) {
|
||||
// Magic slot is a book. Unenchanting logic goes here.
|
||||
anvilInv.setItem(OUTPUT, new ItemStack(Material.ENCHANTED_BOOK));
|
||||
anvilInv.getItem(OUTPUT).setType(Material.ENCHANTED_BOOK);
|
||||
// anvilInv.getItem(OUTPUT).setType(Material.ENCHANTED_BOOK);
|
||||
|
||||
ItemMeta bookMeta = anvilInv.getItem(OUTPUT).getItemMeta();
|
||||
|
||||
// Grab enchantments and lore. This is necessary due to leather armor meta being a different class.
|
||||
Map<Enchantment, Integer> itemEnchantments = anvilInv.getItem(INPUT).getItemMeta().getEnchants();
|
||||
|
||||
for (Enchantment e : itemEnchantments.keySet()) {
|
||||
bookMeta.addEnchant(e, itemEnchantments.get(e), true); // force-add all enchants
|
||||
}
|
||||
|
||||
List<String> bookLore = anvilInv.getItem(INPUT).getItemMeta().getLore(); // add more filtering code after this later
|
||||
bookMeta.setLore(bookLore);
|
||||
|
||||
ItemMeta bookMeta = anvilInv.getItem(INPUT).getItemMeta();
|
||||
bookMeta.setDisplayName(null);
|
||||
anvilInv.getItem(OUTPUT).setItemMeta(bookMeta);
|
||||
|
||||
@ -14224,6 +14244,8 @@ class updateInventoryTask implements Runnable {
|
||||
cost += (1 + enchantments.get(e));
|
||||
}
|
||||
|
||||
cost = Math.min(60, cost);
|
||||
|
||||
ItemStack orbs = new ItemStack(Material.SLIME_BALL);
|
||||
|
||||
ItemMeta temp_meta = orbs.getItemMeta();
|
||||
@ -14297,7 +14319,7 @@ class updateInventoryTask implements Runnable {
|
||||
public double getEnchantmentNumb(String s) {
|
||||
//Parse the string for spaces.
|
||||
String[] enchant = s.split(" ");
|
||||
if (enchant[0].contains(ChatColor.YELLOW+"")) {
|
||||
if (enchant[0].contains(ChatColor.YELLOW+"") && (enchant.length > 1)) {
|
||||
String newstring = ((enchant[0].replace(ChatColor.YELLOW.getChar(), ' ')).replace('%', ' ')).replace(Character.toString((char)0x00A7), Character.toString((char)0x0020));
|
||||
// Bukkit.getLogger().info("Enchant number is "+Double.valueOf(newstring));
|
||||
return Double.valueOf(newstring);
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user