sigonasr2/SigMinecraft
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'dev' into devbranch

Browse Source
This commit is contained in:
sigonasr2 2013-12-10 09:31:12 -07:00
commit 0eb06c137a
3 changed files with 641 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

201
BankEconomyMod/src/me/kaZep/Base/Main.java
View File

@ -21,12 +21,15 @@ import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import java.text.*; import java.text.*;
import me.kaZep.Base.BonusEnchantment.ItemType;
import me.kaZep.Commands.JobsDataInfo; import me.kaZep.Commands.JobsDataInfo;
import me.kaZep.Commands.JobsDataInfo.Job; import me.kaZep.Commands.JobsDataInfo.Job;
import me.kaZep.Commands.commandBankEconomy; import me.kaZep.Commands.commandBankEconomy;
import net.jmhertlein.mctowns.MCTowns; import net.jmhertlein.mctowns.MCTowns;
import net.milkbowl.vault.economy.Economy; import net.milkbowl.vault.economy.Economy;
import org.apache.commons.lang.math.IntRange;
import org.apache.commons.lang.math.Range;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.Chunk; import org.bukkit.Chunk;
@ -189,11 +192,17 @@ public class Main extends JavaPlugin
public List<ReviveInventory> revive_inventory_list = null; public List<ReviveInventory> revive_inventory_list = null;
public List<Chunk> chunk_queue_list = null; public List<Chunk> chunk_queue_list = null;
public static List<RecyclingCenterNode> recycling_center_list = null; public static List<RecyclingCenterNode> recycling_center_list = null;
public static List<BonusEnchantment> bonus_enchantment_list = null;
public DamageAPI DMGCALC = null; public DamageAPI DMGCALC = null;
public long lastMessage = 0; public long lastMessage = 0;
public static ItemSetList ItemSetList = null; public static ItemSetList ItemSetList = null;
public static BonusEnchantment ENCHANT_CRITICAL_CHANCE, ENCHANT_ARMOR_PENETRATION, ENCHANT_LIFE_STEAL,
ENCHANT_ATTACK_SPEED, ENCHANT_DAMAGE, ENCHANT_HEALTH, ENCHANT_DAMAGE_REDUCTION, ENCHANT_DURABILITY,
ENCHANT_BLOCK_CHANCE, ENCHANT_SPEED_BOOST_CHANCE, ENCHANT_STURDY, ENCHANT_REPAIR, ENCHANT_EXECUTE;
public FileWriter outputStream = null; public FileWriter outputStream = null;
public EnchantLevelDatabase ENCHANTMENT_DATA; public EnchantLevelDatabase ENCHANTMENT_DATA;
@ -779,6 +788,21 @@ public class Main extends JavaPlugin
"When jumping, you cannot be hit."); "When jumping, you cannot be hit.");
ItemSetList.addSet(set); ItemSetList.addSet(set);
//Add in custom enchantments.
ENCHANT_CRITICAL_CHANCE = new BonusEnchantment("Critical Chance",true,false,ItemType.WEAPONS,new IntRange(0,100));
ENCHANT_ARMOR_PENETRATION = new BonusEnchantment("Armor Penetration",false,false,ItemType.WEAPONS,new IntRange(0,100));
ENCHANT_LIFE_STEAL = new BonusEnchantment("Life Steal",true,false,ItemType.WEAPONS,new IntRange(0,100));
ENCHANT_ATTACK_SPEED = new BonusEnchantment("Attack Speed",true,false,ItemType.WEAPONS,new IntRange(0,500));
ENCHANT_DAMAGE = new BonusEnchantment("Damage",false,false,ItemType.WEAPONS,new IntRange(0,1000));
ENCHANT_HEALTH = new BonusEnchantment("Health",false,false,ItemType.ARMOR,new IntRange(0,1000));
ENCHANT_DAMAGE_REDUCTION = new BonusEnchantment("Damage Reduction",true,false,ItemType.ARMOR,new IntRange(0,100));
ENCHANT_DURABILITY = new BonusEnchantment("Durability",false,false,ItemType.ARMOR,new IntRange(0,9999999));
ENCHANT_BLOCK_CHANCE = new BonusEnchantment("Block Chance",true,false,ItemType.ARMOR,new IntRange(0,100));
ENCHANT_SPEED_BOOST_CHANCE = new BonusEnchantment("Speed Boost Chance",true,false,ItemType.ARMOR,new IntRange(0,100));
ENCHANT_STURDY = new BonusEnchantment("Sturdy",false,true,ItemType.ARMOR,new IntRange(0,1000));
ENCHANT_REPAIR = new BonusEnchantment("Repair",false,true,ItemType.ARMOR,new IntRange(0,1000));
ENCHANT_EXECUTE = new BonusEnchantment("Execute",false,true,ItemType.WEAPONS,new IntRange(0,1000));
DMGCALC = new DamageAPI(); DMGCALC = new DamageAPI();
//System.out.println("Running BankEconomy in "+this.getDataFolder().getAbsolutePath()); //System.out.println("Running BankEconomy in "+this.getDataFolder().getAbsolutePath());
//System.out.println("File size: "+f.length()); //System.out.println("File size: "+f.length());
@ -5275,6 +5299,120 @@ public void payDay(int time)
return finalval; return finalval;
} }
/**
* Removes a bonus enchantment from the item.
* If the enchantment does not exist on the item,
* the same exact copy of the item is returned.
* If you want to instead lower the enchantment
* level that exists on the item, use addEnchantment()
* with the override argument turned on to do so.
* @param item The item to remove the bonus enchant from.
* @param enchant The bonus enchantment to remove. (See Main.ENCHANT_)
* @return The new item with the given enchantment removed.
*/
public ItemStack removeBonusEnchantment(ItemStack item, BonusEnchantment enchant) {
if (item.hasItemMeta() && item.getItemMeta().hasLore()) {
List<String> newlore = item.getItemMeta().getLore();
for (int i=0;i<item.getItemMeta().getLore().size();i++) {
if (item.getItemMeta().getLore().get(i).contains(enchant.name)) {
//Include it in the new meta.
newlore.remove(i);
break;
}
}
ItemMeta meta = item.getItemMeta();
meta.setLore(newlore);
item.setItemMeta(meta);
return item;
} else {
return item;
}
}
/**
* Adds a bonus enchantment to an item.
* If the enchantment already exists on the item,
* it will add to the old amount unless override
* is turned off. This version of the function
* automatically has override set to false, meaning
* it will add to the enchantment amount.
* @param item The item to add the bonus enchant to.
* @param enchant The bonus enchantment to apply. (See Main.ENCHANT_)
* @param amt The value of the enchantment to apply.
* @param override Whether or not the enchantment should be overwritten.
* @return The item with the new enchantment added in.
*/
public ItemStack addBonusEnchantment(ItemStack item, BonusEnchantment enchant, int amt) {
return addBonusEnchantment(item, enchant, amt, false);
}
/**
* Adds a bonus enchantment to an item.
* If the enchantment already exists on the item,
* it will add to the old amount unless override
* is turned off.
* @param item The item to add the bonus enchant to.
* @param enchant The bonus enchantment to apply. (See Main.ENCHANT_)
* @param amt The value of the enchantment to apply.
* @param override Whether or not the enchantment should be overwritten.
* @return The item with the new enchantment added in.
*/
public ItemStack addBonusEnchantment(ItemStack item, BonusEnchantment enchant, int amt, boolean override) {
List<String> lore = null;
String enchant_string = enchant.name;
boolean percent=enchant.percent, enchant_format=enchant.enchant_format;
if (item.hasItemMeta() && item.getItemMeta().hasLore()) {
ItemMeta meta = item.getItemMeta();
lore = item.getItemMeta().getLore();
//Make sure the lore doesn't already exist. If it does, we have to actually
//replace it.
boolean added=false;
for (int i=0;i<lore.size();i++) {
if (lore.get(i).contains(enchant_string)) {
if (!enchant_format) {
//Take that old amount and add onto it.
double oldamt=0;
if (!override) {oldamt = getEnchantmentNumb(lore.get(i));} else {oldamt=0;}
lore.set(i, ChatColor.YELLOW+"+"+(int)(oldamt+amt)+((percent)?"% ":" ")+ChatColor.BLUE+enchant_string);
} else {
double oldamt=0;
if (!override) {oldamt = getEnchantmentNumb(lore.get(i));} else {oldamt=0;}
String parser = lore.get(i);
parser.replace(enchant_string, "");
if (!override) {oldamt=toNumber(parser);} else {oldamt=0;}
lore.set(i, ChatColor.GRAY+enchant_string+" "+toRomanNumeral((int)amt));
}
added=true;
break;
}
}
if (!added) {
//Add onto the lore.
if (!enchant_format) {
lore.add(ChatColor.YELLOW+"+"+(int)amt+((percent)?"% ":" ")+ChatColor.BLUE+enchant_string);
} else {
lore.add(ChatColor.GRAY+enchant_string+" "+toRomanNumeral((int)amt));
}
added=true;
}
meta.setLore(lore);
item.setItemMeta(meta);
return sortEnchantments(item); //Sort all enchants before returning.
} else {
lore = new ArrayList<String>();
ItemMeta meta = item.getItemMeta();
//Add onto the lore.
if (!enchant_format) {
lore.add(ChatColor.YELLOW+"+"+(int)amt+((percent)?"% ":" ")+ChatColor.BLUE+enchant_string);
} else {
lore.add(ChatColor.GRAY+enchant_string+" "+toRomanNumeral((int)amt));
}
meta.setLore(lore);
item.setItemMeta(meta);
return sortEnchantments(item); //Sort all enchants before returning.
}
}
/** /**
* *
* @param item The item to sort Enchantments on. * @param item The item to sort Enchantments on.
@ -5873,4 +6011,67 @@ public void payDay(int time)
},total_tick_delay+=tick_delay); },total_tick_delay+=tick_delay);
} }
} }
/**
* A helper function for Bonus Enchantments.
* @return Returns all bonus enchantments in a list.
*/
public static List<BonusEnchantment> getBonusEnchantments() {
return bonus_enchantment_list;
}
/**
* A helper function for Bonus Enchantments.
* @return Returns all enchantments in a list that weapons can use.
*/
public static List<BonusEnchantment> getBonusWeaponEnchantments() {
List<BonusEnchantment> finallist = new ArrayList<BonusEnchantment>();
for (int i=0;i<bonus_enchantment_list.size();i++) {
if (bonus_enchantment_list.get(i).item_type==ItemType.WEAPONS ||
bonus_enchantment_list.get(i).item_type==ItemType.BOTH) {
finallist.add(bonus_enchantment_list.get(i));
}
}
return finallist;
}
/**
* A helper function for Bonus Enchantments.
* @return Returns all enchantments in a list that armor can use.
*/
public static List<BonusEnchantment> getBonusArmorEnchantments() {
List<BonusEnchantment> finallist = new ArrayList<BonusEnchantment>();
for (int i=0;i<bonus_enchantment_list.size();i++) {
if (bonus_enchantment_list.get(i).item_type==ItemType.ARMOR ||
bonus_enchantment_list.get(i).item_type==ItemType.BOTH) {
finallist.add(bonus_enchantment_list.get(i));
}
}
return finallist;
}
}
class BonusEnchantment {
public enum ItemType { WEAPONS, ARMOR, BOTH }
String name; //The string name of the Bonus Enchantment.
boolean percent; //Whether or not this enchantment is a percentage value, or an integer value.
boolean enchant_format; //Whether or not this enchantment is type 1 (false) or type 2 (true). Type 2 enchants are the ones that look like actual in-game enchantments.
ItemType item_type; //The item type this enchantment can apply to.
Range value_range;
/**
* Creates a new BonusEnchantment.
* @param name The string name of the Bonus enchantment.
* @param percent Whether or not this enchantment is a percentage value (true), or an integer value (false).
* @param enchant_format Whether or not this enchantment is type 1 (false) or type 2 (true). Type 2 enchants are the ones that look like actual in-game enchantments.
* @param type The type of items this enchantment can apply to (See BonusEnchantment.ItemType)
* @param values_range A value range that determines what the minimum and maximum amounts of these numbers can be. (Useful for other functions that need to determine how much of this enchantment to apply.)
*/
public BonusEnchantment(String name, boolean percent, boolean enchant_format, ItemType type, Range values_range) {
this.name=name;
this.percent=percent;
this.enchant_format=enchant_format;
this.item_type = type;
this.value_range = values_range;
Main.bonus_enchantment_list.add(this);
}
} }

