diff --git a/BankEconomyMod/bin/me/kaZep/Base/Main.class b/BankEconomyMod/bin/me/kaZep/Base/Main.class index c70674b..0e9d878 100644 Binary files a/BankEconomyMod/bin/me/kaZep/Base/Main.class and b/BankEconomyMod/bin/me/kaZep/Base/Main.class differ diff --git a/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$1.class b/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$1.class index c4018f6..436f71d 100644 Binary files a/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$1.class and b/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$1.class differ diff --git a/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$2.class b/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$2.class index 5c12766..ee9f0cc 100644 Binary files a/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$2.class and b/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$2.class differ diff --git a/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$3.class b/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$3.class index 0eec2ef..0399cd4 100644 Binary files a/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$3.class and b/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$3.class differ diff --git a/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$4.class b/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$4.class index eff9a1a..4587d7e 100644 Binary files a/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$4.class and b/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$4.class differ diff --git a/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$5.class b/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$5.class index a90c11b..08c37d2 100644 Binary files a/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$5.class and b/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$5.class differ diff --git a/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$6.class b/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$6.class index 9e25f3b..971ed33 100644 Binary files a/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$6.class and b/BankEconomyMod/bin/me/kaZep/Base/PlayerListener$6.class differ diff --git a/BankEconomyMod/bin/me/kaZep/Base/PlayerListener.class b/BankEconomyMod/bin/me/kaZep/Base/PlayerListener.class index 2f6c7d3..45cbc60 100644 Binary files a/BankEconomyMod/bin/me/kaZep/Base/PlayerListener.class and b/BankEconomyMod/bin/me/kaZep/Base/PlayerListener.class differ diff --git a/BankEconomyMod/src/me/kaZep/Base/Main.java b/BankEconomyMod/src/me/kaZep/Base/Main.java index 4eeeab8..0224ac9 100644 --- a/BankEconomyMod/src/me/kaZep/Base/Main.java +++ b/BankEconomyMod/src/me/kaZep/Base/Main.java @@ -527,7 +527,7 @@ public class Main extends JavaPlugin Weaponsmith_job.setAction(0, "CRAFT"); Weaponsmith_job.setExp(100, 100, 30, 1.05); Weaponsmith_job.addData("ARROW", 0.025, 4, 0); - Weaponsmith_job.addData("WOODEN SWORD", 0.05, 10, 0); + //Weaponsmith_job.addData("WOODEN SWORD", 0.05, 10, 0); Weaponsmith_job.addData("FLINT AND STEEL", 0.06, 12, 0); Weaponsmith_job.addData("BOW", 0.075, 12, 0); Weaponsmith_job.addData("IRON SWORD", 0.375, 75, 0); @@ -542,9 +542,9 @@ public class Main extends JavaPlugin Blacksmith_job.setJobDescription("A blacksmith's job is to provide tools, armor, and other crafted materials to others and themselves to protect them."); Blacksmith_job.setAction(0, "CRAFT"); Blacksmith_job.setExp(250, 150, 37, 1.03); - Blacksmith_job.addData("STONE HOE", 0.04, 7, 0); - Blacksmith_job.addData("STONE SHOVEL", 0.05, 8, 0); - Blacksmith_job.addData("STONE PICKAXE", 0.075, 15, 0); + //Blacksmith_job.addData("STONE HOE", 0.04, 7, 0); + //Blacksmith_job.addData("STONE SHOVEL", 0.05, 8, 0); + //Blacksmith_job.addData("STONE PICKAXE", 0.075, 15, 0); Blacksmith_job.addData("LEATHER BOOTS", 0.125, 8, 0); Blacksmith_job.addData("LEATHER CAP", 0.15, 14, 0); Blacksmith_job.addData("LEATHER PANTS", 0.175, 15, 0); @@ -3287,7 +3287,7 @@ public void payDay(int time) getAccountsConfig().set(p+".jobs.job"+(slot+1)+"exp", Double.valueOf(0)); } //Check for lv up. - if (getJobExp(job,getAccountsConfig().getInt(p+".jobs.job"+(slot+1)+"lv"))<=getAccountsConfig().getDouble(p+".jobs.job"+(slot+1)+"exp")) { + if (getJobLv(job,p)<40 && getJobExp(job,getAccountsConfig().getInt(p+".jobs.job"+(slot+1)+"lv"))<=getAccountsConfig().getDouble(p+".jobs.job"+(slot+1)+"exp")) { //Make sure we can't go over level cap. //Level up! Level up! YEAH! getAccountsConfig().set(p+".jobs.job"+(slot+1)+"exp", Double.valueOf(getAccountsConfig().getDouble(p+".jobs.job"+(slot+1)+"exp")-getJobExp(job,getAccountsConfig().getInt(p+".jobs.job"+(slot+1)+"lv")))); getAccountsConfig().set(p+".jobs.job"+(slot+1)+"lv", Integer.valueOf(getAccountsConfig().getInt(p+".jobs.job"+(slot+1)+"lv")+1)); diff --git a/BankEconomyMod/src/me/kaZep/Base/PlayerListener.java b/BankEconomyMod/src/me/kaZep/Base/PlayerListener.java index 262ba83..126d498 100644 --- a/BankEconomyMod/src/me/kaZep/Base/PlayerListener.java +++ b/BankEconomyMod/src/me/kaZep/Base/PlayerListener.java @@ -611,7 +611,7 @@ public class PlayerListener Cow a = (Cow)e.getRightClicked(); if (a.canBreed()) { if (Math.random()<=0.50) { - p.getItemInHand().setAmount(p.getItemInHand().getAmount()+1); + p.getItemInHand().setAmount(p.getItemInHand().getAmount()); } } } @@ -659,7 +659,7 @@ public class PlayerListener Sheep a = (Sheep)e.getRightClicked(); if (a.canBreed()) { if (Math.random()<=0.50) { - p.getItemInHand().setAmount(p.getItemInHand().getAmount()+1); + p.getItemInHand().setAmount(p.getItemInHand().getAmount()); } } } @@ -707,7 +707,7 @@ public class PlayerListener Pig a = (Pig)e.getRightClicked(); if (a.canBreed()) { if (Math.random()<=0.50) { - p.getItemInHand().setAmount(p.getItemInHand().getAmount()+1); + p.getItemInHand().setAmount(p.getItemInHand().getAmount()); } } } @@ -755,7 +755,7 @@ public class PlayerListener Chicken a = (Chicken)e.getRightClicked(); if (a.canBreed()) { if (Math.random()<=0.50) { - p.getItemInHand().setAmount(p.getItemInHand().getAmount()+1); + p.getItemInHand().setAmount(p.getItemInHand().getAmount()); } } } @@ -803,7 +803,7 @@ public class PlayerListener Wolf a = (Wolf)e.getRightClicked(); if (a.canBreed()) { if (Math.random()<=0.50) { - p.getItemInHand().setAmount(p.getItemInHand().getAmount()+1); + p.getItemInHand().setAmount(p.getItemInHand().getAmount()); } } } @@ -851,7 +851,7 @@ public class PlayerListener Ocelot a = (Ocelot)e.getRightClicked(); if (a.canBreed()) { if (Math.random()<=0.50) { - p.getItemInHand().setAmount(p.getItemInHand().getAmount()+1); + p.getItemInHand().setAmount(p.getItemInHand().getAmount()); } } } @@ -893,6 +893,19 @@ public class PlayerListener } } } + if (p.getItemInHand().getType()==Material.GOLDEN_APPLE || p.getItemInHand().getType()==Material.GOLDEN_CARROT) { + if (e.getRightClicked().getType()==EntityType.HORSE) { + if (this.plugin.PlayerinJob(p, "Breeder") && this.plugin.getJobLv("Breeder", p)>=20) { + Horse a = (Horse)e.getRightClicked(); + if (a.canBreed()) { + if (Math.random()<=0.50) { + p.getItemInHand().setAmount(p.getItemInHand().getAmount()); + } + } + } + //This is a special entity and won't be added to the list of animals to despawn for now. + } + } } @EventHandler @@ -3558,37 +3571,6 @@ public class PlayerListener if (result.getResult().getType()==Material.DIAMOND_SWORD) { crafteditem=true; } - if (this.plugin.getJobLv("Weaponsmith", p)>=20) { - ItemStack[] crafteditems = result.getMatrix(); - for (int i=0;i=5) { - ItemStack[] crafteditems = result.getMatrix(); - for (int i=0;i=10 && crafteditem) { - //Bukkit.getPlayer("sigonasr2").sendMessage("Valid item. Going to attempt to enchant."); - ItemStack resulting = this.plugin.EnchantItem(result.getResult(),10); - result.setResult(resulting); - } } if (this.plugin.PlayerinJob(p,"Blacksmith")) { boolean crafteditem=false; @@ -7631,7 +7613,18 @@ public ItemStack getGoodie() { meta.setLore(setLore); finalitem.setItemMeta(meta); //finalitem.setDurability((short)1560); //TESTING. - p.getInventory().addItem(finalitem); + boolean full=true; + for (int i=0;i enchant_data = new ArrayList(); //OMGGGG. forgot to initialize the dang list! + if (item.getType()==Material.STONE_HOE || item.getType()==Material.IRON_HOE || item.getType()==Material.WOOD_HOE || item.getType()==Material.GOLD_HOE || item.getType()==Material.DIAMOND_HOE) { + enchant_data=ENCHANTMENT_DATA.stone_hoe; + } else + //DERP + if (item.getType()==Material.STONE_SPADE) {enchant_data=ENCHANTMENT_DATA.stone_shovel;} else + if (item.getType()==Material.STONE_PICKAXE) {enchant_data=ENCHANTMENT_DATA.stone_pickaxe;} else + if (item.getType()==Material.LEATHER_BOOTS) {enchant_data=ENCHANTMENT_DATA.leather_boots;} else + if (item.getType()==Material.LEATHER_LEGGINGS) {enchant_data=ENCHANTMENT_DATA.leather_pants;} else + if (item.getType()==Material.LEATHER_CHESTPLATE) {enchant_data=ENCHANTMENT_DATA.leather_tunic;} else + if (item.getType()==Material.LEATHER_HELMET) {enchant_data=ENCHANTMENT_DATA.leather_cap;} else + if (item.getType()==Material.IRON_SPADE) {enchant_data=ENCHANTMENT_DATA.iron_shovel;} else + if (item.getType()==Material.IRON_BOOTS) {enchant_data=ENCHANTMENT_DATA.iron_boots;} else + if (item.getType()==Material.IRON_PICKAXE) {enchant_data=ENCHANTMENT_DATA.iron_pickaxe;} else + if (item.getType()==Material.IRON_HELMET) {enchant_data=ENCHANTMENT_DATA.iron_helmet;} else + if (item.getType()==Material.GOLD_SPADE) {enchant_data=ENCHANTMENT_DATA.golden_shovel;} else + if (item.getType()==Material.IRON_LEGGINGS) {enchant_data=ENCHANTMENT_DATA.iron_leggings;} else + if (item.getType()==Material.DIAMOND_SPADE) {enchant_data=ENCHANTMENT_DATA.diamond_shovel;} else + if (item.getType()==Material.GOLD_BOOTS) {enchant_data=ENCHANTMENT_DATA.golden_boots;} else + if (item.getType()==Material.IRON_CHESTPLATE) {enchant_data=ENCHANTMENT_DATA.iron_chestplate;} else + if (item.getType()==Material.GOLD_HELMET) {enchant_data=ENCHANTMENT_DATA.golden_helmet;} else + if (item.getType()==Material.IRON_CHESTPLATE) {enchant_data=ENCHANTMENT_DATA.iron_chestplate;} else + if (item.getType()==Material.DIAMOND_PICKAXE) {enchant_data=ENCHANTMENT_DATA.diamond_pickaxe;} else + if (item.getType()==Material.DIAMOND_BOOTS) {enchant_data=ENCHANTMENT_DATA.diamond_boots;} else + if (item.getType()==Material.GOLD_LEGGINGS) {enchant_data=ENCHANTMENT_DATA.golden_leggings;} else + if (item.getType()==Material.GOLD_CHESTPLATE) {enchant_data=ENCHANTMENT_DATA.golden_chestplate;} else + if (item.getType()==Material.DIAMOND_HELMET) {enchant_data=ENCHANTMENT_DATA.diamond_helmet;} else + if (item.getType()==Material.DIAMOND_LEGGINGS) {enchant_data=ENCHANTMENT_DATA.diamond_leggings;} else + if (item.getType()==Material.DIAMOND_CHESTPLATE) {enchant_data=ENCHANTMENT_DATA.diamond_chestplate;} + int enchantments=0; + int iterations=0; + while (enchantments==0 && iterations<100) { //Attempt to enchant it, up to 100 tries. + iterations++; + //Bukkit.getPlayer("sigonasr2").sendMessage("Enchant data size is "+enchant_data.size()); + for (int i=0;i=10 && validItem_Weaponsmith(post)) { + //Bukkit.getPlayer("sigonasr2").sendMessage("Valid item. Going to attempt to enchant."); + ItemStack resulting = EnchantItem(post,5); + player.getInventory().setItem(i, resulting); + } + } + if (PlayerinJob((Player)player,"Blacksmith")) { + if (getJobLv("Blacksmith", player.getName())>=10 && validItem_Blacksmith(post)) { + //Bukkit.getPlayer("sigonasr2").sendMessage("Valid item. Going to attempt to enchant."); + ItemStack resulting = EnchantItem(post,10); + player.getInventory().setItem(i, resulting); + } else + if (getJobLv("Blacksmith", player.getName())>=5 && validItem_Blacksmith(post)) { + //Bukkit.getPlayer("sigonasr2").sendMessage("Valid item. Going to attempt to enchant."); + ItemStack resulting = EnchantItem(post,5); + player.getInventory().setItem(i, resulting); + } + } } //Bukkit.getPlayer("sigonasr2").sendMessage("Item amounts differ. New count: "+newItemsCount); }