diff --git a/BankEconomyMod/src/me/kaZep/Base/Main.java b/BankEconomyMod/src/me/kaZep/Base/Main.java index 74bd496..0f956f1 100644 --- a/BankEconomyMod/src/me/kaZep/Base/Main.java +++ b/BankEconomyMod/src/me/kaZep/Base/Main.java @@ -332,7 +332,7 @@ public class Main extends JavaPlugin nether_star.setIngredient('d', Material.DIAMOND); Bukkit.addRecipe(nether_star); - //Add Recipe for water source crafting. + //Add Recipe for water source crafting. ItemStack water = new ItemStack(Material.WATER, 8); ItemMeta water_name = water.getItemMeta(); @@ -355,6 +355,56 @@ public class Main extends JavaPlugin Bukkit.addRecipe(nether_water); + //Add Recipe for orb of distortion + ItemStack orb = new ItemStack(Material.SLIME_BALL, 1); + ItemMeta orb_name = orb.getItemMeta(); + + List orblore = new ArrayList(); + orblore.add(ChatColor.GRAY+""+ChatColor.ITALIC+""); + orblore.add(ChatColor.GRAY+""+ChatColor.ITALIC+"This orb distorts space-time"); + orblore.add(ChatColor.GRAY+""+ChatColor.ITALIC+"around it, preventing anyone"); + orblore.add(ChatColor.GRAY+""+ChatColor.ITALIC+"from teleporting to its carrier."); + orb_name.setLore(orblore); + orb_name.setDisplayName(ChatColor.AQUA+"Orb of Distortion"); + + orb.setItemMeta(orb_name); + orb.addUnsafeEnchantment(Enchantment.ARROW_DAMAGE, 1); + + ShapedRecipe distortion_orb = new ShapedRecipe(orb); + + distortion_orb.shape("aaa", "aba", "aaa"); + distortion_orb.setIngredient('a', Material.ENDER_PEARL); + distortion_orb.setIngredient('b', Material.ENDER_STONE); + + Bukkit.addRecipe(distortion_orb); + + //Add Recipe for rose of distortion + ItemStack rose = new ItemStack(Material.RED_ROSE, 1); + ItemMeta rose_name = rose.getItemMeta(); + + List roselore = new ArrayList(); + roselore.add(ChatColor.GRAY+""+ChatColor.ITALIC+""); + roselore.add(ChatColor.GRAY+""+ChatColor.ITALIC+"This flower is infused with"); + roselore.add(ChatColor.GRAY+""+ChatColor.ITALIC+"overwhelming magical power,"); + roselore.add(ChatColor.GRAY+""+ChatColor.ITALIC+"causing it to never wilt."); + roselore.add(ChatColor.GRAY+""+ChatColor.ITALIC+""); + roselore.add(ChatColor.GRAY+""+ChatColor.ITALIC+"The holder of this flower"); + roselore.add(ChatColor.GRAY+""+ChatColor.ITALIC+"will also be resistant to"); + roselore.add(ChatColor.GRAY+""+ChatColor.ITALIC+"any "+ChatColor.RESET+"WITHER"+ChatColor.GRAY+""+ChatColor.ITALIC+" effects."); + rose_name.setLore(roselore); + rose_name.setDisplayName(ChatColor.AQUA+"Unwilting Flower"); + + rose.setItemMeta(rose_name); + rose.addUnsafeEnchantment(Enchantment.ARROW_DAMAGE, 1); + + ShapedRecipe witherless_rose = new ShapedRecipe(rose); + + witherless_rose.shape(" a ", "aba", " a "); + witherless_rose.setIngredient('a', Material.NETHER_STAR); + witherless_rose.setIngredient('b', Material.RED_ROSE); + + Bukkit.addRecipe(witherless_rose); + //Add Recipe for pocket crafting table ItemStack table = new ItemStack(Material.WORKBENCH); ItemMeta table_name = table.getItemMeta(); @@ -2707,6 +2757,23 @@ public void checkJukeboxes() { LOGGING_UPDATE_COUNTS=0; for (int i=0;i data = p.getInventory().getContents()[m].getItemMeta().getLore(); + + for (int i=0;i data = p.getInventory().getContents()[m].getItemMeta().getLore(); + + for (int i=0;i=30) { diff --git a/BankEconomyMod/src/me/kaZep/Base/PlayerBuffData.java b/BankEconomyMod/src/me/kaZep/Base/PlayerBuffData.java index e8729d5..cc0906a 100644 --- a/BankEconomyMod/src/me/kaZep/Base/PlayerBuffData.java +++ b/BankEconomyMod/src/me/kaZep/Base/PlayerBuffData.java @@ -30,6 +30,16 @@ public class PlayerBuffData { double money_gained=0; long last_money_report_time=0; public Main plugin; + + public String toString() { + //A method that outputs this class as a string. + return "PlayerBuffData@{p = "+((p!=null)?p.toString():"null")+", base_spdlv = "+base_spdlv+", base_armorlv = "+base_armorlv+", armorbufflist = "+ + ((armorbufflist!=null)?armorbufflist.toString():"null")+", base_hplv = "+base_hplv+", hpbufflist = "+((hpbufflist!=null)?hpbufflist.toString():"null")+", helmet_durability = "+ + helmet_durability+", chestplate_durability = "+chestplate_durability+", leggings_durability = "+leggings_durability+"," + + " boots_durability = "+boots_durability+", potion_spdlv = "+potion_spdlv+", potion_time = "+potion_time+", hpbuff_time = "+ + hpbuff_time+", extra_hp = "+extra_hp+", money_gained = "+money_gained+", last_money_report_time = "+last_money_report_time+"," + + "plugin = "+((plugin!=null)?plugin.toString():"null")+"}"; + } public String healthbar(double curHP,double maxHP) { //笆�笆� diff --git a/BankEconomyMod/src/me/kaZep/Base/PlayerListener.java b/BankEconomyMod/src/me/kaZep/Base/PlayerListener.java index e3ae86c..08b95a3 100644 --- a/BankEconomyMod/src/me/kaZep/Base/PlayerListener.java +++ b/BankEconomyMod/src/me/kaZep/Base/PlayerListener.java @@ -21,6 +21,7 @@ import net.milkbowl.vault.economy.EconomyResponse; + import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.Chunk; @@ -178,6 +179,8 @@ import org.bukkit.scoreboard.Team; import org.bukkit.util.Vector; import org.bukkit.potion.Potion; +import sig.ItemSets.DiabloDropsHook; + import com.google.common.base.Objects; import com.modcrafting.diablodrops.DiabloDrops; import com.sk89q.worldedit.CuboidClipboard; @@ -321,7 +324,7 @@ implements Listener if (this.plugin.PlayerinJob(p, "Enchanter") && this.plugin.getJobLv("Enchanter", p)>=5) { e.setAmount(e.getAmount()*2); } - if (this.plugin.getAccountsConfig().getBoolean("halloween-enabled")) { + if (this.plugin.getAccountsConfig().getBoolean("halloween-enabled") || this.plugin.getConfig().getBoolean("thanksgiving-enabled")) { e.setAmount(e.getAmount()*2); } if (this.plugin.getAccountsConfig().getBoolean(p.getName().toLowerCase()+".settings.notify3")) { @@ -4502,11 +4505,28 @@ implements Listener if (result.getResult().getType()==Material.MELON_BLOCK) { result.setResult(new ItemStack(Material.AIR)); } + + if (result.getResult().getType()==Material.WOOL && result.getResult().getAmount() == 1) { + //Make sure the crafting matrix only contains three string. + int stringcount=0; + for (int i=0;i