1
BankEconomyMod/src/me/kaZep/Base/PlayerBuffData.java
View File

@ -187,7 +187,6 @@ public class PlayerBuffData {
p.removePotionEffect(PotionEffectType.FAST_DIGGING); p.removePotionEffect(PotionEffectType.FAST_DIGGING);
p.addPotionEffect(new PotionEffect(PotionEffectType.FAST_DIGGING,399,this.plugin.getStatBonus(1, this.plugin.getAccountsConfig().getInt(p.getName().toLowerCase()+".stats.stat2")/5)/20-1)); p.addPotionEffect(new PotionEffect(PotionEffectType.FAST_DIGGING,399,this.plugin.getStatBonus(1, this.plugin.getAccountsConfig().getInt(p.getName().toLowerCase()+".stats.stat2")/5)/20-1));
} }
if (p.getHealth()>p.getMaxHealth()) { if (p.getHealth()>p.getMaxHealth()) {
p.setHealth(p.getMaxHealth()); p.setHealth(p.getMaxHealth());
} }

339
BankEconomyMod/src/me/kaZep/Base/PlayerListener.java
View File

@ -456,10 +456,168 @@ implements Listener
} }
} }
/**
* Opens the bonus inventory for Enchanters who have
* the Level 30 A buff.
* @param input The input item that determines what bonuses exist.
* @return The Inventory containing all the appropriate bonuses.
*/
private Inventory openBonusInventory(Player p, ItemStack input, int lvs) {
//Determine what the bonus sets are via the input.
Inventory inv = Bukkit.createInventory(p, 18, "Choose an additional bonus:");
if (input.getType().name().toLowerCase().contains("helmet")) {
ItemStack base = input.clone();base.addUnsafeEnchantment(Enchantment.PROTECTION_ENVIRONMENTAL, base.getEnchantmentLevel(Enchantment.PROTECTION_ENVIRONMENTAL)+lvs/10+1);inv.addItem(base);
base = input.clone();base.addUnsafeEnchantment(Enchantment.PROTECTION_FIRE, base.getEnchantmentLevel(Enchantment.PROTECTION_FIRE)+lvs/10+1);inv.addItem(base);
base = input.clone();base.addUnsafeEnchantment(Enchantment.PROTECTION_EXPLOSIONS, base.getEnchantmentLevel(Enchantment.PROTECTION_EXPLOSIONS)+lvs/10+1);inv.addItem(base);
base = input.clone();base.addUnsafeEnchantment(Enchantment.PROTECTION_PROJECTILE, base.getEnchantmentLevel(Enchantment.PROTECTION_PROJECTILE)+lvs/10+1);inv.addItem(base);
base = input.clone();base.addUnsafeEnchantment(Enchantment.OXYGEN, base.getEnchantmentLevel(Enchantment.OXYGEN)+lvs/10+1);inv.addItem(base);
base = input.clone();base.addUnsafeEnchantment(Enchantment.WATER_WORKER, base.getEnchantmentLevel(Enchantment.WATER_WORKER)+lvs/10+1);inv.addItem(base);
base = input.clone();base.addUnsafeEnchantment(Enchantment.THORNS, base.getEnchantmentLevel(Enchantment.THORNS)+lvs/10+1);inv.addItem(base);
base = input.clone();base.addUnsafeEnchantment(Enchantment.DURABILITY, base.getEnchantmentLevel(Enchantment.DURABILITY)+lvs/10+1);inv.addItem(base);
base = input.clone();this.plugin.addBonusEnchantment(base, Main.ENCHANT_HEALTH, 2*(lvs/10+1));inv.addItem(base);
base = input.clone();this.plugin.addBonusEnchantment(base, Main.ENCHANT_DAMAGE_REDUCTION, 3*(lvs/10+1));inv.addItem(base);
base = input.clone();this.plugin.addBonusEnchantment(base, Main.ENCHANT_DURABILITY, 200*(lvs/10+1));inv.addItem(base);
base = input.clone();this.plugin.addBonusEnchantment(base, Main.ENCHANT_BLOCK_CHANCE, 5*(lvs/10+1));inv.addItem(base);
base = input.clone();this.plugin.addBonusEnchantment(base, Main.ENCHANT_SPEED_BOOST_CHANCE, 20*(lvs/10+1));inv.addItem(base);
base = input.clone();this.plugin.addBonusEnchantment(base, Main.ENCHANT_STURDY, lvs/10+1);inv.addItem(base);
if (lvs==30) {base = input.clone();this.plugin.addBonusEnchantment(base, Main.ENCHANT_REPAIR, lvs/10+1);inv.addItem(base);}
} else
if (input.getType().name().toLowerCase().contains("chestplate") || input.getType().name().toLowerCase().contains("leggings")) {
ItemStack base = input.clone();base.addUnsafeEnchantment(Enchantment.PROTECTION_ENVIRONMENTAL, base.getEnchantmentLevel(Enchantment.PROTECTION_ENVIRONMENTAL)+lvs/10+1);inv.addItem(base);
base = input.clone();base.addUnsafeEnchantment(Enchantment.PROTECTION_FIRE, base.getEnchantmentLevel(Enchantment.PROTECTION_FIRE)+lvs/10+1);inv.addItem(base);
base = input.clone();base.addUnsafeEnchantment(Enchantment.PROTECTION_EXPLOSIONS, base.getEnchantmentLevel(Enchantment.PROTECTION_EXPLOSIONS)+lvs/10+1);inv.addItem(base);
base = input.clone();base.addUnsafeEnchantment(Enchantment.PROTECTION_PROJECTILE, base.getEnchantmentLevel(Enchantment.PROTECTION_PROJECTILE)+lvs/10+1);inv.addItem(base);
base = input.clone();base.addUnsafeEnchantment(Enchantment.THORNS, base.getEnchantmentLevel(Enchantment.THORNS)+lvs/10+1);inv.addItem(base);
base = input.clone();base.addUnsafeEnchantment(Enchantment.DURABILITY, base.getEnchantmentLevel(Enchantment.DURABILITY)+lvs/10+1);inv.addItem(base);
base = input.clone();this.plugin.addBonusEnchantment(base, Main.ENCHANT_HEALTH, 2*(lvs/10+1));inv.addItem(base);
base = input.clone();this.plugin.addBonusEnchantment(base, Main.ENCHANT_DAMAGE_REDUCTION, 3*(lvs/10+1));inv.addItem(base);
base = input.clone();this.plugin.addBonusEnchantment(base, Main.ENCHANT_DURABILITY, 200*(lvs/10+1));inv.addItem(base);
base = input.clone();this.plugin.addBonusEnchantment(base, Main.ENCHANT_BLOCK_CHANCE, 5*(lvs/10+1));inv.addItem(base);
base = input.clone();this.plugin.addBonusEnchantment(base, Main.ENCHANT_SPEED_BOOST_CHANCE, 20*(lvs/10+1));inv.addItem(base);
base = input.clone();this.plugin.addBonusEnchantment(base, Main.ENCHANT_STURDY, lvs/10+1);inv.addItem(base);
if (lvs==30) {base = input.clone();this.plugin.addBonusEnchantment(base, Main.ENCHANT_REPAIR, lvs/10+1);inv.addItem(base);}
} else
if (input.getType().name().toLowerCase().contains("boots")) {
ItemStack base = input.clone();base.addUnsafeEnchantment(Enchantment.PROTECTION_ENVIRONMENTAL, base.getEnchantmentLevel(Enchantment.PROTECTION_ENVIRONMENTAL)+lvs/10+1);inv.addItem(base);
base = input.clone();base.addUnsafeEnchantment(Enchantment.PROTECTION_FIRE, base.getEnchantmentLevel(Enchantment.PROTECTION_FIRE)+lvs/10+1);inv.addItem(base);
base = input.clone();base.addUnsafeEnchantment(Enchantment.PROTECTION_EXPLOSIONS, base.getEnchantmentLevel(Enchantment.PROTECTION_EXPLOSIONS)+lvs/10+1);inv.addItem(base);
base = input.clone();base.addUnsafeEnchantment(Enchantment.PROTECTION_PROJECTILE, base.getEnchantmentLevel(Enchantment.PROTECTION_PROJECTILE)+lvs/10+1);inv.addItem(base);
base = input.clone();base.addUnsafeEnchantment(Enchantment.THORNS, base.getEnchantmentLevel(Enchantment.THORNS)+lvs/10+1);inv.addItem(base);
base = input.clone();base.addUnsafeEnchantment(Enchantment.PROTECTION_FALL, base.getEnchantmentLevel(Enchantment.PROTECTION_FALL)+lvs/10+1);inv.addItem(base);
base = input.clone();base.addUnsafeEnchantment(Enchantment.DURABILITY, base.getEnchantmentLevel(Enchantment.DURABILITY)+lvs/10+1);inv.addItem(base);
base = input.clone();this.plugin.addBonusEnchantment(base, Main.ENCHANT_HEALTH, 2*(lvs/10+1));inv.addItem(base);
base = input.clone();this.plugin.addBonusEnchantment(base, Main.ENCHANT_DAMAGE_REDUCTION, 3*(lvs/10+1));inv.addItem(base);
base = input.clone();this.plugin.addBonusEnchantment(base, Main.ENCHANT_DURABILITY, 200*(lvs/10+1));inv.addItem(base);
base = input.clone();this.plugin.addBonusEnchantment(base, Main.ENCHANT_BLOCK_CHANCE, 5*(lvs/10+1));inv.addItem(base);
base = input.clone();this.plugin.addBonusEnchantment(base, Main.ENCHANT_SPEED_BOOST_CHANCE, 20*(lvs/10+1));inv.addItem(base);
base = input.clone();this.plugin.addBonusEnchantment(base, Main.ENCHANT_STURDY, lvs/10+1);inv.addItem(base);
if (lvs==30) {base = input.clone();this.plugin.addBonusEnchantment(base, Main.ENCHANT_REPAIR, lvs/10+1);inv.addItem(base);}
} else
if (input.getType().name().toLowerCase().contains("sword")) {
ItemStack base = input.clone();base.addUnsafeEnchantment(Enchantment.DAMAGE_ALL, base.getEnchantmentLevel(Enchantment.DAMAGE_ALL)+lvs/10+1);inv.addItem(base);
base = input.clone();base.addUnsafeEnchantment(Enchantment.DAMAGE_UNDEAD, base.getEnchantmentLevel(Enchantment.DAMAGE_UNDEAD)+lvs/10+1);inv.addItem(base);
base = input.clone();base.addUnsafeEnchantment(Enchantment.DAMAGE_ARTHROPODS, base.getEnchantmentLevel(Enchantment.DAMAGE_ARTHROPODS)+lvs/10+1);inv.addItem(base);
base = input.clone();base.addUnsafeEnchantment(Enchantment.KNOCKBACK, base.getEnchantmentLevel(Enchantment.KNOCKBACK)+lvs/10+1);inv.addItem(base);
base = input.clone();base.addUnsafeEnchantment(Enchantment.FIRE_ASPECT, base.getEnchantmentLevel(Enchantment.FIRE_ASPECT)+lvs/10+1);inv.addItem(base);
base = input.clone();base.addUnsafeEnchantment(Enchantment.LOOT_BONUS_MOBS, base.getEnchantmentLevel(Enchantment.LOOT_BONUS_MOBS)+lvs/10+1);inv.addItem(base);
base = input.clone();base.addUnsafeEnchantment(Enchantment.DURABILITY, base.getEnchantmentLevel(Enchantment.DURABILITY)+lvs/10+1);inv.addItem(base);
base = input.clone();this.plugin.addBonusEnchantment(base, Main.ENCHANT_CRITICAL_CHANCE, 5*(lvs/10+1));inv.addItem(base);
base = input.clone();this.plugin.addBonusEnchantment(base, Main.ENCHANT_ARMOR_PENETRATION, 2*(lvs/10+1));inv.addItem(base);
base = input.clone();this.plugin.addBonusEnchantment(base, Main.ENCHANT_LIFE_STEAL, 2*(lvs/10+1));inv.addItem(base);
base = input.clone();this.plugin.addBonusEnchantment(base, Main.ENCHANT_ATTACK_SPEED, 10*(lvs/10+1));inv.addItem(base);
base = input.clone();this.plugin.addBonusEnchantment(base, Main.ENCHANT_DAMAGE, 2*(lvs/10+1));inv.addItem(base);
if (lvs==30) {base = input.clone();this.plugin.addBonusEnchantment(base, Main.ENCHANT_EXECUTE, lvs/10+1);inv.addItem(base);}
} else
if (input.getType().name().toLowerCase().contains("axe") && !input.getType().name().toLowerCase().contains("pickaxe")) {
ItemStack base = input.clone();base.addUnsafeEnchantment(Enchantment.DAMAGE_ALL, base.getEnchantmentLevel(Enchantment.DAMAGE_ALL)+lvs/10+1);inv.addItem(base);
base = input.clone();base.addUnsafeEnchantment(Enchantment.DAMAGE_UNDEAD, base.getEnchantmentLevel(Enchantment.DAMAGE_UNDEAD)+lvs/10+1);inv.addItem(base);
base = input.clone();base.addUnsafeEnchantment(Enchantment.DAMAGE_ARTHROPODS, base.getEnchantmentLevel(Enchantment.DAMAGE_ARTHROPODS)+lvs/10+1);inv.addItem(base);
base = input.clone();base.addUnsafeEnchantment(Enchantment.DIG_SPEED, base.getEnchantmentLevel(Enchantment.DIG_SPEED)+lvs/10+1);inv.addItem(base);
base = input.clone();base.addUnsafeEnchantment(Enchantment.SILK_TOUCH, base.getEnchantmentLevel(Enchantment.SILK_TOUCH)+lvs/10+1);inv.addItem(base);
base = input.clone();base.addUnsafeEnchantment(Enchantment.LOOT_BONUS_BLOCKS, base.getEnchantmentLevel(Enchantment.LOOT_BONUS_BLOCKS)+lvs/10+1);inv.addItem(base);
base = input.clone();this.plugin.addBonusEnchantment(base, Main.ENCHANT_CRITICAL_CHANCE, 5*(lvs/10+1));inv.addItem(base);
base = input.clone();this.plugin.addBonusEnchantment(base, Main.ENCHANT_ARMOR_PENETRATION, 2*(lvs/10+1));inv.addItem(base);
base = input.clone();this.plugin.addBonusEnchantment(base, Main.ENCHANT_LIFE_STEAL, 2*(lvs/10+1));inv.addItem(base);
base = input.clone();this.plugin.addBonusEnchantment(base, Main.ENCHANT_ATTACK_SPEED, 10*(lvs/10+1));inv.addItem(base);
base = input.clone();this.plugin.addBonusEnchantment(base, Main.ENCHANT_DAMAGE, 2*(lvs/10+1));inv.addItem(base);
if (lvs==30) {base = input.clone();this.plugin.addBonusEnchantment(base, Main.ENCHANT_EXECUTE, lvs/10+1);inv.addItem(base);}
} else
if (input.getType().name().toLowerCase().contains("spade") || input.getType().name().toLowerCase().contains("pickaxe")) {
ItemStack base = input.clone();base.addUnsafeEnchantment(Enchantment.DIG_SPEED, base.getEnchantmentLevel(Enchantment.DIG_SPEED)+lvs/10+1);inv.addItem(base);
base = input.clone();base.addUnsafeEnchantment(Enchantment.SILK_TOUCH, base.getEnchantmentLevel(Enchantment.SILK_TOUCH)+lvs/10+1);inv.addItem(base);
base = input.clone();base.addUnsafeEnchantment(Enchantment.LOOT_BONUS_BLOCKS, base.getEnchantmentLevel(Enchantment.LOOT_BONUS_BLOCKS)+lvs/10+1);inv.addItem(base);
base = input.clone();base.addUnsafeEnchantment(Enchantment.DURABILITY, base.getEnchantmentLevel(Enchantment.DURABILITY)+lvs/10+1);inv.addItem(base);
base = input.clone();this.plugin.addBonusEnchantment(base, Main.ENCHANT_CRITICAL_CHANCE, 5*(lvs/10+1));inv.addItem(base);
base = input.clone();this.plugin.addBonusEnchantment(base, Main.ENCHANT_ARMOR_PENETRATION, 2*(lvs/10+1));inv.addItem(base);
base = input.clone();this.plugin.addBonusEnchantment(base, Main.ENCHANT_LIFE_STEAL, 2*(lvs/10+1));inv.addItem(base);
base = input.clone();this.plugin.addBonusEnchantment(base, Main.ENCHANT_ATTACK_SPEED, 10*(lvs/10+1));inv.addItem(base);
base = input.clone();this.plugin.addBonusEnchantment(base, Main.ENCHANT_DAMAGE, 2*(lvs/10+1));inv.addItem(base);
if (lvs==30) {base = input.clone();this.plugin.addBonusEnchantment(base, Main.ENCHANT_EXECUTE, lvs/10+1);inv.addItem(base);}
} else
if (input.getType().name().toLowerCase().contains("bow")) {
ItemStack base = input.clone();base.addUnsafeEnchantment(Enchantment.ARROW_DAMAGE, base.getEnchantmentLevel(Enchantment.ARROW_DAMAGE)+lvs/10+1);inv.addItem(base);
base = input.clone();base.addUnsafeEnchantment(Enchantment.ARROW_KNOCKBACK, base.getEnchantmentLevel(Enchantment.ARROW_KNOCKBACK)+lvs/10+1);inv.addItem(base);
base = input.clone();base.addUnsafeEnchantment(Enchantment.ARROW_FIRE, base.getEnchantmentLevel(Enchantment.ARROW_FIRE)+lvs/10+1);inv.addItem(base);
base = input.clone();base.addUnsafeEnchantment(Enchantment.ARROW_INFINITE, base.getEnchantmentLevel(Enchantment.ARROW_INFINITE)+lvs/10+1);inv.addItem(base);
base = input.clone();base.addUnsafeEnchantment(Enchantment.DURABILITY, base.getEnchantmentLevel(Enchantment.DURABILITY)+lvs/10+1);inv.addItem(base);
base = input.clone();this.plugin.addBonusEnchantment(base, Main.ENCHANT_CRITICAL_CHANCE, 5*(lvs/10+1));inv.addItem(base);
base = input.clone();this.plugin.addBonusEnchantment(base, Main.ENCHANT_ARMOR_PENETRATION, 2*(lvs/10+1));inv.addItem(base);
base = input.clone();this.plugin.addBonusEnchantment(base, Main.ENCHANT_LIFE_STEAL, 2*(lvs/10+1));inv.addItem(base);
base = input.clone();this.plugin.addBonusEnchantment(base, Main.ENCHANT_ATTACK_SPEED, 10*(lvs/10+1));inv.addItem(base);
base = input.clone();this.plugin.addBonusEnchantment(base, Main.ENCHANT_DAMAGE, 2*(lvs/10+1));inv.addItem(base);
if (lvs==30) {base = input.clone();this.plugin.addBonusEnchantment(base, Main.ENCHANT_EXECUTE, lvs/10+1);inv.addItem(base);}
} else
if (input.getType().name().toLowerCase().contains("hoe")) {
ItemStack base = input.clone();base.addUnsafeEnchantment(Enchantment.DURABILITY, base.getEnchantmentLevel(Enchantment.DURABILITY)+lvs/10+1);inv.addItem(base);
base = input.clone();this.plugin.addBonusEnchantment(base, Main.ENCHANT_CRITICAL_CHANCE, 5*(lvs/10+1));inv.addItem(base);
base = input.clone();this.plugin.addBonusEnchantment(base, Main.ENCHANT_ARMOR_PENETRATION, 2*(lvs/10+1));inv.addItem(base);
base = input.clone();this.plugin.addBonusEnchantment(base, Main.ENCHANT_LIFE_STEAL, 2*(lvs/10+1));inv.addItem(base);
base = input.clone();this.plugin.addBonusEnchantment(base, Main.ENCHANT_ATTACK_SPEED, 10*(lvs/10+1));inv.addItem(base);
base = input.clone();this.plugin.addBonusEnchantment(base, Main.ENCHANT_DAMAGE, 2*(lvs/10+1));inv.addItem(base);
if (lvs==30) {base = input.clone();this.plugin.addBonusEnchantment(base, Main.ENCHANT_EXECUTE, lvs/10+1);inv.addItem(base);}
} else
if (input.getType().name().toLowerCase().contains("shears")) {
ItemStack base = input.clone();base.addUnsafeEnchantment(Enchantment.DIG_SPEED, base.getEnchantmentLevel(Enchantment.DIG_SPEED)+lvs/10+1);inv.addItem(base);
base = input.clone();base.addUnsafeEnchantment(Enchantment.SILK_TOUCH, base.getEnchantmentLevel(Enchantment.SILK_TOUCH)+lvs/10+1);inv.addItem(base);
base = input.clone();base.addUnsafeEnchantment(Enchantment.DURABILITY, base.getEnchantmentLevel(Enchantment.DURABILITY)+lvs/10+1);inv.addItem(base);
base = input.clone();this.plugin.addBonusEnchantment(base, Main.ENCHANT_CRITICAL_CHANCE, 5*(lvs/10+1));inv.addItem(base);
base = input.clone();this.plugin.addBonusEnchantment(base, Main.ENCHANT_ARMOR_PENETRATION, 2*(lvs/10+1));inv.addItem(base);
base = input.clone();this.plugin.addBonusEnchantment(base, Main.ENCHANT_LIFE_STEAL, 2*(lvs/10+1));inv.addItem(base);
base = input.clone();this.plugin.addBonusEnchantment(base, Main.ENCHANT_ATTACK_SPEED, 10*(lvs/10+1));inv.addItem(base);
base = input.clone();this.plugin.addBonusEnchantment(base, Main.ENCHANT_DAMAGE, 2*(lvs/10+1));inv.addItem(base);
if (lvs==30) {base = input.clone();this.plugin.addBonusEnchantment(base, Main.ENCHANT_EXECUTE, lvs/10+1);inv.addItem(base);}
} else
if (input.getType().name().toLowerCase().contains("flint")) {
ItemStack base = input.clone();base.addUnsafeEnchantment(Enchantment.DURABILITY, base.getEnchantmentLevel(Enchantment.DURABILITY)+lvs/10+1);inv.addItem(base);
base = input.clone();this.plugin.addBonusEnchantment(base, Main.ENCHANT_CRITICAL_CHANCE, 5*(lvs/10+1));inv.addItem(base);
base = input.clone();this.plugin.addBonusEnchantment(base, Main.ENCHANT_ARMOR_PENETRATION, 2*(lvs/10+1));inv.addItem(base);
base = input.clone();this.plugin.addBonusEnchantment(base, Main.ENCHANT_LIFE_STEAL, 2*(lvs/10+1));inv.addItem(base);
base = input.clone();this.plugin.addBonusEnchantment(base, Main.ENCHANT_ATTACK_SPEED, 10*(lvs/10+1));inv.addItem(base);
base = input.clone();this.plugin.addBonusEnchantment(base, Main.ENCHANT_DAMAGE, 2*(lvs/10+1));inv.addItem(base);
if (lvs==30) {base = input.clone();this.plugin.addBonusEnchantment(base, Main.ENCHANT_EXECUTE, lvs/10+1);inv.addItem(base);}
} else
if (input.getType().name().toLowerCase().contains("carrot")) {
ItemStack base = input.clone();base.addUnsafeEnchantment(Enchantment.DURABILITY, base.getEnchantmentLevel(Enchantment.DURABILITY)+lvs/10+1);inv.addItem(base);
base = input.clone();this.plugin.addBonusEnchantment(base, Main.ENCHANT_CRITICAL_CHANCE, 5*(lvs/10+1));inv.addItem(base);
base = input.clone();this.plugin.addBonusEnchantment(base, Main.ENCHANT_ARMOR_PENETRATION, 2*(lvs/10+1));inv.addItem(base);
base = input.clone();this.plugin.addBonusEnchantment(base, Main.ENCHANT_LIFE_STEAL, 2*(lvs/10+1));inv.addItem(base);
base = input.clone();this.plugin.addBonusEnchantment(base, Main.ENCHANT_ATTACK_SPEED, 10*(lvs/10+1));inv.addItem(base);
base = input.clone();this.plugin.addBonusEnchantment(base, Main.ENCHANT_DAMAGE, 2*(lvs/10+1));inv.addItem(base);
if (lvs==30) {base = input.clone();this.plugin.addBonusEnchantment(base, Main.ENCHANT_EXECUTE, lvs/10+1);inv.addItem(base);}
} else {
return null;
}
return inv;
}
/**
* DO NOT use e.getItem() to get the final results! It gets
* manually handled and will not return what you want in terms
* of enchantments! The variable "finalitem" stores the correct
* resulting ItemStack after all adjustments are made.
*/
@EventHandler @EventHandler
public void onEnchantItem(EnchantItemEvent e) { public void onEnchantItem(EnchantItemEvent e) {
Map<Enchantment,Integer> map = e.getEnchantsToAdd();
Player p = e.getEnchanter(); Player p = e.getEnchanter();
/*e.getEnchanter().sendMessage("Enchantments are:"); /*e.getEnchanter().sendMessage("Enchantments are:");
for (Map.Entry<Enchantment,Integer> entry : map.entrySet()) { for (Map.Entry<Enchantment,Integer> entry : map.entrySet()) {
@ -525,10 +683,10 @@ implements Listener
p.sendMessage(ChatColor.LIGHT_PURPLE+"You feel a magical presence get inserted into your inventory."); p.sendMessage(ChatColor.LIGHT_PURPLE+"You feel a magical presence get inserted into your inventory.");
}*/ }*/
ItemStack finalitem=e.getItem().clone();
if (this.plugin.PlayerinJob(p, "Enchanter")) { if (this.plugin.PlayerinJob(p, "Enchanter")) {
if (this.plugin.getJobLv("Enchanter", p)>=10) { if (this.plugin.getJobLv("Enchanter", p)>=10) {
e.setExpLevelCost((int)(e.getExpLevelCost()*0.75));
if (e.getItem().getType()==Material.BOW) { if (e.getItem().getType()==Material.BOW) {
int enchants[] = {48,49,50,51}; int enchants[] = {48,49,50,51};
for (int j=0;j<enchants.length;j++) { for (int j=0;j<enchants.length;j++) {
@ -563,6 +721,7 @@ implements Listener
ItemMeta meta = e.getItem().getItemMeta(); ItemMeta meta = e.getItem().getItemMeta();
meta.setLore(ourLore); meta.setLore(ourLore);
e.getItem().setItemMeta(meta); e.getItem().setItemMeta(meta);
finalitem.setItemMeta(meta);
} else { } else {
if (e.getItem().getType().toString().toLowerCase().contains("sword")) { if (e.getItem().getType().toString().toLowerCase().contains("sword")) {
int enchants[] = {16,17,18,19,20,21,34}; int enchants[] = {16,17,18,19,20,21,34};
@ -598,6 +757,7 @@ implements Listener
ItemMeta meta = e.getItem().getItemMeta(); ItemMeta meta = e.getItem().getItemMeta();
meta.setLore(ourLore); meta.setLore(ourLore);
e.getItem().setItemMeta(meta); e.getItem().setItemMeta(meta);
finalitem.setItemMeta(meta);
} else if (e.getItem().getType().toString().toLowerCase().contains("spade") || } else if (e.getItem().getType().toString().toLowerCase().contains("spade") ||
e.getItem().getType().toString().toLowerCase().contains("axe") || e.getItem().getType().toString().toLowerCase().contains("axe") ||
e.getItem().getType().toString().toLowerCase().contains("hoe") || e.getItem().getType().toString().toLowerCase().contains("hoe") ||
@ -635,6 +795,7 @@ implements Listener
ItemMeta meta = e.getItem().getItemMeta(); ItemMeta meta = e.getItem().getItemMeta();
meta.setLore(ourLore); meta.setLore(ourLore);
e.getItem().setItemMeta(meta); e.getItem().setItemMeta(meta);
finalitem.setItemMeta(meta);
} else { } else {
int enchants[] = {0,1,2,3,4,5,6,7,34}; int enchants[] = {0,1,2,3,4,5,6,7,34};
for (int j=0;j<enchants.length;j++) { for (int j=0;j<enchants.length;j++) {
@ -669,20 +830,16 @@ implements Listener
ItemMeta meta = e.getItem().getItemMeta(); ItemMeta meta = e.getItem().getItemMeta();
meta.setLore(ourLore); meta.setLore(ourLore);
e.getItem().setItemMeta(meta); e.getItem().setItemMeta(meta);
finalitem.setItemMeta(meta);
} }
} }
} }
for (Map.Entry<Enchantment,Integer> entry : map.entrySet()) {
if (this.plugin.getJobLv("Enchanter", p)>=20) {
if (entry.getKey().getMaxLevel()<entry.getValue()) {
entry.setValue(entry.getValue()+((int)(Math.random()*2)+1));
}
}
if (e.getItem().getType()==Material.BOW) { if (e.getItem().getType()==Material.BOW) {
int enchants[] = {48,49,50,51}; int enchants[] = {48,49,50,51};
for (int j=0;j<enchants.length;j++) { for (int j=0;j<enchants.length;j++) {
if (Math.random()<1.0d/enchants.length) { if (Math.random()<1.0d/enchants.length) {
e.getItem().addUnsafeEnchantment(Enchantment.getById(enchants[j]), (int)(Math.random()*5)+1); e.getItem().addUnsafeEnchantment(Enchantment.getById(enchants[j]), (int)(Math.random()*5)+1);
finalitem.addUnsafeEnchantment(Enchantment.getById(enchants[j]), (int)(Math.random()*5)+1);
} }
} }
List<String> ourLore = new ArrayList<String>(); List<String> ourLore = new ArrayList<String>();
@ -712,12 +869,14 @@ implements Listener
ItemMeta meta = e.getItem().getItemMeta(); ItemMeta meta = e.getItem().getItemMeta();
meta.setLore(ourLore); meta.setLore(ourLore);
e.getItem().setItemMeta(meta); e.getItem().setItemMeta(meta);
finalitem.setItemMeta(meta);
} else { } else {
if (e.getItem().getType().toString().toLowerCase().contains("sword")) { if (e.getItem().getType().toString().toLowerCase().contains("sword")) {
int enchants[] = {16,17,18,19,20,21,34}; int enchants[] = {16,17,18,19,20,21,34};
for (int j=0;j<enchants.length;j++) { for (int j=0;j<enchants.length;j++) {
if (Math.random()<1.0d/enchants.length) { if (Math.random()<1.0d/enchants.length) {
e.getItem().addUnsafeEnchantment(Enchantment.getById(enchants[j]), (int)(Math.random()*5)+1); e.getItem().addUnsafeEnchantment(Enchantment.getById(enchants[j]), (int)(Math.random()*5)+1);
finalitem.addUnsafeEnchantment(Enchantment.getById(enchants[j]), (int)(Math.random()*5)+1);
} }
} }
List<String> ourLore = new ArrayList<String>(); List<String> ourLore = new ArrayList<String>();
@ -747,6 +906,7 @@ implements Listener
ItemMeta meta = e.getItem().getItemMeta(); ItemMeta meta = e.getItem().getItemMeta();
meta.setLore(ourLore); meta.setLore(ourLore);
e.getItem().setItemMeta(meta); e.getItem().setItemMeta(meta);
finalitem.setItemMeta(meta);
} else if (e.getItem().getType().toString().toLowerCase().contains("spade") || } else if (e.getItem().getType().toString().toLowerCase().contains("spade") ||
e.getItem().getType().toString().toLowerCase().contains("axe") || e.getItem().getType().toString().toLowerCase().contains("axe") ||
e.getItem().getType().toString().toLowerCase().contains("hoe") || e.getItem().getType().toString().toLowerCase().contains("hoe") ||
@ -757,11 +917,13 @@ implements Listener
if (enchants[j]==33) { if (enchants[j]==33) {
if (e.getItem().getEnchantmentLevel(Enchantment.LOOT_BONUS_BLOCKS)==0) { if (e.getItem().getEnchantmentLevel(Enchantment.LOOT_BONUS_BLOCKS)==0) {
e.getItem().addEnchantment(Enchantment.getById(enchants[j]), (int)(Math.random()*5)+1); e.getItem().addEnchantment(Enchantment.getById(enchants[j]), (int)(Math.random()*5)+1);
finalitem.addEnchantment(Enchantment.getById(enchants[j]), (int)(Math.random()*5)+1);
} }
} }
if (enchants[j]==35) { if (enchants[j]==35) {
if (e.getItem().getEnchantmentLevel(Enchantment.SILK_TOUCH)==0) { if (e.getItem().getEnchantmentLevel(Enchantment.SILK_TOUCH)==0) {
e.getItem().addEnchantment(Enchantment.getById(enchants[j]), (int)(Math.random()*5)+1); e.getItem().addEnchantment(Enchantment.getById(enchants[j]), (int)(Math.random()*5)+1);
finalitem.addEnchantment(Enchantment.getById(enchants[j]), (int)(Math.random()*5)+1);
} }
} }
} }
@ -793,11 +955,13 @@ implements Listener
ItemMeta meta = e.getItem().getItemMeta(); ItemMeta meta = e.getItem().getItemMeta();
meta.setLore(ourLore); meta.setLore(ourLore);
e.getItem().setItemMeta(meta); e.getItem().setItemMeta(meta);
finalitem.setItemMeta(meta);
} else { } else {
int enchants[] = {0,1,2,3,4,5,6,7,34}; int enchants[] = {0,1,2,3,4,5,6,7,34};
for (int j=0;j<enchants.length;j++) { for (int j=0;j<enchants.length;j++) {
if (Math.random()<1.0d/enchants.length) { if (Math.random()<1.0d/enchants.length) {
e.getItem().addUnsafeEnchantment(Enchantment.getById(enchants[j]), (int)(Math.random()*5)+1); e.getItem().addUnsafeEnchantment(Enchantment.getById(enchants[j]), (int)(Math.random()*5)+1);
finalitem.addUnsafeEnchantment(Enchantment.getById(enchants[j]), (int)(Math.random()*5)+1);
} }
} }
List<String> ourLore = new ArrayList<String>(); List<String> ourLore = new ArrayList<String>();
@ -827,8 +991,22 @@ implements Listener
ItemMeta meta = e.getItem().getItemMeta(); ItemMeta meta = e.getItem().getItemMeta();
meta.setLore(ourLore); meta.setLore(ourLore);
e.getItem().setItemMeta(meta); e.getItem().setItemMeta(meta);
finalitem.setItemMeta(meta);
} }
} }
Map<Enchantment,Integer> map = finalitem.getEnchantments();
for (Map.Entry<Enchantment,Integer> entry : map.entrySet()) {
if (this.plugin.getJobLv("Enchanter", p)>=20) {
if (entry.getKey().getMaxLevel()<entry.getValue()) {
try {
entry.setValue(entry.getValue()+((int)(Math.random()*2)+1));
}
catch (UnsupportedOperationException except) {
Bukkit.getLogger().warning("Could not handle this particular enchantment.");
}
}
}
Bukkit.getLogger().info("Enchantment "+entry.getKey().toString()+" at level "+entry.getValue());
if (entry.getKey().getName()==Enchantment.PROTECTION_ENVIRONMENTAL.getName()) { if (entry.getKey().getName()==Enchantment.PROTECTION_ENVIRONMENTAL.getName()) {
this.plugin.gainMoneyExp(p,"Enchanter",0.08*entry.getValue(),4*Math.pow(entry.getValue(),2)); this.plugin.gainMoneyExp(p,"Enchanter",0.08*entry.getValue(),4*Math.pow(entry.getValue(),2));
} }
@ -890,6 +1068,96 @@ implements Listener
this.plugin.gainMoneyExp(p,"Enchanter",0.50*entry.getValue(),40*Math.pow(entry.getValue(),2)); this.plugin.gainMoneyExp(p,"Enchanter",0.50*entry.getValue(),40*Math.pow(entry.getValue(),2));
} }
} }
Map<Enchantment,Integer> map2 = e.getEnchantsToAdd();
for (Map.Entry<Enchantment,Integer> entry : map2.entrySet()) {
if (this.plugin.getJobLv("Enchanter", p)>=20) {
if (entry.getKey().getMaxLevel()<entry.getValue()) {
entry.setValue(entry.getValue()+((int)(Math.random()*2)+1));
}
}
finalitem.addUnsafeEnchantment(entry.getKey(), entry.getValue());
Bukkit.getLogger().info("Enchantment "+entry.getKey().toString()+" at level "+entry.getValue());
if (entry.getKey().getName()==Enchantment.PROTECTION_ENVIRONMENTAL.getName()) {
this.plugin.gainMoneyExp(p,"Enchanter",0.08*entry.getValue(),4*Math.pow(entry.getValue(),2));
}
if (entry.getKey().getName()==Enchantment.DAMAGE_UNDEAD.getName()) {
this.plugin.gainMoneyExp(p,"Enchanter",0.10*entry.getValue(),8*Math.pow(entry.getValue(),2));
}
if (entry.getKey().getName()==Enchantment.PROTECTION_FIRE.getName()) {
this.plugin.gainMoneyExp(p,"Enchanter",0.10*entry.getValue(),6*Math.pow(entry.getValue(),2));
}
if (entry.getKey().getName()==Enchantment.DAMAGE_ARTHROPODS.getName()) {
this.plugin.gainMoneyExp(p,"Enchanter",0.12*entry.getValue(),8*Math.pow(entry.getValue(),2));
}
if (entry.getKey().getName()==Enchantment.PROTECTION_FALL.getName()) {
this.plugin.gainMoneyExp(p,"Enchanter",0.14*entry.getValue(),10*Math.pow(entry.getValue(),2));
}
if (entry.getKey().getName()==Enchantment.DAMAGE_ALL.getName()) {
this.plugin.gainMoneyExp(p,"Enchanter",0.15*entry.getValue(),14*Math.pow(entry.getValue(),2));
}
if (entry.getKey().getName()==Enchantment.DIG_SPEED.getName()) {
this.plugin.gainMoneyExp(p,"Enchanter",0.15*entry.getValue(),14*Math.pow(entry.getValue(),2));
}
if (entry.getKey().getName()==Enchantment.PROTECTION_EXPLOSIONS.getName()) {
this.plugin.gainMoneyExp(p,"Enchanter",0.20*entry.getValue(),16*Math.pow(entry.getValue(),2));
}
if (entry.getKey().getName()==Enchantment.THORNS.getName()) {
this.plugin.gainMoneyExp(p,"Enchanter",0.20*entry.getValue(),16*Math.pow(entry.getValue(),2));
}
if (entry.getKey().getName()==Enchantment.KNOCKBACK.getName()) {
this.plugin.gainMoneyExp(p,"Enchanter",0.20*entry.getValue(),18*Math.pow(entry.getValue(),2));
}
if (entry.getKey().getName()==Enchantment.ARROW_KNOCKBACK.getName()) {
this.plugin.gainMoneyExp(p,"Enchanter",0.20*entry.getValue(),18*Math.pow(entry.getValue(),2));
}
if (entry.getKey().getName()==Enchantment.FIRE_ASPECT.getName()) {
this.plugin.gainMoneyExp(p,"Enchanter",0.22*entry.getValue(),20*Math.pow(entry.getValue(),2));
}
if (entry.getKey().getName()==Enchantment.ARROW_FIRE.getName()) {
this.plugin.gainMoneyExp(p,"Enchanter",0.22*entry.getValue(),20*Math.pow(entry.getValue(),2));
}
if (entry.getKey().getName()==Enchantment.WATER_WORKER.getName()) {
this.plugin.gainMoneyExp(p,"Enchanter",0.25*entry.getValue(),16*Math.pow(entry.getValue(),2));
}
if (entry.getKey().getName()==Enchantment.OXYGEN.getName()) {
this.plugin.gainMoneyExp(p,"Enchanter",0.30*entry.getValue(),20*Math.pow(entry.getValue(),2));
}
if (entry.getKey().getName()==Enchantment.DURABILITY.getName()) {
this.plugin.gainMoneyExp(p,"Enchanter",0.35*entry.getValue(),24*Math.pow(entry.getValue(),2));
}
if (entry.getKey().getName()==Enchantment.ARROW_INFINITE.getName()) {
this.plugin.gainMoneyExp(p,"Enchanter",0.40*entry.getValue(),40*Math.pow(entry.getValue(),2));
}
if (entry.getKey().getName()==Enchantment.LOOT_BONUS_MOBS.getName()) {
this.plugin.gainMoneyExp(p,"Enchanter",0.40*entry.getValue(),30*Math.pow(entry.getValue(),2));
}
if (entry.getKey().getName()==Enchantment.LOOT_BONUS_BLOCKS.getName()) {
this.plugin.gainMoneyExp(p,"Enchanter",0.50*entry.getValue(),40*Math.pow(entry.getValue(),2));
}
if (entry.getKey().getName()==Enchantment.SILK_TOUCH.getName()) {
this.plugin.gainMoneyExp(p,"Enchanter",0.50*entry.getValue(),40*Math.pow(entry.getValue(),2));
}
}
}
/////////////////////////////////////////////finalitem contains the item with ALL enchantments that were added on.
//Perform all maintenance operations below.
if (this.plugin.hasJobBuff("Enchanter", p, Job.JOB30A)) {
//Open up another inventory giving you the ability to choose an upgrade as well.
//p.closeInventory();
//Bukkit.getLogger().info("Final item: "+finalitem.toString());
Inventory open = openBonusInventory(p, finalitem, e.getExpLevelCost());
ItemMeta meta = e.getItem().getItemMeta();
meta.setDisplayName(ChatColor.DARK_GRAY+""+ChatColor.ITALIC+"[Temporary Item]");
e.getItem().setItemMeta(meta);
if (open!=null) {
p.openInventory(open);
}
}
if (this.plugin.hasJobBuff("Enchanter", p, Job.JOB10)) {
e.setExpLevelCost((int)(e.getExpLevelCost()*0.75));
} }
} }
@ -4569,6 +4837,15 @@ implements Listener
public void onItemDrop(PlayerDropItemEvent e) { public void onItemDrop(PlayerDropItemEvent e) {
//If the player is a support, drop it with only 1 second of wait time. //If the player is a support, drop it with only 1 second of wait time.
Player p = e.getPlayer(); Player p = e.getPlayer();
if (e.getItemDrop().getItemStack().hasItemMeta() && e.getItemDrop().getItemStack().getItemMeta().hasDisplayName()) {
if (e.getItemDrop().getItemStack().getItemMeta().getDisplayName().equalsIgnoreCase(ChatColor.DARK_GRAY+""+ChatColor.ITALIC+"[Temporary Item]")) {
//Bukkit.getLogger().info("This is a temporary item.");
e.getItemDrop().setPickupDelay(0);
//p.getInventory().addItem(e.getItemDrop().getItemStack());
//e.getItemDrop().getItemStack().getItemMeta(
//e.getItemDrop().remove();
}
}
if (this.plugin.PlayerinJob(p, "Support")) { if (this.plugin.PlayerinJob(p, "Support")) {
//This item drops with half the pickup speed of normal items. //This item drops with half the pickup speed of normal items.
e.getItemDrop().setPickupDelay(20); e.getItemDrop().setPickupDelay(20);
@ -11236,7 +11513,8 @@ implements Listener
@EventHandler @EventHandler
public void onInventoryCloseEvent(InventoryCloseEvent e) { public void onInventoryCloseEvent(InventoryCloseEvent e) {
Player p = (Player)e.getPlayer(); final Player p = (Player)e.getPlayer();
final Inventory inv = e.getInventory();
//Bukkit.getLogger().info("GEt close inventory event."); //Bukkit.getLogger().info("GEt close inventory event.");
p.getScoreboard().getTeam(p.getName().toLowerCase()).setPrefix(ChatColor.WHITE+""); p.getScoreboard().getTeam(p.getName().toLowerCase()).setPrefix(ChatColor.WHITE+"");
if (p.hasPermission("group.moderator")) { if (p.hasPermission("group.moderator")) {
@ -11245,6 +11523,21 @@ implements Listener
if (p.hasPermission("group.administrators")) { if (p.hasPermission("group.administrators")) {
p.getScoreboard().getTeam(p.getName().toLowerCase()).setPrefix(ChatColor.LIGHT_PURPLE+""); p.getScoreboard().getTeam(p.getName().toLowerCase()).setPrefix(ChatColor.LIGHT_PURPLE+"");
} }
if (e.getInventory().getName().contains("Choose an additional bonus:")) {
//If we still have the temporary item, we will re-open the window soon after.
for (int i=0;i<p.getInventory().getContents().length;i++) {
if (p.getInventory().getContents()[i]!=null && p.getInventory().getContents()[i].hasItemMeta() &&
p.getInventory().getContents()[i].getItemMeta().hasDisplayName() &&
p.getInventory().getContents()[i].getItemMeta().getDisplayName().equalsIgnoreCase(ChatColor.DARK_GRAY+""+ChatColor.ITALIC+"[Temporary Item]")) {
p.getServer().getScheduler().scheduleSyncDelayedTask(plugin, new Runnable() {
@Override
public void run() {
p.openInventory(inv);
}
}, 1);
}
}
} else
if (e.getInventory().getName().contains("Item Cube")) { if (e.getInventory().getName().contains("Item Cube")) {
int identifier=-1; int identifier=-1;
//Get idenfitier. //Get idenfitier.
@ -12758,6 +13051,34 @@ implements Listener
} }
} }
} else } else
if (event.getInventory().getTitle().equalsIgnoreCase("Choose an additional bonus:")) {
if (event.getClick()!=ClickType.LEFT) {
event.setCancelled(true);
p.updateInventory();
}
if (event.getClick()==ClickType.LEFT) {
//Select this one. Drop it on the ground.
//Bukkit.getLogger().info("Raw slot is "+event.getRawSlot());
if (event.getRawSlot()<18) {
ItemStack itemselected = event.getCurrentItem();
if (itemselected!=null && itemselected.getType()!=Material.AIR) {
Item it = p.getWorld().dropItemNaturally(p.getLocation(), itemselected);
it.setPickupDelay(0);
for (int i=0;i<p.getInventory().getContents().length;i++) {
if (p.getInventory().getContents()[i]!=null && p.getInventory().getContents()[i].hasItemMeta() &&
p.getInventory().getContents()[i].getItemMeta().hasDisplayName() &&
p.getInventory().getContents()[i].getItemMeta().getDisplayName().equalsIgnoreCase(ChatColor.DARK_GRAY+""+ChatColor.ITALIC+"[Temporary Item]")) {
p.getInventory().removeItem(p.getInventory().getContents()[i]);
}
}
p.closeInventory();
}
} else {
event.setCancelled(true);
p.updateInventory();
}
}
}
if (event.getInventory().getTitle().equalsIgnoreCase("Repair and Enchant")) { if (event.getInventory().getTitle().equalsIgnoreCase("Repair and Enchant")) {
final int INPUT = 10; final int INPUT = 10;
final int MATERIALS = 12; final int MATERIALS = 12;